perfsonar development work

Author: melis
Date: 2008-03-03 11:14:14 -0500 (Mon, 03 Mar 2008)
New Revision: 3454

Modified:
   branches/geant2_java-sshtelnet-mp-RELEASE/ant/axis-deploy-targets.xml
   branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties
   branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties.template
   branches/geant2_java-sshtelnet-mp-RELEASE/ant/libs-download-targets.xml
   branches/geant2_java-sshtelnet-mp-RELEASE/conf/log4j.properties
   branches/geant2_java-sshtelnet-mp-RELEASE/conf/log4j.properties.template
   
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshKeyManager.java
   
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
Log:
and also to the release branch

Modified: 
branches/geant2_java-sshtelnet-mp-RELEASE/ant/axis-deploy-targets.xml
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/ant/axis-deploy-targets.xml     
  2008-03-03 16:13:01 UTC (rev 3453)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/ant/axis-deploy-targets.xml     
  2008-03-03 16:14:14 UTC (rev 3454)
@@ -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.20080115/perfsonar-base-1.0.20080115.jar"
  todir="${service.home}/${deploy.root}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080303/perfsonar-base-1.0.20080303.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: branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties      
2008-03-03 16:13:01 UTC (rev 3453)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties      
2008-03-03 16:14:14 UTC (rev 3454)
@@ -11,7 +11,7 @@
 service.name=geant2_java-sshtelnet-mp
 
 jarfilename=perfsonar-sshtelnet-mp
-version=1.3RC1
+version=1.3RC2
 
 exist.war.file=exist-1.0.1.war
 
exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&amp;version=1.0.1

Modified: 
branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties.template
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties.template   
  2008-03-03 16:13:01 UTC (rev 3453)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties.template   
  2008-03-03 16:14:14 UTC (rev 3454)
@@ -11,7 +11,7 @@
 service.name=geant2_java-sshtelnet-mp
 
 jarfilename=perfsonar-sshtelnet-mp
-version=1.3RC1
+version=1.3RC2
 
 exist.war.file=exist-1.0.1.war
 
exist.war.download.url=http://www.perfsonar.net/download/dependencies/preinstall_download.php?product=exist-war&amp;version=1.0.1

Modified: 
branches/geant2_java-sshtelnet-mp-RELEASE/ant/libs-download-targets.xml
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/ant/libs-download-targets.xml   
  2008-03-03 16:13:01 UTC (rev 3453)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/ant/libs-download-targets.xml   
  2008-03-03 16:14:14 UTC (rev 3454)
@@ -60,7 +60,7 @@
     <artifact:dependencies>
 
       <dependency groupId="rrdjtool"  artifactId="rrdjtool"            
version="1.0"/>
-      <dependency groupId="perfsonar" artifactId="perfsonar-base"      
version="1.0.20080115"/>
+      <dependency groupId="perfsonar" artifactId="perfsonar-base"      
version="1.0.20080303"/>
       <dependency groupId="nmwg"      artifactId="nmwg"                
version="1.0.20071008"/>
 
 

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/conf/log4j.properties
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/log4j.properties     
2008-03-03 16:13:01 UTC (rev 3453)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/log4j.properties     
2008-03-03 16:14:14 UTC (rev 3454)
@@ -5,7 +5,7 @@
 
 #Group=Logger
 #Description=location of the log directory
-logDir=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs
+logDir=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs
 
 
 #ROOT
@@ -14,7 +14,7 @@
 #log4j.appender.rootAppender.MaxBackupIndex=11
 #Group=RootLogger
 #Description=The file for the root logger
-#log4j.appender.rootAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar.log
+#log4j.appender.rootAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar.log
 #Group=RootLogger
 #Description=The class responsible for the layout of the root logger
 #log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
@@ -37,7 +37,7 @@
 log4j.appender.debugAppender.MaxBackupIndex=11
 #Group=DebugLogger
 #Description=The file for the debug logger
-log4j.appender.debugAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar_debug.log
+log4j.appender.debugAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar_debug.log
 #Group=DebugLogger
 #Description=The class responsible for the layout of the debug logger
 log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
@@ -60,7 +60,7 @@
 log4j.appender.infoAppender.MaxBackupIndex=11
 #Group=InfoLogger
 #Description=The file for the info logger
-log4j.appender.infoAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar_info.log
+log4j.appender.infoAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar_info.log
 #Group=InfoLogger
 #Description=The class responsible for the layout of the info logger
 log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
@@ -83,7 +83,7 @@
 log4j.appender.warnAppender.MaxBackupIndex=11
 #Group=WarnLogger
 #Description=The file for the warning logger
-log4j.appender.warnAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar_warn.log
+log4j.appender.warnAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar_warn.log
 #Group=WarnLogger
 #Description=The class responsible for the layout of the warning logger
 log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
@@ -106,7 +106,7 @@
 log4j.appender.errorAppender.MaxBackupIndex=11
 #Group=ErrorLogger
 #Description=The file for the error logger
-log4j.appender.errorAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar_error.log
+log4j.appender.errorAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar_error.log
 #Group=ErrorLogger
 #Description=The class responsible for the layout of the error logger
 log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
@@ -129,7 +129,7 @@
 log4j.appender.fatalAppender.MaxBackupIndex=11
 #Group=FatalLogger
 #Description=The file for the fatal logger
-log4j.appender.fatalAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar_fatal.log
 #Group=FatalLogger
 #Description=The class responsible for the layout of the fatal logger
 log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout

Modified: 
branches/geant2_java-sshtelnet-mp-RELEASE/conf/log4j.properties.template
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/log4j.properties.template  
  2008-03-03 16:13:01 UTC (rev 3453)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/log4j.properties.template  
  2008-03-03 16:14:14 UTC (rev 3454)
@@ -5,7 +5,7 @@
 
 #Group=Logger
 #Description=location of the log directory
-logDir=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs
+logDir=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs
 
 
 #ROOT
@@ -14,7 +14,7 @@
 log4j.appender.rootAppender.MaxBackupIndex=11
 #Group=RootLogger
 #Description=The file for the root logger
-log4j.appender.rootAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar.log
+log4j.appender.rootAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar.log
 #Group=RootLogger
 #Description=The class responsible for the layout of the root logger
 log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
@@ -37,7 +37,7 @@
 log4j.appender.debugAppender.MaxBackupIndex=11
 #Group=DebugLogger
 #Description=The file for the debug logger
-log4j.appender.debugAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar_debug.log
+log4j.appender.debugAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar_debug.log
 #Group=DebugLogger
 #Description=The class responsible for the layout of the debug logger
 log4j.appender.debugAppender.layout=org.apache.log4j.PatternLayout
@@ -60,7 +60,7 @@
 log4j.appender.infoAppender.MaxBackupIndex=11
 #Group=InfoLogger
 #Description=The file for the info logger
-log4j.appender.infoAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar_info.log
+log4j.appender.infoAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar_info.log
 #Group=InfoLogger
 #Description=The class responsible for the layout of the info logger
 log4j.appender.infoAppender.layout=org.apache.log4j.PatternLayout
@@ -83,7 +83,7 @@
 log4j.appender.warnAppender.MaxBackupIndex=11
 #Group=WarnLogger
 #Description=The file for the warning logger
-log4j.appender.warnAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar_warn.log
+log4j.appender.warnAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar_warn.log
 #Group=WarnLogger
 #Description=The class responsible for the layout of the warning logger
 log4j.appender.warnAppender.layout=org.apache.log4j.PatternLayout
@@ -106,7 +106,7 @@
 log4j.appender.errorAppender.MaxBackupIndex=11
 #Group=ErrorLogger
 #Description=The file for the error logger
-log4j.appender.errorAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar_error.log
+log4j.appender.errorAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar_error.log
 #Group=ErrorLogger
 #Description=The class responsible for the layout of the error logger
 log4j.appender.errorAppender.layout=org.apache.log4j.PatternLayout
@@ -129,7 +129,7 @@
 log4j.appender.fatalAppender.MaxBackupIndex=11
 #Group=FatalLogger
 #Description=The file for the fatal logger
-log4j.appender.fatalAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp-1.3RC1/WEB-INF/logs/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/home/perfsonar/webapps/geant2_java-sshtelnet-mp/WEB-INF/logs/perfsonar_fatal.log
 #Group=FatalLogger
 #Description=The class responsible for the layout of the fatal logger
 log4j.appender.fatalAppender.layout=org.apache.log4j.PatternLayout

Modified: 
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshKeyManager.java
===================================================================
--- 
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshKeyManager.java
        2008-03-03 16:13:01 UTC (rev 3453)
+++ 
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/remote/ssh/SshKeyManager.java
        2008-03-03 16:14:14 UTC (rev 3454)
@@ -281,7 +281,7 @@
 
             channel.connect();
             if (timeout != 0){
-            final Channel channel2 = channel;
+               final Channel channel2 = channel;
 
                    Runnable updateAComponent = new Runnable() {
        

Modified: 
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
===================================================================
--- 
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
       2008-03-03 16:13:01 UTC (rev 3453)
+++ 
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/webAdmin/SSHTelnetHandler.java
       2008-03-03 16:14:14 UTC (rev 3454)
@@ -480,10 +480,7 @@
                        // Get the type of the service. Will be used for 
making the new db
                        // collection
 
-                       String metadataName = servletProperties.getProperty(
-                                       
"component.mp.xmldb.metadata_file_name").trim();
                        // Naming the new collection on exist db
-                       String dbCollection = metadataName;
                        // Initializing all necessary fileds
                        String adminPass = null;
                        String existURI = "";
@@ -522,12 +519,12 @@
                                // The input from the user is also set in 
service properties with a
                                // slight modification for the xmldb uri. We 
need to add the
                                // collection at the end of the URI
-                               if (!key.endsWith("xmldb.db_uri")) {
-                                       serviceProperties.setProperty(key, 
finalProperties
-                                                       .getProperty(key));
-                               } else {
-                                       serviceProperties.setProperty(key, 
existURI + "/db/");
-                               }
+                               //if (!key.endsWith("xmldb.db_uri")) {
+                               serviceProperties.setProperty(key, 
finalProperties.getProperty(key));
+                               servletProperties.setProperty(key, 
finalProperties.getProperty(key));
+                               //} else {
+                               //      serviceProperties.setProperty(key, 
existURI + "/db/");
+                               //}
                                // Setting also the wizard properties
                                properties.setWizardProperty(key, 
finalProperties
                                                .getWizardProperty(key));
@@ -540,7 +537,7 @@
                                if (key.endsWith("xmldb.db_password")) {
                                        password = 
finalProperties.getProperty(key);
                                }
-                               if (key.endsWith("metadata_file_name")) {
+                               if (key.endsWith("metadata_file_path")) {
                                        confFile = 
finalProperties.getProperty(key);
                                }
                        }