perfsonar-dev - perfsonar: r4537 - in trunk/geant2_java-as: . conf doc
Subject: perfsonar development work
List archive
- From:
- To:
- Subject: perfsonar: r4537 - in trunk/geant2_java-as: . conf doc
- Date: Tue, 23 Sep 2008 16:26:09 -0400
Author: rodriguez
Date: 2008-09-23 16:26:09 -0400 (Tue, 23 Sep 2008)
New Revision: 4537
Modified:
trunk/geant2_java-as/conf/log4j.properties.template
trunk/geant2_java-as/conf/log4j.syslog.properties.template
trunk/geant2_java-as/conf/service.properties.template-2
trunk/geant2_java-as/conf/wizard.properties.template
trunk/geant2_java-as/doc/ChangeLog.txt
trunk/geant2_java-as/pom.xml
Log:
- Using webadmin 0.9.6b
- Updating root folder to /opt/perfsonar/services/geant2-java-as
Modified: trunk/geant2_java-as/conf/log4j.properties.template
===================================================================
--- trunk/geant2_java-as/conf/log4j.properties.template 2008-09-23 20:24:29
UTC (rev 4536)
+++ trunk/geant2_java-as/conf/log4j.properties.template 2008-09-23 20:26:09
UTC (rev 4537)
@@ -6,8 +6,8 @@
# The path of a directory which contains log files.
-# Replace occurrences of _LOGPATH_ string in this file with a real path.
-logDir=_LOGPATH_
+# Replace occurrences of /opt/perfsonar/services/geant2-java-as/WEB-INF/log
string in this file with a real path.
+logDir=/opt/perfsonar/services/geant2-java-as/WEB-INF/log
##
@@ -60,7 +60,7 @@
# Group=Debug message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.debugAppender.File=_LOGPATH_/perfsonar_debug.log
+log4j.appender.debugAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_debug.log
# Group=Debug message logging
# Description=The class responsible for the logging layout.
@@ -88,7 +88,7 @@
# Group=Info message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.infoAppender.File=_LOGPATH_/perfsonar_info.log
+log4j.appender.infoAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_info.log
# Group=Info message logging
# Description=The class responsible for the logging layout.
@@ -116,7 +116,7 @@
# Group=Warn message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.warnAppender.File=_LOGPATH_/perfsonar_warn.log
+log4j.appender.warnAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_warn.log
# Group=Warn message logging
# Description=The class responsible for the logging layout.
@@ -144,7 +144,7 @@
# Group=Error message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.errorAppender.File=_LOGPATH_/perfsonar_error.log
+log4j.appender.errorAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_error.log
# Group=Error message logging
# Description=The class responsible for the logging layout.
@@ -172,7 +172,7 @@
# Group=Fatal message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.fatalAppender.File=_LOGPATH_/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_fatal.log
# Group=Fatal message logging
# Description=The class responsible for the logging layout.
@@ -200,7 +200,7 @@
# Group=All message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.psRootAppender.File=_LOGPATH_/perfsonar.log
+log4j.appender.psRootAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar.log
# Group=All message logging
# Description=The class responsible for the logging layout.
@@ -225,7 +225,7 @@
# ROOT
#log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=_LOGPATH_/perfsonar_root.log
+#log4j.appender.rootAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_root.log
#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
#log4j.appender.rootAppender.layout.ConversionPattern=%d %%PERFSONAR-AS.%p%%
%m%n
#log4j.rootLogger=DEBUG, rootAppender
Modified: trunk/geant2_java-as/conf/log4j.syslog.properties.template
===================================================================
--- trunk/geant2_java-as/conf/log4j.syslog.properties.template 2008-09-23
20:24:29 UTC (rev 4536)
+++ trunk/geant2_java-as/conf/log4j.syslog.properties.template 2008-09-23
20:26:09 UTC (rev 4537)
@@ -6,8 +6,8 @@
# The path of a directory which contains log files.
-# Replace occurrences of _LOGPATH_ string in this file with a real path.
-logDir=_LOGPATH_
+# Replace occurrences of /opt/perfsonar/services/geant2-java-as/WEB-INF/log
string in this file with a real path.
+logDir=/opt/perfsonar/services/geant2-java-as/WEB-INF/log
##
@@ -60,7 +60,7 @@
# Group=Debug message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.debugAppender.File=_LOGPATH_/perfsonar_debug.log
+log4j.appender.debugAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_debug.log
# Group=Debug message logging
# Description=The class responsible for the logging layout.
@@ -88,7 +88,7 @@
# Group=Info message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.infoAppender.File=_LOGPATH_/perfsonar_info.log
+log4j.appender.infoAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_info.log
# Group=Info message logging
# Description=The class responsible for the logging layout.
@@ -116,7 +116,7 @@
# Group=Warn message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.warnAppender.File=_LOGPATH_/perfsonar_warn.log
+log4j.appender.warnAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_warn.log
# Group=Warn message logging
# Description=The class responsible for the logging layout.
@@ -144,7 +144,7 @@
# Group=Error message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.errorAppender.File=_LOGPATH_/perfsonar_error.log
+log4j.appender.errorAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_error.log
# Group=Error message logging
# Description=The class responsible for the logging layout.
@@ -172,7 +172,7 @@
# Group=Fatal message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.fatalAppender.File=_LOGPATH_/perfsonar_fatal.log
+log4j.appender.fatalAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_fatal.log
# Group=Fatal message logging
# Description=The class responsible for the logging layout.
@@ -200,7 +200,7 @@
# Group=All message logging
# Description=The path to the log file, including the log file's name.
-log4j.appender.psRootAppender.File=_LOGPATH_/perfsonar.log
+log4j.appender.psRootAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar.log
# Group=All message logging
# Description=The class responsible for the logging layout.
@@ -245,7 +245,7 @@
# ROOT
#log4j.appender.rootAppender.MaxBackupIndex=11
-#log4j.appender.rootAppender.File=_LOGPATH_/perfsonar_root.log
+#log4j.appender.rootAppender.File=/opt/perfsonar/services/geant2-java-as/WEB-INF/log/perfsonar_root.log
#log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
#log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
#log4j.rootLogger=DEBUG, rootAppender
Modified: trunk/geant2_java-as/conf/service.properties.template-2
===================================================================
--- trunk/geant2_java-as/conf/service.properties.template-2 2008-09-23
20:24:29 UTC (rev 4536)
+++ trunk/geant2_java-as/conf/service.properties.template-2 2008-09-23
20:26:09 UTC (rev 4537)
@@ -15,11 +15,11 @@
# 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
+service.sax_parser.config=/opt/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=/var/lib/tomcat5.5/webapps/geant2-java-as/WEB-INF/classes/perfsonar/conf/log4j.properties
+service.log.log4j.config=/opt/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/log4j.properties
#
-----------------------------------------------------------------------------------------------
# Configuration of LS functionality
@@ -50,7 +50,7 @@
# Group=LS
# Description=The version number of the service.
-service.r.service_version=1.0
+service.r.service_version=1.1
# Group=LS
# Description=The email address of the person who manages the service.
@@ -77,7 +77,7 @@
# Group=Authentication
# Description=The full path to the TrustStore file containing the CA certs.
-service.as.truststore_file=/var/lib/tomcat5.5/webapps/geant2-java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks
+service.as.truststore_file=/opt/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks
# Group=Authentication
# Description=The password for the TrustStore file.
@@ -85,7 +85,7 @@
# Group=Authentication
# Description=The full path to a file containing valid Component IDs in
eduGAIN.
-service.as.valid_components=/var/lib/tomcat5.5/webapps/geant2-java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile
+service.as.valid_components=/opt/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile
# Group=Authentication
# Description=The crypt provider library for the service.
Modified: trunk/geant2_java-as/conf/wizard.properties.template
===================================================================
--- trunk/geant2_java-as/conf/wizard.properties.template 2008-09-23
20:24:29 UTC (rev 4536)
+++ trunk/geant2_java-as/conf/wizard.properties.template 2008-09-23
20:26:09 UTC (rev 4537)
@@ -84,9 +84,9 @@
</property>
<property>
- <entry key="service.as.truststore_file"
required="true">/var/lib/tomcat5.5/webapps/geant2-java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</entry>
+ <entry key="service.as.truststore_file"
required="true">/opt/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>/var/lib/tomcat5-5/webapps/geant2-java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</ProposedValue>
+
<ProposedValue>/opt/perfsonar/geant2-java-as/WEB-INF/classes/perfsonar/conf/perfSONARtruststore.jks</ProposedValue>
<Group order="1">Authentication</Group>
</property>
@@ -98,9 +98,9 @@
</property>
<property>
- <entry key="service.as.valid_components"
required="true">/var/lib/tomcat5.5/webapps/geant2-java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile</entry>
+ <entry key="service.as.valid_components"
required="true">/opt/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile</entry>
<Comment>Enter the full path to a file containing valid Component IDs in
eduGAIN:</Comment>
-
<ProposedValue>/var/lib/tomcat5.5/webapps/geant2-java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile</ProposedValue>
+
<ProposedValue>/opt/perfsonar/services/geant2-java-as/WEB-INF/classes/perfsonar/conf/ASValidComponentsFile</ProposedValue>
<Group order="3">Authentication</Group>
</property>
Modified: trunk/geant2_java-as/doc/ChangeLog.txt
===================================================================
--- trunk/geant2_java-as/doc/ChangeLog.txt 2008-09-23 20:24:29 UTC (rev
4536)
+++ trunk/geant2_java-as/doc/ChangeLog.txt 2008-09-23 20:26:09 UTC (rev
4537)
@@ -1,5 +1,8 @@
AS ChangeLog
+2008-14-07 Version 1.1rc3
+- Uses the webadmin 0.9.6b
+
2008-14-07 Version 1.1rc2
- Uses the webadmin 0.9.1b
Modified: trunk/geant2_java-as/pom.xml
===================================================================
--- trunk/geant2_java-as/pom.xml 2008-09-23 20:24:29 UTC (rev 4536)
+++ trunk/geant2_java-as/pom.xml 2008-09-23 20:26:09 UTC (rev 4537)
@@ -165,7 +165,7 @@
<dependency>
<groupId>perfsonar</groupId>
<artifactId>perfsonar-web-admin</artifactId>
- <version>0.9.1b</version>
+ <version>0.9.6b</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
- perfsonar: r4537 - in trunk/geant2_java-as: . conf doc, svnlog, 09/23/2008
Archive powered by MHonArc 2.6.16.