perfsonar development work

Author: roman
Date: 2008-03-26 10:30:26 -0400 (Wed, 26 Mar 2008)
New Revision: 3551

Added:
   trunk/geant2_java-rrd-ma/ant/webapp-package-targets.xml
Modified:
   trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
   trunk/geant2_java-rrd-ma/ant/build.xml
   trunk/geant2_java-rrd-ma/ant/const.properties.template
Log:

- Targets responsible for creating webapp directory structure and war file 
have been moved to webapp-package-targets.xml file
- Generic targets responsible for creating webapp directory structure have 
been moved fo the base
- new version of the base is used (20070326)





Modified: trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml        2008-03-26 
12:25:32 UTC (rev 3550)
+++ trunk/geant2_java-rrd-ma/ant/axis-deploy-targets.xml        2008-03-26 
14:30:26 UTC (rev 3551)
@@ -227,6 +227,7 @@
 
   <!-- it is assumed that the installation location is /home/perfsonar 
directory (user) -->
 
+  <!--
 
   <property name="tmpdir" value="tmp" />
 
@@ -292,13 +293,11 @@
              
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}"
+          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" />
@@ -309,7 +308,7 @@
           
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" />
@@ -320,7 +319,7 @@
           
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="${line.separator}# Group=Internal${line.separator}"
           append="true" />
@@ -359,6 +358,7 @@
 
   </target>
 
+  -->
 
 
   <!-- 
===================================================================================
 -->

Modified: trunk/geant2_java-rrd-ma/ant/build.xml
===================================================================
--- trunk/geant2_java-rrd-ma/ant/build.xml      2008-03-26 12:25:32 UTC (rev 
3550)
+++ trunk/geant2_java-rrd-ma/ant/build.xml      2008-03-26 14:30:26 UTC (rev 
3551)
@@ -40,6 +40,7 @@
   <import file="axis-deploy-targets.xml"/>
   <import file="test-targets.xml"/>
   <import file="release-targets.xml"/>
+  <import file="webapp-package-targets.xml"/>
 
 
 </project>
\ No newline at end of file

Modified: trunk/geant2_java-rrd-ma/ant/const.properties.template
===================================================================
--- trunk/geant2_java-rrd-ma/ant/const.properties.template      2008-03-26 
12:25:32 UTC (rev 3550)
+++ trunk/geant2_java-rrd-ma/ant/const.properties.template      2008-03-26 
14:30:26 UTC (rev 3551)
@@ -21,7 +21,7 @@
 wsdd.webservice.name=MeasurementArchiveService
 
 antcontrib.jar=${basedir}/lib/misc/ant-contrib-1.0b3.jar
-antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080303.jar
+antpsbase.jar=${basedir}/lib/misc/perfsonar-base-ant-1.0.20080326.jar
 
 #rrdjtool native library
 lib_name=libjrrd.so

Added: trunk/geant2_java-rrd-ma/ant/webapp-package-targets.xml


Property changes on: trunk/geant2_java-rrd-ma/ant/webapp-package-targets.xml
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native