perfsonar development work

Author: roman
Date: 2008-03-26 10:33:59 -0400 (Wed, 26 Mar 2008)
New Revision: 3553

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

2 new macros, which can be called when webapp directory structure is created, 
have beed added.



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-03-26 14:32:28 UTC (rev 3552)
+++ trunk/perfsonar_base/src/main/java/org/perfsonar/base/ant/antlib.xml      
  2008-03-26 14:33:59 UTC (rev 3553)
@@ -812,4 +812,91 @@
   </macrodef>
 
 
+  <!-- 
===================================================================================
 -->
+  <!-- packaging targets -->
+
+
+  <macrodef name="webapp-package-directory-init-phase-1">
+    <attribute name="tmpdir"/>
+    <sequential>
+      <delete dir="@{tmpdir}" quiet="true" failonerror="false" />
+      <delete dir="@{tmpdir}-webapps" quiet="true" failonerror="false" />
+      <mkdir dir="@{tmpdir}"/>
+      <mkdir dir="@{tmpdir}/WEB-INF"/>
+      <mkdir dir="@{tmpdir}/WEB-INF/logs"/>
+    </sequential>
+  </macrodef>
+
+
+  <macrodef name="webapp-package-directory-init-phase-3"
+          xmlns:psbase="psbase:/base.perfsonar.org">
+    <attribute name="tmpdir"/>
+    <attribute name="service.name"/>
+    <attribute name="version"/>
+    <attribute name="wsdd.file.deploy"/>
+    <attribute name="wsdd.file.undeploy"/>
+    <sequential>
+      <psbase:copy-dep-base-service-jars dest-jars-path="@{tmpdir}"/>
+      <psbase:copy-axis-config dest-conf-path="@{tmpdir}"/>
+
+
+      <replace 
file="@{tmpdir}/WEB-INF/classes/perfsonar/conf/wizard.properties"
+               token="__BASEPATH__"
+               
value="/home/perfsonar/webapps/@{service.name}-@{version}/WEB-INF"
 />
+
+      <replace 
file="@{tmpdir}/WEB-INF/classes/perfsonar/conf/log4j.properties"
+               token="_LOGPATH_"
+               
value="/home/perfsonar/webapps/@{service.name}-@{version}/WEB-INF/logs"/>
+
+
+    <copy file="${basedir}/conf/wsdd/@{wsdd.file.deploy}"    
todir="@{tmpdir}/wsdd"/>
+    <copy file="${basedir}/conf/wsdd/@{wsdd.file.undeploy}"  
todir="@{tmpdir}/wsdd"/>
+
+    <copy todir="@{tmpdir}/WEB-INF/samples" failonerror="false">
+      <fileset dir="${basedir}/samples"/>
+    </copy>
+
+    <copy todir="@{tmpdir}/WEB-INF/contrib" failonerror="false">
+      <fileset dir="${basedir}/contrib"/>
+    </copy>
+
+    <copy todir="@{tmpdir}/WEB-INF/doc" failonerror="false">
+      <fileset dir="${basedir}/doc"/>
+    </copy>
+
+    <copy file="${basedir}/conf/axis-1.4/WEB-INF/server-config.wsdd"
+          todir="@{tmpdir}/WEB-INF"
+          failonerror="false"/>
+
+    <!-- ======================================== -->
+    <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 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" />
+    </sequential>
+  </macrodef>
+
+
+
 </antlib>