perfsonar development work

Author: melis
Date: 2008-10-15 10:37:46 -0400 (Wed, 15 Oct 2008)
New Revision: 4625

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/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
   trunk/geant2_java-sshtelnet-mp/conf/service.properties
   trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
   trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog
   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
Log:
updated trunk to version 1.3.4RC4

Modified: trunk/geant2_java-sshtelnet-mp/ant/const.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/const.properties 2008-10-15 08:57:57 
UTC (rev 4624)
+++ trunk/geant2_java-sshtelnet-mp/ant/const.properties 2008-10-15 14:37:46 
UTC (rev 4625)
@@ -11,7 +11,7 @@
 service.name=ps-mdm-sshtelnet-mp
 
 jarfilename=perfsonar-sshtelnet-mp
-version=1.3.4RC3
+version=1.3.4RC4
 
 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: trunk/geant2_java-sshtelnet-mp/ant/const.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/const.properties.template        
2008-10-15 08:57:57 UTC (rev 4624)
+++ trunk/geant2_java-sshtelnet-mp/ant/const.properties.template        
2008-10-15 14:37:46 UTC (rev 4625)
@@ -11,7 +11,7 @@
 service.name=ps-mdm-sshtelnet-mp
 
 jarfilename=perfsonar-sshtelnet-mp
-version=1.3.4RC3
+version=1.3.4RC4
 
 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: trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml
===================================================================
--- trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml        
2008-10-15 08:57:57 UTC (rev 4624)
+++ trunk/geant2_java-sshtelnet-mp/ant/libs-download-targets.xml        
2008-10-15 14:37:46 UTC (rev 4625)
@@ -61,6 +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="nmwg"      artifactId="nmwg"                
version="1.0.20071008"/>
 
 

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-10-15 08:57:57 UTC (rev 4624)
+++ 
trunk/geant2_java-sshtelnet-mp/conf/axis-1.4/WEB-INF/classes/perfsonar/conf/service.properties
      2008-10-15 14:37:46 UTC (rev 4625)
@@ -13,7 +13,7 @@
 component.mp.xmldb.db_username=sshtelnet
 
 # Group=eXist
-# Description=The name of the metadata configuration file which is to be 
uploaded in the eXist
+# Description=The name of the metadata configuration file which is to be 
uploaded in the eXist.
 component.mp.xmldb.metadata_file_name=sshtelnetmetadata.xml
 
 #Group=eXist
@@ -36,7 +36,7 @@
 #-------------------
 
 # Group=Internal
-# Description=The path to the log4j.properties  configuration file. If you 
want to enable syslog message logging, enter the path to the 
log4j.syslog.properties file instead.
+# Description=The path to the log4j.properties configuration file. If you 
want to enable syslog message logging, enter the path to the 
log4j.syslog.properties file instead.
 service.log.log4j.config=/etc/ps-mdm-sshtelnet-mp/log4j.properties
 
 # Group=Internal
@@ -63,11 +63,11 @@
 #-------------
 
 # Group=LS
-# Description=Type of service
+# Description=The service type.
 service.r.service_type=mp
 
 # Group=LS
-# Description=Location of the Lookup Service
+# Description=The URL address of the LS service.
 service.r.ls_url=http://somewhere
 
 # Group=LS
@@ -75,28 +75,28 @@
 service.r.access_point=http://somewhere
 
 # Group=LS
-# Description=The name of the organisation which deployed the MP
+# Description=The name of the organisation who is deploying the service.
 service.r.organization_name=X
 
 # Group=LS
-# Description=The name of the service
+# Description=The name of the service (can contain multiple words).
 service.r.service_name=geant2-java-sshtelnet-mp
 
 # Group=LS
-# Description=The version of the service
-service.r.service_version=1.3.4RC3
+# Description=The version number of the service.
+service.r.service_version=1.3.4RC4
 
 # Group=LS
-# Description=The e-mail address of the contact person for the service
+# Description=The email address of the person who manages the service.
 
service.r.contact_email=user@domain
 
 # Group=LS
-# Description=Description for the service
+# Description=The description of the service.
 service.r.service_description=perfSONAR service
 
 # Group=LS
-# Description=The period of time between registrations to the LS
-component.registrator.interval=900000
+# Description=The time (miliseconds) between register requests to the LS 
service (default value is 43200000 ms; 12 hours).
+component.registrator.interval=43200000
 
 # Group=LS
 # Description=The name of the scheduler component (the implementation of 
this component must also be declared in the components.properties file).
@@ -114,13 +114,13 @@
 #-------------------------
 
 # Group=Authentication
-# Description=Location of the Authentication Service
+# Description=The URL address of the Authentication Service.
 
service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService
 
 # Group=Authentication
-# Description=The types of messages for which Authentication is to be 
enabled (if Authentication is enabled off course)
+# Description=The types of messages for which authentication is to be 
enabled (if required).
 service.as.authn_for_msg_types=SetupDataRequest,MetadataKeyRequest
 
 # Group=Authentication
-# Description=If the authentication is enabled or not
+# Description=Determines if authentication is enabled (on) or not (off).
 service.as.authn_active=off

Modified: trunk/geant2_java-sshtelnet-mp/conf/service.properties
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/service.properties      2008-10-15 
08:57:57 UTC (rev 4624)
+++ trunk/geant2_java-sshtelnet-mp/conf/service.properties      2008-10-15 
14:37:46 UTC (rev 4625)
@@ -13,7 +13,7 @@
 component.mp.xmldb.db_username=sshtelnet
 
 # Group=eXist
-# Description=The name of the metadata configuration file which is to be 
uploaded in the eXist
+# Description=The name of the metadata configuration file which is to be 
uploaded in the eXist.
 component.mp.xmldb.metadata_file_name=sshtelnetmetadata.xml
 
 #Group=eXist
@@ -36,7 +36,7 @@
 #-------------------
 
 # Group=Internal
-# Description=The path to the log4j.properties  configuration file. If you 
want to enable syslog message logging, enter the path to the 
log4j.syslog.properties file instead.
+# Description=The path to the log4j.properties configuration file. If you 
want to enable syslog message logging, enter the path to the 
log4j.syslog.properties file instead.
 service.log.log4j.config=/etc/ps-mdm-sshtelnet-mp/log4j.properties
 
 # Group=Internal
@@ -63,11 +63,11 @@
 #-------------
 
 # Group=LS
-# Description=Type of service
+# Description=The service type.
 service.r.service_type=mp
 
 # Group=LS
-# Description=Location of the Lookup Service
+# Description=The URL address of the LS service.
 service.r.ls_url=http://somewhere
 
 # Group=LS
@@ -75,28 +75,28 @@
 service.r.access_point=http://somewhere
 
 # Group=LS
-# Description=The name of the organisation which deployed the MP
+# Description=The name of the organisation who is deploying the service.
 service.r.organization_name=X
 
 # Group=LS
-# Description=The name of the service
+# Description=The name of the service (can contain multiple words).
 service.r.service_name=geant2-java-sshtelnet-mp
 
 # Group=LS
-# Description=The version of the service
-service.r.service_version=1.3.4RC3
+# Description=The version number of the service.
+service.r.service_version=1.3.4RC4
 
 # Group=LS
-# Description=The e-mail address of the contact person for the service
+# Description=The email address of the person who manages the service.
 
service.r.contact_email=user@domain
 
 # Group=LS
-# Description=Description for the service
+# Description=The description of the service.
 service.r.service_description=perfSONAR service
 
 # Group=LS
-# Description=The period of time between registrations to the LS
-component.registrator.interval=900000
+# Description=The time (miliseconds) between register requests to the LS 
service (default value is 43200000 ms; 12 hours).
+component.registrator.interval=43200000
 
 # Group=LS
 # Description=The name of the scheduler component (the implementation of 
this component must also be declared in the components.properties file).
@@ -114,13 +114,13 @@
 #-------------------------
 
 # Group=Authentication
-# Description=Location of the Authentication Service
+# Description=The URL address of the Authentication Service.
 
service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService
 
 # Group=Authentication
-# Description=The types of messages for which Authentication is to be 
enabled (if Authentication is enabled off course)
+# Description=The types of messages for which authentication is to be 
enabled (if required).
 service.as.authn_for_msg_types=SetupDataRequest,MetadataKeyRequest
 
 # Group=Authentication
-# Description=If the authentication is enabled or not
+# Description=Determines if authentication is enabled (on) or not (off).
 service.as.authn_active=off

Modified: trunk/geant2_java-sshtelnet-mp/conf/service.properties.template
===================================================================
--- trunk/geant2_java-sshtelnet-mp/conf/service.properties.template     
2008-10-15 08:57:57 UTC (rev 4624)
+++ trunk/geant2_java-sshtelnet-mp/conf/service.properties.template     
2008-10-15 14:37:46 UTC (rev 4625)
@@ -13,7 +13,7 @@
 component.mp.xmldb.db_username=sshtelnet
 
 # Group=eXist
-# Description=The name of the metadata configuration file which is to be 
uploaded in the eXist
+# Description=The name of the metadata configuration file which is to be 
uploaded in the eXist.
 component.mp.xmldb.metadata_file_name=sshtelnetmetadata.xml
 
 #Group=eXist
@@ -36,7 +36,7 @@
 #-------------------
 
 # Group=Internal
-# Description=The path to the log4j.properties  configuration file. If you 
want to enable syslog message logging, enter the path to the 
log4j.syslog.properties file instead.
+# Description=The path to the log4j.properties configuration file. If you 
want to enable syslog message logging, enter the path to the 
log4j.syslog.properties file instead.
 service.log.log4j.config=/etc/ps-mdm-sshtelnet-mp/log4j.properties
 
 # Group=Internal
@@ -63,11 +63,11 @@
 #-------------
 
 # Group=LS
-# Description=Type of service
+# Description=The service type.
 service.r.service_type=mp
 
 # Group=LS
-# Description=Location of the Lookup Service
+# Description=The URL address of the LS service.
 service.r.ls_url=http://somewhere
 
 # Group=LS
@@ -75,28 +75,28 @@
 service.r.access_point=http://somewhere
 
 # Group=LS
-# Description=The name of the organisation which deployed the MP
+# Description=The name of the organisation who is deploying the service.
 service.r.organization_name=X
 
 # Group=LS
-# Description=The name of the service
+# Description=The name of the service (can contain multiple words).
 service.r.service_name=geant2-java-sshtelnet-mp
 
 # Group=LS
-# Description=The version of the service
-service.r.service_version=1.3.4RC3
+# Description=The version number of the service.
+service.r.service_version=1.3.4RC4
 
 # Group=LS
-# Description=The e-mail address of the contact person for the service
+# Description=The email address of the person who manages the service.
 
service.r.contact_email=user@domain
 
 # Group=LS
-# Description=Description for the service
+# Description=The description of the service.
 service.r.service_description=perfSONAR service
 
 # Group=LS
-# Description=The period of time between registrations to the LS
-component.registrator.interval=900000
+# Description=The time (miliseconds) between register requests to the LS 
service (default value is 43200000 ms; 12 hours).
+component.registrator.interval=43200000
 
 # Group=LS
 # Description=The name of the scheduler component (the implementation of 
this component must also be declared in the components.properties file).
@@ -114,13 +114,13 @@
 #-------------------------
 
 # Group=Authentication
-# Description=Location of the Authentication Service
+# Description=The URL address of the Authentication Service.
 
service.as.point=http\://homer.rediris.es\:8080/perfSONAR-AS/services/AuthService
 
 # Group=Authentication
-# Description=The types of messages for which Authentication is to be 
enabled (if Authentication is enabled off course)
+# Description=The types of messages for which authentication is to be 
enabled (if required).
 service.as.authn_for_msg_types=SetupDataRequest,MetadataKeyRequest
 
 # Group=Authentication
-# Description=If the authentication is enabled or not
+# Description=Determines if authentication is enabled (on) or not (off).
 service.as.authn_active=off

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog      2008-10-15 
08:57:57 UTC (rev 4624)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/changelog      2008-10-15 
14:37:46 UTC (rev 4625)
@@ -1,3 +1,12 @@
+ps-mdm-sshtelnet-mp (1.3.4RC4) unstable; urgency=low
+
+  * ps-base version: 1.0.20080902
+  * web-admin version: 0.9.6b
+  * Fixed bug with paths in deb file
+  * Fixed some descriptions in the WebAdmin
+
+ -- Stijn Melis 
<>
  Wed, 15 Oct 2008 14:25:09 +0200
+
 ps-mdm-sshtelnet-mp (1.3.4RC3) unstable; urgency=low
 
   * ps-base version: 1.0.20080902

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/docs
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/docs   2008-10-15 08:57:57 
UTC (rev 4624)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/docs   2008-10-15 14:37:46 
UTC (rev 4625)
@@ -1 +1 @@
-ps-mdm-sshtelnet-mp-1.3.4RC3/doc/*
\ No newline at end of file
+ps-mdm-sshtelnet-mp-1.3.4RC4/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-10-15 08:57:57 
UTC (rev 4624)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/files  2008-10-15 14:37:46 
UTC (rev 4625)
@@ -1 +1 @@
-ps-mdm-sshtelnet-mp_1.3.4RC2_all.deb web extra
+ps-mdm-sshtelnet-mp_1.3.4RC4_all.deb web extra

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/install
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/install        2008-10-15 
08:57:57 UTC (rev 4624)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/install        2008-10-15 
14:37:46 UTC (rev 4625)
@@ -1 +1 @@
-ps-mdm-sshtelnet-mp-1.3.4RC3/tmp-webapps/webapps/ps-mdm-sshtelnet-mp/* 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp
+ps-mdm-sshtelnet-mp-1.3.4RC4/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-10-15 
08:57:57 UTC (rev 4624)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/postinst       2008-10-15 
14:37:46 UTC (rev 4625)
@@ -20,7 +20,7 @@
 
 case "$1" in
     configure)
-       ln -sf /usr/lib/perfsonar/services/$SERVICE 
/var/lib/tomcat5.5/webapps/$SERVICE
+       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
     chown tomcat55 
/usr/lib/perfsonar/services/ps-mdm-sshtelnet-mp/WEB-INF/classes/perfsonar/conf/*
     /etc/init.d/tomcat5.5 restart

Modified: trunk/geant2_java-sshtelnet-mp/packaging/deb/rules
===================================================================
--- trunk/geant2_java-sshtelnet-mp/packaging/deb/rules  2008-10-15 08:57:57 
UTC (rev 4624)
+++ trunk/geant2_java-sshtelnet-mp/packaging/deb/rules  2008-10-15 14:37:46 
UTC (rev 4625)
@@ -17,7 +17,7 @@
 
 build-stamp: configure-stamp 
        dh_testdir
-       ant -f ps-mdm-sshtelnet-mp-1.3.4RC3/ant/build.xml 
webapp-package-create
+       ant -f ps-mdm-sshtelnet-mp-1.3.4RC4/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-10-15 08:57:57 UTC (rev 4624)
+++ trunk/geant2_java-sshtelnet-mp/packaging/rpm/ps-mdm-sshtelnet-mp.specs    
  2008-10-15 14:37:46 UTC (rev 4625)
@@ -6,7 +6,7 @@
 Name: ps-mdm-sshtelnet-mp
 
 # Version of the microrelease
-Version: 1.3.4RC3
+Version: 1.3.4RC4
 License: GPL
 
 # Package version. Increment if you create a new package of same microrelease
@@ -134,6 +134,11 @@
 
 
 %changelog
+* Wed Oct 15 2008 Stijn Melis 
<>
 1.3.4RC4
+- ps-base version: 1.0.20080902
+- web-admin version: 0.9.6b
+- Fixed some descriptions in the WebAdmin
+
 * Mon Oct 13 2008 Stijn Melis 
<>
 1.3.4RC3
 - ps-base version: 1.0.20080902
 - web-admin version: 0.9.6b