perfsonar development work

Author: rodriguez
Date: 2008-09-05 06:14:54 -0400 (Fri, 05 Sep 2008)
New Revision: 4449

Modified:
   trunk/geant2_java-as/conf/axis-1.4/index.jsp
   trunk/geant2_java-as/conf/log4j.properties.template
   trunk/geant2_java-as/conf/log4j.syslog.properties.template
   trunk/geant2_java-as/conf/perfSONARtruststore.jks
   trunk/geant2_java-as/conf/service.properties.template-2
Log:
Adding some minor changes
Updating the perfSONAR truststore

Modified: trunk/geant2_java-as/conf/axis-1.4/index.jsp
===================================================================
--- trunk/geant2_java-as/conf/axis-1.4/index.jsp        2008-09-03 11:42:07 
UTC (rev 4448)
+++ trunk/geant2_java-as/conf/axis-1.4/index.jsp        2008-09-05 10:14:54 
UTC (rev 4449)
@@ -125,10 +125,6 @@
                                         <br>
                                         <a  
href="ServiceAdmin?loggingProperties" target="main">Logging</a>
                                         <br>
-                                        <a  href="eXistAdmin" 
target="main">eXist Database</a>
-                                        <br>
-                                        <a  href="MetadataAdmin" 
target="main">Config File Management</a>
-                                        <br>
 
                                     </span>
                                 </p>

Modified: trunk/geant2_java-as/conf/log4j.properties.template
===================================================================
--- trunk/geant2_java-as/conf/log4j.properties.template 2008-09-03 11:42:07 
UTC (rev 4448)
+++ trunk/geant2_java-as/conf/log4j.properties.template 2008-09-05 10:14:54 
UTC (rev 4449)
@@ -131,7 +131,7 @@
 log4j.appender.warnAppender.MaxFileSize=500KB
 
 # Group=Warn message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log 
file.
 log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
 
 
@@ -159,7 +159,7 @@
 log4j.appender.errorAppender.MaxFileSize=500KB
 
 # Group=Error message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log 
file.
 log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
 
 
@@ -187,7 +187,7 @@
 log4j.appender.fatalAppender.MaxFileSize=500KB
 
 # Group=Fatal message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log 
file.
 log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
 
 
@@ -215,7 +215,7 @@
 log4j.appender.psRootAppender.MaxFileSize=500KB
 
 # Group=All message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log 
file.
 log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
 
 

Modified: trunk/geant2_java-as/conf/log4j.syslog.properties.template
===================================================================
--- trunk/geant2_java-as/conf/log4j.syslog.properties.template  2008-09-03 
11:42:07 UTC (rev 4448)
+++ trunk/geant2_java-as/conf/log4j.syslog.properties.template  2008-09-05 
10:14:54 UTC (rev 4449)
@@ -131,7 +131,7 @@
 log4j.appender.warnAppender.MaxFileSize=500KB
 
 # Group=Warn message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log 
file.
 log4j.appender.warnAppender=org.apache.log4j.RollingFileAppender
 
 
@@ -159,7 +159,7 @@
 log4j.appender.errorAppender.MaxFileSize=500KB
 
 # Group=Error message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log 
file.
 log4j.appender.errorAppender=org.apache.log4j.RollingFileAppender
 
 
@@ -187,7 +187,7 @@
 log4j.appender.fatalAppender.MaxFileSize=500KB
 
 # Group=Fatal message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log 
file.
 log4j.appender.fatalAppender=org.apache.log4j.RollingFileAppender
 
 
@@ -215,7 +215,7 @@
 log4j.appender.psRootAppender.MaxFileSize=500KB
 
 # Group=All message logging
-# Description=The class responsible for appending log messages the log file.
+# Description=The class responsible for appending log messages to the log 
file.
 log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
 
 
@@ -226,7 +226,7 @@
 log4j.appender.SYSLOG=org.apache.log4j.net.SyslogAppender
 
 # Group=Syslog logging
-# Description=IP address of the host executing syslog-ng
+# Description=The IP address of the host executing syslog-ng
 log4j.appender.SYSLOG.syslogHost=127.0.0.1
 
 # Group=Syslog logging
@@ -234,7 +234,7 @@
 log4j.appender.SYSLOG.layout=org.apache.log4j.PatternLayout
 
 # Group=Syslog logging
-# Description=The log message format. It can includes @Location after 
PERFSONAR-AS.
+# Description=The log message format. This can include @Location after 
PERFSONAR-AS.
 log4j.appender.SYSLOG.layout.ConversionPattern=\%PERFSONAR-AS.%p\% %m%n
 
 

Modified: trunk/geant2_java-as/conf/perfSONARtruststore.jks
===================================================================
(Binary files differ)

Modified: trunk/geant2_java-as/conf/service.properties.template-2
===================================================================
--- trunk/geant2_java-as/conf/service.properties.template-2     2008-09-03 
11:42:07 UTC (rev 4448)
+++ trunk/geant2_java-as/conf/service.properties.template-2     2008-09-05 
10:14:54 UTC (rev 4449)
@@ -14,21 +14,21 @@
 service.as.message_types=AuthNEERequest,EchoRequest,LookupInfoRequest
 
 # Group=Internal
-# Description=Description of the service.
-service.r.service_description=perfSONAR authentication service
-
-# Group=Internal
 # Description=The location of the SAX parser configuration.
 
service.sax_parser.config=/var/lib/tomcat5.5/webapps/geant2-java-as/WEB-INF/classes/perfsonar/conf/objects.config
 
 # Group=Internal
-# Description=The location of the the log4j logger configuration file.
+# 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=/var/lib/tomcat5.5/webapps/geant2-java-as/WEB-INF/classes/perfsonar/conf/log4j.properties
 
 # 
-----------------------------------------------------------------------------------------------
 # Configuration of LS functionality
 
 # Group=LS
+# Description=Description of the service.
+service.r.service_description=perfSONAR authentication service
+
+# Group=LS
 # Description=The service type.
 service.r.service_type=as