perfsonar development work

Author: rodriguez
Date: 2008-11-11 04:38:27 -0500 (Tue, 11 Nov 2008)
New Revision: 4691

Added:
   trunk/geant2_java-as/conf/service.properties
   trunk/geant2_java-as/conf/servlet.properties
   trunk/geant2_java-as/conf/wizard.properties
Modified:
   trunk/geant2_java-as/conf/service.properties.template-2
   trunk/geant2_java-as/conf/wizard.properties.template
Log:
It resolves the bugs #681 and #608

Added: trunk/geant2_java-as/conf/service.properties

Modified: trunk/geant2_java-as/conf/service.properties.template-2
===================================================================
--- trunk/geant2_java-as/conf/service.properties.template-2     2008-11-06 
13:38:48 UTC (rev 4690)
+++ trunk/geant2_java-as/conf/service.properties.template-2     2008-11-11 
09:38:27 UTC (rev 4691)
@@ -14,18 +14,18 @@
 service.as.message_types=AuthNEERequest,EchoRequest,LookupInfoRequest
 
 # Group=Internal
-# Description=The location of the SAX parser configuration.
-service.sax_parser.config=/opt/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/objects.config
+# Description=The path to the file objects.config, including the NMWG 
parser's configuration settings. The parser reads the request or metadata 
configuration files, and creates internally used objects that represent these 
files.
+service.sax_parser.config=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/objects.config
 
 # 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.
-service.log.log4j.config=/opt/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/log4j.properties
+service.log.log4j.config=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/log4j.properties
 
 # 
-----------------------------------------------------------------------------------------------
 # Configuration of LS functionality
 
 # Group=LS
-# Description=Description of the service.
+# Description=The description of the service.
 service.r.service_description=perfSONAR authentication service
 
 # Group=LS
@@ -57,7 +57,7 @@
 
service.r.contact_email=user@domain
 
 # Group=LS
-# Description=The time (miliseconds) between register requests to the LS 
service.
+# Description=The time (miliseconds) between register requests to the LS 
service (default value is 43200000 ms; 12 hours).
 component.registrator.interval=43200000
 
 # Group=LS
@@ -77,7 +77,7 @@
 
 # Group=Authentication
 # Description=The full path to the TrustStore file containing the CA certs.
-service.as.truststore_file=/opt/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks
+service.as.truststore_file=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks
 
 # Group=Authentication
 # Description=The password for the TrustStore file.
@@ -85,8 +85,8 @@
 
 # Group=Authentication
 # Description=The full path to a file containing valid Component IDs in 
eduGAIN.
-service.as.valid_components=/opt/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile
+service.as.valid_components=/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile
 
 # Group=Authentication
 # Description=The crypt provider library for the service.
-service.as.crypt_provider=SunRsaSign
\ No newline at end of file
+service.as.crypt_provider=SunRsaSign

Added: trunk/geant2_java-as/conf/servlet.properties

Added: trunk/geant2_java-as/conf/wizard.properties

Modified: trunk/geant2_java-as/conf/wizard.properties.template
===================================================================
--- trunk/geant2_java-as/conf/wizard.properties.template        2008-11-06 
13:38:48 UTC (rev 4690)
+++ trunk/geant2_java-as/conf/wizard.properties.template        2008-11-11 
09:38:27 UTC (rev 4691)
@@ -43,7 +43,7 @@
 
   <property>
     <entry key="service.r.organization_name">Institution</entry>
-    <Comment>Enter the name of the organization running this 
service:</Comment>
+    <Comment>Enter the name of the organisation running this 
service:</Comment>
     <ProposedValue>Institution</ProposedValue>
     <Group order="4">LS</Group>
   </property>
@@ -86,7 +86,7 @@
   <property>
     <entry key="service.as.truststore_file" 
required="true">/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</entry>
     <Comment>Enter the full path to the TrustStore file containing the CA 
certs:</Comment>
-    
<ProposedValue>/usr/lib/perfsonar/geant2-java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</ProposedValue>
+    
<ProposedValue>/usr/lib/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</ProposedValue>
     <Group order="1">Authentication</Group>
   </property>