perfsonar-dev - perfsonar: r4489 - in branches/WebAdmin: . ant perfSONARWebAdmin/auxiliary/xmlDB
Subject: perfsonar development work
List archive
perfsonar: r4489 - in branches/WebAdmin: . ant perfSONARWebAdmin/auxiliary/xmlDB
Chronological Thread
- From:
- To:
- Subject: perfsonar: r4489 - in branches/WebAdmin: . ant perfSONARWebAdmin/auxiliary/xmlDB
- Date: Mon, 15 Sep 2008 11:50:20 -0400
Author: pgerakios
Date: 2008-09-15 11:50:19 -0400 (Mon, 15 Sep 2008)
New Revision: 4489
Added:
branches/WebAdmin/CHANGELOG
Modified:
branches/WebAdmin/ant/const.properties
branches/WebAdmin/index.jsp
branches/WebAdmin/liveclock.js
branches/WebAdmin/perfSONARWebAdmin/auxiliary/xmlDB/existAuthenticatorImpl.java
Log:
Added: branches/WebAdmin/CHANGELOG
Modified: branches/WebAdmin/ant/const.properties
===================================================================
--- branches/WebAdmin/ant/const.properties 2008-09-15 10:04:34 UTC (rev
4488)
+++ branches/WebAdmin/ant/const.properties 2008-09-15 15:50:19 UTC (rev
4489)
@@ -9,7 +9,7 @@
target.server=127.0.0.1
service.name=perfsonar-web-admin
jarfilename=perfsonar-web-admin
-version=0.9.1b
+version=0.9.3b
antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080303.jar
Modified: branches/WebAdmin/index.jsp
===================================================================
--- branches/WebAdmin/index.jsp 2008-09-15 10:04:34 UTC (rev 4488)
+++ branches/WebAdmin/index.jsp 2008-09-15 15:50:19 UTC (rev 4489)
@@ -6,7 +6,7 @@
<link rel="stylesheet" type="text/css" href="main.css"/>
<meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1">
<script src="Service_Admin.js"></script>
- <script language="javascript" src="liveclock.js"/>
+ <script src="liveclock.js"></script>
<style type="text/css">
<!--
@@ -51,7 +51,7 @@
-->
</style>
</head>
- <body >
+ <body>
<%
java.text.DateFormat dateFormat = new java.text.SimpleDateFormat("EEE
MMM dd HH:mm:ss zzz yyyy");
java.util.Date now= new java.util.Date();
@@ -82,17 +82,9 @@
<tr><td id="date">
<script
type="text/javascript">
<!--
- // For Version 4+
browsers, write the appropriate HTML to the
- // page for
the clock, otherwise, attempt to write a static
- // date to the page.
- if (ie4||ns6)
{
- document.write('<span
id="LiveClockIE" style="width:'+mywidth+'px" ></span>'); }
- else if (document.layers) { document.write('<ilayer
bgColor="'+myback_color+'" id="ClockPosNS" visibility="hide"><layer
width="'+mywidth+'" id="LiveClockNS"></layer></ilayer>'); }
- else { old = "true"; show_clock(); }
- show_clock();
+ show_clock();
//-->
</script>
-
</td></tr>
<tr><td id="serviceName"><%=serviceName %>
<%=serviceVersion%></td></tr>
</table>
Modified: branches/WebAdmin/liveclock.js
===================================================================
--- branches/WebAdmin/liveclock.js 2008-09-15 10:04:34 UTC (rev 4488)
+++ branches/WebAdmin/liveclock.js 2008-09-15 15:50:19 UTC (rev 4489)
@@ -146,14 +146,16 @@
myclock += '<font style="color:'+myfont_color+';
font-family:'+myfont_face+'; font-size:'+myfont_size+'pt;">';
myclock += Digital.toGMTString();
myclock += '</font>';
-
+
+ document.getElementById("date").innerHTML = myclock
+ //document.write(myclock);
if (old == "true") {
- document.write(myclock);
old = "die";
return;
}
- // Write the clock to the layer:
+ // Write the clock to the layer:
+ /*
if (ns4) {
clockpos = document.ClockPosNS;
liveclock = clockpos.document.LiveClockNS;
@@ -163,7 +165,9 @@
LiveClockIE.innerHTML = myclock;
} else if (ns6){
document.getElementById("LiveClockIE").innerHTML =
myclock;
- }
+ }
+ */
+
if (myupdate != 0) {
setTimeout("show_clock()",ClockUpdate[myupdate]); }
}
Modified:
branches/WebAdmin/perfSONARWebAdmin/auxiliary/xmlDB/existAuthenticatorImpl.java
===================================================================
---
branches/WebAdmin/perfSONARWebAdmin/auxiliary/xmlDB/existAuthenticatorImpl.java
2008-09-15 10:04:34 UTC (rev 4488)
+++
branches/WebAdmin/perfSONARWebAdmin/auxiliary/xmlDB/existAuthenticatorImpl.java
2008-09-15 15:50:19 UTC (rev 4489)
@@ -39,6 +39,16 @@
private XQueryService service;
+ private String getMethodName(int i)
+ {
+ StackTraceElement[] ste = (new Throwable()).getStackTrace();
+ return ste[ste.length-i].getClassName() + " : " +
ste[ste.length-i].getMethodName() + " : " ;
+ }
+
+ private void printDatabaseInfo()
+ {
+ System.err.println( getMethodName(-2) + " URI : " + DBLocation + "
admin user name : " + "admin" + " admin password : " + password);
+ }
//
-----------------------------------------------------------------------
// public methods
@@ -89,8 +99,10 @@
return (Boolean.parseBoolean((String)
it.nextResource()
.getContent()));
- } catch (XMLDBException e) {
- // TODO Auto-generated catch block
+ }
+ catch( org.xmldb.api.base.XMLDBException e )
+ {
+ printDatabaseInfo();
e.printStackTrace();
}
return false;
@@ -117,7 +129,13 @@
service = (XQueryService)
DatabaseManager.getCollection(
DBLocation + "/db", "admin",
password).getService(
"XPathQueryService", "1.0");
- } catch (Exception e) {
+ }
+ catch( org.xmldb.api.base.XMLDBException e )
+ {
+ printDatabaseInfo();
+ e.printStackTrace();
+ }
+ catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
@@ -147,7 +165,14 @@
try {
manager.modifyUser("admin", newp, null, null);
System.out.println("Changed the admin password");
- } catch (Exception e) {
+ }
+ catch( org.xmldb.api.base.XMLDBException e )
+ {
+ //printDatabaseInfo();
+ e.printStackTrace();
+ }
+
+ catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
- perfsonar: r4489 - in branches/WebAdmin: . ant perfSONARWebAdmin/auxiliary/xmlDB, svnlog, 09/15/2008
Archive powered by MHonArc 2.6.16.