Skip to Content.
Sympa Menu

perfsonar-dev - perfsonar: r4463 - 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/perfsonar/conf conf/axis-1.4/WEB-INF/samples conf/axis-1.4/WEB-INF/samples/requests conf/axis-1.4/WEB-INF/samples/responses conf/axis-1.4/graphics doc src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/webAdmin

Subject: perfsonar development work

List archive

perfsonar: r4463 - 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/perfsonar/conf conf/axis-1.4/WEB-INF/samples conf/axis-1.4/WEB-INF/samples/requests conf/axis-1.4/WEB-INF/samples/responses conf/axis-1.4/graphics doc src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/webAdmin


Chronological Thread 
  • From:
  • To:
  • Subject: perfsonar: r4463 - 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/perfsonar/conf conf/axis-1.4/WEB-INF/samples conf/axis-1.4/WEB-INF/samples/requests conf/axis-1.4/WEB-INF/samples/responses conf/axis-1.4/graphics doc src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/webAdmin
  • Date: Mon, 8 Sep 2008 06:13:19 -0400
Author: melis
Date: 2008-09-08 06:13:18 -0400 (Mon, 08 Sep 2008)
New Revision: 4463

Added:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/samples/
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/samples/requests/

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/samples/requests/EchoRequest.xml
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/samples/responses/

trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/samples/responses/EchoResponse.xml
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/fingerprint.jsp
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/Paul_Hasleham.vcf
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/testdepl_fail.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/testdepl_main.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/testdepl_return.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/testdepl_startbn.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/testdepl_succ.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/happyaxis.jsp
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/i18nLib.jsp
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/index.html
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/index_sqlma.jsp
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/schema.rng
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/testdepl.jsp
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/tick.gif
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/wizard.properties
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/wizardproperties.dtd
Removed:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/fingerprint.jsp
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/Paul_Hasleham.vcf
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/happyaxis.jsp
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/i18nLib.jsp
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/index.html
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
Modified:
trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml
trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
trunk/geant2_java-sshtelnet-mp/ant/webapp-package-targets.xml
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/conf/servlet.properties

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/web.xml
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/default.css
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/Thumbs.db
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/index.jsp
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/main.css
trunk/geant2_java-sshtelnet-mp/conf/servlet.properties
trunk/geant2_java-sshtelnet-mp/conf/servlet.properties.template
trunk/geant2_java-sshtelnet-mp/conf/wizard.properties
trunk/geant2_java-sshtelnet-mp/doc/Interface Specification for SSHTelnet
1.3.doc

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java

trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
Log:
updated trunk with latest work

Modified: trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml 2008-09-05
13:09:00 UTC (rev 4462)
+++ trunk/geant2_java-sshtelnet-mp/ant/axis-deploy-targets.xml 2008-09-08
10:13:18 UTC (rev 4463)
@@ -50,7 +50,7 @@
depends="copy-dep-base-service-jars">

<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080310/perfsonar-base-1.0.20080310.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080721/perfsonar-base-1.0.20080721.jar"
todir="${service.home}/${deploy.root}/WEB-INF/lib"/>

<copy file="${basedir}/conf/eventType-map.xml"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>
<copy file="${basedir}/conf/eventType-rules.xml"
todir="${service.home}/${deploy.root}/WEB-INF/classes/perfsonar/conf"/>

Modified: trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
2008-09-05 13:09:00 UTC (rev 4462)
+++ trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
2008-09-08 10:13:18 UTC (rev 4463)
@@ -60,7 +60,7 @@
<artifact:dependencies>

<dependency groupId="rrdjtool" artifactId="rrdjtool"
version="1.0"/>
- <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080310"/>
+ <dependency groupId="perfsonar" artifactId="perfsonar-base"
version="1.0.20080721"/>
<dependency groupId="nmwg" artifactId="nmwg"
version="1.0.20071008"/>



Modified: trunk/geant2_java-sshtelnet-mp/ant/webapp-package-targets.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/webapp-package-targets.xml
2008-09-05 13:09:00 UTC (rev 4462)
+++ trunk/geant2_java-sshtelnet-mp/ant/webapp-package-targets.xml
2008-09-08 10:13:18 UTC (rev 4463)
@@ -76,7 +76,9 @@
<copy file="${basedir}/conf/components.properties.template"
tofile="${basedir}/conf/components.properties"/>
<copy file="${basedir}/conf/log4j.properties.template"
- tofile="${basedir}/conf/log4j.properties"/>
+ tofile="${basedir}/conf/log4j.properties"/>
+ <copy file="${basedir}/conf/log4j.syslog.properties.template"
+ tofile="${basedir}/conf/log4j.syslog.properties"/>

<copy file="${basedir}/conf/servlet.properties.template"
tofile="${basedir}/conf/servlet.properties"/>

@@ -85,9 +87,9 @@
todir="${tmpdir}/WEB-INF/lib"/>
<copy
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar"

todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080310/perfsonar-base-1.0.20080310.jar"

+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080721/perfsonar-base-1.0.20080721.jar"

todir="${tmpdir}/WEB-INF/lib"/>
- <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8.3b/perfsonar-web-admin-0.8.3b.jar"

+ <copy
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.1b/perfsonar-web-admin-0.9.1b.jar"

todir="${tmpdir}/WEB-INF/lib"/>
<copy file="${basedir}/lib/repository/remote/j2ssh-ant.jar"
todir="${tmpdir}/WEB-INF/lib"/>
@@ -109,6 +111,8 @@
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
<copy file="${basedir}/conf/log4j.properties"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
+ <copy file="${basedir}/conf/log4j.syslog.properties"
+ todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>
<copy file="${basedir}/conf/components.properties"
todir="${tmpdir}/WEB-INF/classes/perfsonar/conf"/>


Modified: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/Service_Admin.js
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/Service_Admin.js
2008-09-05 13:09:00 UTC (rev 4462)
+++ trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/Service_Admin.js
2008-09-08 10:13:18 UTC (rev 4463)
@@ -31,7 +31,7 @@
reset_button.style.left = 83 + '%';
}
else {
- //alert("Not 768 "+x);
+ //alert("Not 768 "+x);
reset_button.style.top = 95 + '%';
reset_button.style.left = 67 + '%';
}
@@ -42,7 +42,7 @@
button.style.left = 91.5 + '%';
}
else {
- button.style.top = 95 + '%';
+ button.style.top = 95 + '%';
button.style.left = 74 + '%';
}
}
@@ -54,4 +54,75 @@
onscroll = FloatPosition;
onresize = FloatPosition;

+function checkStarFields(){

+ var divs = document.getElementsByTagName("div");
+ var filled = true;
+
+ for (var i = 0; i < divs.length; i++) {
+
+ var div = divs[i];
+ if (div.style.display == "block") {
+ var input_array = div.getElementsByTagName("input");
+
+ var text = document.createElement("td");
+ var ex = document.getElementById("extra");
+ if (ex != null) {
+ var p = ex.parentNode;
+ p.removeChild(ex);
+ }
+ text.id = "extra";
+ text.innerHTML = '<p style=\"color:red;\">Please fill in the
field!</p>';
+
+ for (var j = 0; j < input_array.length; j++) {
+
+ var input = input_array[j];
+
+ if (input.id == "required") {
+
+ var parent = input.parentNode.parentNode;
+ if (input.value == null || input.value == "" ||
input.value == " ") {
+ if
(parent.parentNode.parentNode.parentNode.style.display == "block") {
+ filled = false;
+ parent.appendChild(text);
+ return filled;
+ }
+
+ }
+
+ }
+
+ }
+ }
+
+ }
+
+ return filled;
+
+}
+
+function getDate(){
+
+ var date = document.getElementById("date");
+
+ var stampdays = new Array("Sunday", "Monday", "Tuesday", "Wednesday",
"Thursday", "Friday", "Saturday");
+
+ var stampmonths = new Array("January", "February", "March", "April",
"May", "June", "July", "August", "September", "October", "November",
"December");
+
+ var thedate = new Date();
+
+ date.innerHTML = stampdays[thedate.getDay()] + ", " +
stampmonths[thedate.getMonth()] + " " + thedate.getDate() + ", " +
thedate.getFullYear();
+
+}
+
+function highlight(el){
+ alert("Highlighted");
+ var links = document.getElementsByTagName("a");
+ for (var i = 0; i < links.length; i++) {
+
+ var link = links[i];
+
+ link.className
+ }
+}
+

Modified:
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/servlet.properties
2008-09-05 13:09:00 UTC (rev 4462)
+++
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/servlet.properties
2008-09-08 10:13:18 UTC (rev 4463)
@@ -1,54 +1,30 @@
-#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
-component.mp.xmldb.metadata_file_name=sshtelnetmetadata.xml
-
-# 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 ;)
-servlets=
-
-# Group=eXist
-# Description=The username for the eXist database
-component.mp.xmldb.db_username=sshtelnet
-
-# 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
-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_adminpassword
-
-# 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
-component.mp.xmldb.db_uri=xmldb\:exist\://localhost\:8080/exist/xmlrpc/db
-
-# 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
-servlet.exist_location.property=component.mp.xmldb.db_uri
+#Changed at Wed Jan 30 11:12:44 CET 2008
+#Wed Jan 30 11:12:44 CET 2008
+
+# Group=Servlet
+# Description=Type of service
+servlet.service_type=sshtelnetmp
+
+# 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_adminpassword
+
+# Group=Servlet
+# Description=The username for the servlet
+servlet.username=perfsonaruser
+
+# 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
+servlet.exist_location.property=component.mp.xmldb.db_uri
+
+# Group=Servlet
+# Description=Controls the use of advanced features in the properties
management servlet. Default value is �off�
+servlet.extra_functionalities=off

Modified:
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/classes/perfsonar/conf/wizard.properties
2008-09-05 13:09:00 UTC (rev 4462)
+++
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/wizard.properties
2008-09-08 10:13:18 UTC (rev 4463)
@@ -77,60 +77,92 @@

<ProposedValue>/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</ProposedValue>
<Group order="8">LS</Group>
</property>
- -->
+ -->


<property>
- <entry key="component.mp.xmldb.db_adminpassword" required="true"
password="true" />
- <Comment>Enter the eXist administration password:</Comment>
- <ProposedValue />
- <Group order="7">eXist</Group>
+ <entry key="component.mp.xmldb.db_uri"
required="true">xmldb:exist://localhost:8080/exist/xmlrpc/db </entry>
+ <Comment>Enter the URI location of the eXist database:</Comment>
+ <ProposedValue>xmldb:exist://localhost:8080/exist/xmlrpc/db
</ProposedValue>
+ <Group order="1">eXist</Group>
</property>

<property>
- <entry key="old_adminpassword" required="true"
password="true">admin</entry>
- <Comment>Enter the old eXist administration password:</Comment>
- <ProposedValue>admin</ProposedValue>
- <Group order="6">eXist</Group>
+ <entry key="component.mp.xmldb.db_username"
required="true">sshtelnet</entry>
+ <Comment>Enter the service username for the eXist user:</Comment>
+ <ProposedValue>sshtelnet</ProposedValue>
+ <Group order="2">eXist</Group>
</property>

<property>
- <entry key="component.mp.xmldb.db_uri"
required="true">xmldb:exist://127.0.0.1:8080/exist/xmlrpc/db</entry>
- <Comment>Enter the URI location of the eXist database:</Comment>
-
<ProposedValue>xmldb:exist://127.0.0.1:8080/exist/xmlrpc/db</ProposedValue>
+ <entry key="component.mp.xmldb.db_password" required="true"
password="true">sshtelnet</entry>
+ <Comment>Enter the password for the eXist user:</Comment>
+ <ProposedValue>sshtelnet</ProposedValue>
<Group order="3">eXist</Group>
</property>

<property>
- <entry key="component.mp.xmldb.db_username"
required="true">sshtelnet</entry>
- <Comment>Enter the service username for the eXist user:</Comment>
- <ProposedValue>sshtelnet</ProposedValue>
- <Group order="4">eXist</Group>
+ <entry key="create_user" required="true">no</entry>
+ <Comment>Do you wish to create a user with this name?</Comment>
+ <ProposedValue>no</ProposedValue>
+ <Group order="4" check="true">eXist</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
</property>

<property>
+ <entry key="old_adminpassword_1" required="true" password="true" />
+ <Comment>Enter the eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="5" dependsOn="4">eXist</Group>
+ </property>
+
+ <property>
<entry key="component.mp.xmldb.metadata_file_name"
required="true">sshtelnetmetadata.xml</entry>
<Comment>Enter the name of the metadata configuration file:</Comment>
<ProposedValue>sshtelnetmetadata.xml</ProposedValue>
- <Group order="1">eXist</Group>
+ <Group order="6">eXist</Group>
</property>

<property>
<entry key="component.mp.xmldb.metadata_file_path"
required="true">/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</entry>
- <Comment>Enter the path to the metadata configuration file:</Comment>
+ <Comment>Enter the full path of the metadata configuration
file:</Comment>

<ProposedValue>/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</ProposedValue>
- <Group order="2">eXist</Group>
+ <Group order="7">eXist</Group>
</property>

<property>
- <entry key="component.mp.xmldb.db_password" required="true"
password="true">sshtelnet</entry>
- <Comment>Give the non-admin password for the eXist database (for the
user specified above)</Comment>
- <ProposedValue>sshtelnet</ProposedValue>
- <Group order="5">eXist</Group>
+ <entry key="change_admin_pass" required="true">no</entry>
+ <Comment>Do you wish to change the exist Admin password?</Comment>
+ <ProposedValue>no</ProposedValue>
+ <Group order="8" check="true">eXist</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
</property>

+ <property>
+ <entry key="component.mp.xmldb.db_adminpassword" required="true"
password="true" />
+ <Comment>Enter the eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="9" dependsOn="8">eXist</Group>
+ </property>

<property>
+ <entry key="component.ma.xmldb.db_adminpassword_confirm" required="true"
password="true" />
+ <Comment>Confirm new eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="10" dependsOn="8">eXist</Group>
+ </property>
+
+ <property>
+ <entry key="old_adminpassword" required="true" password="true" />
+ <Comment>Enter the old eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="99" dependsOn="8">eXist</Group>
+ </property>
+
+
+ <property>
<entry key="servlet.username" required="true">perfsonaruser</entry>
<Comment>Enter the username for logging in to the admin pages:</Comment>
<ProposedValue>perfsonaruser</ProposedValue>

Added:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/samples/requests/EchoRequest.xml

Added:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/samples/responses/EchoResponse.xml

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-09-05 13:09:00 UTC (rev 4462)
+++ trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/web.xml
2008-09-08 10:13:18 UTC (rev 4463)
@@ -147,9 +147,10 @@
</mime-mapping>

<welcome-file-list id="WelcomeFileList">
+ <welcome-file>index.jsp</welcome-file>
<welcome-file>index.html</welcome-file>
- <welcome-file>index.jsp</welcome-file>
<welcome-file>index.jws</welcome-file>
</welcome-file-list>

+
</web-app>

Modified: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/default.css
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/default.css 2008-09-05
13:09:00 UTC (rev 4462)
+++ trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/default.css 2008-09-08
10:13:18 UTC (rev 4463)
@@ -1,3 +1,4 @@
+
/* standard elements */
html {
min-height: 100%;
@@ -13,7 +14,7 @@
font-family: arial;
}

-a img {
+a img{
border: none;
}
/* Wizard CSS */
@@ -50,6 +51,16 @@
margin-bottom: 20px;
}

+.inner_properties {
+ padding:0px;
+ margin:0px;
+}
+.inner_properties table{
+ border: none;
+ margin:0px;
+ padding:0px;
+}
+
.properties td {
padding: 15px;
font-family: Verdana, Arial, Helvetica, sans-serif;
@@ -317,9 +328,6 @@
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;
@@ -329,33 +337,23 @@
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 {
+.users_option_off 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;
+ background: transparent url(graphics/manage_users_off_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 {
+.users_option_on 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;
+ background: transparent url(graphics/manage_users_on_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;
@@ -637,5 +635,167 @@
font-size: 13px;
}

+.test_table {
+ background-color: #99ff99;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}

+.test_table td {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}

+/* Stitching Servlet*/
+
+#main_iface_panel{
+ margin-top: 2%;
+ margin-left:2%;
+ background-color: #ffffff;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ height:100%
+
+}
+#main_iface_panel a{
+
+}
+
+#main_iface_panel a:visited a:active{
+
+}
+#iface_panel_body table{
+
+}
+#iface_panel_body td{
+ vertical-align:top;
+ height:100%;
+ padding:0px;
+}
+#file_management{
+ border: 1px solid blue;
+ padding:10px;
+ font-weight:bold;
+}
+
+#file_management table{
+ width:100%;
+}
+#file_info{
+ background-color:#BBBBE6;
+ padding:0px;
+}
+
+#file_info table{
+ width:100%;
+}
+#file_info th{
+
+ background-color:#8282C9;
+ color:#000000;
+ padding: 5px;
+ text-align:left;
+}
+#file_info_header{
+ color:white;
+ background-color:#8282C9;
+ font-weight:bold;
+}
+#file_info td{
+
+ padding: 5px;
+ text-align:left;
+}
+
+#iface_panel_header{
+
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ padding: 5px;
+ background-color: #E6E6FA;
+ margin:1px;
+
+}
+#panel_body_sidebar{
+
+ background-color: #CBCBED;
+}
+#panel_body_sidebar_devices{
+ height:100%;
+ background-color: #CBCBED;
+ float:left;
+ padding: 5px;
+ margin:1px;
+
+}
+
+#panel_body_sidebar table{
+ width:100%;
+ height:100%;
+}
+#panel_body_sidebar tr{
+ height:100%;
+}
+#panel_body_sidebar td{
+ padding: 8px;
+}
+
+#panel_body_sidebar a a:visited a:link{
+ padding: 0px;
+ margin:0px
+}
+
+#panel_body_ifaces{
+ background-color: #DEDEF9;
+ float:left;
+ padding-left: 10px;
+ padding-right: 10px;
+ padding-bottom:20px;
+ padding-top:8px;
+ margin:0px;
+}
+#host_name{
+ font-size:15px;
+ font-weight:bold;
+}
+
+#ifaces_table{
+ margin-top: 15px;
+ background-color:#ECECFC;
+ width:100%;
+ border-spacing: 1px 0px;
+
+}
+
+#ifaces_table td{
+ padding: 5px;
+ border-top:none;
+}
+
+
+.ifaces_header1{
+ text-align:left;
+ font-weight:bold;
+ background-color:#8282C9;
+}
+.ifaces_header2{
+ background-color:#8282C9;
+ font-weight:bold;
+ text-align:center;
+}
+
+.execute_button_stitching {
+ display: block;
+ margin: 0px;
+ 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;
+}
+

Deleted: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/fingerprint.jsp

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/fingerprint.jsp

Deleted:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/Paul_Hasleham.vcf

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/Paul_Hasleham.vcf

Modified: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/Thumbs.db
===================================================================
(Binary files differ)

Deleted: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/WebAdmin.htm

Deleted:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/admin_home_target.gif

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

Deleted:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/apply_button.gif

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

Deleted:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/apply_button_2.gif

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

Deleted: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/arrow_icon.gif

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

Deleted: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/arrow_icon2.gif

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

Deleted:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/button_1_large.gif

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

Deleted:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/button_1_small.gif

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

Deleted:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/button_2_large.gif

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

Deleted:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/button_2_small.gif

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

Deleted:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/cancel_button.gif

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

Deleted:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/create_resource_button.gif

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

Deleted:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/delete_red_button.gif

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

Deleted: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/edit_button.gif

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

Deleted:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/edit_green_button.gif

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

Deleted: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/login_panel.gif

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

Deleted: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/logos.gif

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

Deleted:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/logout_button.gif

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

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

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

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

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

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

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

Deleted:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/manage_users_on_tab.gif

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

Deleted:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/step_1_bottom.gif

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

Deleted:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/step_1_slice.gif

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

Deleted: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/step_1_top.gif

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

Deleted:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/step_2_bottom.gif

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

Deleted:
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/step_2_slice.gif

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

Deleted: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/graphics/step_2_top.gif

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

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

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


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

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


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

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


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

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


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

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


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

Deleted: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/happyaxis.jsp

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/happyaxis.jsp

Deleted: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/i18nLib.jsp

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/i18nLib.jsp

Deleted: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/index.html

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/index.html

Modified: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/index.jsp
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/index.jsp 2008-09-05
13:09:00 UTC (rev 4462)
+++ trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/index.jsp 2008-09-08
10:13:18 UTC (rev 4463)
@@ -1,112 +1,152 @@
+<%@ page
import="perfSONARWebAdmin.auxiliary.PerfsonarProperties,perfSONARWebAdmin.auxiliary.PerfsonarPropertiesImpl,perfSONARWebAdmin.auxiliary.PerfsonarProperty,java.io.File,java.io.FileInputStream,java.io.FileOutputStream,java.io.IOException"
%>
+
<html>
-<%@ page contentType="text/html; charset=utf-8" %>
-<%
-/*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-%>
+ <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">
+ <script src="Service_Admin.js"></script>

-<%@ include file="i18nLib.jsp" %>
+ <style type="text/css">
+ <!--
+
+ a {
+ }
+
+ .style3 {
+ color: #8585c1;
+ font-size: 13px;
+ }
+
+ .style3 a:link {
+ color: #8585C1;
+ cursor: pointer;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ }
+
+ .style3 a:active {
+ color: #117721;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ }
+
+ .style3 a:visited {
+ color: #8585C1;
+ cursor: auto;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ /*font-weight: bold;*/
+ }
+
+
+ .style3 a:hover {
+ color: #8585C1;
+ cursor: pointer;
+ text-decoration: underline;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ }
+ -->
+ </style>
+ </head>
+ <body>
+ <%
+ java.text.DateFormat dateFormat = new java.text.SimpleDateFormat("EEE
MMM dd HH:mm:ss zzz yyyy");
+ java.util.Date now= new java.util.Date();
+ java.util.Date date= dateFormat.parse(now.toString());
+ String confPath = "WEB-INF/classes/perfsonar/conf/";
+ String ServicePropertiesPath = confPath+ "service.properties";
+ ServletContext sc = getServletContext();
+ String ServicePath = sc.getRealPath("/");
+ PerfsonarProperty property = new PerfsonarProperty();
+ PerfsonarProperties serviceProperties = new PerfsonarPropertiesImpl();
+ serviceProperties.loadProperties(new FileInputStream(ServicePath
+ + ServicePropertiesPath));

-<%
- // initialize a private HttpServletRequest
- setRequest(request);
+ String serviceName=
serviceProperties.getProperty("service.r.service_name").getValue().trim();
+ String serviceVersion=
serviceProperties.getProperty("service.r.service_version").getValue().trim();
+

- // set a resouce base
- setResouceBase("i18n");
-%>
+ %>
+ <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>
+ <td>
+ <table>
+ <tr><td
id="date"><%=date.toString()%></td></tr>
+ <tr><td id="serviceName"><%=serviceName %>
&nbsp;<%=serviceVersion%></td></tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </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 &nbsp; &nbsp; &nbsp;</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>
+ <br>
+ <a href="testdepl.jsp"
target="main">Test</a>
+ </p>
+ </td>
+ </tr>

-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
- <title>Apache-Axis</title>
-</head>
+ <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>
+ <a href="MetadataAdmin"
target="main">Config File Management</a>
+ <br>

-<body bgcolor="#FFFFFF">
-
-<h1 align="center">Apache-AXIS</h1>
-
-<%= getLocaleChoice() %>
-
-<%
- out.print(getMessage("welcomeMessage")+"<p/>");
- out.print(getMessage("operationType"));
-%>
-
-<ul>
-
- <li>
- <%
- out.print("<a href=\""+ getMessage("validationURL") +"\">");
- out.print(getMessage("validation") +"</a> - ");
- out.print(getMessage("validationFootnote00") +"<br>");
- out.print("<i>"+ getMessage("validationFootnote01") +"</i>");
- %>
- </li>
-
- <li>
- <%
- out.print("<a href=\""+ getMessage("serviceListURL") +"\">");
- out.print(getMessage("serviceList") +"</a> - ");
- out.print(getMessage("serviceListFootnote"));
- %>
- </li>
-
- <li>
- <%
- out.print("<a href=\""+ getMessage("callAnEndpointURL") +"\">");
- out.print(getMessage("callAnEndpoint") +"</a> - ");
- out.print(getMessage("callAnEndpointFootnote00") +" ");
- out.print(getMessage("callAnEndpointFootnote01"));
- %>
- </li>
-
- <li>
- <%
- out.print("<a href=\""+ getMessage("visitURL") +"\">");
- out.print(getMessage("visit") +"</a> - ");
- out.print(getMessage("visitFootnote"));
- %>
- </li>
-
- <li>
- <%
- out.print("<a href=\""+ getMessage("adminURL") +"\">");
- out.print(getMessage("admin") +"</a> - ");
- out.print(getMessage("adminFootnote"));
- %>
- </li>
-
- <li>
- <%
- out.print("<a href=\""+ getMessage("soapMonitorURL") +"\">");
- out.print(getMessage("soapMonitor") +"</a> - ");
- out.print(getMessage("soapMonitorFootnote"));
- %>
- </li>
-
-</ul>
-
-<%
- out.print(getMessage("sideNote") +"<p/>");
-%>
-
-<%
- out.print("<h3>"+ getMessage("validatingAxis") +"</h3>");
-
- out.print(getMessage("validationNote00") +"<p/>");
- out.print(getMessage("validationNote01"));
-%>
-</body>
+ </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
&nbsp;
+ </div>
+ </div>
+ </body>
</html>

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/index_sqlma.jsp

Modified: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/main.css
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/main.css 2008-09-05
13:09:00 UTC (rev 4462)
+++ trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/main.css 2008-09-08
10:13:18 UTC (rev 4463)
@@ -218,6 +218,25 @@
clip: rect(auto,auto,auto,auto);
float:left;
}
+#date{
+ padding-top:5px;
+ float:right;
+ text-align:right;
+ margin-left: 79.5%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+}
+
+#serviceName{
+ padding-top:5px;
+ float:right;
+ text-align:right;
+ margin-left: 79.5%;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 13px;
+ font-weight:bold;
+}
+
.mainWindow{
border: none;
padding: 0px;
@@ -354,4 +373,115 @@
border-left-color: #FFFFFF;
}

+.execute_button_testdepl {
+ display: block;
+ margin-top: 5px;
+ width: 120px;
+ height: 30px;
+ float: right;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 60%;
+ font-weight: 400;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/button_2_medium.gif) no-repeat
center;
+}

+.testdeplmain {
+ text-align: left;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+/* font-weight:bold;;*/
+/* margin-left: -20%;*/
+ margin-left: 2%;
+ border-width: 1px;
+ border-color: #61AF61;
+ padding: 5px;
+ width: 556px;
+ height:108px;
+ background: transparent url(graphics/testdepl_main.gif) no-repeat
center;
+}
+
+.testdeplsucc {
+ text-align: left;
+ float: left;
+ /*font-weight:bold;;*/
+ text-decoration: none;
+/* margin-left: -20%;*/
+ margin-left: 2%;
+ padding: 5px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ border:solid;
+ border-width: 1px;
+ border-color: #61AF61;
+ width: 544px;
+ height: 220px;
+ background: transparent url(graphics/testdepl_succ.gif) no-repeat center;
+}
+
+.testdeplfail {
+ text-align: left;
+ float: left;
+/* font-weight:bold;;*/
+ text-decoration: none;
+ padding: 5px;
+ margin-left: 2%;
+ /*margin-left: -20%;*/
+ height: 105px;
+ width:555px;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ border:solid;
+ border-width: 1px;
+ border-color: #61AF61;
+ background: transparent url(graphics/testdepl_fail.gif) no-repeat
center;
+}
+
+.testdeplstartbn {
+ display: block;
+ margin-top: 5px;
+ width: 120px;
+ height: 30px;
+ float: right;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 60%;
+ font-weight: 400;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/testdepl_startbn.gif) no-repeat
center;
+}
+
+.testdeplretbn {
+ display: block;
+ margin-top: 5px;
+ width: 150px;
+ height: 30px;
+ float: none;;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 60%;
+ font-weight: 400;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/testdepl_return.gif) no-repeat
center;
+}
+
+.testdeplretbn2 {
+ display: block;
+ margin-top: 5px;
+ width: 150px;
+ height: 30px;
+ float: right;
+ border: none;
+ font-family: Helvetica, Calibri, Arial, sans-serif;
+ font-size: 60%;
+ font-weight: 400;
+ text-decoration: none;
+ cursor: pointer;
+ background: transparent url(graphics/testdepl_return.gif) no-repeat
center;
+}
+
+

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/schema.rng

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

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

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

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/testdepl.jsp

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


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

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

Added: trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/wizardproperties.dtd

Modified: trunk/geant2_java-sshtelnet-mp/conf/servlet.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/servlet.properties 2008-09-05
13:09:00 UTC (rev 4462)
+++ trunk/geant2_java-sshtelnet-mp/conf/servlet.properties 2008-09-08
10:13:18 UTC (rev 4463)
@@ -1,54 +1,30 @@
-#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
-component.mp.xmldb.metadata_file_name=sshtelnetmetadata.xml
-
-# 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 ;)
-servlets=
-
-# Group=eXist
-# Description=The username for the eXist database
-component.mp.xmldb.db_username=sshtelnet
-
-# 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
-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_adminpassword
-
-# 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
-component.mp.xmldb.db_uri=xmldb\:exist\://localhost\:8080/exist/xmlrpc/db
-
-# 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
-servlet.exist_location.property=component.mp.xmldb.db_uri
+#Changed at Wed Jan 30 11:12:44 CET 2008
+#Wed Jan 30 11:12:44 CET 2008
+
+# Group=Servlet
+# Description=Type of service
+servlet.service_type=sshtelnetmp
+
+# 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_adminpassword
+
+# Group=Servlet
+# Description=The username for the servlet
+servlet.username=perfsonaruser
+
+# 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
+servlet.exist_location.property=component.mp.xmldb.db_uri
+
+# Group=Servlet
+# Description=Controls the use of advanced features in the properties
management servlet. Default value is �off�
+servlet.extra_functionalities=off

Modified: trunk/geant2_java-sshtelnet-mp/conf/servlet.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/servlet.properties.template
2008-09-05 13:09:00 UTC (rev 4462)
+++ trunk/geant2_java-sshtelnet-mp/conf/servlet.properties.template
2008-09-08 10:13:18 UTC (rev 4463)
@@ -1,30 +1,10 @@
#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
-component.mp.xmldb.metadata_file_name=sshtelnetmetadata.xml
-
-# 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 ;)
-servlets=
-
-# Group=eXist
-# Description=The username for the eXist database
-component.mp.xmldb.db_username=sshtelnet
-
-# 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

servlet.wizard.external_handler=org.perfsonar.service.measurementPoint.webAdmin.SSHTelnetHandler
@@ -37,10 +17,6 @@
# Description=The username for the servlet
servlet.username=perfsonaruser

-# 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
servlet.password=perfsonarpass
@@ -48,3 +24,7 @@
# 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
+
+# Group=Servlet
+# Description=Controls the use of advanced features in the properties
management servlet. Default value is �off�
+servlet.extra_functionalities=off

Modified: trunk/geant2_java-sshtelnet-mp/conf/wizard.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/wizard.properties 2008-09-05
13:09:00 UTC (rev 4462)
+++ trunk/geant2_java-sshtelnet-mp/conf/wizard.properties 2008-09-08
10:13:18 UTC (rev 4463)
@@ -77,60 +77,92 @@

<ProposedValue>/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</ProposedValue>
<Group order="8">LS</Group>
</property>
- -->
+ -->


<property>
- <entry key="component.mp.xmldb.db_adminpassword" required="true"
password="true" />
- <Comment>Enter the eXist administration password:</Comment>
- <ProposedValue />
- <Group order="7">eXist</Group>
+ <entry key="component.mp.xmldb.db_uri"
required="true">xmldb:exist://localhost:8080/exist/xmlrpc/db </entry>
+ <Comment>Enter the URI location of the eXist database:</Comment>
+ <ProposedValue>xmldb:exist://localhost:8080/exist/xmlrpc/db
</ProposedValue>
+ <Group order="1">eXist</Group>
</property>

<property>
- <entry key="old_adminpassword" required="true"
password="true">admin</entry>
- <Comment>Enter the old eXist administration password:</Comment>
- <ProposedValue>admin</ProposedValue>
- <Group order="6">eXist</Group>
+ <entry key="component.mp.xmldb.db_username"
required="true">sshtelnet</entry>
+ <Comment>Enter the service username for the eXist user:</Comment>
+ <ProposedValue>sshtelnet</ProposedValue>
+ <Group order="2">eXist</Group>
</property>

<property>
- <entry key="component.mp.xmldb.db_uri"
required="true">xmldb:exist://127.0.0.1:8080/exist/xmlrpc/db</entry>
- <Comment>Enter the URI location of the eXist database:</Comment>
-
<ProposedValue>xmldb:exist://127.0.0.1:8080/exist/xmlrpc/db</ProposedValue>
+ <entry key="component.mp.xmldb.db_password" required="true"
password="true">sshtelnet</entry>
+ <Comment>Enter the password for the eXist user:</Comment>
+ <ProposedValue>sshtelnet</ProposedValue>
<Group order="3">eXist</Group>
</property>

<property>
- <entry key="component.mp.xmldb.db_username"
required="true">sshtelnet</entry>
- <Comment>Enter the service username for the eXist user:</Comment>
- <ProposedValue>sshtelnet</ProposedValue>
- <Group order="4">eXist</Group>
+ <entry key="create_user" required="true">no</entry>
+ <Comment>Do you wish to create a user with this name?</Comment>
+ <ProposedValue>no</ProposedValue>
+ <Group order="4" check="true">eXist</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
</property>

<property>
+ <entry key="old_adminpassword_1" required="true" password="true" />
+ <Comment>Enter the eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="5" dependsOn="4">eXist</Group>
+ </property>
+
+ <property>
<entry key="component.mp.xmldb.metadata_file_name"
required="true">sshtelnetmetadata.xml</entry>
<Comment>Enter the name of the metadata configuration file:</Comment>
<ProposedValue>sshtelnetmetadata.xml</ProposedValue>
- <Group order="1">eXist</Group>
+ <Group order="6">eXist</Group>
</property>

<property>
<entry key="component.mp.xmldb.metadata_file_path"
required="true">/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</entry>
- <Comment>Enter the path to the metadata configuration file:</Comment>
+ <Comment>Enter the full path of the metadata configuration
file:</Comment>

<ProposedValue>/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml</ProposedValue>
- <Group order="2">eXist</Group>
+ <Group order="7">eXist</Group>
</property>

<property>
- <entry key="component.mp.xmldb.db_password" required="true"
password="true">sshtelnet</entry>
- <Comment>Give the non-admin password for the eXist database (for the
user specified above)</Comment>
- <ProposedValue>sshtelnet</ProposedValue>
- <Group order="5">eXist</Group>
+ <entry key="change_admin_pass" required="true">no</entry>
+ <Comment>Do you wish to change the exist Admin password?</Comment>
+ <ProposedValue>no</ProposedValue>
+ <Group order="8" check="true">eXist</Group>
+ <AcceptedValue>yes</AcceptedValue>
+ <AcceptedValue>no</AcceptedValue>
</property>

+ <property>
+ <entry key="component.mp.xmldb.db_adminpassword" required="true"
password="true" />
+ <Comment>Enter the eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="9" dependsOn="8">eXist</Group>
+ </property>

<property>
+ <entry key="component.ma.xmldb.db_adminpassword_confirm" required="true"
password="true" />
+ <Comment>Confirm new eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="10" dependsOn="8">eXist</Group>
+ </property>
+
+ <property>
+ <entry key="old_adminpassword" required="true" password="true" />
+ <Comment>Enter the old eXist administration password:</Comment>
+ <ProposedValue />
+ <Group order="99" dependsOn="8">eXist</Group>
+ </property>
+
+
+ <property>
<entry key="servlet.username" required="true">perfsonaruser</entry>
<Comment>Enter the username for logging in to the admin pages:</Comment>
<ProposedValue>perfsonaruser</ProposedValue>

Modified: trunk/geant2_java-sshtelnet-mp/doc/Interface Specification for
SSHTelnet 1.3.doc
===================================================================
(Binary files differ)

Modified:
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
===================================================================
---
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
2008-09-05 13:09:00 UTC (rev 4462)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
2008-09-08 10:13:18 UTC (rev 4463)
@@ -41,7 +41,7 @@
* TODO::Parse output ??
*
* @author Stijn Verstichel
- *
+ * @author Stijn Melis
*/
public class WebserviceEngineAdapter implements ServiceEngine {

@@ -121,16 +121,16 @@
Data[] requestData = request.getDataArray();

if (actionType.equalsIgnoreCase(ActionType.GET_KEY)) {
-
+ logger.debug("[WebserviceEngineAdapter] Message type:
MetadataKeyRequest");
return createServiceCapabilitiesResponse(request);

} else if (actionType.equalsIgnoreCase(ActionType.ECHO)) {
-
+ logger.debug("[WebserviceEngineAdapter] Message type:
EchoRequest");
return createEchoResponse(request);

}// Find the correct handler for the device requested
else {
-
+ logger.debug("[WebserviceEngineAdapter] Message type:
SetupDataRequest");
logger.debug("[WebserviceEngineAdapter][takeAction] Number of
blocks: " + requestMetadata.length);

messages = new Message[requestMetadata.length];
@@ -522,7 +522,7 @@
EventType reqEventType = reqMetadata.getEventType();

if
(reqEventType.getEventType().equals(testEventType)){
-
+
logger.debug("[WebserviceEngineAdapter][CreateEchoResponse] selftest
started");
InternalChecker checker = new
InternalChecker();

Metadata resMetadata = new Metadata();
@@ -536,9 +536,8 @@
resData.setMetadataIdRef(reqMetadata.getId());

if (checker.checkExist()){
+ List devices = checker.getDevices();

- List devices = checker.getDevices();
-
Metadata[] resDataMetadataBlock = new
Metadata[devices.size() + 1];
Data[] resDataDataBlock = new
Data[devices.size() + 1];

@@ -570,7 +569,7 @@
evType = new
EventType();

evType.setEventType("http://schemas.perfsonar.net/tools/admin/selftest/"; +

"MP/SSHTELNET/sshtelnet_device_test_"+i+"/success/1.0");
-
resDataMetadataBlock[0].setEventType(evType);
+
resDataMetadataBlock[i].setEventType(evType);

resDataDataBlock[i] =
new Data();

resDataDataBlock[i].setId("data_sshtelnet_device_test_"+i);
@@ -581,13 +580,15 @@


resData.addChild(resDataMetadataBlock[i]);

resData.addChild(resDataDataBlock[i]);
+
+
} else {

resDataMetadataBlock[i] = new Metadata();

resDataMetadataBlock[i].setId("sshtelnet_device_test_"+i);
evType = new
EventType();

evType.setEventType("http://schemas.perfsonar.net/tools/admin/selftest/"; +

"MP/SSHTELNET/sshtelnet_device_test_"+i+"/failure/1.0");
-
resDataMetadataBlock[0].setEventType(evType);
+
resDataMetadataBlock[i].setEventType(evType);

resDataDataBlock[i] =
new Data();

resDataDataBlock[i].setId("data_sshtelnet_device_test_"+i);
@@ -599,9 +600,12 @@


resData.addChild(resDataMetadataBlock[i]);

resData.addChild(resDataDataBlock[i]);
- }

+
+
+ }
+ i++;
}
-
+ response.addChild(resData);
} else {
Metadata resDataMetadata = new
Metadata();

resDataMetadata.setId("sshtelnet_eXist_test");
@@ -618,15 +622,18 @@
resDataData.setDatum(datum);

resData.addChild(resDataMetadata);
- resData.addChild(resDataData);

+ resData.addChild(resDataData);
+
+ response.addChild(resData);
}
} else if
(reqEventType.getEventType().equals(EchoRequest.ECHO_NAMESPACE)){
+
logger.debug("[WebserviceEngineAdapter][CreateEchoResponse] regular
EchoRequest");
EchoRequest echo = new EchoRequest();
return echo.execute(request);
}
return response;
} catch (PerfSONARException e) {
-
logger.error("[WebserviceEngineAdapter][createEchoResponse] An error occured
while doing" +
+
logger.error("[WebserviceEngineAdapter][CreateEchoResponse] An error occured
while doing" +
" the internal check: " +
e.getStackTrace()[0].toString());
return null;
}

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-09-05 13:09:00 UTC (rev 4462)
+++
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
2008-09-08 10:13:18 UTC (rev 4463)
@@ -353,18 +353,22 @@
WizardProperties existProperties =
groupedProperties.get("eXist");
Iterator it = existProperties.orderedKeys();

- // Get all other parameters regarding exist in the users
reqauest
+
while (it.hasNext()) {
- String key = (String) it.next();
+
+ String key = (String) it.next();
// Get the parameter
String value = request.getParameter(key).trim();
// Get the property
WizardProperty pr =
existProperties.getWizardProperty(key);
// Set value and proposed value
pr.setPropertyValue(value);
- pr.setProposedValue(value);
+ if (!pr.getCheck()) {
+ pr.setProposedValue(value);
+ }
// Set the property in the exist group properties
existProperties.setWizardProperty(key, pr);
+
}
// Update the exist group Property
groupedProperties.put("eXist", existProperties);
@@ -376,11 +380,11 @@
} catch (Exception e) {
// Set doen to false if anything happens
done = false;
- throw new Exception(getFault(e));
+ throw new Exception(e.getMessage());
}
return done;
}
-
+
/**
* Method for handling all configuration actions regarding any other
group
* besides LS and eXist
@@ -583,7 +587,7 @@
* The Wizard Properties associated with the exist group
* @throws Exception
*/
- private void existActions(WizardProperties finalProperties)
+ /*private void existActions(WizardProperties finalProperties)
throws Exception {
//System.out.println("existActions("+finalProperties+")
called");

@@ -727,9 +731,192 @@
e.printStackTrace();
}

- }
+ }*/

/**
+ * Method used for handling all actions associated with exist db
+ * confoguration
+ *
+ * @param finalProperties
+ * The Wizard Properties associated with the exist group
+ * @throws Exception
+ */
+ private void existActions(WizardProperties finalProperties)
+ throws Exception {
+
+ // 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));
+ // 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.getKeysIterator();
+ // Get the type of the service. Will be used for making the
new db
+ // collection
+ String serviceName = servletProperties.getProperty(
+ "servlet.service_type").trim();
+ // Naming the new collection on exist db
+ String dbCollection = serviceName + "config";
+ // Initializing all necessary fileds
+ String adminPass = null;
+ String existURI = "";
+ String newAdminPass = null;
+ String username = null;
+ String password = null;
+ String confFile = null;
+ String old_adminPass = null;
+ String old_adminPass1 = null;
+ String new_adminPassConfirm = null;
+ String createUser = null;
+ String changePass = null;
+ // Need to get the new xmlDBURI and old and new admin
password so that
+ // we can make the changes
+ while (it.hasNext()) {
+ String key = (String) it.next();
+ if (key.endsWith("xmldb.db_uri")) {
+ existURI = finalProperties.getProperty(key);
+ }
+
+ }
+
+ it = finalProperties.orderedKeys();
+ // Iterating though tthe users input
+ while (it.hasNext()) {
+ String key = (String) it.next();
+ // The input from the user is also set in service
properties with a
+ // slight modification for tyhe xmldb uri. We need to
add the
+ // collection at the end of the URI
+ PerfsonarProperty property = new PerfsonarProperty();
+
+ if (!key.endsWith("xmldb.db_uri")) {
+
+ if (key.equals("create_user")) {
+
+ createUser =
finalProperties.getProperty(key).trim();
+
+ }
+
+ else if (key.equals("old_adminpassword_1")) {
+
+ old_adminPass1 =
finalProperties.getProperty(key).trim();
+
+ }
+
+ else if (key.equals("change_admin_pass")) {
+
+ changePass =
finalProperties.getProperty(key).trim();
+
+ } else if
(key.endsWith("xmldb.db_adminpassword_confirm")) {
+
+ new_adminPassConfirm =
finalProperties.getProperty(key)
+ .trim();
+
+ } else if (key.equals("old_adminpassword")) {
+
+ old_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 {
+
if(!key.endsWith("xmldb.db_adminpassword")||(finalProperties.getProperty("change_admin_pass").equals("yes"))){
+
property.setValue(finalProperties.getProperty(key));
+
serviceProperties.setProperty(key, property);
+ }
+ }
+ }
+ } else {
+
+ property = serviceProperties.getProperty(key);
+ property.setValue(existURI);
+ serviceProperties.setProperty(key, property);
+
+ }
+ // Setting also the wizard properties
+
+ properties.setWizardProperty(key,
finalProperties
+ .getWizardProperty(key));
+
+
+ // Also getting all needed information in orer to
configure the
+ // exist db
+ if (key.endsWith("xmldb.db_username")) {
+ username =
finalProperties.getProperty(key).trim();
+ }
+ if (key.endsWith("xmldb.db_password")) {
+ password =
finalProperties.getProperty(key).trim();
+ }
+ if (key.endsWith("xmldb.metadata_file_path")) {
+ confFile =
finalProperties.getProperty(key).trim();
+ }
+ if (key.endsWith("xmldb.db_adminpassword")) {
+
+ newAdminPass =
finalProperties.getProperty(key).trim();
+ }
+
+ }
+
+ // If admin pass is not set than its considered to be empty
+ if (adminPass == null) {
+ adminPass = "";
+ }
+
+ // Creating all necessary collections and users in exist
+ if (existURI == null) {
+ throw new Exception("eXist xmldb URI is empty!\n");
+ } else {
+
+ if (createUser.equals("yes")) {
+
+ xmlDBManager manager = new
xmlDBManagerImpl(existURI, "admin",
+ old_adminPass1);
+ // Creating collection and users
+ //manager.createCollection(dbCollection); //
we do not use a collection
+ String[] groups = {"dba"};
+ manager.createUser(null, username, password,
groups);
+ // Adding the metadata config document
+ manager.getCollection(null).addDocument(
+ new File(confFile), username);
+ } else {
+ xmlDBManager manager = new
xmlDBManagerImpl(existURI, username,
+ password);
+ // Creating collection and users
+ //manager.createCollection(dbCollection); //
we do not use a collection
+ // Adding the metadata config document
+ manager.getCollection(null).addDocument(
+ new File(confFile), username);
+ }
+ // Modifying the admin user password
+ if (changePass.equals("yes")) {
+ if
(newAdminPass.equals(new_adminPassConfirm)) {
+
+ xmlDBManager manager = new
xmlDBManagerImpl(existURI,
+ "admin",
old_adminPass);
+ manager.modifyUser("admin",
newAdminPass, null, null);
+
+ } else {
+ throw new Exception(
+ "New eXist Admin
passwords don't match.Please re-enter passwords.");
+ }
+ }
+ serviceProperties.storeProperties(new
FileOutputStream(ServicePath
+ + ServicePropertiesPath));
+ properties.storeToXML(new FileOutputStream(new
File(ServicePath
+ + WizardPropertiesPath)), " Last
Modification "
+ +
Calendar.getInstance().getTime().toString());
+ }
+
+ }
+
+ /**
* Method used for adding registration componenets to the
* componenets.properties file
*


  • perfsonar: r4463 - 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/perfsonar/conf conf/axis-1.4/WEB-INF/samples conf/axis-1.4/WEB-INF/samples/requests conf/axis-1.4/WEB-INF/samples/responses conf/axis-1.4/graphics doc src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters src/main/java/org/perfsonar/service/measurementPoint/webAdmin, svnlog, 09/08/2008

Archive powered by MHonArc 2.6.16.

Top of Page