perfsonar development work

Author: roman
Date: 2008-04-16 07:18:57 -0400 (Wed, 16 Apr 2008)
New Revision: 3684

Modified:
   trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml
Log:

Macro 'webapp-package-directory-init-phase-3' responsible for the 3rd phase 
of creating webapp directory updated.
Version number is not needed in service directory name.



Modified: trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml
===================================================================
--- trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml      
  2008-04-16 07:50:22 UTC (rev 3683)
+++ trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml      
  2008-04-16 11:18:57 UTC (rev 3684)
@@ -847,11 +847,11 @@
 
       <replace 
file="@{tmpdir}/WEB-INF/classes/perfsonar/conf/wizard.properties"
                token="__BASEPATH__"
-               
value="/home/perfsonar/webapps/@{service.name}-@{version}/WEB-INF"
 />
+               value="/opt/perfsonar/services/@{service.name}/WEB-INF" />
 
       <replace 
file="@{tmpdir}/WEB-INF/classes/perfsonar/conf/log4j.properties"
                token="_LOGPATH_"
-               
value="/home/perfsonar/webapps/@{service.name}-@{version}/WEB-INF/logs"/>
+               value="/opt/perfsonar/services/@{service.name}/WEB-INF/logs"/>
 
 
     <copy file="${basedir}/conf/wsdd/@{wsdd.file.deploy}"    
todir="@{tmpdir}/wsdd"/>
@@ -886,7 +886,7 @@
           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}"
+          
message="service.sax_parser.config=/opt/perfsonar/services/@{service.name}/WEB-INF/classes/perfsonar/conf/objects.config${line.separator}"
           append="true" />
 
     <!-- ======================================== -->
@@ -897,7 +897,7 @@
           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}"
+          
message="service.log.log4j.config=/opt/perfsonar/services/@{service.name}/WEB-INF/classes/perfsonar/conf/log4j.properties${line.separator}"
           append="true" />
     </sequential>
   </macrodef>