perfsonar development work

Author: melis
Date: 2008-12-19 10:57:51 -0500 (Fri, 19 Dec 2008)
New Revision: 4823

Added:
   trunk/geant2_java-sshtelnet-mp/conf/wsdd/service-deploy.wsdd
   trunk/geant2_java-sshtelnet-mp/conf/wsdd/service-undeploy.wsdd
   trunk/geant2_java-sshtelnet-mp/samples/requests/EchoRequest.xml
   trunk/geant2_java-sshtelnet-mp/samples/responses/
   trunk/geant2_java-sshtelnet-mp/samples/responses/EchoResponse.xml
Removed:
   
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/wsdd/sshtelnetmp-service-deploy.wsdd
   trunk/geant2_java-sshtelnet-mp/conf/wsdd/sshtelnetmp-service-undeploy.wsdd
Modified:
   trunk/geant2_java-sshtelnet-mp/ant/const.properties
   trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
   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/WEB-INF/classes/perfsonar/conf/log4j.properties
   
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/wizard.properties
   
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/EchoResponse.xml
   trunk/geant2_java-sshtelnet-mp/conf/log4j.properties
   trunk/geant2_java-sshtelnet-mp/conf/service.properties
   trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
   trunk/geant2_java-sshtelnet-mp/conf/wizard.properties
   trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog
   trunk/geant2_java-sshtelnet-mp/packaging/deb/dirs
   trunk/geant2_java-sshtelnet-mp/packaging/deb/docs
   trunk/geant2_java-sshtelnet-mp/packaging/deb/files
   trunk/geant2_java-sshtelnet-mp/packaging/deb/install
   trunk/geant2_java-sshtelnet-mp/packaging/deb/postinst
   trunk/geant2_java-sshtelnet-mp/packaging/deb/rules
   trunk/geant2_java-sshtelnet-mp/packaging/rpm/ps-mdm-sshtelnet-mp.specs
   
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/telnet/TelnetManager.java
   
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
Log:
updated trunk to reflect version 1.3.4RC8

Modified: trunk/geant2_java-sshtelnet-mp/ant/const.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/const.properties 2008-12-18 04:28:48 
UTC (rev 4822)
+++ trunk/geant2_java-sshtelnet-mp/ant/const.properties 2008-12-19 15:57:51 
UTC (rev 4823)
@@ -11,13 +11,13 @@
 service.name=ps-mdm-sshtelnet-mp
 
 jarfilename=perfsonar-sshtelnet-mp
-version=1.3.4RC4
+version=1.3.4RC8
 
 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
 
-wsdd.file.deploy=sshtelnetmp-service-deploy.wsdd
-wsdd.file.undeploy=sshtelnetmp-service-undeploy.wsdd
+wsdd.file.deploy=service-deploy.wsdd
+wsdd.file.undeploy=service-undeploy.wsdd
 
 antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
 antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080416.jar

Modified: trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/const.properties.template        
2008-12-18 04:28:48 UTC (rev 4822)
+++ trunk/geant2_java-sshtelnet-mp/ant/const.properties.template        
2008-12-19 15:57:51 UTC (rev 4823)
@@ -11,13 +11,13 @@
 service.name=ps-mdm-sshtelnet-mp
 
 jarfilename=perfsonar-sshtelnet-mp
-version=1.3.4RC4
+version=1.3.4RC8
 
 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
 
-wsdd.file.deploy=sshtelnetmp-service-deploy.wsdd
-wsdd.file.undeploy=sshtelnetmp-service-undeploy.wsdd
+wsdd.file.deploy=service-deploy.wsdd
+wsdd.file.undeploy=service-undeploy.wsdd
 
 antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
 antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080416.jar

Modified: trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml        
2008-12-18 04:28:48 UTC (rev 4822)
+++ trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml        
2008-12-19 15:57:51 UTC (rev 4823)
@@ -61,7 +61,7 @@
 
       <dependency groupId="rrdjtool"  artifactId="rrdjtool"            
version="1.0"/>
       <dependency groupId="perfsonar" artifactId="perfsonar-base"      
version="1.0.20080902"/>
-         <dependency groupID="perfsonar" artifactId="perfsonar-web-admin" 
version="0.9.6b"/>
+         <dependency groupID="perfsonar" artifactId="perfsonar-web-admin" 
version="0.9.3c"/>
       <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-12-18 04:28:48 UTC (rev 4822)
+++ trunk/geant2_java-sshtelnet-mp/ant/webapp-package-targets.xml       
2008-12-19 15:57:51 UTC (rev 4823)
@@ -88,7 +88,7 @@
                  todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080902/perfsonar-base-1.0.20080902.jar"
  
                  todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.6b/perfsonar-web-admin-0.9.6b.jar"
    
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.9.3c/perfsonar-web-admin-0.9.3c.jar"
    
                  todir="${tmpdir}/WEB-INF/lib"/>
     <copy file="${basedir}/lib/repository/remote/j2ssh-ant.jar"
                  todir="${tmpdir}/WEB-INF/lib"/>

Modified: 
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/log4j.properties
        2008-12-18 04:28:48 UTC (rev 4822)
+++ 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/log4j.properties
        2008-12-19 15:57:51 UTC (rev 4823)
@@ -13,19 +13,19 @@
 
 # Group=Log levels
 # Description=Assigns info log messages to the specified log appender.
-log4j.logger.sonar-info=INFO, psRootAppender
+#log4j.logger.sonar-info=INFO, psRootAppender
 
 # Group=Log levels
 # Description=Assigns warn log messages to the specified log appender.
-log4j.logger.sonar-warn=WARN, psRootAppender
+#log4j.logger.sonar-warn=WARN, psRootAppender
 
 # Group=Log levels
 # Description=Assigns error log messages to the specified log appender.
-log4j.logger.sonar-error=ERROR, psRootAppender
+#log4j.logger.sonar-error=ERROR, psRootAppender
 
 # Group=Log levels
 # Description=Assigns fatal log messages to the specified log appender.
-log4j.logger.sonar-fatal=FATAL, psRootAppender
+#log4j.logger.sonar-fatal=FATAL, psRootAppender
 
 
 
@@ -35,11 +35,11 @@
 ##
 ## this section is only for developer tests
 ##
-#log4j.logger.sonar-debug=DEBUG, debugAppender, psRootAppender
-#log4j.logger.sonar-info=INFO, infoAppender, psRootAppender
-#log4j.logger.sonar-warn=WARN, warnAppender, psRootAppender
-#log4j.logger.sonar-error=ERROR, errorAppender, psRootAppender
-#log4j.logger.sonar-fatal=FATAL, fatalAppender, psRootAppender
+log4j.logger.sonar-debug=DEBUG, debugAppender, psRootAppender
+log4j.logger.sonar-info=INFO, infoAppender, psRootAppender
+log4j.logger.sonar-warn=WARN, warnAppender, psRootAppender
+log4j.logger.sonar-error=ERROR, errorAppender, psRootAppender
+log4j.logger.sonar-fatal=FATAL, fatalAppender, psRootAppender
 
 
 

Modified: 
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/service.properties
      2008-12-18 04:28:48 UTC (rev 4822)
+++ 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
      2008-12-19 15:57:51 UTC (rev 4823)
@@ -84,7 +84,7 @@
 
 # Group=LS
 # Description=The version number of the service.
-service.r.service_version=1.3.4RC4
+service.r.service_version=1.3.4RC8
 
 # Group=LS
 # Description=The email address of the person who manages the service.

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-12-18 04:28:48 UTC (rev 4822)
+++ 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/wizard.properties
       2008-12-19 15:57:51 UTC (rev 4823)
@@ -15,6 +15,7 @@
 <!ATTLIST Group 
   order CDATA #REQUIRED 
  check (true|false) #IMPLIED 
+ dependsOn CDATA #IMPLIED
 >
 <!ELEMENT AcceptedValue (#PCDATA) >
 ]>
@@ -109,16 +110,7 @@
     <Group order="7">LS</Group>
   </property>  
   
-  <!--
-  <property>
-    <entry key="service.ls.registration_file" 
required="true">/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml</entry>
-    <Comment>Enter the path to the metadata configuration file which needs 
to be uploaded to the LS:</Comment>
-    
<ProposedValue>/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml</ProposedValue>
-    <Group order="8">LS</Group>
-  </property>
-  -->  
   
-  
   <property>
     <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>

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

Modified: 
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/requests/EchoRequest.xml
       2008-12-18 04:28:48 UTC (rev 4822)
+++ 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/samples/requests/EchoRequest.xml
       2008-12-19 15:57:51 UTC (rev 4823)
@@ -2,12 +2,12 @@
 <nmwg:message type="EchoRequest"
               id="id1"
               xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
- 
+
    <nmwg:metadata id="meta">
        <nmwg:eventType>
          http://schemas.perfsonar.net/tools/admin/echo/2.0
       </nmwg:eventType>
    </nmwg:metadata>
- 
+
    <nmwg:data id="data" metadataIdRef="meta"/>
 </nmwg:message>

Modified: 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/samples/responses/EchoResponse.xml
===================================================================
--- 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/samples/responses/EchoResponse.xml
     2008-12-18 04:28:48 UTC (rev 4822)
+++ 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/samples/responses/EchoResponse.xml
     2008-12-19 15:57:51 UTC (rev 4823)
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<nmwg:message type="EchoResponse"
-              id="id1"
-              xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";
-              xmlns:nmwgr="http://ggf.org/ns/nmwg/result/2.0/datum/";>
-  
-   <nmwg:metadata id="meta">
-       <nmwg:eventType>success.echo</nmwg:eventType>
-   </nmwg:metadata>
- 
-   <nmwg:data id="data" metadataIdRef="meta">
-       <nmwgr:datum>
-           This is the echo response from the service.
-       </nmwgr:datum>
-   </nmwg:data> 
+<nmwg:message id="id1_resp" messageIdRef="id1" type="EchoResponse" 
xmlns:nmwg="http://ggf.org/ns/nmwg/base/2.0/";>
+       <nmwg:metadata id="resultCodeMetadata">
+               <nmwg:eventType>success.echo</nmwg:eventType>
+       </nmwg:metadata>
+       <nmwg:data id="resultDescriptionData_for_resultCodeMetadata" 
metadataIdRef="resultCodeMetadata">
+               <nmwgr:datum 
xmlns:nmwgr="http://ggf.org/ns/nmwg/result/2.0/";>This is the echo response 
from the service.</nmwgr:datum>
+       </nmwg:data>
 </nmwg:message>
+

Modified: trunk/geant2_java-sshtelnet-mp/conf/log4j.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/log4j.properties        2008-12-18 
04:28:48 UTC (rev 4822)
+++ trunk/geant2_java-sshtelnet-mp/conf/log4j.properties        2008-12-19 
15:57:51 UTC (rev 4823)
@@ -13,19 +13,19 @@
 
 # Group=Log levels
 # Description=Assigns info log messages to the specified log appender.
-log4j.logger.sonar-info=INFO, psRootAppender
+#log4j.logger.sonar-info=INFO, psRootAppender
 
 # Group=Log levels
 # Description=Assigns warn log messages to the specified log appender.
-log4j.logger.sonar-warn=WARN, psRootAppender
+#log4j.logger.sonar-warn=WARN, psRootAppender
 
 # Group=Log levels
 # Description=Assigns error log messages to the specified log appender.
-log4j.logger.sonar-error=ERROR, psRootAppender
+#log4j.logger.sonar-error=ERROR, psRootAppender
 
 # Group=Log levels
 # Description=Assigns fatal log messages to the specified log appender.
-log4j.logger.sonar-fatal=FATAL, psRootAppender
+#log4j.logger.sonar-fatal=FATAL, psRootAppender
 
 
 
@@ -35,11 +35,11 @@
 ##
 ## this section is only for developer tests
 ##
-#log4j.logger.sonar-debug=DEBUG, debugAppender, psRootAppender
-#log4j.logger.sonar-info=INFO, infoAppender, psRootAppender
-#log4j.logger.sonar-warn=WARN, warnAppender, psRootAppender
-#log4j.logger.sonar-error=ERROR, errorAppender, psRootAppender
-#log4j.logger.sonar-fatal=FATAL, fatalAppender, psRootAppender
+log4j.logger.sonar-debug=DEBUG, debugAppender, psRootAppender
+log4j.logger.sonar-info=INFO, infoAppender, psRootAppender
+log4j.logger.sonar-warn=WARN, warnAppender, psRootAppender
+log4j.logger.sonar-error=ERROR, errorAppender, psRootAppender
+log4j.logger.sonar-fatal=FATAL, fatalAppender, psRootAppender
 
 
 

Modified: trunk/geant2_java-sshtelnet-mp/conf/service.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/service.properties      2008-12-18 
04:28:48 UTC (rev 4822)
+++ trunk/geant2_java-sshtelnet-mp/conf/service.properties      2008-12-19 
15:57:51 UTC (rev 4823)
@@ -84,7 +84,7 @@
 
 # Group=LS
 # Description=The version number of the service.
-service.r.service_version=1.3.4RC4
+service.r.service_version=1.3.4RC8
 
 # Group=LS
 # Description=The email address of the person who manages the service.

Modified: trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/service.properties.template     
2008-12-18 04:28:48 UTC (rev 4822)
+++ trunk/geant2_java-sshtelnet-mp/conf/service.properties.template     
2008-12-19 15:57:51 UTC (rev 4823)
@@ -84,7 +84,7 @@
 
 # Group=LS
 # Description=The version number of the service.
-service.r.service_version=1.3.4RC4
+service.r.service_version=1.3.4RC8
 
 # Group=LS
 # Description=The email address of the person who manages the service.

Modified: trunk/geant2_java-sshtelnet-mp/conf/wizard.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/wizard.properties       2008-12-18 
04:28:48 UTC (rev 4822)
+++ trunk/geant2_java-sshtelnet-mp/conf/wizard.properties       2008-12-19 
15:57:51 UTC (rev 4823)
@@ -15,6 +15,7 @@
 <!ATTLIST Group 
   order CDATA #REQUIRED 
  check (true|false) #IMPLIED 
+ dependsOn CDATA #IMPLIED
 >
 <!ELEMENT AcceptedValue (#PCDATA) >
 ]>
@@ -109,16 +110,7 @@
     <Group order="7">LS</Group>
   </property>  
   
-  <!--
-  <property>
-    <entry key="service.ls.registration_file" 
required="true">/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml</entry>
-    <Comment>Enter the path to the metadata configuration file which needs 
to be uploaded to the LS:</Comment>
-    
<ProposedValue>/etc/ps-mdm-sshtelnet-mp/sshtelnetmetadata.xml</ProposedValue>
-    <Group order="8">LS</Group>
-  </property>
-  -->  
   
-  
   <property>
     <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>

Copied: trunk/geant2_java-sshtelnet-mp/conf/wsdd/service-deploy.wsdd (from 
rev 4612, 
trunk/geant2_java-sshtelnet-mp/conf/wsdd/sshtelnetmp-service-deploy.wsdd)

Copied: trunk/geant2_java-sshtelnet-mp/conf/wsdd/service-undeploy.wsdd (from 
rev 4612, 
trunk/geant2_java-sshtelnet-mp/conf/wsdd/sshtelnetmp-service-undeploy.wsdd)

Deleted: 
trunk/geant2_java-sshtelnet-mp/conf/wsdd/sshtelnetmp-service-deploy.wsdd

Deleted: 
trunk/geant2_java-sshtelnet-mp/conf/wsdd/sshtelnetmp-service-undeploy.wsdd

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog      2008-12-18 
04:28:48 UTC (rev 4822)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog      2008-12-19 
15:57:51 UTC (rev 4823)
@@ -1,3 +1,40 @@
+ps-mdm-sshtelnet-mp (1.3.4RC8) unstable; urgency=low
+
+  * ps-base version: 1.0.20080902
+  * web-admin version: 0.9.3c
+  * Updated WebAdmin to use 0.9.3c
+  * Made sure that the directory for the temporary token files for the MP is 
writeable by the tomcat user
+  
+ -- Stijn Melis 
<>
  Fri, 19 Dec 2008 12:07:09 +0200
+
+ps-mdm-sshtelnet-mp (1.3.4RC7) unstable; urgency=low
+
+  * ps-base version: 1.0.20080902
+  * web-admin version: 0.9.1c
+  * Updated WebAdmin to use 0.9.1c
+  * Fixed bug about the test page in the web admin
+  * Fixed small issue regarding logging information when a telnet session 
isn't successfully established
+
+ -- Stijn Melis 
<>
  Thu, 27 Nov 2008 14:37:09 +0200
+
+ps-mdm-sshtelnet-mp (1.3.4RC6) unstable; urgency=low
+
+  * ps-base version: 1.0.20080902
+  * web-admin version: 0.9.0c
+  * Fixed paths for logging in the deb file
+  * Updated WebAdmin to use 0.9.0c
+
+ -- Stijn Melis 
<>
  Tue, 28 Oct 2008 10:07:09 +0200
+
+ps-mdm-sshtelnet-mp (1.3.4RC5) unstable; urgency=low
+
+  * ps-base version: 1.0.20080902
+  * web-admin version: 0.9.7b
+  * Fixed paths for logging in the deb file
+  * Updated WebAdmin to use 0.9.7b
+
+ -- Stijn Melis 
<>
  Wed, 22 Oct 2008 09:58:09 +0200
+
 ps-mdm-sshtelnet-mp (1.3.4RC4) unstable; urgency=low
 
   * ps-base version: 1.0.20080902

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/dirs
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/dirs   2008-12-18 04:28:48 
UTC (rev 4822)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/dirs   2008-12-19 15:57:51 
UTC (rev 4823)
@@ -1,3 +1,2 @@
-/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp
 /etc/ps-mdm-sshtelnet-mp
-/var/lib/ps-mdm-sshtelnet-mp
\ No newline at end of file
+/var/lib/ps-mdm-sshtelnet-mp

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/docs
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/docs   2008-12-18 04:28:48 
UTC (rev 4822)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/docs   2008-12-19 15:57:51 
UTC (rev 4823)
@@ -1 +1 @@
-ps-mdm-sshtelnet-mp-1.3.4RC4/doc/*
\ No newline at end of file
+ps-mdm-sshtelnet-mp-1.3.4RC8/doc/*
\ No newline at end of file

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/files
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/files  2008-12-18 04:28:48 
UTC (rev 4822)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/files  2008-12-19 15:57:51 
UTC (rev 4823)
@@ -1 +1 @@
-ps-mdm-sshtelnet-mp_1.3.4RC4_all.deb web extra
+ps-mdm-sshtelnet-mp_1.3.4RC8_all.deb web extra

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/install
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/install        2008-12-18 
04:28:48 UTC (rev 4822)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/install        2008-12-19 
15:57:51 UTC (rev 4823)
@@ -1 +1 @@
-ps-mdm-sshtelnet-mp-1.3.4RC4/tmp-webapps/webapps/ps-mdm-sshtelnet-mp/* 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp
+ps-mdm-sshtelnet-mp-1.3.4RC8/tmp-webapps/webapps/ps-mdm-sshtelnet-mp/* 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/postinst
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/postinst       2008-12-18 
04:28:48 UTC (rev 4822)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/postinst       2008-12-19 
15:57:51 UTC (rev 4823)
@@ -20,9 +20,12 @@
 
 case "$1" in
     configure)
-       ln -sf /usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp 
/var/lib/tomcat5.5/webapps/ps-mdm-sshtelnet-mp
+    ln -sf /usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp 
/var/lib/tomcat5.5/webapps/ps-mdm-sshtelnet-mp
     ln -sf 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/*
 /etc/ps-mdm-sshtelnet-mp || true
+    ln -sf /var/log/tomcat5.5 /var/log/ps-mdm-sshtelnet-mp 
+    unlink 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/ps-mdm-sshtelnet-mp
     chown tomcat55 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/*
+    chown tomcat55 -R 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/
     /etc/init.d/tomcat5.5 restart
     ;;
 

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/rules
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/rules  2008-12-18 04:28:48 
UTC (rev 4822)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/rules  2008-12-19 15:57:51 
UTC (rev 4823)
@@ -17,7 +17,7 @@
 
 build-stamp: configure-stamp 
        dh_testdir
-       ant -f ps-mdm-sshtelnet-mp-1.3.4RC4/ant/build.xml 
webapp-package-create
+       ant -f ps-mdm-sshtelnet-mp-1.3.4RC8/ant/build.xml 
webapp-package-create
 
        touch $@
 

Modified: 
trunk/geant2_java-sshtelnet-mp/packaging/rpm/ps-mdm-sshtelnet-mp.specs
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/rpm/ps-mdm-sshtelnet-mp.specs    
  2008-12-18 04:28:48 UTC (rev 4822)
+++ trunk/geant2_java-sshtelnet-mp/packaging/rpm/ps-mdm-sshtelnet-mp.specs    
  2008-12-19 15:57:51 UTC (rev 4823)
@@ -1,12 +1,12 @@
 
 # This is where all tomcat stuff will be installed
-%define prefix /usr/lib/perfsonar/services/%{name}
+%define prefix /usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp
 
 # The full name of your package.
 Name: ps-mdm-sshtelnet-mp
 
 # Version of the microrelease
-Version: 1.3.4RC4
+Version: 1.3.4RC8
 License: GPL
 
 # Package version. Increment if you create a new package of same microrelease
@@ -34,7 +34,7 @@
 Requires: tomcat5
 Requires: tomcat5-exist
 
-# For what architecture is this package ment
+# For what architecture is this package meant
 BuildArch: noarch
 
 # What RPM packages are needed during build
@@ -88,16 +88,17 @@
 
 %post
 ## make symlink for easy access to conf
-%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.properties 
%{_sysconfdir}/%{name}
-%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/objects.config 
%{_sysconfdir}/%{name}
-%{__ln_s} %{prefix}/WEB-INF/classes/perfsonar/conf/*.xml 
%{_sysconfdir}/%{name}
-%{__ln_sf} %{prefix} /var/lib/tomcat5/webapps/%{name}
-%{__ln_s} %{_var}/log/tomcat5 %{_var}/log/%{name}
+ln -s 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/*.properties
 /etc/ps-mdm-sshtelnet-mp
+ln -s 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config
 /etc/ps-mdm-sshtelnet-mp
+ln -s 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/*.xml
 /etc/ps-mdm-sshtelnet-mp
+ln -s /usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp 
/var/lib/tomcat5/webapps/ps-mdm-sshtelnet-mp
+ln -s /var/log/tomcat5 /var/log/ps-mdm-sshtelnet-mp
+unlink /usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/ps-mdm-sshtelnet-mp
 ## restart tomcat
 /sbin/service tomcat5 restart
+chown tomcat:tomcat -R 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/
 
 
-
 %preun
 ## remove symlink
 %{__rm} -rf %{_sysconfdir}/%{name}/*.properties
@@ -134,6 +135,30 @@
 
 
 %changelog
+* Fri Dec 19 2008 Stijn Melis 
<>
 1.3.4RC8
+- ps-base version: 1.0.20080902
+- web-admin version: 0.9.3c
+- Updated WebAdmin to use 0.9.3c
+- Made sure that the directory for the temporary token files for the MP is 
writeable by the tomcat user
+
+* Thu Nov 27 2008 Stijn Melis 
<>
 1.3.4RC7
+- ps-base version: 1.0.20080902
+- web-admin version: 0.9.1c
+- Updated WebAdmin to use 0.9.1c
+- Fixed bug about the test page in the web admin
+- Fixed small issue regarding logging information when a telnet session 
isn't successfully established
+
+* Tue Oct 28 2008 Stijn Melis 
<>
 1.3.4RC6
+- ps-base version: 1.0.20080902
+- web-admin version: 0.9.0c
+- Updated WebAdmin to use 0.9.0c
+
+* Wed Oct 22 2008 Stijn Melis 
<>
 1.3.4RC5
+- ps-base version: 1.0.20080902
+- web-admin version: 0.9.7b
+- Fixed paths for logging when using deb file
+- Updated WebAdmin to use 0.9.7b
+
 * Wed Oct 15 2008 Stijn Melis 
<>
 1.3.4RC4
 - ps-base version: 1.0.20080902
 - web-admin version: 0.9.6b

Added: trunk/geant2_java-sshtelnet-mp/samples/requests/EchoRequest.xml

Added: trunk/geant2_java-sshtelnet-mp/samples/responses/EchoResponse.xml

Modified: 
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/telnet/TelnetManager.java
===================================================================
--- 
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/telnet/TelnetManager.java
        2008-12-18 04:28:48 UTC (rev 4822)
+++ 
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/remote/telnet/TelnetManager.java
        2008-12-19 15:57:51 UTC (rev 4823)
@@ -67,7 +67,7 @@
                 telnet.connect(url, port);
                 telnet.setPrompt("chaos4>");
                 connected = true;
-
+                logger.debug("[TelnetManager] Connection established");
             } catch (IOException e) {
 
                 logger.error("[TelnetManager] Connection failed");
@@ -75,7 +75,7 @@
 
             }
 
-            logger.debug("[TelnetManager] Connection established");
+            
 
         }//connect
 
@@ -95,19 +95,20 @@
             logger.debug("Connecting on port: " + port + " url: " + url);
             telnet.connect(url, port);
 
+            telnet.setPrompt(prompt);
+            connected = true;
+
+            logger.debug("[TelnetManager] Connection established");
+            
         } catch (IOException e) {
 
             logger.error("[TelnetManager] Connection failed");
             logger.error("[TelnetManager] " + 
e.getStackTrace()[0].toString());
 
-        }
+        }       
 
-        telnet.setPrompt(prompt);
-        connected = true;
-
-        logger.debug("[TelnetManager] Connection established");
-
     }//connect
+    
     public void connect(String userName, String loginPrompt, String passwd, 
String passwdPrompt) {
 
        logger.debug("[TelnetManager] Trying to connect ... ");
@@ -124,8 +125,14 @@
             logger.debug("Logging in ...");
             telnet.login(userName, loginPrompt, passwd, passwdPrompt);
             
-            logger.debug("logged in !!");
+            //logger.debug("logged in !!");
+            
+            telnet.setPrompt(prompt);
+            logger.debug("prompt: " + prompt);
+            connected = true;
 
+            logger.debug("[TelnetManager] Connection established");
+
         } catch (IOException e) {
 
             logger.error("[TelnetManager] Connection failed");
@@ -133,12 +140,8 @@
 
         }
 
-        telnet.setPrompt(prompt);
-        logger.debug("prompt: " + prompt);
-        connected = true;
+       
 
-        logger.debug("[TelnetManager] Connection established");
-
     }//connect
     public void connect(String username, String keyUrl, String passphrase)
             throws 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-12-18 04:28:48 UTC (rev 4822)
+++ 
trunk/geant2_java-sshtelnet-mp/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
  2008-12-19 15:57:51 UTC (rev 4823)
@@ -14,6 +14,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 
+import perfSONARWebAdmin.auxiliary.MaskedException;
 import perfSONARWebAdmin.auxiliary.PerfsonarProperties;
 import perfSONARWebAdmin.auxiliary.PerfsonarPropertiesImpl;
 import perfSONARWebAdmin.auxiliary.PerfsonarProperty;
@@ -33,313 +34,38 @@
  * @author Michalis Michael,CyNet
  * 
  */
-public class SSHTelnetHandler implements ConfigurationHandler {
+public class SSHTelnetHandler extends ConfigurationHandler {
 
-       // 
-----------------------------------------------------------------------
-       // class fields
-
-       // Hashtable containg Wizard Properties as values and the various 
groups in
-       // which the properties are divided to as keys
-       private Hashtable<String, WizardProperties> groupedProperties = null;
-
-       // All of the Wizard Properties
-       private WizardProperties properties = null;
-
-       // The HtTMLOutput class that is used for outputting html code to the 
user.
-       // Currently not used by this reference implementation
-       @SuppressWarnings("unused")
-       private HTMLOutput htmlOutput;
-
-       // The path to the configuration directory
-       private static final String confPath = 
"WEB-INF/classes/perfsonar/conf/";
-
-       // The path to the service.properties file
-       private static final String ServicePropertiesPath = confPath
-       + "service.properties";
-
-       // The path to the logging properties file
-       private static final String LoggingPropertiesPath = confPath
-       + "log4j.properties";
-
-       // The path to the componenets.properties file
-       private static final String ComponentsPropertiesPath = confPath
-       + "components.properties";
-
-       // The path to the objects properties file
-       private static final String ObjectsConfigPath = confPath + 
"objects.config";
-
-       // The path to the wizard.properties file
-       private static final String WizardPropertiesPath = confPath
-       + "wizard.properties";
-
-       // The path to the servlet.properties file
-       private static final String ServletPropertiesPath = confPath
-       + "servlet.properties";
-
-       // The path to the directory under the webapps folder in which the 
service
-       // is installed
-       private static String ServicePath;
-
-       // Bollean that states if the configuration process is finished
-       private static boolean configured = false;
-
-       // 
-----------------------------------------------------------------------
-       // constructors
-
        /**
         * Class constructor
         */
-       public SSHTelnetHandler() {
-
+       public SSHTelnetHandler(String servicePath ,   WizardProperties
+                       properties,   Hashtable<String, WizardProperties> 
groupedProperties) {
+               super (servicePath, properties, groupedProperties);
        }
 
-       // 
-----------------------------------------------------------------------
-       // public methods
-
        /*
         * (non-Javadoc)
         * 
-        * @see 
perfSONARWebAdmin.auxiliary.wizard.ConfigurationHandler#handleRequest(javax.servlet.http.HttpServletRequest)
-        */
-       public boolean handleRequest(HttpServletRequest request) throws 
Exception {
-
-               // Setting configured to false
-               configured = false;
-               // Also definining some more booleans for every different 
group to be
-               // configured
-               boolean eXistDone = false;
-               boolean LSDone = false;
-               // Other is every other group besides LS and eXist. This 
seperation is
-               // made because LS registration and eXist configuration are 
common for
-               // all java services
-               boolean otherDone = false;
-
-               // Each group is independent from each other and can be 
configured
-               // without any depemdencies
-               try {
-                       // Handling exist configuration
-                       // True if this is done properly
-                       eXistDone = handleExist(request);
-                       //eXistDone = true;
-               } catch (Exception e) {
-
-                       throw new Exception(
-                                       "Problem with eXist 
configuration!Please check your input.\n"
-                                       + getFault(e));
-               }
-               try {
-                       // Handling LS configuration
-                       // True if all is done properly
-                       LSDone = handleLS(request);
-               } catch (Exception e) {
-                       throw new Exception(
-                                       "Problem with LS configuration!Please 
check your input.\n"
-                                       + getFault(e));
-               }
-               try {
-                       // Handling other groups configuration
-                       // True if all is done properly
-                       otherDone = handleOther(request);
-               } catch (Exception e) {
-
-                       throw new Exception(
-                                       "Problem with Store 
configuration!Please check your input.\n"
-                                       + getFault(e));
-               }
-               // if every group has configured successfully then the final
-               // configuration procedures are called
-               if (eXistDone && LSDone && otherDone) {
-                       try {
-                               configured = finishConfiguration();
-                               // if everything has gone OK then true is 
returned
-                               return configured;
-                       } catch (Exception e) {
-                               throw new Exception("Problem finishing 
configuration.\n"
-                                               + getFault(e));
-                       }
-               } else {
-                       return configured;
-               }
-
-       }
-
-       /*
-        * (non-Javadoc)
-        * 
         * @see 
perfSONARWebAdmin.auxiliary.wizard.ConfigurationHandler#isConfigured()
         */
-       public boolean isConfigured() {
+       /*public boolean isConfigured() {
 
                return configured;
-       }
+       }*/
 
        /*
         * (non-Javadoc)
         * 
         * @see 
perfSONARWebAdmin.auxiliary.wizard.ConfigurationHandler#setHTMLOutput(perfSONARWebAdmin.auxiliary.wizard.HTMLOutput)
         */
-       public void setHTMLOutput(HTMLOutput output) {
+       /*public void setHTMLOutput(HTMLOutput output) {
 
                htmlOutput = output;
 
-       }
+       }*/
 
-       /*
-        * (non-Javadoc)
-        * 
-        * @see 
perfSONARWebAdmin.auxiliary.wizard.ConfigurationHandler#setProperties(perfSONARWebAdmin.auxiliary.wizard.WizardProperties)
-        */
-       public void setProperties(WizardProperties loadedProperties) {
-
-               properties = loadedProperties;
-       }
-
-       /*
-        * (non-Javadoc)
-        * 
-        * @see 
perfSONARWebAdmin.auxiliary.wizard.ConfigurationHandler#setGroupedProperties(java.util.Hashtable)
-        */
-       public void setGroupedProperties(
-                       Hashtable<String, WizardProperties> otherProperties) {
-
-               groupedProperties = otherProperties;
-
-       }
-
-       /*
-        * (non-Javadoc)
-        * 
-        * @see 
perfSONARWebAdmin.auxiliary.wizard.ConfigurationHandler#setServicePath(java.lang.String)
-        */
-       public void setServicePath(String servicePath) {
-
-               ServicePath = servicePath;
-
-       }
-
-       // 
-----------------------------------------------------------------------
-       // private methods
-
        /**
-        * Method used for handling other groups configuration(That is other 
than LS
-        * and exist)
-        * 
-        * @param request
-        *            The HttpServletRequest containing input from the user
-        * @return True if other groups are configured successfully
-        * @throws Exception
-        */
-       private boolean handleOther(HttpServletRequest request) throws 
Exception {
-
-               // Getting all groups
-               Iterator groupIt = groupedProperties.keySet().iterator();
-               // Setting done to true, You will see later why
-               boolean done = true;
-               // Iterating through the groups
-               while (groupIt.hasNext()) {
-                       String group = (String) groupIt.next();
-                       // Every other group should be handled except for 
eXist and LS
-                       if (!(group.equals("eXist") || group.equals("LS"))) {
-
-                               // Retrieving the properties belonging to the 
group
-                               WizardProperties groupProperties = 
groupedProperties.get(group);
-                               // Iterating through the properties. This way 
using the key of
-                               // each property we can retrieve the users 
input from the
-                               // request
-                               Iterator it = groupProperties.orderedKeys();
-                               while (it.hasNext()) {
-                                       String key = (String) it.next();
-                                       // get the value from the request
-                                       String value = 
request.getParameter(key).trim();
-                                       WizardProperty pr = 
groupProperties.getWizardProperty(key);
-                                       // Set the property value
-                                       pr.setPropertyValue(value);
-                                       // if the property does not the check 
field set, the also
-                                       // put the user input as the proposed 
value also
-                                       // This happens, because properties 
that have the check
-                                       // property set, are usually 
important for the rest of the
-                                       // group properties since their value 
would determine if the
-                                       // rest need to be configured. So 
their proposed value is
-                                       // left to thr developer
-                                       if (!pr.getCheck()) {
-                                               pr.setProposedValue(value);
-                                       }
-                                       // Updating the property inside the 
group propereties
-                                       
groupProperties.setWizardProperty(key, pr);
-                               }
-                               // Updating the grouped properties
-                               groupedProperties.put(group, groupProperties);
-                               // Applying the configuration input from the 
user to the service
-                               try {
-                                       otherActions(group, groupProperties);
-                               } catch (Exception e) {
-                                       // If actions had a problem then done 
is set to false
-                                       done = false;
-                                       throw new Exception(getFault(e));
-                               }
-                       }
-               }
-
-               return done;
-       }
-
-       /**
-        * Method used for handling LS registration configuration
-        * 
-        * @param request
-        *            The HttpServletRequest containing input from the user
-        * @return True if LS registration is configured successfully
-        * @throws Exception
-        */
-       private boolean handleLS(HttpServletRequest request) throws Exception 
{
-
-               // Retrieving the useLS parameter. The useLS parammeter is 
inserted as
-               // input by the shoaAllProperties method of the HTMLOutput 
class
-               // automatically. It is the answer to if the user wants to 
register to
-               // an LS since their is no service property that corresponds 
to this
-               // question
-               String useLS = request.getParameter("useLS").trim();
-               // If yes all other properties regarding LS registration are 
retrieved
-               if (useLS.equals("yes")) {
-                       // Retrieving all propertie associated with LS
-                       WizardProperties lsProperties = 
groupedProperties.get("LS");
-                       // Getting the keys of the properties
-                       Iterator it = lsProperties.orderedKeys();
-                       while (it.hasNext()) {
-                               String key = (String) it.next();
-                               // Using the keys for retrieving the users 
input
-                               String value = 
request.getParameter(key).trim();
-                               WizardProperty pr = 
lsProperties.getWizardProperty(key);
-                               // Setting property value and proposed value
-                               pr.setPropertyValue(value);
-                               pr.setProposedValue(value);
-                               // Setting property
-                               lsProperties.setWizardProperty(key, pr);
-                       }
-                       // Setting the LS group properties
-                       groupedProperties.put("LS", lsProperties);
-                       boolean done = false;
-                       // Trying to perfom the LS configuration actions to 
the service
-                       try {
-                               lsActions(lsProperties);
-                               done = true;
-                       } catch (Exception e) {
-                               // False if an error happens
-                               done = false;
-                               throw new Exception(getFault(e));
-                       }
-
-                       return done;
-               }
-               // If no then the registration componenets are commented in 
the
-               // components.properties file
-               else {
-                       removeRegistrationComponents();
-                       return true;
-               }
-       }
-
-       /**
         * Method used for handling eXist database configuration
         * 
         * @param request
@@ -347,8 +73,7 @@
         * @return True if LS registration is configured successfully
         * @throws Exception
         */
-       private boolean handleExist(HttpServletRequest request) throws 
Exception {
-               boolean done = false;
+       protected void handleExist(HttpServletRequest request) throws 
MaskedException {
                // Getting the exist database associated properties
                WizardProperties existProperties = 
groupedProperties.get("eXist");
                Iterator it = existProperties.orderedKeys();
@@ -377,209 +102,13 @@
                        // Call for the needed actions for exist 
configuration.The exist
                        // group properties are used as input
                        existActions(existProperties);
-                       done = true;
                } catch (Exception e) {
                        // Set doen to false if anything happens
-                       done = false;
                        e.printStackTrace();
-                       throw new Exception(e.getMessage());
+                       throw new MaskedException(e, e.getMessage());
                }
-               return done;
-       }
-       
-       /**
-        * 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
-        */
-       /**
-        * 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 {
-
-               //System.out.println("otherActions("+group+", 
"+functionProperties+") called");
-               // The only other group for rrd ma is the Store group
-               // 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, that does not use grouping and description 
so we can
-               // use
-               // the ServiceProperties class as usual
-               else {
-                       //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();
-
-               }
-               properties.storeToXML(new FileOutputStream(new 
File(ServicePath
-                               + WizardPropertiesPath)), " Last Modification 
"
-                               + 
Calendar.getInstance().getTime().toString());
-       }
-
-
-       /**
-        * Method for handling all configuration actions regarding the LS
-        * registration
-        * 
-        * @param finalProperties
-        *            The WizardProperties that belong to the LS registration 
group
-        * @throws IOException
-        */
-       private void lsActions(WizardProperties finalProperties) throws 
IOException {
-               //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
-
-                       // 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(new 
FileOutputStream(ServicePath
-                               + ServicePropertiesPath));
-               // Setting the LS registration componenets in components 
properties file
-               addRegistrationComponents();
-               // Storing the wizard properties
-               properties.storeToXML(new FileOutputStream(new 
File(ServicePath
-                               + WizardPropertiesPath)), " Last Modification 
"
-                               + 
Calendar.getInstance().getTime().toString());
        }
-       
 
        /**
         * Method used for handling all actions associated with exist db
@@ -589,160 +118,6 @@
         *            The Wizard Properties associated with the exist group
         * @throws Exception
         */
-       /*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
-                       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
-
-                       // Naming the new collection on exist db
-                       // Initializing all necessary fileds
-                       String adminPass = null;
-                       String existURI = "";
-                       String newAdminPass = null;
-                       String username = null;
-                       String password = null;
-                       String confFile = 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_adminpassword")) {
-
-                                       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 = "";
-                       }
-
-                       it = finalProperties.orderedKeys();
-                       // Iterating though the 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.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));
-
-                               // 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("metadata_file_path")) {
-                                       confFile = 
finalProperties.getProperty(key).trim();
-                               }
-                       }
-
-                       // Creating all necessary collections and users in 
exist
-                       if (existURI == null) {
-                               throw new Exception("eXist xmldb URI is 
empty!\n");
-                       } else {
-                               //System.out.println("creating eXist stuff");
-                               //if (existURI.startsWith("xmldb:exist://"))
-                               //      existURI = 
existURI.substring("xmld:exist://".length()+1, existURI.length());
-                               if (existURI.endsWith("/db"))
-                                       existURI = existURI.substring(0, 
existURI.length()-"/db".length());
-                               //System.out.println("existURI to connect to: 
" + existURI + "\nusername to use: admin\npassword to use: " + adminPass);
-                               xmlDBManager manager = new 
xmlDBManagerImpl(existURI, "admin",
-                                               adminPass);
-                               //System.out.println("eXistManager : " + 
manager);
-                               // Creating collection and users
-                               //manager.createCollection(dbCollection);
-                               //System.out.println("eXist creating user 
with info: " + null + ", " + username + ", " + password);
-                               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),
-                                               username);
-                               //System.out.println("eXist metadata added");
-                               // Modifying the admin user password
-                               if (newAdminPass != null){
-                                       manager.modifyUser("admin", 
newAdminPass, null, null);
-                                       //System.out.println("eXist admin 
password changed");
-                               }
-
-                               serviceProperties.storeProperties(new 
FileOutputStream(ServicePath
-                                               + ServicePropertiesPath));
-                               
-                               properties.storeToXML(new 
FileOutputStream(new File(ServicePath
-                                               + WizardPropertiesPath)), " 
Last Modification "
-                                               + 
Calendar.getInstance().getTime().toString());
-                               //System.out.println("eXist xml stored");
-                       }
-               } catch (Exception e) {
-                       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 {
 
@@ -752,18 +127,10 @@
                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 = "";
@@ -882,8 +249,6 @@
                                
                                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
@@ -892,8 +257,6 @@
                        } 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);
@@ -918,72 +281,8 @@
                }
 
        }
-       
-       /**
-        * Method used for adding registration componenets to the
-        * componenets.properties file
-        * 
-        * @throws IOException
-        */
-       private void addRegistrationComponents() throws IOException {
-               File comp = new File(ServicePath + ComponentsPropertiesPath);
-               FileReader fr = new FileReader(comp);
-               StringBuffer contents = new StringBuffer();
-               BufferedReader br = new BufferedReader(fr);
-               String line = "";
-               while (line != null) {
-                       if (line.startsWith("#scheduler")) {
-                               line = line.substring(1);
-                       }
-                       if (line.startsWith("#registrator")) {
-                               line = line.substring(1);
-                       }
-                       contents.append(line + "\n");
-                       line = br.readLine();
-               }
 
-               FileWriter fw = new FileWriter(comp);
-               BufferedWriter bw = new BufferedWriter(fw);
-               bw.write(contents.toString().trim());
-               bw.close();
-               fw.close();
-               br.close();
-               fr.close();
-       }
-
        /**
-        * Method for removing ls registration components from 
components.properties
-        * file
-        * 
-        * @throws IOException
-        */
-       private void removeRegistrationComponents() throws IOException {
-               File comp = new File(ServicePath + ComponentsPropertiesPath);
-               FileReader fr = new FileReader(comp);
-               StringBuffer contents = new StringBuffer();
-               BufferedReader br = new BufferedReader(fr);
-               String line = "";
-               while (line != null) {
-                       if (line.startsWith("scheduler")) {
-                               line = "#" + line;
-                       }
-                       if (line.startsWith("registrator")) {
-                               line = "#" + line;
-                       }
-                       contents.append(line + "\n");
-                       line = br.readLine();
-               }
-
-               FileWriter fw = new FileWriter(comp);
-               BufferedWriter bw = new BufferedWriter(fw);
-               bw.write(contents.toString().trim());
-               bw.close();
-               fw.close();
-               br.close();
-               fr.close();
-       }
-
-       /**
         * Method for performing final actions for service configuration
         * 
         * @return
@@ -1012,22 +311,5 @@
                return true;
 
        }
-
-       /**
-        * Method to get the stack trace of an exception
-        * 
-        * @param e
-        *            The exception
-        * @return A string with stack the trace
-        */
-       private String getFault(Exception e) {
-               StackTraceElement[] trace = e.getStackTrace();
-               String fault = e.getMessage();
-               for (int j = 0; j < trace.length; j++) {
-                       fault += trace[j].toString() + "\n";
-               }
-               return fault;
-       }
-
 }