perfsonar-dev - perfsonar: r3814 - in trunk/geant2_java-sshtelnet-mp: ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/WEB-INF/classes conf/axis-1.4/WEB-INF/classes/perfsonar conf/axis-1.4/WEB-INF/classes/perfsonar/conf conf/axis-1.4/WEB-INF/lib conf/axis-1.4/graphics lib/misc src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata src/main/java/org/perfsonar/service/measurementPoint/webAdmin webapps webapps/WEB-INF/lib webapps/graphics

Subject: perfsonar development work

List archive

perfsonar: r3814 - in trunk/geant2_java-sshtelnet-mp: ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/WEB-INF/classes conf/axis-1.4/WEB-INF/classes/perfsonar conf/axis-1.4/WEB-INF/classes/perfsonar/conf conf/axis-1.4/WEB-INF/lib conf/axis-1.4/graphics lib/misc src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata src/main/java/org/perfsonar/service/measurementPoint/webAdmin webapps webapps/WEB-INF/lib webapps/graphics

From:
To:
Subject: perfsonar: r3814 - in trunk/geant2_java-sshtelnet-mp: ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/WEB-INF/classes conf/axis-1.4/WEB-INF/classes/perfsonar conf/axis-1.4/WEB-INF/classes/perfsonar/conf conf/axis-1.4/WEB-INF/lib conf/axis-1.4/graphics lib/misc src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata src/main/java/org/perfsonar/service/measurementPoint/webAdmin webapps webapps/WEB-INF/lib webapps/graphics
Date: Mon, 5 May 2008 10:18:15 -0400

Author: melis
Date: 2008-05-05 10:18:14 -0400 (Mon, 05 May 2008)
New Revision: 3814

Added:
trunk/geant2_java-sshtelnet-mp/ant/webapp-package-targets.xml
trunk/geant2_java-sshtelnet-mp/conf/CSVgenerator.pl
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/Service_Admin.js
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/components.properties

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.properties

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/objects.config

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/servlet.properties

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/wizard.properties
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/lib/

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/lib/commons-codec-1.3.jar

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/lib/commons-fileupload-1.2.jar

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/lib/commons-io-1.3.2.jar

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/lib/perfsonar-web-admin-0.8.3b.jar
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/server-config.wsdd
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/default.css
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/Paul_Hasleham.vcf
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/Thumbs.db
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/WebAdmin.htm
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/admin_home_target.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/apply_button.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/apply_button_2.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/arrow_icon.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/arrow_icon2.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/button_1_large.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/button_1_small.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/button_2_large.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/button_2_small.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/cancel_button.gif

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/create_resource_button.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/delete_red_button.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/edit_button.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/edit_green_button.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/login_panel.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/logos.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/logout_button.gif

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/manage_collections_off_tab.gif

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/manage_collections_on_tab.gif

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/manage_users_off_tab.gif

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/manage_users_on_tab.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/step_1_bottom.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/step_1_slice.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/step_1_top.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/step_2_bottom.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/step_2_slice.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/step_2_top.gif

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/subversion.tigris.org.html
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/main.css
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/partners.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/perfsonar.png
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/perfsonar_logo.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/sqlma_admin_script.js
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/subversion.tigris.org.html
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/tags.htm
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/top_slice.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/welcome.htm
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/wz_tooltip.js
trunk/geant2_java-sshtelnet-mp/conf/wizard.properties
trunk/geant2_java-sshtelnet-mp/lib/misc/perfsonar-base-ant-1.0.20080416.jar
trunk/geant2_java-sshtelnet-mp/webapps/Service_Admin.js

trunk/geant2_java-sshtelnet-mp/webapps/WEB-INF/lib/perfsonar-web-admin-0.8.3b.jar
trunk/geant2_java-sshtelnet-mp/webapps/graphics/
trunk/geant2_java-sshtelnet-mp/webapps/graphics/Paul_Hasleham.vcf
trunk/geant2_java-sshtelnet-mp/webapps/graphics/Thumbs.db
trunk/geant2_java-sshtelnet-mp/webapps/graphics/WebAdmin.htm
trunk/geant2_java-sshtelnet-mp/webapps/graphics/admin_home_target.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/apply_button.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/apply_button_2.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/arrow_icon.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/arrow_icon2.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/button_1_large.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/button_1_small.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/button_2_large.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/button_2_small.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/cancel_button.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/create_resource_button.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/delete_red_button.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/edit_button.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/edit_green_button.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/login_panel.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/logos.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/logout_button.gif

trunk/geant2_java-sshtelnet-mp/webapps/graphics/manage_collections_off_tab.gif

trunk/geant2_java-sshtelnet-mp/webapps/graphics/manage_collections_on_tab.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/manage_users_off_tab.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/manage_users_on_tab.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/step_1_bottom.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/step_1_slice.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/step_1_top.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/step_2_bottom.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/step_2_slice.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/step_2_top.gif
trunk/geant2_java-sshtelnet-mp/webapps/graphics/subversion.tigris.org.html
trunk/geant2_java-sshtelnet-mp/webapps/perfsonar.png
trunk/geant2_java-sshtelnet-mp/webapps/sqlma_admin_script.js
trunk/geant2_java-sshtelnet-mp/webapps/subversion.tigris.org.html
trunk/geant2_java-sshtelnet-mp/webapps/tags.htm
trunk/geant2_java-sshtelnet-mp/webapps/top_slice.gif
trunk/geant2_java-sshtelnet-mp/webapps/welcome.htm
trunk/geant2_java-sshtelnet-mp/webapps/wz_tooltip.js
Removed:
trunk/geant2_java-sshtelnet-mp/lib/misc/perfsonar-base-ant-1.0.20071008.jar

trunk/geant2_java-sshtelnet-mp/webapps/WEB-INF/lib/perfsonar-web-admin-0.5b.jar
Modified:
trunk/geant2_java-sshtelnet-mp/ant/build.xml
trunk/geant2_java-sshtelnet-mp/ant/const.properties
trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/web.xml
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/index.html
trunk/geant2_java-sshtelnet-mp/conf/log4j.properties
trunk/geant2_java-sshtelnet-mp/conf/log4j.properties.template
trunk/geant2_java-sshtelnet-mp/conf/service.properties
trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
trunk/geant2_java-sshtelnet-mp/conf/servlet.properties
trunk/geant2_java-sshtelnet-mp/conf/servlet.properties.template

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
trunk/geant2_java-sshtelnet-mp/webapps/default.css
trunk/geant2_java-sshtelnet-mp/webapps/index.html
trunk/geant2_java-sshtelnet-mp/webapps/main.css
Log:
update to version 1.3

Modified: trunk/geant2_java-sshtelnet-mp/ant/build.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/build.xml 2008-05-05 13:51:38
UTC (rev 3813)
+++ trunk/geant2_java-sshtelnet-mp/ant/build.xml 2008-05-05 14:18:14
UTC (rev 3814)
@@ -40,5 +40,6 @@
<import file="axis-deploy-targets.xml"/>
<import file="test-targets.xml"/>
<import file="release-targets.xml"/>
+ <import file="webapp-package-targets.xml"/>

</project>

Modified: trunk/geant2_java-sshtelnet-mp/ant/const.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/const.properties 2008-05-05 13:51:38
UTC (rev 3813)
+++ trunk/geant2_java-sshtelnet-mp/ant/const.properties 2008-05-05 14:18:14
UTC (rev 3814)
@@ -8,10 +8,10 @@

target.server=127.0.0.1

-service.name=geant2_java-sshtelnet-mp
+service.name=geant2-java-sshtelnet-mp

jarfilename=perfsonar-sshtelnet-mp
-version=1.3RC4
+version=1.3

exist.war.file=exist-1.0.1.war

exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&version=1.0.1
@@ -20,7 +20,7 @@
wsdd.file.undeploy=sshtelnetmp-service-undeploy.wsdd

antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
-antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20071008.jar
+antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080416.jar

api.location=doc/api
api.title=perfSONAR

Modified: trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
2008-05-05 13:51:38 UTC (rev 3813)
+++ trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
2008-05-05 14:18:14 UTC (rev 3814)
@@ -8,10 +8,10 @@

target.server=127.0.0.1

-service.name=geant2_java-sshtelnet-mp
+service.name=geant2-java-sshtelnet-mp

jarfilename=perfsonar-sshtelnet-mp
-version=1.3RC4
+version=1.3

exist.war.file=exist-1.0.1.war

exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&version=1.0.1
@@ -20,7 +20,7 @@
wsdd.file.undeploy=sshtelnetmp-service-undeploy.wsdd

antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
-antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20071008.jar
+antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080416.jar

api.location=doc/api
api.title=perfSONAR

Added: trunk/geant2_java-sshtelnet-mp/ant/webapp-package-targets.xml

Added: trunk/geant2_java-sshtelnet-mp/conf/CSVgenerator.pl

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/Service_Admin.js

Added:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/components.properties

Added:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.properties

Added:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/objects.config

Added:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties

Added:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/servlet.properties

Added:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml

Added:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/wizard.properties

Added:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/lib/commons-codec-1.3.jar

Property changes on:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/lib/commons-codec-1.3.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/lib/commons-fileupload-1.2.jar

Property changes on:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/lib/commons-fileupload-1.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/lib/commons-io-1.3.2.jar

Property changes on:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/lib/commons-io-1.3.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/lib/perfsonar-web-admin-0.8.3b.jar

Property changes on:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/lib/perfsonar-web-admin-0.8.3b.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/server-config.wsdd

Modified: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/web.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/web.xml
2008-05-05 13:51:38 UTC (rev 3813)
+++ trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/web.xml
2008-05-05 14:18:14 UTC (rev 3814)
@@ -44,6 +44,33 @@
<load-on-startup>100</load-on-startup>
</servlet>

+ <servlet>
+ <servlet-name>
+ ServiceAdmin
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.service.Admin
+ </servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>
+ eXistAdmin
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.exist.eXistAdmin
+ </servlet-class>
+ </servlet>
+
+ <servlet>
+ <servlet-name>
+ Wizard
+ </servlet-name>
+ <servlet-class>
+ perfSONARWebAdmin.admin.wizard.Wizard
+ </servlet-class>
+ </servlet>
+
<servlet-mapping>
<servlet-name>AxisServlet</servlet-name>
<url-pattern>/servlet/AxisServlet</url-pattern>
@@ -64,6 +91,34 @@
<url-pattern>/SOAPMonitor</url-pattern>
</servlet-mapping>

+ <servlet-mapping>
+ <servlet-name>
+ ServiceAdmin
+ </servlet-name>
+ <url-pattern>
+ /ServiceAdmin
+ </url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>
+ eXistAdmin
+ </servlet-name>
+ <url-pattern>
+ /eXistAdmin
+ </url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>
+ Wizard
+ </servlet-name>
+ <url-pattern>
+ /Wizard
+ </url-pattern>
+ </servlet-mapping>
+
+


+ </style>
+ </head>
+ <body>
+ <div class="adminPanel">
+ <div class="banner">
+ <table border="0" align="left" cellpadding="0"
cellspacing="0">
+ <tr>
+ <td>
+ <a href="welcome.htm" target="main"><img
src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94" border="0"
align="right"></a>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="mainWindow">
+ <div class="sidebar">
+ <table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <th>
+ <a href="welcome.htm" class="button"
target="main">Admin home      </a>
+ </th>
+ </tr>
+ <tr>
+ <td>
+ <p>
+ <span class="navtexheading">Basic
+ <br>
+ Configuration
+ </span>
+ </p>
+ <p>
+ <span class="navtex"><a href="Wizard"
target="main">Service</a></span>
+ </p>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>
+ <span class="navtexheading
style3">Advanced
+ <br>
+ Configuration
+ </span>
+ </p>
+ <p>
+ <span class="navtex style3"><a
href="ServiceAdmin?serviceProperties" target="main">Service</a>
+ <br>
+ <a
href="ServiceAdmin?loggingProperties" target="main">Logging</a>
+ <br>
+ <a href="eXistAdmin"
target="main">eXist Database</a>
+ <br>
+ </span>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ </tr>
+ </table>
+ <img src="graphics/logos.gif" alt="perfSONAR project
partners" width="117" height="263" border="0" align="top"/>
+ </div>
+ <div class="centerWindow">
+ <object data="welcome.htm" type="text/html" name="main"
width="99%" height="100%">
+ </object>
+ </div>
+ </div>
+ <div class="footer">
+ PERFormance Service-Oriented Network monitoring ARchitecture
 
+ </div>
+ </div>
+ </body>
</html>

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/main.css

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/partners.gif

Property changes on: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/partners.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/perfsonar.png

Property changes on:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/perfsonar.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/perfsonar_logo.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/perfsonar_logo.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/sqlma_admin_script.js

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/subversion.tigris.org.html

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/tags.htm

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/top_slice.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/top_slice.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/welcome.htm

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/wz_tooltip.js

Modified: trunk/geant2_java-sshtelnet-mp/conf/log4j.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/log4j.properties 2008-05-05
13:51:38 UTC (rev 3813)
+++ trunk/geant2_java-sshtelnet-mp/conf/log4j.properties 2008-05-05
14:18:14 UTC (rev 3814)
@@ -3,145 +3,145 @@
## project : perfSONAR
## author: romradz

-#Group=Logger
-#Description=location of the log directory
-logDir=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs
+# Group=Logger
+# Description=location of the log directory
+logDir=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs

#ROOT
-#Group=RootLogger
-#Description=The maximum backup index for the root logger
-#log4j.appender.rootAppender.MaxBackupIndex=11
-#Group=RootLogger
-#Description=The file for the root logger
-#log4j.appender.rootAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar.log
-#Group=RootLogger
-#Description=The class responsible for the layout of the root logger
-#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
-#Group=RootLogger
-#Description=The conversion pattern for the root logger
-#log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
-#Group=RootLogger
-#Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
-#log4j.rootLogger=DEBUG, rootAppender
-#Group=RootLogger
-#Description=The maximum file size for the root logger
-#log4j.appender.rootAppender.MaxFileSize=500KB
-#Group=RootLogger
-#Description=The class responsible for appending text in the root logger
-#log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
+# Group=RootLogger
+# Description=The maximum backup index for the root logger
+log4j.appender.rootAppender.MaxBackupIndex=11
+# Group=RootLogger
+# Description=The file for the root logger
+log4j.appender.rootAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar.log
+# Group=RootLogger
+# Description=The class responsible for the layout of the root logger
+log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
+# Group=RootLogger
+# Description=The conversion pattern for the root logger
+log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
+# Group=RootLogger
+# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
+log4j.rootLogger=DEBUG, rootAppender
+# Group=RootLogger
+# Description=The maximum file size for the root logger
+#og4j.appender.rootAppender.MaxFileSize=500KB
+# Group=RootLogger
+# Description=The class responsible for appending text in the root logger
+log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender

#DEBUG
-#Group=DebugLogger
-#Description=The maximum backup index for the debug logger
+# Group=DebugLogger
+# Description=The maximum backup index for the debug logger
log4j.appender.debugAppender.MaxBackupIndex=11
-#Group=DebugLogger
-#Description=The file for the debug logger
-log4j.appender.debugAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar_debug.log
-#Group=DebugLogger
-#Description=The class responsible for the layout of the debug logger
+# Group=DebugLogger
+# Description=The file for the debug logger
+log4j.appender.debugAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_debug.log
+# Group=DebugLogger
+# Description=The class responsible for the layout of the debug logger
log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
-#Group=DebugLogger
-#Description=The conversion pattern for the debug logger
+# Group=DebugLogger
+# Description=The conversion pattern for the debug logger
log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
-#Group=DebugLogger
-#Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
+# Group=DebugLogger
+# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
log4j.logger.sonar-debug=DEBUG, debugAppender
-#Group=DebugLogger
-#Description=The maximum file size for the debug logger
+# Group=DebugLogger
+# Description=The maximum file size for the debug logger
log4j.appender.debugAppender.MaxFileSize=500KB
-#Group=DebugLogger
-#Description=The class responsible for appending text in the debug logger
+# Group=DebugLogger
+# Description=The class responsible for appending text in the debug logger
log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender

#INFO
-#Group=InfoLogger
-#Description=The maximum backup index for the info logger
+# Group=InfoLogger
+# Description=The maximum backup index for the info logger
log4j.appender.infoAppender.MaxBackupIndex=11
-#Group=InfoLogger
-#Description=The file for the info logger
-log4j.appender.infoAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar_info.log
-#Group=InfoLogger
-#Description=The class responsible for the layout of the info logger
+# Group=InfoLogger
+# Description=The file for the info logger
+log4j.appender.infoAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_info.log
+# Group=InfoLogger
+# Description=The class responsible for the layout of the info logger
log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
-#Group=InfoLogger
-#Description=The conversion pattern for the info logger
+# Group=InfoLogger
+# Description=The conversion pattern for the info logger
log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
-#Group=InfoLogger
-#Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
+# Group=InfoLogger
+# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
log4j.logger.sonar-info=INFO, infoAppender
-#Group=InfoLogger
-#Description=The maximum file size for the info logger
+# Group=InfoLogger
+# Description=The maximum file size for the info logger
log4j.appender.infoAppender.MaxFileSize=500KB
-#Group=InfoLogger
-#Description=The class responsible for appending text in the info logger
+# Group=InfoLogger
+# Description=The class responsible for appending text in the info logger
log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender

#WARN
-#Group=WarnLogger
-#Description=The maximum backup index for the warning logger
+# Group=WarnLogger
+# Description=The maximum backup index for the warning logger
log4j.appender.warnAppender.MaxBackupIndex=11
-#Group=WarnLogger
-#Description=The file for the warning logger
-log4j.appender.warnAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar_warn.log
-#Group=WarnLogger
-#Description=The class responsible for the layout of the warning logger
+# Group=WarnLogger
+# Description=The file for the warning logger
+log4j.appender.warnAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_warn.log
+# Group=WarnLogger
+# Description=The class responsible for the layout of the warning logger
log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
-#Group=WarnLogger
-#Description=The conversion pattern for the warning logger
+# Group=WarnLogger
+# Description=The conversion pattern for the warning logger
log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
-#Group=WarnLogger
-#Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
+# Group=WarnLogger
+# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
log4j.logger.sonar-warn=WARN, warnAppender
-#Group=WarnLogger
-#Description=The maximum file size for the warning logger
+# Group=WarnLogger
+# Description=The maximum file size for the warning logger
log4j.appender.warnAppender.MaxFileSize=500KB
-#Group=WarnLogger
-#Description=The class responsible for appending text in the warning logger
+# Group=WarnLogger
+# Description=The class responsible for appending text in the warning logger
log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender

#ERROR
-#Group=ErrorLogger
-#Description=The maximum backup index for the error logger
+# Group=ErrorLogger
+# Description=The maximum backup index for the error logger
log4j.appender.errorAppender.MaxBackupIndex=11
-#Group=ErrorLogger
-#Description=The file for the error logger
-log4j.appender.errorAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar_error.log
-#Group=ErrorLogger
-#Description=The class responsible for the layout of the error logger
+# Group=ErrorLogger
+# Description=The file for the error logger
+log4j.appender.errorAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_error.log
+# Group=ErrorLogger
+# Description=The class responsible for the layout of the error logger
log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
-#Group=ErrorLogger
-#Description=The conversion pattern for the error logger
+# Group=ErrorLogger
+# Description=The conversion pattern for the error logger
log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
-#Group=ErrorLogger
-#Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
+# Group=ErrorLogger
+# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
log4j.logger.sonar-error=ERROR, errorAppender
-#Group=ErrorLogger
-#Description=The maximum file size for the error logger
+# Group=ErrorLogger
+# Description=The maximum file size for the error logger
log4j.appender.errorAppender.MaxFileSize=500KB
-#Group=ErrorLogger
-#Description=The class responsible for appending text in the error logger
+# Group=ErrorLogger
+# Description=The class responsible for appending text in the error logger
log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender

#FATAL
-#Group=FatalLogger
-#Description=The maximum backup index for the fatal logger
+# Group=FatalLogger
+# Description=The maximum backup index for the fatal logger
log4j.appender.fatalAppender.MaxBackupIndex=11
-#Group=FatalLogger
-#Description=The file for the fatal logger
-log4j.appender.fatalAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar_fatal.log
-#Group=FatalLogger
-#Description=The class responsible for the layout of the fatal logger
+# Group=FatalLogger
+# Description=The file for the fatal logger
+log4j.appender.fatalAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_fatal.log
+# Group=FatalLogger
+# Description=The class responsible for the layout of the fatal logger
log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
-#Group=FatalLogger
-#Description=The conversion pattern for the fatal logger
+# Group=FatalLogger
+# Description=The conversion pattern for the fatal logger
log4j.appender.fatalAppender.layout.ConversionPattern=%d %5p - %m%n
-#Group=FatalLogger
-#Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
+# Group=FatalLogger
+# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
log4j.logger.sonar-fatal=FATAL, fatalAppender
-#Group=FatalLogger
-#Description=The maximum file size for the fatal logger
+# Group=FatalLogger
+# Description=The maximum file size for the fatal logger
log4j.appender.fatalAppender.MaxFileSize=500KB
-#Group=FatalLogger
-#Description=The class responsible for appending text in the fatal logger
+# Group=FatalLogger
+# Description=The class responsible for appending text in the fatal logger
log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender

Modified: trunk/geant2_java-sshtelnet-mp/conf/log4j.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/log4j.properties.template
2008-05-05 13:51:38 UTC (rev 3813)
+++ trunk/geant2_java-sshtelnet-mp/conf/log4j.properties.template
2008-05-05 14:18:14 UTC (rev 3814)
@@ -3,145 +3,145 @@
## project : perfSONAR
## author: romradz

-#Group=Logger
-#Description=location of the log directory
-logDir=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs
+# Group=Logger
+# Description=location of the log directory
+logDir=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs

#ROOT
-#Group=RootLogger
-#Description=The maximum backup index for the root logger
+# Group=RootLogger
+# Description=The maximum backup index for the root logger
log4j.appender.rootAppender.MaxBackupIndex=11
-#Group=RootLogger
-#Description=The file for the root logger
-log4j.appender.rootAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar.log
-#Group=RootLogger
-#Description=The class responsible for the layout of the root logger
+# Group=RootLogger
+# Description=The file for the root logger
+log4j.appender.rootAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar.log
+# Group=RootLogger
+# Description=The class responsible for the layout of the root logger
log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
-#Group=RootLogger
-#Description=The conversion pattern for the root logger
+# Group=RootLogger
+# Description=The conversion pattern for the root logger
log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
-#Group=RootLogger
-#Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
+# Group=RootLogger
+# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
log4j.rootLogger=DEBUG, rootAppender
-#Group=RootLogger
-#Description=The maximum file size for the root logger
+# Group=RootLogger
+# Description=The maximum file size for the root logger
#og4j.appender.rootAppender.MaxFileSize=500KB
-#Group=RootLogger
-#Description=The class responsible for appending text in the root logger
+# Group=RootLogger
+# Description=The class responsible for appending text in the root logger
log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender

#DEBUG
-#Group=DebugLogger
-#Description=The maximum backup index for the debug logger
+# Group=DebugLogger
+# Description=The maximum backup index for the debug logger
log4j.appender.debugAppender.MaxBackupIndex=11
-#Group=DebugLogger
-#Description=The file for the debug logger
-log4j.appender.debugAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar_debug.log
-#Group=DebugLogger
-#Description=The class responsible for the layout of the debug logger
+# Group=DebugLogger
+# Description=The file for the debug logger
+log4j.appender.debugAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_debug.log
+# Group=DebugLogger
+# Description=The class responsible for the layout of the debug logger
log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
-#Group=DebugLogger
-#Description=The conversion pattern for the debug logger
+# Group=DebugLogger
+# Description=The conversion pattern for the debug logger
log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
-#Group=DebugLogger
-#Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
+# Group=DebugLogger
+# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
log4j.logger.sonar-debug=DEBUG, debugAppender
-#Group=DebugLogger
-#Description=The maximum file size for the debug logger
+# Group=DebugLogger
+# Description=The maximum file size for the debug logger
log4j.appender.debugAppender.MaxFileSize=500KB
-#Group=DebugLogger
-#Description=The class responsible for appending text in the debug logger
+# Group=DebugLogger
+# Description=The class responsible for appending text in the debug logger
log4j.appender.debugAppender=org.apache.log4j.RollingFileAppender

#INFO
-#Group=InfoLogger
-#Description=The maximum backup index for the info logger
+# Group=InfoLogger
+# Description=The maximum backup index for the info logger
log4j.appender.infoAppender.MaxBackupIndex=11
-#Group=InfoLogger
-#Description=The file for the info logger
-log4j.appender.infoAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar_info.log
-#Group=InfoLogger
-#Description=The class responsible for the layout of the info logger
+# Group=InfoLogger
+# Description=The file for the info logger
+log4j.appender.infoAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_info.log
+# Group=InfoLogger
+# Description=The class responsible for the layout of the info logger
log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
-#Group=InfoLogger
-#Description=The conversion pattern for the info logger
+# Group=InfoLogger
+# Description=The conversion pattern for the info logger
log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
-#Group=InfoLogger
-#Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
+# Group=InfoLogger
+# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
log4j.logger.sonar-info=INFO, infoAppender
-#Group=InfoLogger
-#Description=The maximum file size for the info logger
+# Group=InfoLogger
+# Description=The maximum file size for the info logger
log4j.appender.infoAppender.MaxFileSize=500KB
-#Group=InfoLogger
-#Description=The class responsible for appending text in the info logger
+# Group=InfoLogger
+# Description=The class responsible for appending text in the info logger
log4j.appender.infoAppender=org.apache.log4j.RollingFileAppender

#WARN
-#Group=WarnLogger
-#Description=The maximum backup index for the warning logger
+# Group=WarnLogger
+# Description=The maximum backup index for the warning logger
log4j.appender.warnAppender.MaxBackupIndex=11
-#Group=WarnLogger
-#Description=The file for the warning logger
-log4j.appender.warnAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar_warn.log
-#Group=WarnLogger
-#Description=The class responsible for the layout of the warning logger
+# Group=WarnLogger
+# Description=The file for the warning logger
+log4j.appender.warnAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_warn.log
+# Group=WarnLogger
+# Description=The class responsible for the layout of the warning logger
log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
-#Group=WarnLogger
-#Description=The conversion pattern for the warning logger
+# Group=WarnLogger
+# Description=The conversion pattern for the warning logger
log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
-#Group=WarnLogger
-#Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
+# Group=WarnLogger
+# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
log4j.logger.sonar-warn=WARN, warnAppender
-#Group=WarnLogger
-#Description=The maximum file size for the warning logger
+# Group=WarnLogger
+# Description=The maximum file size for the warning logger
log4j.appender.warnAppender.MaxFileSize=500KB
-#Group=WarnLogger
-#Description=The class responsible for appending text in the warning logger
+# Group=WarnLogger
+# Description=The class responsible for appending text in the warning logger
log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender

#ERROR
-#Group=ErrorLogger
-#Description=The maximum backup index for the error logger
+# Group=ErrorLogger
+# Description=The maximum backup index for the error logger
log4j.appender.errorAppender.MaxBackupIndex=11
-#Group=ErrorLogger
-#Description=The file for the error logger
-log4j.appender.errorAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar_error.log
-#Group=ErrorLogger
-#Description=The class responsible for the layout of the error logger
+# Group=ErrorLogger
+# Description=The file for the error logger
+log4j.appender.errorAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_error.log
+# Group=ErrorLogger
+# Description=The class responsible for the layout of the error logger
log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
-#Group=ErrorLogger
-#Description=The conversion pattern for the error logger
+# Group=ErrorLogger
+# Description=The conversion pattern for the error logger
log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
-#Group=ErrorLogger
-#Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
+# Group=ErrorLogger
+# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
log4j.logger.sonar-error=ERROR, errorAppender
-#Group=ErrorLogger
-#Description=The maximum file size for the error logger
+# Group=ErrorLogger
+# Description=The maximum file size for the error logger
log4j.appender.errorAppender.MaxFileSize=500KB
-#Group=ErrorLogger
-#Description=The class responsible for appending text in the error logger
+# Group=ErrorLogger
+# Description=The class responsible for appending text in the error logger
log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender

#FATAL
-#Group=FatalLogger
-#Description=The maximum backup index for the fatal logger
+# Group=FatalLogger
+# Description=The maximum backup index for the fatal logger
log4j.appender.fatalAppender.MaxBackupIndex=11
-#Group=FatalLogger
-#Description=The file for the fatal logger
-log4j.appender.fatalAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar_fatal.log
-#Group=FatalLogger
-#Description=The class responsible for the layout of the fatal logger
+# Group=FatalLogger
+# Description=The file for the fatal logger
+log4j.appender.fatalAppender.File=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/logs/perfsonar_fatal.log
+# Group=FatalLogger
+# Description=The class responsible for the layout of the fatal logger
log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout
-#Group=FatalLogger
-#Description=The conversion pattern for the fatal logger
+# Group=FatalLogger
+# Description=The conversion pattern for the fatal logger
log4j.appender.fatalAppender.layout.ConversionPattern=%d %5p - %m%n
-#Group=FatalLogger
-#Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
+# Group=FatalLogger
+# Description=Information specific to the perfsonar debugger (not sure of
this one at all really)
log4j.logger.sonar-fatal=FATAL, fatalAppender
-#Group=FatalLogger
-#Description=The maximum file size for the fatal logger
+# Group=FatalLogger
+# Description=The maximum file size for the fatal logger
log4j.appender.fatalAppender.MaxFileSize=500KB
-#Group=FatalLogger
-#Description=The class responsible for appending text in the fatal logger
+# Group=FatalLogger
+# Description=The class responsible for appending text in the fatal logger
log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender

Modified: trunk/geant2_java-sshtelnet-mp/conf/service.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/service.properties 2008-05-05
13:51:38 UTC (rev 3813)
+++ trunk/geant2_java-sshtelnet-mp/conf/service.properties 2008-05-05
14:18:14 UTC (rev 3814)
@@ -1,102 +1,106 @@
#Changed at Wed Jan 30 11:12:44 CET 2008
#Wed Jan 30 11:12:44 CET 2008

-#Group=Global
-#Description=Type of service
+# Group=Global
+# Description=Type of service
service.r.service_type=mp

-#Group=Global
-#Description=Description for the service
+# Group=Global
+# Description=Description for the service
service.r.service_description=perfSONAR service

-#Group=eXist
-#Description=The password for the admin account for eXist
+# Group=eXist
+# Description=The password for the admin account for eXist
component.mp.xmldb.db_adminpassword=admin

-#Group=eXist
-#Description=The username for eXist
+# Group=eXist
+# Description=The username for eXist
component.mp.xmldb.db_username=sshtelnet

-#Group=logger
-#Description=The location of the configuration file for the log4j logger
-service.log.log4j.config=/home/perfsonar/webapps/JAVA-SSHTELNET-MP-1.3-RC1/WEB-INF/classes/perfsonar/conf/log4j.properties
+# Group=Internal
+# Description=The location of the configuration file for the log4j logger
+service.log.log4j.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/log4j.properties

-#Group=LS
-#Description=Location of the Lookup Service
-service.r.ls_url=http\://selena.acad.bg\:8070/axis/services/LookupService
+# Group=LS
+# Description=Location of the Lookup Service
+service.r.ls_url=http\://loco4.man.poznan.pl\:8080/XML-LS/services/LookupService

-#Group=Global
-#Description=Type of service
+# Group=Global
+# Description=Type of service
service.r.type=mp

-#Group=AuthN
-#Description=Location of the Authentication Service
+# Group=Authentication
+# Description=Location of the Authentication Service

service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService

-#Group=Scheduler
-#Description=The scheduler component
+# Group=Internal
+# Description=The scheduler component
component.registrator.scheduler_component=scheduler

-#Group=eXist
-#Description=The location of the metadata configuration file which is to be
uploaded in the eXist
-component.mp.xmldb.metadata_file_name=/home/perfsonar/webapps/JAVA-SSHTELNET-MP-1.3-RC1/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+# Group=eXist
+# Description=The location of the metadata configuration file which is to be
uploaded in the eXist
+component.mp.xmldb.metadata_file_name=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml

-#Group=LS
-#Description=The period of time between registrations to the LS
+# Group=eXist
+# Description=The location of the metadata configuration file which is to be
uploaded in the eXist
+component.mp.xmldb.metadata_file_path=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+
+# Group=LS
+# Description=The period of time between registrations to the LS
component.registrator.interval=30000

-#Group=SSHTELNET
-#Description=The name of the class which is responsible for handling the
requests
+# Group=Internal
+# Description=The name of the class which is responsible for handling the
requests

service.mp.class_name=org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.WebserviceEngineAdapter

-#Group=eXist
-#Description=The url of the eXist db
-component.mp.xmldb.db_uri=xmldb\:exist\://127.0.0.1\:8080/exist/xmlrpc/db/db/
+# Group=eXist
+# Description=The url of the eXist db
+component.mp.xmldb.db_uri=xmldb\:exist\://127.0.0.1\:8080/exist/xmlrpc/db

-#Group=eXist
-#Description=The url of the eXist db (probably a redundant parameter, but
nevertheless still in there, will be removed in the near future)
+# Group=eXist
+# Description=The url of the eXist db (probably a redundant parameter, but
nevertheless still in there, will be removed in the near future)

component.mp.xmldb.db_uri.xmlrpc=xmldb\:exist\://localhost\:8080/exist/xmlrpc/db

-#Group=Global
-#Description=The name of the organisation which deployed the MP
+# Group=Global
+# Description=The name of the organisation which deployed the MP
service.r.organization_name=

-#Group=eXist
-#Description=The password for the eXist database
+# Group=eXist
+# Description=The password for the eXist database
component.mp.xmldb.db_password=sshtelnet

-#Group=SAX
-#Description=The location of the configuration for the SAX parser
-service.sax_parser.config=/home/perfsonar/webapps/JAVA-SSHTELNET-MP-1.3-RC1/WEB-INF/classes/perfsonar/conf/objects.config
+# Group=Internal
+# Description=The location of the configuration for the SAX parser
+service.sax_parser.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config

-#Group=eXist
-#Description=The type of access for the eXist database (has to be xmlrpc)
+# Group=eXist
+# Description=The type of access for the eXist database (has to be xmlrpc)
component.mp.xmldb.db_access=xmlrpc

-#Group=LS
-#Description=The name of the metadata configuration file which is to be sent
to the LS
-service.ls.registration_file=/home/perfsonar/webapps/JAVA-SSHTELNET-MP-1.3-RC1/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+# Group=LS
+# Description=The name of the metadata configuration file which is to be
sent to the LS
+service.ls.registration_file=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml

-#Group=Global
-#Description=The name of the service
-service.r.service_name=JAVA-SSHTELNET-MP
+# Group=Global
+# Description=The name of the service
+service.r.service_name=geant2-java-sshtelnet-mp

-#Group=AuthN
-#Description=The types of messages for which AuthN is to be enabled (if
AuthN is enabled off course)
-service.as.authn_for_msg_types=SetupDataRequest,MetadataKeyRequest
+# Group=Authentication
+# Description=The types of messages for which Authentication is to be
enabled (if Authentication is enabled off course)
+service.as.Authentication_for_msg_types=SetupDataRequest,MetadataKeyRequest

-#Group=Global
-#Description=The version of the service
-service.r.service_version=1.3RC1
+# Group=Global
+# Description=The version of the service
+service.r.service_version=1.3RC6

-#Group=AuthN
-#Description=If the authentication is enabled or not
-service.as.authn_active=on
+# Group=Authentication
+# Description=If the authentication is enabled or not
+service.as.Authentication_active=off

-#Group=Global
-#Description=The e-mail address of the contact person for the service
+# Group=Global
+# Description=The e-mail address of the contact person for the service
service.r.contact_email=

-#Group=SSHTELNET
-#Description=Types of messages supported by this service
+# Group=Internal
+# Description=Types of messages supported by this service
service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest

Modified: trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
2008-05-05 13:51:38 UTC (rev 3813)
+++ trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
2008-05-05 14:18:14 UTC (rev 3814)
@@ -1,102 +1,102 @@
#Changed at Wed Jan 30 11:12:44 CET 2008
#Wed Jan 30 11:12:44 CET 2008

-#Group=Global
-#Description=Type of service
+# Group=Global
+# Description=Type of service
service.r.service_type=mp

-#Group=Global
-#Description=Description for the service
+# Group=Global
+# Description=Description for the service
service.r.service_description=perfSONAR service

-#Group=eXist
-#Description=The password for the admin account for eXist
+# Group=eXist
+# Description=The password for the admin account for eXist
component.mp.xmldb.db_adminpassword=admin

-#Group=eXist
-#Description=The username for eXist
+# Group=eXist
+# Description=The username for eXist
component.mp.xmldb.db_username=sshtelnet

-#Group=logger
-#Description=The location of the configuration file for the log4j logger
-service.log.log4j.config=/home/perfsonar/webapps/JAVA-SSHTELNET-MP-1.3-RC1/WEB-INF/classes/perfsonar/conf/log4j.properties
+# Group=Internal
+# Description=The location of the configuration file for the log4j logger
+service.log.log4j.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/log4j.properties

-#Group=LS
-#Description=Location of the Lookup Service
-service.r.ls_url=http\://selena.acad.bg\:8070/axis/services/LookupService
+# Group=LS
+# Description=Location of the Lookup Service
+service.r.ls_url=http\://loco4.man.poznan.pl\:8080/XML-LS/services/LookupService

-#Group=Global
-#Description=Type of service
+# Group=Global
+# Description=Type of service
service.r.type=mp

-#Group=AuthN
-#Description=Location of the Authentication Service
+# Group=Authentication
+# Description=Location of the Authentication Service

service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService

-#Group=Scheduler
-#Description=The scheduler component
+# Group=Internal
+# Description=The scheduler component
component.registrator.scheduler_component=scheduler

-#Group=eXist
-#Description=The location of the metadata configuration file which is to be
uploaded in the eXist
-component.mp.xmldb.metadata_file_name=/home/perfsonar/webapps/JAVA-SSHTELNET-MP-1.3-RC1/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+# Group=eXist
+# Description=The location of the metadata configuration file which is to be
uploaded in the eXist
+component.mp.xmldb.metadata_file_name=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml

-#Group=LS
-#Description=The period of time between registrations to the LS
+# Group=LS
+# Description=The period of time between registrations to the LS
component.registrator.interval=30000

-#Group=SSHTELNET
-#Description=The name of the class which is responsible for handling the
requests
+# Group=Internal
+# Description=The name of the class which is responsible for handling the
requests

service.mp.class_name=org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.WebserviceEngineAdapter

-#Group=eXist
-#Description=The url of the eXist db
-component.mp.xmldb.db_uri=xmldb\:exist\://127.0.0.1\:8080/exist/xmlrpc/db/db/
+# Group=eXist
+# Description=The url of the eXist db
+component.mp.xmldb.db_uri=xmldb\:exist\://127.0.0.1\:8080/exist/xmlrpc/db

-#Group=eXist
-#Description=The url of the eXist db (probably a redundant parameter, but
nevertheless still in there, will be removed in the near future)
+# Group=eXist
+# Description=The url of the eXist db (probably a redundant parameter, but
nevertheless still in there, will be removed in the near future)

component.mp.xmldb.db_uri.xmlrpc=xmldb\:exist\://localhost\:8080/exist/xmlrpc/db

-#Group=Global
-#Description=The name of the organisation which deployed the MP
+# Group=Global
+# Description=The name of the organisation which deployed the MP
service.r.organization_name=

-#Group=eXist
-#Description=The password for the eXist database
+# Group=eXist
+# Description=The password for the eXist database
component.mp.xmldb.db_password=sshtelnet

-#Group=SAX
-#Description=The location of the configuration for the SAX parser
-service.sax_parser.config=/home/perfsonar/webapps/JAVA-SSHTELNET-MP-1.3-RC1/WEB-INF/classes/perfsonar/conf/objects.config
+# Group=Internal
+# Description=The location of the configuration for the SAX parser
+service.sax_parser.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config

-#Group=eXist
-#Description=The type of access for the eXist database (has to be xmlrpc)
+# Group=eXist
+# Description=The type of access for the eXist database (has to be xmlrpc)
component.mp.xmldb.db_access=xmlrpc

-#Group=LS
-#Description=The name of the metadata configuration file which is to be sent
to the LS
-service.ls.registration_file=/home/perfsonar/webapps/JAVA-SSHTELNET-MP-1.3-RC1/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+# Group=LS
+# Description=The name of the metadata configuration file which is to be
sent to the LS
+service.ls.registration_file=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml

-#Group=Global
-#Description=The name of the service
-service.r.service_name=JAVA-SSHTELNET-MP
+# Group=Global
+# Description=The name of the service
+service.r.service_name=geant2-java-sshtelnet-mp

-#Group=AuthN
-#Description=The types of messages for which AuthN is to be enabled (if
AuthN is enabled off course)
-service.as.authn_for_msg_types=SetupDataRequest,MetadataKeyRequest
+# Group=Authentication
+# Description=The types of messages for which Authentication is to be
enabled (if Authentication is enabled off course)
+service.as.Authentication_for_msg_types=SetupDataRequest,MetadataKeyRequest

-#Group=Global
-#Description=The version of the service
-service.r.service_version=1.3RC1
+# Group=Global
+# Description=The version of the service
+service.r.service_version=1.3RC6

-#Group=AuthN
-#Description=If the authentication is enabled or not
-service.as.authn_active=on
+# Group=Authentication
+# Description=If the authentication is enabled or not
+service.as.Authentication_active=off

-#Group=Global
-#Description=The e-mail address of the contact person for the service
+# Group=Global
+# Description=The e-mail address of the contact person for the service
service.r.contact_email=

-#Group=SSHTELNET
-#Description=Types of messages supported by this service
+# Group=Internal
+# Description=Types of messages supported by this service
service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest

Modified: trunk/geant2_java-sshtelnet-mp/conf/servlet.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/servlet.properties 2008-05-05
13:51:38 UTC (rev 3813)
+++ trunk/geant2_java-sshtelnet-mp/conf/servlet.properties 2008-05-05
14:18:14 UTC (rev 3814)
@@ -1,46 +1,54 @@
#Changed at Wed Jan 30 11:12:44 CET 2008
#Wed Jan 30 11:12:44 CET 2008

-#Group=eXist
-#Description=The name of the metadata configuration file to be uploaded to
the eXist
+# Group=eXist
+# Description=The name of the metadata configuration file to be uploaded to
the eXist
component.mp.xmldb.metadata_file_name=sshtelnetmetadata.xml

-#Group=Servlet
-#Description=Type of service
+# Group=eXist
+# Description=The path to the metadata configuration file to be uploaded to
the eXist
+component.mp.xmldb.metadata_file_path=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+
+# Group=Servlet
+# Description=Type of service
servlet.service_type=sshtelnetmp

-#Group=Servlet
-#Description=No idea really ;)
+# Group=Servlet
+# Description=No idea really ;)
servlets=

-#Group=eXist
-#Description=The username for the eXist database
+# Group=eXist
+# Description=The username for the eXist database
component.mp.xmldb.db_username=sshtelnet

-#Group=eXist
-#Description=the password for the eXist database
+# Group=eXist
+# Description=the password for the eXist database
component.mp.xmldb.db_password=sshtelnet

-#Group=Wizard
-#Description=The class for handling the wizard for the SSHTELNET MP
+# Group=Wizard
+# Description=The class for handling the wizard for the SSHTELNET MP

servlet.wizard.external_handler=org.perfsonar.service.measurementPoint.webAdmin.SSHTelnetHandler

-#Group=Servlet
-#Description=The property in the service.properties file responsible for
holding the admin password for the eXist database
-servlet.exist_adminpass.property=component.mp.xmldb.db_password
+# Group=Servlet
+# Description=The property in the service.properties file responsible for
holding the admin password for the eXist database
+servlet.exist_adminpass.property=component.mp.xmldb.db_adminpassword

-#Group=Servlet
-#Description=The username for the servlet
+# Group=Servlet
+# Description=The admin password for the eXist database
+component.mp.xmldb.db_adminpassword=admin
+
+# Group=Servlet
+# Description=The username for the servlet
servlet.username=perfsonaruser

-#Group=eXist
-#Description=The location of the eXist database
+# Group=eXist
+# Description=The location of the eXist database
component.mp.xmldb.db_uri=xmldb\:exist\://localhost\:8080/exist/xmlrpc/db

-#Group=Servlet
-#Description=The password for the servlet
+# Group=Servlet
+# Description=The password for the servlet
servlet.password=perfsonarpass

-#Group=Servlet
-#Description=The property in the service.properties file responsible for
holding the location of the eXist database
+# Group=Servlet
+# Description=The property in the service.properties file responsible for
holding the location of the eXist database
servlet.exist_location.property=component.mp.xmldb.db_uri

Modified: trunk/geant2_java-sshtelnet-mp/conf/servlet.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/servlet.properties.template
2008-05-05 13:51:38 UTC (rev 3813)
+++ trunk/geant2_java-sshtelnet-mp/conf/servlet.properties.template
2008-05-05 14:18:14 UTC (rev 3814)
@@ -1,46 +1,50 @@
#Changed at Wed Jan 30 11:12:44 CET 2008
#Wed Jan 30 11:12:44 CET 2008

-#Group=eXist
-#Description=The name of the metadata configuration file to be uploaded to
the eXist
+# Group=eXist
+# Description=The name of the metadata configuration file to be uploaded to
the eXist
component.mp.xmldb.metadata_file_name=sshtelnetmetadata.xml

-#Group=Servlet
-#Description=Type of service
+# Group=eXist
+# Description=The path to the metadata configuration file to be uploaded to
the eXist
+component.mp.xmldb.metadata_file_path=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+
+# Group=Servlet
+# Description=Type of service
servlet.service_type=sshtelnetmp

-#Group=Servlet
-#Description=No idea really ;)
+# Group=Servlet
+# Description=No idea really ;)
servlets=

-#Group=eXist
-#Description=The username for the eXist database
+# Group=eXist
+# Description=The username for the eXist database
component.mp.xmldb.db_username=sshtelnet

-#Group=eXist
-#Description=the password for the eXist database
+# Group=eXist
+# Description=the password for the eXist database
component.mp.xmldb.db_password=sshtelnet

-#Group=Wizard
-#Description=The class for handling the wizard for the SSHTELNET MP
+# Group=Wizard
+# Description=The class for handling the wizard for the SSHTELNET MP

servlet.wizard.external_handler=org.perfsonar.service.measurementPoint.webAdmin.SSHTelnetHandler

-#Group=Servlet
-#Description=The property in the service.properties file responsible for
holding the admin password for the eXist database
-servlet.exist_adminpass.property=component.mp.xmldb.db_password
+# Group=Servlet
+# Description=The property in the service.properties file responsible for
holding the admin password for the eXist database
+servlet.exist_adminpass.property=component.mp.xmldb.db_adminpassword

-#Group=Servlet
-#Description=The username for the servlet
+# Group=Servlet
+# Description=The username for the servlet
servlet.username=perfsonaruser

-#Group=eXist
-#Description=The location of the eXist database
+# Group=eXist
+# Description=The location of the eXist database
component.mp.xmldb.db_uri=xmldb\:exist\://localhost\:8080/exist/xmlrpc/db

-#Group=Servlet
-#Description=The password for the servlet
+# Group=Servlet
+# Description=The password for the servlet
servlet.password=perfsonarpass

-#Group=Servlet
-#Description=The property in the service.properties file responsible for
holding the location of the eXist database
+# Group=Servlet
+# Description=The property in the service.properties file responsible for
holding the location of the eXist database
servlet.exist_location.property=component.mp.xmldb.db_uri

Added: trunk/geant2_java-sshtelnet-mp/conf/wizard.properties

Deleted:
trunk/geant2_java-sshtelnet-mp/lib/misc/perfsonar-base-ant-1.0.20071008.jar

Added:
trunk/geant2_java-sshtelnet-mp/lib/misc/perfsonar-base-ant-1.0.20080416.jar

Property changes on:
trunk/geant2_java-sshtelnet-mp/lib/misc/perfsonar-base-ant-1.0.20080416.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
2008-05-05 13:51:38 UTC (rev 3813)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
2008-05-05 14:18:14 UTC (rev 3814)
@@ -72,13 +72,13 @@
}

public String getProperty(String property) throws PerfSONARException {
- //logger.debug("[DbMetadataConfiguration] getProperty(" + property +
") called.");
+ logger.debug("[DbMetadataConfiguration] getProperty(" + property +
") called.");

return null;
}

public String getProperty(String device, String property) throws
PerfSONARException {
- //logger.debug("[DbMetadataConfiguration] getProperty(" + device +
", " + property + ") called.");
+ logger.debug("[DbMetadataConfiguration] getProperty(" + device + ",
" + property + ") called.");

String query = "";
@@ -97,7 +97,7 @@
query += "return
fn:data($i/nmwg:parameters/nmwg:parameter[@name=\""
+ property + "\"]/@value)";
}

- //logger.debug("[DbMetadataConfiguration] query: " + query);
+ logger.debug("[DbMetadataConfiguration] query: " + query);

Object object = null;
try {
@@ -129,7 +129,7 @@

public String getProperty(String device, String command, String
property) throws PerfSONARException {

- //logger.debug("[DbMetadataConfiguration] getProperty(" + device +
", " + command + ", " + property + ") called.");
+ logger.debug("[DbMetadataConfiguration] getProperty(" + device + ",
" + command + ", " + property + ") called.");

String query = "";
@@ -150,7 +150,7 @@
query += "return
fn:data($file/nmwg:store/nmwg:data[@metadataIdRef=$i]/nmwg:key[nmwg:eventType='"
+ command +
"']/nmwg:parameters/nmwg:parameter[@name='"
+ property + "']/@value)\n";
}

- //logger.debug("[DbMetadataConfiguration] query: " + query);
+ logger.debug("[DbMetadataConfiguration] query: " + query);

Object object = null;
try {
@@ -184,7 +184,7 @@

public List getProperties(String property) throws PerfSONARException {

- //logger.debug("[DbMetadataConfiguration] getProperties(" + property
+ ") called.");
+ logger.debug("[DbMetadataConfiguration] getProperties(" + property +
") called.");

String query = "";
@@ -197,7 +197,7 @@
query += "return data($i)";
}

- //logger.debug("[DbMetadataConfiguration] query: " + query);
+ logger.debug("[DbMetadataConfiguration] query: " + query);

Object object = null;
try {
@@ -217,7 +217,7 @@
"DbMetadataConfiguration.getProperties: " + "Result
array of metadata search in null");
}

- //logger.debug("DbMetadataConfiguration.getProperties: " + "The
number of elements returned as a result of xquery statement: " +
xmlResults.length);
+ logger.debug("DbMetadataConfiguration.getProperties: " + "The number
of elements returned as a result of xquery statement: " + xmlResults.length);

if (xmlResults.length == 0) {
throw new PerfSONARException(
@@ -242,7 +242,7 @@

public List getProperties(String device, String property) throws
PerfSONARException {

- //logger.debug("[DbMetadataConfiguration] getProperty(" + device +
", " + property + ") called.");
+ logger.debug("[DbMetadataConfiguration] getProperty(" + device + ",
" + property + ") called.");

String query = "";
@@ -263,7 +263,7 @@
query += "return
fn:data($file/nmwg:store/nmwg:data[@metadataIdRef=$i]/nmwg:key/nmwg:eventType)\n";
}

- //logger.debug("[DbMetadataConfiguration] query: " + query);
+ logger.debug("[DbMetadataConfiguration] query: " + query);

Object object = null;
try {
@@ -283,7 +283,7 @@
"DbMetadataConfiguration.getProperties: " + "Result
array of metadata search in null");
}

- //logger.debug("DbMetadataConfiguration.getProperties: " + "The
number of elements returned as a result of xquery statement: " +
xmlResults.length);
+ logger.debug("DbMetadataConfiguration.getProperties: " + "The number
of elements returned as a result of xquery statement: " + xmlResults.length);

if (xmlResults.length == 0) {
throw new PerfSONARException(

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
2008-05-05 13:51:38 UTC (rev 3813)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
2008-05-05 14:18:14 UTC (rev 3814)
@@ -3,6 +3,7 @@
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.FileWriter;
@@ -13,7 +14,9 @@

import javax.servlet.http.HttpServletRequest;

-
+import perfSONARWebAdmin.auxiliary.PerfsonarProperties;
+import perfSONARWebAdmin.auxiliary.PerfsonarPropertiesImpl;
+import perfSONARWebAdmin.auxiliary.PerfsonarProperty;
import perfSONARWebAdmin.auxiliary.ServiceProperties;
import perfSONARWebAdmin.auxiliary.ServicePropertiesImpl;
import perfSONARWebAdmin.auxiliary.wizard.ConfigurationHandler;
@@ -388,39 +391,122 @@
* The properties regardung the group
* @throws IOException
*/
+ /**
+ * Method for handling all configuration actions regarding any other
group
+ * besides LS and eXist
+ *
+ * @param group
+ * The group
+ * @param functionProperties
+ * The properties regardung the group
+ * @throws IOException
+ */
private void otherActions(String group, WizardProperties
functionProperties)
throws IOException {
- // A class that makes modifying service properties a little
bit easier
- ServiceProperties serviceProperties = null;
+
+ //System.out.println("otherActions("+group+",
"+functionProperties+") called");
// The only other group for rrd ma is the Store group
- if (group.equals("Store")) {
- serviceProperties = new
ServicePropertiesImpl(ServicePath
- + ServicePropertiesPath);
+ // So in this case changes go into the service.property file
that uses
+ // groupig and description
+ // In order to keep that functionality we need in this case
to use the
+ // PerfsonarProperties class
+ if (!group.equals("Administration")) {
+ //System.out.println("Group not equal to
Administrator");
+ // Using PerfsonarProperties in order to keep the
grouping and
+ // description
+ PerfsonarProperties serviceProperties = null;
+ serviceProperties = new PerfsonarPropertiesImpl();
+ serviceProperties.loadProperties(new
FileInputStream(ServicePath
+ + ServicePropertiesPath));
+ // Getting the names for every property of the group
+ Iterator it = functionProperties.orderedKeys();
+ // Setting the value of each property
+
+ // An object that holds the property
group,description,value and key
+ PerfsonarProperty property = new PerfsonarProperty();
+ while (it.hasNext()) {
+ String key = (String) it.next();
+ // Setting service properties and wizard
properties
+
+ // Get the property
+ property = serviceProperties.getProperty(key);
+ // If key property does not exist the throw
an exception
+ if (property == null) {
+ throw new IOException("Key is invalid
" + key + " ");
+ } else {
+ //System.out.println("\n\nBefore
change: ");
+
//System.out.println("--------------");
+ //System.out.println("Property: " +
property.getKey());
+ //System.out.println("Property Value:
" + property.getValue());
+ //System.out.println("Property Group:
" + property.getGroup());
+ //System.out.println("Property
Description: " + property.getDescription());
+ // Change the value of the property
+
if(functionProperties.getProperty(key).equals("yes"))
+ property.setValue("on");
+ else if
(functionProperties.getProperty(key).equals("no"))
+ property.setValue("off");
+ else
+
property.setValue(functionProperties.getProperty(key));
+
+ serviceProperties.setProperty(key,
property);
+ //System.out.println("After change:
");
+ //System.out.println("-------------");
+ //System.out.println("Property: " +
property.getKey());
+ //System.out.println("Property Value:
" + property.getValue());
+ //System.out.println("Property Group:
" + property.getGroup());
+ //System.out.println("Property
Description: " + property.getDescription());
+ }
+ properties.setWizardProperty(key,
functionProperties
+ .getWizardProperty(key));
+ }
+ // Storing all changes
+ serviceProperties.storeProperties(new
FileOutputStream(ServicePath
+ + ServicePropertiesPath));
+
}
// We don't really have any other groups just the ones for
the servlet
- // administration
+ // administration, that does not use grouping and description
so we can
+ // use
+ // the ServiceProperties class as usual
else {
- serviceProperties = new
ServicePropertiesImpl(ServicePath
- + ServletPropertiesPath);
+ //System.out.println("Group equals Administrator");
+ // A class that makes modifying service properties a
little bit
+ // easier
+ ServiceProperties serviceProperties = new
ServicePropertiesImpl(
+ ServicePath + ServletPropertiesPath);
+ // Getting the names for every property of the group
+ Iterator it = functionProperties.orderedKeys();
+ // Setting the value of each property
+ String value = null;
+ while (it.hasNext()) {
+ String key = (String) it.next();
+ // Setting service properties and wizard
properties
+ value = functionProperties.getProperty(key);
+ //System.out.println("\n\nBefore change: ");
+ //System.out.println("--------------");
+ //System.out.println("Property: " + key);
+ //System.out.println("Property Value: " +
functionProperties.getProperty(key));
+ if (value == null) {
+ throw new IOException("Key is invalid
" + key + " ");
+ } else {
+ serviceProperties.setProperty(key,
value);
+ //System.out.println("After change:
");
+ //System.out.println("-------------");
+ //System.out.println("Property: " +
key);
+ //System.out.println("Property Value:
" + functionProperties.getProperty(key));
+ }
+ properties.setWizardProperty(key,
functionProperties
+ .getWizardProperty(key));
+ }
+ serviceProperties.storeProperties();
+
}
- // Getting the names for every property of the group
- Iterator it = functionProperties.orderedKeys();
- // Setting the value of each property
- while (it.hasNext()) {
- String key = (String) it.next();
- // Setting service properties and wizard properties
- serviceProperties.setProperty(key, functionProperties
- .getProperty(key));
- properties.setWizardProperty(key, functionProperties
- .getWizardProperty(key));
- }
- // Storing all changes
- serviceProperties.storeProperties();
properties.storeToXML(new FileOutputStream(new
File(ServicePath
+ WizardPropertiesPath)), " Last Modification
"
+
Calendar.getInstance().getTime().toString());
}

+
/**
* Method for handling all configuration actions regarding the LS
* registration
@@ -430,23 +516,56 @@
* @throws IOException
*/
private void lsActions(WizardProperties finalProperties) throws
IOException {
- // Using the ServiceProperties class to acces the
service.properties
- // file
- ServiceProperties serviceProperties = new
ServicePropertiesImpl(
- ServicePath + ServicePropertiesPath);
+ //System.out.println("lsActions("+finalProperties+") called");
+
+
+ // Changes happen into the service.property file that uses
groupig and
+ // description
+ // In order to keep that functionality we need in this case
to use the
+ // PerfsonarProperties class
+ PerfsonarProperties serviceProperties = new
PerfsonarPropertiesImpl();
+ serviceProperties.loadProperties(new
FileInputStream(ServicePath
+ + ServicePropertiesPath));
Iterator it = finalProperties.orderedKeys();
// Iterating through the LS registration properties properties
+
+ // Initializing the PerfsonarProperty object that holds
information
+ // about grouping and description
+ PerfsonarProperty property = new PerfsonarProperty();
while (it.hasNext()) {
String key = (String) it.next();
// Set the service properties
- serviceProperties
- .setProperty(key, finalProperties.getProperty(key));
+
+ // Get the PerfsonarProperty object
+ property = serviceProperties.getProperty(key);
+
+ // If property key does not exist throw an exceptrion
+ if (property == null) {
+ throw new IOException("Key is invalid " + key
+ " ");
+ } else {
+ //System.out.println("\n\nBefore change: ");
+ //System.out.println("--------------");
+ //System.out.println("Property: " +
property.getKey());
+ //System.out.println("Property Value: " +
property.getValue());
+ //System.out.println("Property Group: " +
property.getGroup());
+ //System.out.println("Property Description: "
+ property.getDescription());
+ // Else set the value right
+
property.setValue(finalProperties.getProperty(key));
+ serviceProperties.setProperty(key, property);
+ //System.out.println("After change: ");
+ //System.out.println("--------------");
+ //System.out.println("Property: " +
property.getKey());
+ //System.out.println("Property Value: " +
property.getValue());
+ //System.out.println("Property Group: " +
property.getGroup());
+ //System.out.println("Property Description: "
+ property.getDescription());
+ }
// Set the wizard properties
properties.setWizardProperty(key, finalProperties
.getWizardProperty(key));
}
// Storing service properties
- serviceProperties.storeProperties();
+ serviceProperties.storeProperties(new
FileOutputStream(ServicePath
+ + ServicePropertiesPath));
// Setting the LS registration componenets in components
properties file
addRegistrationComponents();
// Storing the wizard properties
@@ -454,6 +573,7 @@
+ WizardPropertiesPath)), " Last Modification
"
+
Calendar.getInstance().getTime().toString());
}
+

/**
* Method used for handling all actions associated with exist db
@@ -465,18 +585,20 @@
*/
private void existActions(WizardProperties finalProperties)
throws Exception {
-
+ //System.out.println("existActions("+finalProperties+")
called");
+
try {
// Initiating ServiceProperties classes for handling
input to the
// service.properties and servlet.properties file
- ServiceProperties serviceProperties = new
ServicePropertiesImpl(
- ServicePath + ServicePropertiesPath);
+ PerfsonarProperties serviceProperties = new
PerfsonarPropertiesImpl();
+ serviceProperties.loadProperties(new
FileInputStream(ServicePath
+ + ServicePropertiesPath));
// Any changes happening to the URL of the exist db
and on the admin
// password should be reflected on the
servlet.properties as well
ServiceProperties servletProperties = new
ServicePropertiesImpl(
ServicePath + ServletPropertiesPath);
// Get an iterator for all service properties
- Iterator it =
serviceProperties.getProperties().keySet().iterator();
+ Iterator it = serviceProperties.getKeysIterator();
// Get the type of the service. Will be used for
making the new db
// collection

@@ -494,23 +616,18 @@
String key = (String) it.next();
if (key.endsWith("xmldb.db_adminpassword")) {

-
/********************************************************************
- * CODE CHANGE HERE
*
- * //This is no discarderd, no use
for it now. *
- * // adminPass =
serviceProperties.getProperty(key).getValue() *
- * // .trim();`
*
-
********************************************************************/
-
newAdminPass =
finalProperties.getProperty(key).trim();
+ //System.out.println("newAdminPass: "
+ newAdminPass);
}
if (key.endsWith("xmldb.db_uri")) {
existURI =
finalProperties.getProperty(key);
+ //System.out.println("eXistURI: " +
existURI);
}

}
-
+
//System.out.println("adminPass: " + adminPass +
"\nnewAdminPass: " + newAdminPass);
-
+
// If admin pass is not set than its considered to be
empty
if (adminPass == null) {
adminPass = "";
@@ -519,25 +636,39 @@
it = finalProperties.orderedKeys();
// Iterating though the users input
while (it.hasNext()) {
+
String key = (String) it.next();
- //System.out.println("key: " + key +
"\nvalue: " + finalProperties
- // .getProperty(key));
-
// The input from the user is also set in
service properties with a
- // slight modification for the xmldb uri. We
need to add the
+ // slight modification for tyhe xmldb uri. We
need to add the
// collection at the end of the URI
- //if (!key.endsWith("xmldb.db_uri")) {
-
- // Now we need to get the old password from
the user
- if (key.equals("old_adminpassword")) {

- adminPass =
finalProperties.getProperty(key).trim();
- }
-
- serviceProperties.setProperty(key,
finalProperties.getProperty(key));
- servletProperties.setProperty(key,
finalProperties.getProperty(key));
- //} else {
- // serviceProperties.setProperty(key,
existURI + "/db/");
- //}
+ PerfsonarProperty property = new
PerfsonarProperty();
+ if (key.equals("old_adminpassword")) {
+
+ adminPass =
finalProperties.getProperty(key).trim();
+
+ } else {
+ property =
serviceProperties.getProperty(key);
+ // If property key does not exist
throw an exceptrion
+ if (property == null) {
+ throw new Exception("Key is
invalid " + key + " ");
+ } else {
+
//System.out.println("\n\nBefore change: ");
+
//System.out.println("--------------");
+
//System.out.println("Property: " + property.getKey());
+
//System.out.println("Property Value: " + property.getValue());
+
//System.out.println("Property Group: " + property.getGroup());
+
//System.out.println("Property Description: " + property.getDescription());
+
property.setValue(finalProperties.getProperty(key));
+
serviceProperties.setProperty(key, property);
+ //System.out.println("After
change: ");
+
//System.out.println("--------------");
+
//System.out.println("Property: " + property.getKey());
+
//System.out.println("Property Value: " + property.getValue());
+
//System.out.println("Property Group: " + property.getGroup());
+
//System.out.println("Property Description: " + property.getDescription());
+ }
+ }
+
// Setting also the wizard properties
properties.setWizardProperty(key,
finalProperties
.getWizardProperty(key));
@@ -545,13 +676,13 @@
// Also getting all needed information in
orer to configure the
// exist db
if (key.endsWith("xmldb.db_username")) {
- username =
finalProperties.getProperty(key);
+ username =
finalProperties.getProperty(key).trim();
}
if (key.endsWith("xmldb.db_password")) {
- password =
finalProperties.getProperty(key);
+ password =
finalProperties.getProperty(key).trim();
}
if (key.endsWith("metadata_file_path")) {
- confFile =
finalProperties.getProperty(key);
+ confFile =
finalProperties.getProperty(key).trim();
}
}

@@ -571,7 +702,8 @@
// Creating collection and users
//manager.createCollection(dbCollection);
//System.out.println("eXist creating user
with info: " + null + ", " + username + ", " + password);
- manager.createUser(null, username, password,
null);
+ String[] groups = {"dba"};
+ manager.createUser(null, username, password,
groups);
//System.out.println("eXist user created");
// Adding the metadata config document
manager.getCollection(null).addDocument(new
File(confFile),
@@ -583,7 +715,9 @@
//System.out.println("eXist admin
password changed");
}

- serviceProperties.storeProperties();
+ serviceProperties.storeProperties(new
FileOutputStream(ServicePath
+ + ServicePropertiesPath));
+
properties.storeToXML(new
FileOutputStream(new File(ServicePath
+ WizardPropertiesPath)), "
Last Modification "
+
Calendar.getInstance().getTime().toString());
@@ -591,7 +725,6 @@
}
} catch (Exception e) {
e.printStackTrace();
-
}

}
@@ -668,13 +801,23 @@
*/
public boolean finishConfiguration() throws Exception {

- ServiceProperties serviceProperties = new
ServicePropertiesImpl(
- ServicePath + ServicePropertiesPath);
- serviceProperties.setProperty("service.sax_parser.config",
ServicePath
- + ObjectsConfigPath);
- serviceProperties.setProperty("service.log.log4j.config",
ServicePath
- + LoggingPropertiesPath);
- serviceProperties.storeProperties();
+ PerfsonarProperties serviceProperties = new
PerfsonarPropertiesImpl();
+ serviceProperties.loadProperties(new
FileInputStream(ServicePath
+ + ServicePropertiesPath));
+ PerfsonarProperty property = new PerfsonarProperty();
+ property.setKey("service.sax_parser.config");
+ property.setValue(ServicePath + ObjectsConfigPath);
+ property.setGroup("Internals");
+ property.setDescription("Sax parser configuration paramater");
+ serviceProperties.setProperty(property.getKey(), property);
+ property = new PerfsonarProperty();
+ property.setKey("service.log.log4j.config");
+ property.setValue(ServicePath + LoggingPropertiesPath);
+ property.setGroup("Internals");
+ property.setDescription("Logging Properties path");
+ serviceProperties.setProperty(property.getKey(), property);
+ serviceProperties.storeProperties(new
FileOutputStream(ServicePath
+ + ServicePropertiesPath));

return true;

Added: trunk/geant2_java-sshtelnet-mp/webapps/Service_Admin.js

Deleted:
trunk/geant2_java-sshtelnet-mp/webapps/WEB-INF/lib/perfsonar-web-admin-0.5b.jar

Added:
trunk/geant2_java-sshtelnet-mp/webapps/WEB-INF/lib/perfsonar-web-admin-0.8.3b.jar

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/WEB-INF/lib/perfsonar-web-admin-0.8.3b.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Modified: trunk/geant2_java-sshtelnet-mp/webapps/default.css
===================================================================
--- trunk/geant2_java-sshtelnet-mp/webapps/default.css 2008-05-05 13:51:38
UTC (rev 3813)
+++ trunk/geant2_java-sshtelnet-mp/webapps/default.css 2008-05-05 14:18:14
UTC (rev 3814)
@@ -1,162 +1,641 @@
/* standard elements */
+html {
+ min-height: 100%;
+}

-html {min-height: 100%;}
-
-
* {
- margin: 0;
- padding: 0;
+ margin: 0;
+ padding: 0;
}

+body {
+ background-color: #ffffff;
+ font-family: arial;
+}

-body{
- background-color: #ffffff;
- font-family: arial;
+a img {
+ border: none;
}
+/* Wizard CSS */
+.top {
+ display: block;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ color: #468C46;
+ margin: 0% 1% 0 1%;
+ border-bottom: 1px dotted #468C46;
+ padding: 7px;
+ background: #ffffff;
+}

+.greenasterisk {
+ font-size: 130%;
+ color: #468C46;
+}

-/* title */
+.properties {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ padding: 10px;
+ margin: 0% 1% 0 1%;
+}

-.top {
- display: block;
- font-family: arial;
- font-weight: bold;
- margin: 2% 1% 0 1%;
- border-top: 1px solid green;
- border-right: 1px solid green;
- border-left: 1px solid green;
- padding: 7px;
- background: #afdfc0;
+.properties p {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}

-.properties{
+.properties table {
+ border-bottom: 1px dotted #468C46;
+ margin-bottom: 20px;
+}

- font-family: arial;
- border: 1px solid green;
- padding: 10px;
- margin: 0% 1% 0 1%;
+.properties td {
+ padding: 15px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}
- .properties p{
- font-size: 120%;
-
+
+.properties em {
+ display: block;
+ color: red;
+ font-size: 95%;
}

-.properties table{
- border-bottom: 1px solid green;
- margin-bottom: 20px;
+.info_wizard {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ color: #468C46;
}

-.properties td{
- padding: 15px;
+.info_wizard p {
}
+/* General Purpose CSS*/
+.welcometextlavender {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight: bold;
+ color: #4169E1;
+ border-bottom-width: 1px;
+ border-bottom-style: dotted;
+ border-bottom-color: #4169E1;
+ clip: rect( auto, auto, auto, auto );
+ margin-left: 0%;
+}

-.properties em{
- display: block;
- color: red;
- font-size: 95%;
+.formated_text {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}

+.blueheader {
+ text-align: left;
+ color: #4169E1;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
.info {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ color: #4169E1;
+ float: none;
+ margin: 0% 0% 0% 1%;
+}

- font-family: arial;
- font-size: 120%;
+.info p {
+ float: none;
+ text-align: justify;
}

-.info p{
- position: relative;
- left: -230px;
+.lightgrey {
+ background-color: #f1f3f1;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
}

-.content{
- font-family: arial;
- font-size: 120%;
- margin:2% 1% 0 1%;
- background: #ffffff;
- }
-
+.lightgrey td {
+ padding: 5px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+}
+
+.darkgrey {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ background-color: #e1e5e1;
+}
+
+.darkgrey td {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ padding: 5px;
+}
+
+.hilighted {
+ color: #4169E1;
+ border-bottom: 1px solid #4169E1;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.underlined {
+ border-bottom: 1px solid #4169E1;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.tablessContent {
+ margin: 2% 0 0 0.3%;
+ background: #ffffff;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.input_style_blue {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+}
+
+.headerlavender {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ background-color: #A0A0D8;
+ margin-right: 0px;
+ margin-left: 0px;
+ padding: 5px;
+}
+/*eXist Admin CSS*/
+.content {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ margin: 2% 0% 0 0%;
+ background: #ffffff;
+}
+
.content ul {
- margin-top: 5px;
- display: block;
- list-style: none outside;
- padding: 5px;
- border-top: 1px solid green;
- border-left: 1px solid green;
- border-right: 1px solid green;
- }
-
+ margin-top: 5px;
+ display: block;
+ list-style: none outside;
+ padding: 5px;
+}
+
.content li {
- margin: 0 0 0 0;
- padding: 0px;
- display: block;
- float: left;
- position: relative;
- top: -1.32em;
- }
-
-.content a {
- padding: 5px;
- text-decoration: none;
- color: green;
- background: #ffffff;
- }
-
-.content a:hover {
- background: #3CB371;
- color: green;
- }
-
-.content #selected {
- }
-
-.content #selected a {
-
- font-weight: bold;
- color: green;
- background: #3CB3A1;
- }
-
-.manage {
+ margin: 0 0 0 0;
+ padding: 0px;
+ display: block;
+ float: left;
+ position: relative;
+ top: -1.32em;
+}

- background: #ffffff;
- border-bottom: 1px solid green;
- border-left: 1px solid green;
- border-right: 1px solid green;
- margin:0 1% 0 1%;
- padding: 1em;
- }
+.manage_exist {
+ background: #ffffff;
+ margin: 0% 0% 0% 0%;
+ padding: 0px;
+}

-.showResource{
- font-weight: bold;
- text-indent: 0%;
- text-align:inherit;
- background: #ffffff;
-
+.showResource {
+ float: none;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ text-indent: 0%;
+ margin-top: 5px;
+ margin-left: 0.3%;
+ padding: 0px;
+ text-align: inherit;
}

-.showResource td{
- padding: 7px;
-
+.showResource table {
+ left: -100px;
+ position: static;
+ margin-top: 0px;
+ border-spacing: 1px 0px;
}

+.showResource th {
+ padding: 10px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ background-color: #C7C7F2;
+}
+
+.showResource td {
+ padding: 10px;
+}
+
+.showResource p {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ border: none;
+ padding: 5px;
+ margin: 0% 0% 0% 0%;
+}
+
+.exist_welcome_text {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight: bold;
+ padding: 5px;
+ color: #4169E1;
+ font-weight: bold;
+ border-bottom-width: 1px;
+ border-bottom-style: dotted;
+ border-bottom-color: #4169E1;
+ clip: rect( auto, auto, auto, auto );
+ margin-left: 0%;
+}
+
.input {
- padding: 1em;
- font-size: 110%;
- font-family: arial;
+ padding: 1em;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}

+.input_style {
+ border-color: #468C46;
+ border-style: solid;
+ border-width: 1px;
}

-.input table{
- padding: 5px;
+.login_table {
+ background-color: #E6E6FA;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}

+.login_table td {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}
-.input td{
- padding: 5px;
+
+.logout {
+ margin-top: 10px;
+ margin-left: 48%;
}

-.input th{
- padding: 5px;
- text-align: left;
+.logout a {
+ padding: 5px;
+ text-decoration: none;
+ color: green;
+ background: transparent url(graphics/logout_button.gif) no-repeat center
top;
+ width: 64px;
+ height: 28px;
+ display: block;
+}

+.logout a:hover {
+ background: transparent url(graphics/logout_button.gif) no-repeat center
top;
+ color: #049;
}

+.input_table {
+ border: 1px solid #4169E1;
+ border-spacing: 0px 1px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}

+.input_table td {
+ padding: 5px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+.input_table th {
+ padding: 5px;
+ text-align: left;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+/*Exist Buttons CSS*/
+.collections_option_on a {
+ padding: 7px 80px 7px 80px;
+ width: 210px;
+ height: 28px;
+ text-decoration: none;
+ background: transparent url(graphics/manage_collections_on_tab.gif)
no-repeat center top;
+}
+
+.collections_option_on a:visited, a:active {
+ background: transparent url(graphics/manage_collections_on_tab.gif)
no-repeat center top;
+}
+
+.collections_option_off a {
+ padding: 7px 80px 7px 80px;
+ width: 210px;
+ height: 28px;
+ text-decoration: none;
+ background: transparent url(graphics/manage_collections_off_tab.gif)
no-repeat center top;
+}
+
+.collections_option_off a:visited, a:active {
+ background: transparent url(graphics/manage_collections_off_tab.gif)
no-repeat center top;
+}
+
+.users_option_on a {
+ padding: 7px 65px 7px 65px;
+ width: 210px;
+ height: 28px;
+ text-decoration: none;
+ background: transparent url(graphics/manage_users_on_tab.gif) no-repeat
center top;
+}
+
+users_option_on a:visited, a:active {
+ background: transparent url(graphics/manage_users_on_tab.gif) no-repeat
center top;
+}
+
+.users_option_off a {
+ padding: 7px 65px 7px 65px;
+ width: 210px;
+ height: 28px;
+ text-decoration: none;
+ background: transparent url(graphics/manage_users_off_tab.gif) no-repeat
center top;
+}
+
+users_option_off a:visited, a:active {
+ background: transparent url(graphics/manage_users_off_tab.gif) no-repeat
center top;
+}
+
+.login_button {
+ width: 54px;
+ height: 28px;
+ margin: 0;
+ padding: 0;
+ border: 0px;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: bold;
+ text-align: center;
+ clip: rect( auto, auto, auto, auto );
+ cursor: pointer;
+ background: transparent url(graphics/button_1_small.gif) no-repeat
center top;
+ float: left;
+}
+
+.edit_button_res {
+ display: block;
+ margin-top: 5px;
+ margin-left: 0px;
+ width: 120px;
+ height: 28px;
+ float: left;
+ outline: none;
+ border: none;
+ text-align: center;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: bold;
+ text-decoration: none;
+ background: url(graphics/button_1_large.gif) no-repeat center;
+ cursor: pointer;
+}
+
+.create_button_res {
+ display: block;
+ margin-top: 5px;
+ width: 120px;
+ height: 28px;
+ float: left;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/button_1_large.gif) no-repeat
center;
+}
+
+.delete_button_res {
+ display: block;
+ margin-top: 5px;
+ width: 120px;
+ height: 28px;
+ float: none;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/button_1_large.gif) no-repeat
center top;
+}
+
+.input_Edit_button {
+ width: 54px;
+ height: 28px;
+ margin: 0;
+ border: 0;
+ padding: 0;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
+ cursor: pointer;
+ background: transparent url(graphics/button_1_small.gif) no-repeat
center top;
+ float: left;
+}
+
+.input_Create_button {
+ width: 54px;
+ height: 28px;
+ margin: 0;
+ border: 0;
+ padding: 0;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
+ cursor: pointer;
+ background: transparent url(graphics/button_1_small.gif) no-repeat
center top;
+ float: left;
+}
+
+.execute_button_users {
+ width: 54px;
+ height: 28px;
+ margin: 0;
+ border: 0;
+ padding: 0;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
+ cursor: pointer;
+ background: transparent url(graphics/button_1_small.gif) no-repeat
center top;
+ float: right;
+}
+/*Properties CSS */
+.groupheading {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ color: #468C46;
+}
+
+.manage {
+ background: #ffffff;
+ margin: 0 0.3% 0 0.3%;
+ padding: 0px;
+}
+
+.manage table {
+ padding: 3px;
+ border-spacing: 1px 0px;
+}
+
+.manage th {
+ padding-top: 8px;
+ padding-bottom: 8px;
+ padding-left: 5px;
+ text-align: left;
+}
+
+.manage td {
+ padding-top: 8px;
+ padding-bottom: 8px;
+ padding-left: 5px;
+}
+/*Properties Buttons CSS*/
+.floatResetButton {
+ position: fixed;
+ width: 64px;
+ height: 28px;
+ margin: 0;
+ padding: 0;
+ border: 0;
+ text-indent: -1000em;
+ cursor: pointer;
+ background: transparent url(graphics/cancel_button.gif) no-repeat center
top;
+ float: right;
+}
+
+.floatSubmitButton {
+ position: fixed;;
+ width: 53px;
+ height: 28px;
+ margin: 0;
+ border: 0;
+ padding: 0;
+ text-indent: -1000em;
+ cursor: pointer;
+ background: transparent url(graphics/apply_button_2.gif) no-repeat
center top;
+ float: right;
+}
+
+.submit_button {
+ width: 53px;
+ height: 28px;
+ margin: 0;
+ border: 0;
+ padding: 0;
+ text-indent: -1000em;
+ cursor: pointer;
+ background: transparent url(graphics/apply_button.gif) no-repeat center
top;
+ float: none;
+}
+/* SQLMA Admin CSS*/
+.manage_slqma {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ margin: 0% 1% 0% 1%;
+}
+
+.Options {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ margin: 0% 1% 0% 1%;
+}
+
+#options {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ margin: 0% 1% 0% 1%;
+}
+
+#EditFile {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ margin: 0% 1% 0% 1%;
+ float: none;
+}
+
+#CreateNewFile {
+ margin: 0% 1% 0% 1%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ float: none;
+}
+
+.execute_button_sqlma {
+ display: block;
+ margin-top: 5px;
+ width: 120px;
+ height: 28px;
+ float: left;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/button_1_large.gif) no-repeat
center;
+}
+
+.execute_button_sqlma_small {
+ display: block;
+ margin-top: 5px;
+ width: 54px;
+ height: 28px;
+ float: left;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/button_1_small.gif) no-repeat
center;
+}
+
+.execute_button_sqlma_large {
+ display: block;
+ margin-top: 5px;
+ width: 120px;
+ height: 28px;
+ float: left;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 90%;
+ font-weight: 600;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/button_1_large.gif) no-repeat
center;
+}
+
+.sqlmaheader {
+ margin-left: 1%;
+ color: #4169E1;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 13px;
+}
+
+init_table {
+ margin-left: 1%;
+ float: left;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 13px;
+}
+
+.init_table td {
+ padding: 8px;
+ text-align: left;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 13px;
+}
+
+.init_table th {
+ padding: 8px;
+ text-align: left;
+ color: #4169E1;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 13px;
+}
+
+
+

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/Paul_Hasleham.vcf

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/Thumbs.db

Property changes on: trunk/geant2_java-sshtelnet-mp/webapps/graphics/Thumbs.db
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/WebAdmin.htm

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/admin_home_target.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/admin_home_target.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/apply_button.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/apply_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/apply_button_2.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/apply_button_2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/arrow_icon.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/arrow_icon.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/arrow_icon2.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/arrow_icon2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/button_1_large.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/button_1_large.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/button_1_small.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/button_1_small.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/button_2_large.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/button_2_large.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/button_2_small.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/button_2_small.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/cancel_button.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/cancel_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/create_resource_button.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/create_resource_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/delete_red_button.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/delete_red_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/edit_button.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/edit_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/edit_green_button.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/edit_green_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/login_panel.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/login_panel.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/logos.gif

Property changes on: trunk/geant2_java-sshtelnet-mp/webapps/graphics/logos.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/logout_button.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/logout_button.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/manage_collections_off_tab.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/manage_collections_off_tab.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/manage_collections_on_tab.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/manage_collections_on_tab.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/manage_users_off_tab.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/manage_users_off_tab.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/manage_users_on_tab.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/manage_users_on_tab.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/step_1_bottom.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/step_1_bottom.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/step_1_slice.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/step_1_slice.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/step_1_top.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/step_1_top.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/step_2_bottom.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/step_2_bottom.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/step_2_slice.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/step_2_slice.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/graphics/step_2_top.gif

Property changes on:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/step_2_top.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added:
trunk/geant2_java-sshtelnet-mp/webapps/graphics/subversion.tigris.org.html

Modified: trunk/geant2_java-sshtelnet-mp/webapps/index.html
===================================================================
--- trunk/geant2_java-sshtelnet-mp/webapps/index.html 2008-05-05 13:51:38
UTC (rev 3813)
+++ trunk/geant2_java-sshtelnet-mp/webapps/index.html 2008-05-05 14:18:14
UTC (rev 3814)
@@ -1,79 +1,116 @@
<html>
-
- <head>
- <title>perfSONAR Service Web Administration page</title>
- <link rel="stylesheet" type="text/css" href="main.css" />
- <meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1"><style type="text/css">
-
-</style></head>
- <body>
-<div class="adminPanel" >
-
-<div class="banner">
-<table border="0" align="left" cellpadding="0" cellspacing="0">
-<tr>
- <td><img src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94"
border="0" align="right"></td>
-</tr>
-</table>
-
-</div>
-
-<div class="mainWindow" >
-
-<div class="sidebar" >
-<table border="0" cellpadding="0" cellspacing="0">
-<tr >
-<th>Administration</th>
-</tr>
-<tr>
- <td><p><a href="Wizard" target="main" class="navtex" >Service</a></p>
- <p><a href="Wizard" target="main" class="navtex" >Configuration</a></p>
- <p><a href="Wizard" target="main" class="navtex" >Wizard</a></p></td>
-</tr>
-<tr>
- <td><p><a href="ServiceAdmin?serviceProperties" target="main"
class="navtex" >Service</a></p>
- <p><a href="ServiceAdmin?serviceProperties" target="main" class="navtex"
>configuration</a></p></td>
-</tr>
-<tr>
- <td>
- <p><a href="ServiceAdmin?loggingProperties" target="main" class="navtex"
>logging</a></p>
- <p><a href="ServiceAdmin?loggingProperties" target="main" class="navtex"
>configuration</a>
- </p>
- </p></td>
-</tr>
-<tr><td><p><a href="eXistAdmin" target="main" class="navtex" >eXist
Database</a></p>
- <p><a href="eXistAdmin" target="main" class="navtex"
>Administration</a></p></td>
-</tr>
-</table>
-<a href="http://www.perfsonar.net/partners.html";></a> <br>
-<img src="partners.gif" alt="perfSONAR project partners" border="0"/>
</a></div>
-
-<div class="centerWindow" >
- <object data="http://www.perfsonar.net"; type="text/html" name="main"
width="101%" height="106%" class="main" >
- <p>Sorry for the inconvenience we are having connectiong to the main
page...</p>
- </object>
-</div>
-
-
-</div>
-
-<div class="footer" >PERFormance Service-Oriented Network monitoring
ARchitecture  </div>
-
-
-
-
-
-</div>
-
-
- </body>
+ <head>
+ <title>perfSONAR Service Web Administration page</title>
+ <link rel="stylesheet" type="text/css" href="main.css"/>
+ <meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1">
+ <style type="text/css">
+ 
+ </style>
+ </head>
+ <body>
+ <div class="adminPanel">
+ <div class="banner">
+ <table border="0" align="left" cellpadding="0"
cellspacing="0">
+ <tr>
+ <td>
+ <a href="welcome.htm" target="main"><img
src="perfsonar_logo.gif" alt="perfSONAR" width="192" height="94" border="0"
align="right"></a>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div class="mainWindow">
+ <div class="sidebar">
+ <table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <th>
+ <a href="welcome.htm" class="button"
target="main">Admin home      </a>
+ </th>
+ </tr>
+ <tr>
+ <td>
+ <p>
+ <span class="navtexheading">Basic
+ <br>
+ Configuration
+ </span>
+ </p>
+ <p>
+ <span class="navtex"><a href="Wizard"
target="main">Service</a></span>
+ </p>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <p>
+ <span class="navtexheading
style3">Advanced
+ <br>
+ Configuration
+ </span>
+ </p>
+ <p>
+ <span class="navtex style3"><a
href="ServiceAdmin?serviceProperties" target="main">Service</a>
+ <br>
+ <a
href="ServiceAdmin?loggingProperties" target="main">Logging</a>
+ <br>
+ <a href="eXistAdmin"
target="main">eXist Database</a>
+ <br>
+ </span>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ </tr>
+ </table>
+ <img src="graphics/logos.gif" alt="perfSONAR project
partners" width="117" height="263" border="0" align="top"/>
+ </div>
+ <div class="centerWindow">
+ <object data="welcome.htm" type="text/html" name="main"
width="99%" height="100%">
+ </object>
+ </div>
+ </div>
+ <div class="footer">
+ PERFormance Service-Oriented Network monitoring ARchitecture
 
+ </div>
+ </div>
+ </body>
</html>
-
-

Modified: trunk/geant2_java-sshtelnet-mp/webapps/main.css
===================================================================
--- trunk/geant2_java-sshtelnet-mp/webapps/main.css 2008-05-05 13:51:38
UTC (rev 3813)
+++ trunk/geant2_java-sshtelnet-mp/webapps/main.css 2008-05-05 14:18:14
UTC (rev 3814)
@@ -7,22 +7,51 @@
* {
margin: 0;
padding: 0;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ text-decoration: none;
+ border-top-style: none;
+ border-right-style: none;
+ border-bottom-style: none;
+ border-left-style: none;
}

body{
-
- background-color: #C0C0C0;
- width: 100%;
- height: 100%;
- font-family: arial;
+ background-color: #C0C0C0;
+ width: 100%;
+ height: 100%;
+ }
+a:link {
+ color: #468C46;
+ cursor: pointer;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
}
+a:active {
+ color: #117721;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight: bold;
+}
+a:visited {
+ color: #468C46;
+ cursor: auto;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+a:hover {
+ color: #468C46;
+ cursor: pointer;
+ text-decoration: underline;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}

.adminPanel{
- width: 90%;
- height: 60%;
+ width: 94%;
+ height: 50%;
float:left;
- margin-left: 5%;
+ margin-left: 3%;
margin-right: 5%;
background-color: #ffffff;
margin-bottom: 2%;
@@ -30,35 +59,199 @@
.navtex {
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 13px;
- color: #666666;
+ color: #468C46;
text-align: right;
font-style: normal;
font-weight: normal;
+ line-height: 28px;
+ background-image: none;
}

+.navtexheading {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ color: #468C46;
+ text-align: right;
+ font-style: normal;
+ font-weight: bold;
+ line-height: normal;
+
+}
+.welcometext {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ color: #468C46;
+ border-bottom-width: 1px;
+ border-bottom-style: dotted;
+ border-bottom-color: #468C46;
+ padding-top: 10px;
+ padding-bottom: 8px;
+ padding-right: 0px;
+ clip: rect(auto,auto,auto,auto);
+ margin-right: 0px;
+ margin-left: 2%;
+}
+.heading1 {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 14px;
+ color: #468C46;
+ padding-top: 23px;
+ padding-bottom: 23px;
+ font-weight: bold;
+ margin-left: 2%;
+}
+
+.bodytext1 {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ color: #333333;
+ width: 100%;
+ margin-left: 18%;
+ font-weight: normal;
+ line-height: 22px;
+}

+.bodytextgreenline {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ color: #333333;
+ margin-left: 18%;
+ font-weight: normal;
+ line-height: 18px;
+ border-bottom-width: 1px;
+ border-bottom-style: dotted;
+ border-bottom-color: #468C46;
+ padding-bottom: 11pt;
+}
+
+.contenttable {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ color: #468C46;
+ padding-top: 0px;
+ margin-left: 20px;
+ font-weight: bold;
+ background-color: #FFFFFF;
+}
+.configheadinglavender {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ color: #8585C1;
+ font-weight: bold;
+ background-image: url(graphics/arrow_icon2.gif);
+ background-repeat: no-repeat;
+ background-position: 17px top;
+ padding-left: 38px;
+}
+
+.configheadinglavender a:link {
+ color: #8585C1;
+ cursor: pointer;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+.configheadinglavender a:active {
+ color: #117721;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight: bold;
+}
+.configheadinglavender a:visited {
+ color: #8585C1;
+ cursor: auto;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+.configheadinglavender a:hover {
+ color: #8585C1;
+ cursor: pointer;
+ text-decoration: underline;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+
+.configheading {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ color: #27752C;
+ font-weight: bold;
+ background-image: url(graphics/arrow_icon.gif);
+ background-repeat: no-repeat;
+ background-position: 17px top;
+ padding-left: 38px;
+}
+
+.configheading a:link {
+ color: #27752C;
+ cursor: pointer;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+.configheading a:active {
+ color: #117721;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight: bold;
+}
+.configheading a:visited {
+ color: #27752C;
+ cursor: auto;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+.configheading a:hover {
+ color: #27752C;
+ cursor: pointer;
+ text-decoration: underline;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
.banner{
margin: 5px;
width: 99%;
height: 94px;
background-image: url(top_slice.gif);
background-color: #FFFFFF;
+ padding: 0px;
+ clip: rect(auto,auto,auto,auto);
+ float:left;
}
-
-
.mainWindow{
border: none;
+ padding: 0px;
width: 100%;
- height: 554px;
+ height: 750px;
background-color: #ffffff;
}
+.centerWindow{
+ background-color: #FFFFFF;
+ width: 82%;
+ height:80%;
+ margin-right: 5px;
+ margin-bottom: 5px;
+ margin-left: 0;
+ float: left;
+}
+.centerWindow object{
+ width: 101%;
+ height: 105%;
+ background-color: #FFFFFF;
+}
+
+.welcomepage{
+ background-color: #FFFFFF;
+ width: 100%;
+ height: 100%;
+}
+
/* Sidebar*/

-
.sidebar{
width: 15%;
- height: 300px;
- padding-bottom: 250px;
+ height: 71.1%;
+ padding-bottom: 12.1%;
padding-right: 0px;
float: left;
border-right-width: 1px;
@@ -73,12 +266,19 @@
color: #ffffff;
text-align: right;
background-color: #61AF61;
- padding: 10px;
- right: 0px;
width: 15%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ font-weight: normal;
+ text-decoration:none;
+ background-repeat: no-repeat;
+
+ padding-top: 10px;
+ padding-right: 8%;
+ padding-bottom: 10px;
+ padding-left: 10px;
}
.sidebar td{
- color: #000000;
text-align: right;
background-color: #ffffff;
padding: 10px;
@@ -86,40 +286,42 @@
border-bottom-style: dotted;
border-bottom-color: #92C992;
}
+.sidebar a.button {
+ color: #ffffff;
+ text-align:left;
+ background-color: #61AF61;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ font-weight: normal;
+ text-decoration:none;
+ background-position: 100% 50%;
+ background-image: url(graphics/admin_home_target.gif);
+ background-repeat: no-repeat;
+
+}

+
+
.sidebar a{
- text-decoration: none;
font-weight: normal;
- padding: 0px;
+ padding-top: 0px;
+ padding-right: 0px;
+ padding-bottom: 0px;
+ padding-left: 0px;
+ margin-bottom: 0px;
}

.sidebar img{
- float: none;
+ float: right;
border: none;
- width: 120px;
- height: 60px;
- padding-top: 40px;
+ padding-top: 0px;
padding-right: 0px;
padding-bottom: 0px;
- padding-left: 15px;
}
-.centerWindow{
- width: 83%;
- height: 500px;
- background-color: #ffffff;
- float: left;
-

-}
-.centerWindow object{
-
- width: 100%;
- height: 100%;

-}
-
.footer{
- height: 30px;
+ height: 20px;
text-align: right;
color: #61AF61;
background-color: #ffffff;
@@ -128,11 +330,13 @@
border-top-width: 1px;
border-top-style: dotted;
border-top-color: #61AF61;
- padding-top: 5px;
+ padding-top: 12px;
width: 100%;
border-right-style: none;
border-right-color: #FFFFFF;
border-left-color: #FFFFFF;
+ float: none;
+}
.footermain {
height: 20px;
text-align: right;
@@ -148,29 +352,6 @@
border-right-style: none;
border-right-color: #FFFFFF;
border-left-color: #FFFFFF;
-}
-.footermain {
- height: 20px;
- text-align: right;
- color: #61AF61;
- background-color: #ffffff;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
- width: 100%;
+ }
+

-.footermain {
- height: 20px;
- text-align: right;
- color: #61AF61;
- background-color: #ffffff;
- font-family: Verdana, Arial, Helvetica, sans-serif;
- font-size: 10px;
- border-top-width: 1px;
- border-top-style: dotted;
- border-top-color: #61AF61;
- padding-top: 5px;
- width: 100%;
- border-right-style: none;
- border-right-color: #FFFFFF;
- border-left-color: #FFFFFF; padding: 5px;
-}

Added: trunk/geant2_java-sshtelnet-mp/webapps/perfsonar.png

Property changes on: trunk/geant2_java-sshtelnet-mp/webapps/perfsonar.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/sqlma_admin_script.js

Added: trunk/geant2_java-sshtelnet-mp/webapps/subversion.tigris.org.html

Added: trunk/geant2_java-sshtelnet-mp/webapps/tags.htm

Added: trunk/geant2_java-sshtelnet-mp/webapps/top_slice.gif

Property changes on: trunk/geant2_java-sshtelnet-mp/webapps/top_slice.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream

Added: trunk/geant2_java-sshtelnet-mp/webapps/welcome.htm

Added: trunk/geant2_java-sshtelnet-mp/webapps/wz_tooltip.js

perfsonar: r3814 - in trunk/geant2_java-sshtelnet-mp: ant conf conf/axis-1.4 conf/axis-1.4/WEB-INF conf/axis-1.4/WEB-INF/classes conf/axis-1.4/WEB-INF/classes/perfsonar conf/axis-1.4/WEB-INF/classes/perfsonar/conf conf/axis-1.4/WEB-INF/lib conf/axis-1.4/graphics lib/misc src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata src/main/java/org/perfsonar/service/measurementPoint/webAdmin webapps webapps/WEB-INF/lib webapps/graphics, svnlog, 05/05/2008

List archive