perfsonar development work

Author: roman
Date: 2008-03-13 08:26:56 -0400 (Thu, 13 Mar 2008)
New Revision: 3512

Modified:
   trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
Log:
Ant terget "webapp-directory-prepare" updated. 

Comment lines (Group, Description) have been added to the properties:
- service.sax_parser.config,
- service.ma.conf_file,
- service.log.log4j.config.

(These properties are set up and added automatically to the file 
service.properties by Ant target "webapp-directory-prepare")

(Ant terget "webapp-directory-prepare" is used to create webapp directory. 
This directory is needed to create rpm installation package or war 
file) 



Modified: trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml        2008-03-13 
10:48:40 UTC (rev 3511)
+++ trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml        2008-03-13 
12:26:56 UTC (rev 3512)
@@ -291,17 +291,45 @@
              token="_LOGPATH_"
              
value="/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/logs"/>
 
+
+    <!-- ======================================== -->
+
     <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+          message="${line.separator}${line.separator}# --------properties 
generated by Ant 
script-----------------------------------------------------${line.separator}"
+          append="true" />
+
+    <!-- ======================================== -->
+    <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+          message="${line.separator}${line.separator}# 
Group=Internal${line.separator}"
+          append="true" />
+    <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+          message="# 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.${line.separator}"
+          append="true" />
+    <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
           
message="service.sax_parser.config=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/objects.config${line.separator}"
           append="true" />
 
+    <!-- ======================================== -->
     <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+          message="${line.separator}# Group=Internal${line.separator}"
+          append="true" />
+    <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+          message="# Description=The path to the metadata configuration 
file, including the file's name.${line.separator}"
+          append="true" />
+    <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
           
message="service.ma.conf_file=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/rrd-database_TEST.xml${line.separator}"
           append="true" />
 
+    <!-- ======================================== -->
     <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
-          
message="service.log.log4j.config=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/log4j.properties"
+          message="${line.separator}# Group=Internal${line.separator}"
           append="true" />
+    <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+          message="# Description=The path to the log4j configuration file, 
including the file's name.${line.separator}"
+          append="true" />
+    <echo file="${tmpdir}/WEB-INF/classes/perfsonar/conf/service.properties"
+          
message="service.log.log4j.config=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/log4j.properties${line.separator}"
+          append="true" />
 
     <mkdir dir="${tmpdir}/WEB-INF/logs"/>