perfsonar development work

Author: roman
Date: 2008-04-01 06:45:32 -0400 (Tue, 01 Apr 2008)
New Revision: 3580

Added:
   trunk/geant2_java-sql-ma/ant/webapp-package-targets.xml
Modified:
   trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml
   trunk/geant2_java-sql-ma/ant/build.xml
Log:
Targets responsible for creating webapp directory structure (which can be 
used to generate rpm package) and war file have been moved to the 
new Ant file axis-deploy-targets.xml.


The command to create webapp directory structure:
   $PERFSONAR/ant>ant webapp-package-create

The command to create a war file:
   $PERFSONAR/ant>ant war-package-create

--
$PERFSONAR is the installation directory.




Modified: trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml
===================================================================
--- trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml        2008-04-01 
10:27:18 UTC (rev 3579)
+++ trunk/geant2_java-sql-ma/ant/axis-deploy-targets.xml        2008-04-01 
10:45:32 UTC (rev 3580)
@@ -224,6 +224,7 @@
 
   <!-- it is assumed that the installation location is /home/perfsonar 
directory (user) -->
 
+  <!--
 
   <property name="tmpdir" value="tmp" />
 
@@ -235,7 +236,6 @@
 
   <target name="ibatis-files-prepare">
 
-    <!-- utilization -->
     <copy file="${basedir}/conf/ibatis-utilization.xml"                      
                todir="${tmpdir}/WEB-INF/classes"/>
     <copy 
file="${basedir}/conf/ibatis-SqlMapConfig-utilization.template.xml"           
     tofile="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-utilization.xml"/>
     <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-utilization.xml"          
  token="_DRIVER_"       value="${db.driver}"/>
@@ -243,7 +243,6 @@
     <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-utilization.xml"          
  token="_USERNAME_"     value="${db.username}"/>
     <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-utilization.xml"          
  token="_PASSWORD_"     value="${db.userpassword}"/>
 
-    <!-- errors -->
     <copy file="${basedir}/conf/ibatis-errors.xml"                           
                todir="${tmpdir}/WEB-INF/classes"/>
     <copy file="${basedir}/conf/ibatis-SqlMapConfig-errors.template.xml"     
                
tofile="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-errors.xml"/>
     <replace file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-errors.xml" 
                token="_DRIVER_"       value="${db.driver}"/>
@@ -251,7 +250,6 @@
     <replace file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-errors.xml" 
                token="_USERNAME_"     value="${db.username}"/>
     <replace file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-errors.xml" 
                token="_PASSWORD_"     value="${db.userpassword}"/>
 
-    <!-- discards -->
     <copy file="${basedir}/conf/ibatis-discards.xml"                         
                todir="${tmpdir}/WEB-INF/classes"/>
     <copy file="${basedir}/conf/ibatis-SqlMapConfig-discards.template.xml"   
                
tofile="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-discards.xml"/>
     <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-discards.xml"             
  token="_DRIVER_"       value="${db.driver}"/>
@@ -259,7 +257,6 @@
     <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-discards.xml"             
  token="_USERNAME_"     value="${db.username}"/>
     <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-discards.xml"             
  token="_PASSWORD_"     value="${db.userpassword}"/>
 
-    <!-- L2-status-domain -->
     <copy file="${basedir}/conf/ibatis-L2-status-domain.xml"                 
                todir="${tmpdir}/WEB-INF/classes"/>
     <copy 
file="${basedir}/conf/ibatis-SqlMapConfig-L2-status-domain.template.xml"      
     
tofile="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-domain.xml"/>
     <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-domain.xml"     
  token="_DRIVER_"       value="${db.driver}"/>
@@ -267,7 +264,6 @@
     <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-domain.xml"     
  token="_USERNAME_"     value="${db.username}"/>
     <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-domain.xml"     
  token="_PASSWORD_"     value="${db.userpassword}"/>
 
-    <!-- L2-status-interdomain -->
     <copy file="${basedir}/conf/ibatis-L2-status-interdomain.xml"            
                       todir="${tmpdir}/WEB-INF/classes"/>
     <copy 
file="${basedir}/conf/ibatis-SqlMapConfig-L2-status-interdomain.template.xml" 
     
tofile="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-interdomain.xml"/>
     <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-interdomain.xml"
  token="_DRIVER_"       value="${db.driver}"/>
@@ -275,36 +271,6 @@
     <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-interdomain.xml"
  token="_USERNAME_"     value="${db.username}"/>
     <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-L2-status-interdomain.xml"
  token="_PASSWORD_"     value="${db.userpassword}"/>
 
-    <!-- clmp-bwctl -->
-    <!--
-    <copy file="${basedir}/conf/ibatis-clmp-bwctl.xml"                       
       todir="${tmpdir}/WEB-INF/classes"/>
-    <copy file="${basedir}/conf/ibatis-SqlMapConfig-clmp-bwctl.template.xml" 
       tofile="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-clmp-bwctl.xml"/>
-    <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-clmp-bwctl.xml"    
token="_DRIVER_"       value="${db.driver}"/>
-    <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-clmp-bwctl.xml"    
token="_URL_"          value="${db.url}"/>
-    <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-clmp-bwctl.xml"    
token="_USERNAME_"     value="${db.username}"/>
-    <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-clmp-bwctl.xml"    
token="_PASSWORD_"     value="${db.userpassword}"/>
-    -->
-
-    <!-- clmp-owamp -->
-    <!--
-    <copy file="${basedir}/conf/ibatis-clmp-owamp.xml"                       
       todir="${tmpdir}/WEB-INF/classes"/>
-    <copy file="${basedir}/conf/ibatis-SqlMapConfig-clmp-owamp.template.xml" 
       tofile="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-clmp-owamp.xml"/>
-    <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-clmp-owamp.xml"    
token="_DRIVER_"       value="${db.driver}"/>
-    <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-clmp-owamp.xml"    
token="_URL_"          value="${db.url}"/>
-    <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-clmp-owamp.xml"    
token="_USERNAME_"     value="${db.username}"/>
-    <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-clmp-owamp.xml"    
token="_PASSWORD_"     value="${db.userpassword}"/>
-    -->
-
-    <!-- clmp-ping -->
-    <!--
-    <copy file="${basedir}/conf/ibatis-clmp-ping.xml"                        
       todir="${tmpdir}/WEB-INF/classes"/>
-    <copy file="${basedir}/conf/ibatis-SqlMapConfig-clmp-ping.template.xml"  
       tofile="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-clmp-ping.xml"/>
-    <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-clmp-ping.xml"     
token="_DRIVER_"       value="${db.driver}"/>
-    <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-clmp-ping.xml"     
token="_URL_"          value="${db.url}"/>
-    <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-clmp-ping.xml"     
token="_USERNAME_"     value="${db.username}"/>
-    <replace 
file="${tmpdir}/WEB-INF/classes/ibatis-SqlMapConfig-clmp-ping.xml"     
token="_PASSWORD_"     value="${db.userpassword}"/>
-    -->
-
   </target>
 
 
@@ -320,11 +286,11 @@
     <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}/${build}/${jarfilename}-${version}.jar" 
todir="${tmpdir}/WEB-INF/lib"/>
+    <copy file="${basedir}/${build}/${jarfilename}-${version}.jar"           
                                         todir="${tmpdir}/WEB-INF/lib"/>
 
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-base/1.0.20080310/perfsonar-base-1.0.20080310.jar"
      todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-web-admin/0.8b/perfsonar-web-admin-0.8b.jar"
            todir="${tmpdir}/WEB-INF/lib"/>
-    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.jar"
  todir="${tmpdir}/WEB-INF/lib"/>
+    <copy 
file="${basedir}/lib/repository/perfsonar/perfsonar-rrd-ma/3.0rc2/perfsonar-rrd-ma-3.0rc2.jar"
              todir="${tmpdir}/WEB-INF/lib"/>
     <copy 
file="${basedir}/lib/repository/nmwg/nmwg/1.0.20071008/nmwg-1.0.20071008.jar" 
                              todir="${tmpdir}/WEB-INF/lib"/>
 
     <copy 
file="${basedir}/lib/repository/rrdjtool/rrdjtool/1.0/rrdjtool-1.0.jar"       
                              todir="${tmpdir}/WEB-INF/lib"/>
@@ -367,14 +333,12 @@
              
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" />
@@ -385,7 +349,6 @@
           
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" />
@@ -396,7 +359,6 @@
           
message="service.ma.conf_file=/home/perfsonar/webapps/${service.name}-${version}/WEB-INF/classes/perfsonar/conf/sql-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" />
@@ -436,7 +398,9 @@
 
   </target>
 
+  -->
 
+
   <!-- 
===================================================================================
 -->
   <!-- main targets -->
 

Modified: trunk/geant2_java-sql-ma/ant/build.xml
===================================================================
--- trunk/geant2_java-sql-ma/ant/build.xml      2008-04-01 10:27:18 UTC (rev 
3579)
+++ trunk/geant2_java-sql-ma/ant/build.xml      2008-04-01 10:45:32 UTC (rev 
3580)
@@ -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

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


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