perfsonar development work

Author: melis
Date: 2008-05-28 06:15:30 -0400 (Wed, 28 May 2008)
New Revision: 3890

Modified:
   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/conf/service.properties
   branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties.template
   branches/geant2_java-sshtelnet-mp-RELEASE/conf/wizard.properties
   branches/geant2_java-sshtelnet-mp-RELEASE/doc/changelog.txt
   
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
   
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
Log:
updated RELEASE branch with changes for 1.3.1 as well

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties      
2008-05-28 10:14:34 UTC (rev 3889)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties      
2008-05-28 10:15:30 UTC (rev 3890)
@@ -11,7 +11,7 @@
 service.name=geant2-java-sshtelnet-mp
 
 jarfilename=perfsonar-sshtelnet-mp
-version=1.3
+version=1.3.1
 
 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

Modified: 
branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties.template
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties.template   
  2008-05-28 10:14:34 UTC (rev 3889)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/ant/const.properties.template   
  2008-05-28 10:15:30 UTC (rev 3890)
@@ -11,7 +11,7 @@
 service.name=geant2-java-sshtelnet-mp
 
 jarfilename=perfsonar-sshtelnet-mp
-version=1.3
+version=1.3.1
 
 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

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties   
2008-05-28 10:14:34 UTC (rev 3889)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties   
2008-05-28 10:15:30 UTC (rev 3890)
@@ -1,106 +1,102 @@
-#Changed at Wed Jan 30 11:12:44 CET 2008
-#Wed Jan 30 11:12:44 CET 2008
-
-# Group=Global
-# Description=Type of service
-service.r.service_type=mp
-
-# Group=Global
-# Description=Description for the service
-service.r.service_description=perfSONAR service
-
-# Group=eXist
-# Description=The password for the admin account for eXist
-component.mp.xmldb.db_adminpassword=admin
-
-# Group=eXist
-# Description=The username for eXist
-component.mp.xmldb.db_username=sshtelnet
-
-# Group=Internal
-# Description=The location of the configuration file for the log4j logger
-service.log.log4j.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/log4j.properties
-
-# Group=LS
-# Description=Location of the Lookup Service
-service.r.ls_url=http\://loco4.man.poznan.pl\:8080/XML-LS/services/LookupService
-
-# Group=Global
-# Description=Type of service
-service.r.type=mp
-
-# Group=Authentication
-# Description=Location of the Authentication Service
-service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService
-
-# Group=Internal
-# Description=The scheduler component
-component.registrator.scheduler_component=scheduler
-
-# Group=eXist
-# Description=The location of the metadata configuration file which is to be 
uploaded in the eXist
-component.mp.xmldb.metadata_file_name=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
-
-# Group=eXist
-# Description=The location of the metadata configuration file which is to be 
uploaded in the eXist
-component.mp.xmldb.metadata_file_path=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
-
-# Group=LS
-# Description=The period of time between registrations to the LS
-component.registrator.interval=30000
-
-# Group=Internal
-# Description=The name of the class which is responsible for handling the 
requests
-service.mp.class_name=org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.WebserviceEngineAdapter
-
-# Group=eXist
-# Description=The url of the eXist db
-component.mp.xmldb.db_uri=xmldb\:exist\://127.0.0.1\:8080/exist/xmlrpc/db
-
-# Group=eXist
-# Description=The url of the eXist db (probably a redundant parameter, but 
nevertheless still in there, will be removed in the near future)
-component.mp.xmldb.db_uri.xmlrpc=xmldb\:exist\://localhost\:8080/exist/xmlrpc/db
-
-# Group=Global
-# Description=The name of the organisation which deployed the MP
-service.r.organization_name=
-
-# Group=eXist
-# Description=The password for the eXist database
-component.mp.xmldb.db_password=sshtelnet
-
-# Group=Internal
-# Description=The location of the configuration for the SAX parser
-service.sax_parser.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config
-
-# Group=eXist
-# Description=The type of access for the eXist database (has to be xmlrpc)
-component.mp.xmldb.db_access=xmlrpc
-
-# Group=LS
-# Description=The name of the metadata configuration file which is to be 
sent to the LS
-service.ls.registration_file=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
-
-# Group=Global
-# Description=The name of the service
-service.r.service_name=geant2-java-sshtelnet-mp
-
-# Group=Authentication
-# Description=The types of messages for which Authentication is to be 
enabled (if Authentication is enabled off course)
-service.as.Authentication_for_msg_types=SetupDataRequest,MetadataKeyRequest
-
-# Group=Global
-# Description=The version of the service
-service.r.service_version=1.3RC6
-
-# Group=Authentication
-# Description=If the authentication is enabled or not
-service.as.Authentication_active=off
-
-# Group=Global
-# Description=The e-mail address of the contact person for the service
-service.r.contact_email=
-
-# Group=Internal
-# Description=Types of messages supported by this service
-service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest
+#Changed at Wed Jan 30 11:12:44 CET 2008
+#Wed Jan 30 11:12:44 CET 2008
+
+# Group=Global
+# Description=Type of service
+service.r.service_type=mp
+
+# Group=Global
+# Description=Description for the service
+service.r.service_description=perfSONAR service
+
+# Group=eXist
+# Description=The password for the admin account for eXist
+component.mp.xmldb.db_adminpassword=admin
+
+# Group=eXist
+# Description=The username for eXist
+component.mp.xmldb.db_username=sshtelnet
+
+# Group=Internal
+# Description=The location of the configuration file for the log4j logger
+service.log.log4j.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/log4j.properties
+
+# Group=LS
+# Description=Location of the Lookup Service
+service.r.ls_url=http\://loco4.man.poznan.pl\:8080/XML-LS/services/LookupService
+
+# Group=Global
+# Description=Type of service
+service.r.type=mp
+
+# Group=Authentication
+# Description=Location of the Authentication Service
+service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService
+
+# Group=Internal
+# Description=The scheduler component
+component.registrator.scheduler_component=scheduler
+
+# Group=eXist
+# Description=The location of the metadata configuration file which is to be 
uploaded in the eXist
+component.mp.xmldb.metadata_file_name=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+
+# Group=LS
+# Description=The period of time between registrations to the LS
+component.registrator.interval=30000
+
+# Group=Internal
+# Description=The name of the class which is responsible for handling the 
requests
+service.mp.class_name=org.perfsonar.service.measurementPoint.lookingGlassType.engine.adapters.WebserviceEngineAdapter
+
+# Group=eXist
+# Description=The url of the eXist db
+component.mp.xmldb.db_uri=xmldb\:exist\://127.0.0.1\:8080/exist/xmlrpc/db
+
+# Group=eXist
+# Description=The url of the eXist db (probably a redundant parameter, but 
nevertheless still in there, will be removed in the near future)
+component.mp.xmldb.db_uri.xmlrpc=xmldb\:exist\://localhost\:8080/exist/xmlrpc/db
+
+# Group=Global
+# Description=The name of the organisation which deployed the MP
+service.r.organization_name=
+
+# Group=eXist
+# Description=The password for the eXist database
+component.mp.xmldb.db_password=sshtelnet
+
+# Group=Internal
+# Description=The location of the configuration for the SAX parser
+service.sax_parser.config=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/objects.config
+
+# Group=eXist
+# Description=The type of access for the eXist database (has to be xmlrpc)
+component.mp.xmldb.db_access=xmlrpc
+
+# Group=LS
+# Description=The name of the metadata configuration file which is to be 
sent to the LS
+service.ls.registration_file=/opt/perfsonar/services/geant2-java-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/sshtelnetmetadata.xml
+
+# Group=Global
+# Description=The name of the service
+service.r.service_name=geant2-java-sshtelnet-mp
+
+# Group=Authentication
+# Description=The types of messages for which Authentication is to be 
enabled (if Authentication is enabled off course)
+service.as.authn_for_msg_types=SetupDataRequest,MetadataKeyRequest
+
+# Group=Global
+# Description=The version of the service
+service.r.service_version=1.3.1
+
+# Group=Authentication
+# Description=If the authentication is enabled or not
+service.as.authn_active=off
+
+# Group=Global
+# Description=The e-mail address of the contact person for the service
+service.r.contact_email=
+
+# Group=Internal
+# Description=Types of messages supported by this service
+service.mp.message_types=SetupDataRequest,MetadataKeyRequest,EchoRequest

Modified: 
branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties.template
===================================================================
--- 
branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties.template  
2008-05-28 10:14:34 UTC (rev 3889)
+++ 
branches/geant2_java-sshtelnet-mp-RELEASE/conf/service.properties.template  
2008-05-28 10:15:30 UTC (rev 3890)
@@ -83,15 +83,15 @@
 
 # Group=Authentication
 # Description=The types of messages for which Authentication is to be 
enabled (if Authentication is enabled off course)
-service.as.Authentication_for_msg_types=SetupDataRequest,MetadataKeyRequest
+service.as.authn_for_msg_types=SetupDataRequest,MetadataKeyRequest
 
 # Group=Global
 # Description=The version of the service
-service.r.service_version=1.3RC6
+service.r.service_version=1.3.1
 
 # Group=Authentication
 # Description=If the authentication is enabled or not
-service.as.Authentication_active=off
+service.as.authn_active=off
 
 # Group=Global
 # Description=The e-mail address of the contact person for the service

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/conf/wizard.properties
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/conf/wizard.properties    
2008-05-28 10:14:34 UTC (rev 3889)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/conf/wizard.properties    
2008-05-28 10:15:30 UTC (rev 3890)
@@ -21,9 +21,9 @@
 <properties>
   <comment>Last Modification Thu Mar 06 19:53:22 CET 2008</comment>
   <property>
-    <entry key="service.r.service_version">1.3RC6</entry>
+    <entry key="service.r.service_version">1.3.1</entry>
     <Comment>Enter the version of the service</Comment>
-    <ProposedValue>1.3RC6</ProposedValue>
+    <ProposedValue>1.3.1</ProposedValue>
     <Group order="1">LS</Group>
   </property>
   <property>
@@ -93,7 +93,7 @@
     <Group order="2">Administration</Group>
   </property>
    <property>
-    <entry key="service.as.Authentication_active" required="true">no</entry>
+    <entry key="service.as.authn_active" required="true">no</entry>
     <Comment>Do you wish to enable authentication?</Comment>
     <ProposedValue>yes</ProposedValue>
     <Group order="1" check="true">AS</Group>

Modified: branches/geant2_java-sshtelnet-mp-RELEASE/doc/changelog.txt
===================================================================
--- branches/geant2_java-sshtelnet-mp-RELEASE/doc/changelog.txt 2008-05-28 
10:14:34 UTC (rev 3889)
+++ branches/geant2_java-sshtelnet-mp-RELEASE/doc/changelog.txt 2008-05-28 
10:15:30 UTC (rev 3890)
@@ -1,6 +1,36 @@
 Change log
 ----------
 
+1.3.1  - 28/05/2008
+
+ * ps-base version: 1.0.20080310
+ * web-admin version: 0.8.3b
+ * fixed the bug in the service.properties and wizard.properties files which
+   prevented the Authentication to work properly
+ * removed some unnecessary logging entries in some classes (too much 
printlns
+   which don't really add anything useful)
+
+1.3    - 05/05/2008
+
+ * ps-base version: 1.0.20080310
+ * web-admin version: 0.8.3b
+ * fixed the bug which prevented the MP from connecting to the eXist database
+ * fixed the bug which removed the groups in the webadmin once it was used 
once 
+
+1.3RC4 - 27/03/2008
+
+ * ps-base version: 1.0.20080310
+ * web-admin version: 0.8b
+ * no further fixes
+
+1.3RC3 - 06/03/2008
+
+ * fixed timeout bug in the telnet side of the SSHTELNET MP
+
+1.3RC2 - 03/03/2008
+
+ * fixed bug in the service.properties file
+
 1.3RC1 - 06/02/2008
 
  * added Authentication
@@ -12,16 +42,5 @@
  * installation is now rpm based
  * updated command list
 
-1.3RC2 - 03/03/2008
 
- * fixed bug in the service.properties file
 
-1.3RC3 - 06/03/2008
-
- * fixed timeout bug in the telnet side of the SSHTELNET MP
-
-1.3RC4 - 27/03/2008
-
- * ps-base version: 1.0.20080310
- * web-admin version: 0.8b
- * no further fixes
\ No newline at end of file

Modified: 
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
===================================================================
--- 
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
        2008-05-28 10:14:34 UTC (rev 3889)
+++ 
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/engine/adapters/WebserviceEngineAdapter.java
        2008-05-28 10:15:30 UTC (rev 3890)
@@ -161,8 +161,13 @@
 
                        logger.debug("Device: " + value);
                        logger.debug("Device index: " + 
devices.indexOf(value));
+                       logger.debug("Size of Count: " + count.length + 
"\nindex of device: " + devices.indexOf(value));
                        count[devices.indexOf(value)]++;
+                       logger.debug("Count["+ devices.indexOf(value) + "]: " 
+ count[devices.indexOf(value)]);
+                       logger.debug("Size of currentDevices: " + 
currentDevices.length + "\nindex : " + i);
                        currentDevices[i] = devices.indexOf(value); 
//contains the indexes of the devices in use
+                       logger.debug("currentDevices["+i+"]: " + 
currentDevices[i]);
+                       
                        logger.debug("Number of current connections for 
device \"" + value + "\": " + count[currentDevices[i]]);
                        
                        if (Integer.parseInt(configuration.getProperty(value, 
"numberOfUsers")) <= 0 // numberOfUsers <= 0 --> unlimited amount of users

Modified: 
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
===================================================================
--- 
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
       2008-05-28 10:14:34 UTC (rev 3889)
+++ 
branches/geant2_java-sshtelnet-mp-RELEASE/src/main/java/org/perfsonar/service/measurementPoint/lookingGlassType/metadata/DbMetadataConfiguration.java
       2008-05-28 10:15:30 UTC (rev 3890)
@@ -72,13 +72,13 @@
     }
 
     public String getProperty(String property) throws PerfSONARException {
-        logger.debug("[DbMetadataConfiguration] getProperty(" + property + 
") called.");
+        //logger.debug("[DbMetadataConfiguration] getProperty(" + property + 
") called.");
 
         return null;
     }
 
     public String getProperty(String device, String property) throws 
PerfSONARException {
-        logger.debug("[DbMetadataConfiguration] getProperty(" + device + ", 
" + property + ") called.");
+        //logger.debug("[DbMetadataConfiguration] getProperty(" + device + 
", " + property + ") called.");
 
 
         String query = "";
@@ -97,7 +97,7 @@
             query += "return 
fn:data($i/nmwg:parameters/nmwg:parameter[@name=\""
 + property + "\"]/@value)";
         }
 
-        logger.debug("[DbMetadataConfiguration] query: " + query);
+        //logger.debug("[DbMetadataConfiguration] query: " + query);
 
         Object object = null;
         try {
@@ -129,7 +129,7 @@
 
     public String getProperty(String device, String command, String 
property) throws PerfSONARException {
 
-        logger.debug("[DbMetadataConfiguration] getProperty(" + device + ", 
" + command + ", " + property + ") called.");
+        //logger.debug("[DbMetadataConfiguration] getProperty(" + device + 
", " + command + ", " + property + ") called.");
 
 
         String query = "";
@@ -150,7 +150,7 @@
             query += "return 
fn:data($file/nmwg:store/nmwg:data[@metadataIdRef=$i]/nmwg:key[nmwg:eventType='"
 + command + 
"']/nmwg:parameters/nmwg:parameter[@name='"
 + property + "']/@value)\n";
         }
 
-        logger.debug("[DbMetadataConfiguration] query: " + query);
+        //logger.debug("[DbMetadataConfiguration] query: " + query);
 
         Object object = null;
         try {
@@ -184,7 +184,7 @@
 
     public List getProperties(String property) throws PerfSONARException {
 
-        logger.debug("[DbMetadataConfiguration] getProperties(" + property + 
") called.");
+        //logger.debug("[DbMetadataConfiguration] getProperties(" + property 
+ ") called.");
 
 
         String query = "";
@@ -197,7 +197,7 @@
             query += "return data($i)";
         }
 
-        logger.debug("[DbMetadataConfiguration] query: " + query);
+        //logger.debug("[DbMetadataConfiguration] query: " + query);
 
         Object object = null;
         try {
@@ -217,7 +217,7 @@
                     "DbMetadataConfiguration.getProperties: " + "Result 
array of metadata search in null");
         }
 
-        logger.debug("DbMetadataConfiguration.getProperties: " + "The number 
of elements returned as a result of xquery statement: " + xmlResults.length);
+        //logger.debug("DbMetadataConfiguration.getProperties: " + "The 
number of elements returned as a result of xquery statement: " + 
xmlResults.length);
 
         if (xmlResults.length == 0) {
             throw new PerfSONARException(
@@ -242,7 +242,7 @@
 
     public List getProperties(String device, String property) throws 
PerfSONARException {
 
-        logger.debug("[DbMetadataConfiguration] getProperty(" + device + ", 
" + property + ") called.");
+        //logger.debug("[DbMetadataConfiguration] getProperty(" + device + 
", " + property + ") called.");
 
 
         String query = "";
@@ -263,7 +263,7 @@
             query += "return 
fn:data($file/nmwg:store/nmwg:data[@metadataIdRef=$i]/nmwg:key/nmwg:eventType)\n";
         }
 
-        logger.debug("[DbMetadataConfiguration] query: " + query);
+        //logger.debug("[DbMetadataConfiguration] query: " + query);
 
         Object object = null;
         try {
@@ -283,7 +283,7 @@
                     "DbMetadataConfiguration.getProperties: " + "Result 
array of metadata search in null");
         }
 
-        logger.debug("DbMetadataConfiguration.getProperties: " + "The number 
of elements returned as a result of xquery statement: " + xmlResults.length);
+        //logger.debug("DbMetadataConfiguration.getProperties: " + "The 
number of elements returned as a result of xquery statement: " + 
xmlResults.length);
 
         if (xmlResults.length == 0) {
             throw new PerfSONARException(
@@ -315,7 +315,7 @@
             xmldbAccess =
                     
configuration.getProperty("component.mp.xmldb.db_access");
         } catch (Exception ex) {
-            logger.equals("[DBMETADATACONFIGURATION][GetStorageManager]" + 
ex.getStackTrace().toString());
+            logger.error("[DBMETADATACONFIGURATION][GetStorageManager]" + 
ex.getStackTrace().toString());
             throw new PerfSONARException(
                     "warning.mp.metadata_configuration",
                     "DbMetadataConfiguration.getStorageManager: " + 
"Something went wrong while reading the properties file");