perfsonar development work

Author: rodriguez
Date: 2008-08-04 04:48:46 -0400 (Mon, 04 Aug 2008)
New Revision: 4329

Added:
   trunk/geant2_java-as/conf/log4j.syslog.properties.template
Modified:
   trunk/geant2_java-as/ant/configure-targets.xml
   trunk/geant2_java-as/ant/release-targets.xml
   trunk/geant2_java-as/ant/webapp-package-targets.xml
   trunk/geant2_java-as/conf/log4j.properties.template
Log:
- Splitting log4j.properties into two files: one of them supporting SYSLOG

Modified: trunk/geant2_java-as/ant/configure-targets.xml
===================================================================
--- trunk/geant2_java-as/ant/configure-targets.xml      2008-08-01 15:24:01 
UTC (rev 4328)
+++ trunk/geant2_java-as/ant/configure-targets.xml      2008-08-04 08:48:46 
UTC (rev 4329)
@@ -95,6 +95,11 @@
                              service-home="${service.home}"
                              deploy-root="${deploy.root}"/>
 
+    <psbase:set-log4j-config 
template-file="conf/log4j.syslog.properties.template"
+                             dest-file="conf/log4j.syslog.properties"
+                             service-home="${service.home}"
+                             deploy-root="${deploy.root}"/>
+
     <antcall target="as-register-fuctionality"/>
    
     <antcall target="set-service-properties"/>

Modified: trunk/geant2_java-as/ant/release-targets.xml
===================================================================
--- trunk/geant2_java-as/ant/release-targets.xml        2008-08-01 15:24:01 
UTC (rev 4328)
+++ trunk/geant2_java-as/ant/release-targets.xml        2008-08-04 08:48:46 
UTC (rev 4329)
@@ -43,6 +43,7 @@
     <delete 
file="tmp/${service.name}-${version}/conf/components.properties"/>
     <delete file="tmp/${service.name}-${version}/conf/service.properties"/>
     <delete file="tmp/${service.name}-${version}/conf/log4j.properties"/>
+    <delete 
file="tmp/${service.name}-${version}/conf/log4j.syslog.properties"/>
     <delete 
file="tmp/${service.name}-${version}/conf/ASValidComponentsFile"/>
     <delete 
file="tmp/${service.name}-${version}/conf/perfSONARtruststore.jks"/>
     <delete file="tmp/${service.name}-${version}/ant/const.properties"/>

Modified: trunk/geant2_java-as/ant/webapp-package-targets.xml
===================================================================
--- trunk/geant2_java-as/ant/webapp-package-targets.xml 2008-08-01 15:24:01 
UTC (rev 4328)
+++ trunk/geant2_java-as/ant/webapp-package-targets.xml 2008-08-04 08:48:46 
UTC (rev 4329)
@@ -56,9 +56,10 @@
     <!-- as specific stuff -->
 
     <!-- prepare conf files -->
-    <copy file="${basedir}/conf/service.properties.template-2"   
tofile="${basedir}/conf/service.properties"/>
-    <copy file="${basedir}/conf/components.properties.template"  
tofile="${basedir}/conf/components.properties"/>
-    <copy file="${basedir}/conf/log4j.properties.template"       
tofile="${basedir}/conf/log4j.properties"/>
+    <copy file="${basedir}/conf/service.properties.template-2"    
tofile="${basedir}/conf/service.properties"/>
+    <copy file="${basedir}/conf/components.properties.template"   
tofile="${basedir}/conf/components.properties"/>
+    <copy file="${basedir}/conf/log4j.properties.template"        
tofile="${basedir}/conf/log4j.properties"/>
+    <copy file="${basedir}/conf/log4j.syslog.properties.template" 
tofile="${basedir}/conf/log4j.syslog.properties"/>
 
     <!-- copy jar files -->
     <copy file="${basedir}/${build}/${jarfilename}-${version}.jar" 
todir="${tmpdir}/WEB-INF/lib"/>

Modified: trunk/geant2_java-as/conf/log4j.properties.template
===================================================================
--- trunk/geant2_java-as/conf/log4j.properties.template 2008-08-01 15:24:01 
UTC (rev 4328)
+++ trunk/geant2_java-as/conf/log4j.properties.template 2008-08-04 08:48:46 
UTC (rev 4329)
@@ -1,7 +1,7 @@
 
 ## $Id$
 ## project : perfSONAR
-## author: romradz
+## author: rodriguez
 
 
 
@@ -17,23 +17,23 @@
 
 # Group=Log levels
 # Description=Assigns debug log messages to the specified log appender.
-#log4j.logger.sonar-debug=DEBUG, SYSLOG, psRootAppender
+#log4j.logger.sonar-debug=DEBUG, psRootAppender
 
 # Group=Log levels
 # Description=Assigns info log messages to the specified log appender.
-log4j.logger.sonar-info=INFO, SYSLOG, psRootAppender
+log4j.logger.sonar-info=INFO, psRootAppender
 
 # Group=Log levels
 # Description=Assigns warn log messages to the specified log appender.
-log4j.logger.sonar-warn=WARN, SYSLOG, psRootAppender
+log4j.logger.sonar-warn=WARN, psRootAppender
 
 # Group=Log levels
 # Description=Assigns error log messages to the specified log appender.
-log4j.logger.sonar-error=ERROR, SYSLOG, psRootAppender
+log4j.logger.sonar-error=ERROR, psRootAppender
 
 # Group=Log levels
 # Description=Assigns fatal log messages to the specified log appender.
-log4j.logger.sonar-fatal=FATAL, SYSLOG, psRootAppender
+log4j.logger.sonar-fatal=FATAL, psRootAppender
 
 
 
@@ -43,11 +43,11 @@
 ##
 ## this section is only for developer tests
 ##
-#log4j.logger.sonar-debug=DEBUG, SYSLOG, debugAppender, psRootAppender
-#log4j.logger.sonar-info=INFO, SYSLOG, infoAppender, psRootAppender
-#log4j.logger.sonar-warn=WARN, SYSLOG, warnAppender, psRootAppender
-#log4j.logger.sonar-error=ERROR, SYSLOG, errorAppender, psRootAppender
-#log4j.logger.sonar-fatal=FATAL, SYSLOG, fatalAppender, psRootAppender
+#log4j.logger.sonar-debug=DEBUG, debugAppender, psRootAppender
+#log4j.logger.sonar-info=INFO, infoAppender, psRootAppender
+#log4j.logger.sonar-warn=WARN, warnAppender, psRootAppender
+#log4j.logger.sonar-error=ERROR, errorAppender, psRootAppender
+#log4j.logger.sonar-fatal=FATAL, fatalAppender, psRootAppender
 
 
 
@@ -68,7 +68,7 @@
 
 # Group=Debug message logging
 # Description=The log message format.
-log4j.appender.debugAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.appender.debugAppender.layout.ConversionPattern=%d %%PERFSONAR-AS.%p%% 
%m%n
 
 # Group=Debug message logging
 # Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
@@ -96,7 +96,7 @@
 
 # Group=Info message logging
 # Description=The log message format.
-log4j.appender.infoAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.appender.infoAppender.layout.ConversionPattern=%d %%PERFSONAR-AS.%p%% 
%m%n
 
 # Group=Info message logging
 # Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
@@ -124,7 +124,7 @@
 
 # Group=Warn message logging
 # Description=The log message format.
-log4j.appender.warnAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.appender.warnAppender.layout.ConversionPattern=%d %%PERFSONAR-AS.%p%% 
%m%n
 
 # Group=Warn message logging
 # Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
@@ -152,7 +152,7 @@
 
 # Group=Error message logging
 # Description=The log message format.
-log4j.appender.errorAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.appender.errorAppender.layout.ConversionPattern=%d %%PERFSONAR-AS.%p%% 
%m%n
 
 # Group=Error message logging
 # Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
@@ -180,7 +180,7 @@
 
 # Group=Fatal message logging
 # Description=The log message format.
-log4j.appender.fatalAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.appender.fatalAppender.layout.ConversionPattern=%d %%PERFSONAR-AS.%p%% 
%m%n
 
 # Group=Fatal message logging
 # Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
@@ -208,7 +208,7 @@
 
 # Group=All message logging
 # Description=The log message format.
-log4j.appender.psRootAppender.layout.ConversionPattern=%d %5p - %m%n
+log4j.appender.psRootAppender.layout.ConversionPattern=%d 
%%PERFSONAR-AS.%p%% %m%n
 
 # Group=All message logging
 # Description=The maximum size the log file can reach before it replaces the 
oldest backup file and a new log file is started.
@@ -219,26 +219,6 @@
 log4j.appender.psRootAppender=org.apache.log4j.RollingFileAppender
 
 
-######################################### SYSLOG 
#########################################
-
-# Group=Syslog logging
-# Description=The class responsible for appending log messages to the syslog 
file.
-log4j.appender.SYSLOG=org.apache.log4j.net.SyslogAppender
-
-# Group=Syslog logging
-# Description=IP address of the host executing syslog-ng
-log4j.appender.SYSLOG.syslogHost=127.0.0.1
-
-# Group=Syslog logging
-# Description=The class responsible for the logging layout.
-log4j.appender.SYSLOG.layout=org.apache.log4j.PatternLayout
-
-# Group=Syslog logging
-# Description=The log message format. It can includes @Location after 
PERFSONAR-AS.
-log4j.appender.SYSLOG.layout.ConversionPattern=\%PERFSONAR-AS.%p\% %m%n
-
-
-
 ######################################### ROOT 
#########################################
 
 # this section is only for developer's tests
@@ -247,7 +227,7 @@
 #log4j.appender.rootAppender.MaxBackupIndex=11
 #log4j.appender.rootAppender.File=_LOGPATH_/perfsonar_root.log
 #log4j.appender.rootAppender.layout=org.apache.log4j.PatternLayout
-#log4j.appender.rootAppender.layout.ConversionPattern=%d %5p - %m%n
+#log4j.appender.rootAppender.layout.ConversionPattern=%d %%PERFSONAR-AS.%p%% 
%m%n
 #log4j.rootLogger=DEBUG, rootAppender
 #log4j.appender.rootAppender.MaxFileSize=500KB
 #log4j.appender.rootAppender=org.apache.log4j.RollingFileAppender
\ No newline at end of file

Added: trunk/geant2_java-as/conf/log4j.syslog.properties.template