perfsonar development work

Author: trzaszcz
Date: 2009-06-04 08:05:09 -0400 (Thu, 04 Jun 2009)
New Revision: 5168

Added:
   branches/new-structure-with-base2/ps-mdm-ls/ant/server.properties
Removed:
   branches/new-structure-with-base2/ps-mdm-ls/ant/build-ls.xml
Modified:
   branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml
Log:
ant script enhancement

Deleted: branches/new-structure-with-base2/ps-mdm-ls/ant/build-ls.xml

Modified: branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml   2009-06-04 
12:03:20 UTC (rev 5167)
+++ branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml   2009-06-04 
12:05:09 UTC (rev 5168)
@@ -1,22 +1,10 @@
 <?xml version="1.0"?>
 
-<!--
 
-  <description>
-
-    $Id$
-    project: perfSONAR
-    date: 2009/02/18
-    author: romradz
-
-  </description>
-
--->
-
 <project name="ps-mdm-ls" basedir="..">
 
+       <property file="ant/server.properties"/>
 
-
     <!-- ======================= download.lib =================== -->
 
 
@@ -113,14 +101,14 @@
 
 
     <target name="clean">
-      <delete dir="${build.dir}/classes"/>
-      <delete>
-       <fileset dir="${build.dir}">
-           <include name="*.aar"/>
-               <include name="*.war"/>
-       </fileset>
-</delete>
-
+       <delete dir="${build.dir}/classes"/>
+       <delete>
+                       <fileset dir="${build.dir}">
+                       <include name="*.aar"/>
+                               <include name="*.war"/>
+                       </fileset>
+               </delete>
+               <delete includeemptydirs="true" 
dir="${build.dir}/${jar.name}"/>
     </target>
 
 
@@ -144,6 +132,7 @@
         <fileset dir="${basedir}/conf/axis2">
           <include name="**/*.xml"/>
         </fileset>
+       <fileset file="../ps-mdm-base2/build/ps-mdm-base2-0.0.3.jar"/>
       </copy>
       <jar destfile="${build.dir}/${jar.name}.aar">
         <fileset includes="**/Axis2PerfsonarServiceConnPoint.class **/*.xml" 
dir="${build.dir}/classes"/>
@@ -154,21 +143,22 @@
     <!-- ======================= create.war =================== -->
 
 
-    <property name="axis.dir"    value="${basedir}/resources/axis2-1.4.1"/>
     <property name="temp"        value="${build.dir}/temp" />
     <property name="war.name"    value="${jar.name}"/>
 
 
     <target name="init">
-      <mkdir dir="${temp}" />
-      <copy toDir="${temp}">
+       <echo>${axis.dir}</echo>
+       <mkdir dir="${temp}" />
+       <copy toDir="${temp}">
         <fileset dir="${axis.dir}/webapp">
           <include name="**/**" />
+          <exclude name="**/*.xml"/>
           <exclude name="**/web.xml"/>
           <exclude name="**/log4j.properties"/>
         </fileset>
       </copy>
-      <copy toDir="${temp}/WEB-INF/lib" flatten="true">
+       <copy toDir="${temp}/WEB-INF/lib" flatten="true">
         <fileset dir="${lib.dir}/repository">
           <include name="**/*.jar" />
         </fileset>
@@ -176,8 +166,19 @@
       <copy toDir="${temp}/WEB-INF">
         <fileset dir="${build.dir}">
           <include name="**/*.class" />
+          <exclude name="**/temp/**"/>
         </fileset>
       </copy>
+        <!--
+       <echo>configuration files</echo>
+       <mkdir dir="${temp}/WEB-INF/classes/perfsonar/conf"/>
+       <copy todir="${temp}/WEB-INF/classes/perfsonar/conf/">
+               <fileset dir="conf">
+                       <include name="configuration.xml"/>
+                       <include name="configuration-rules.xml"/>
+               </fileset>
+       </copy>
+       -->
     </target>
 
 
@@ -223,22 +224,71 @@
 
 
     <target  name="create.war"
-             depends="create.service,init,prepare.repo">
-      <war destfile="${build.dir}/${war.name}.war" 
webxml="${axis.dir}/webapp/WEB-INF/web.xml">
-        <webinf dir="${temp}/WEB-INF" />
-        <fileset dir="${temp}">
-          <include name="axis2-web/**" />
-        </fileset>
-      </war>
-      <delete dir="${temp}" />
+             depends="clean,create.service,init,prepare.repo">
+       <war destfile="${build.dir}/${war.name}.war" 
webxml="${axis.dir}/webapp/WEB-INF/web.xml">
+               <webinf dir="${temp}/WEB-INF" />
+               <fileset dir="${temp}">
+                       <include name="axis2-web/**" />
+               </fileset>
+       </war>
+       <!--
+       <delete dir="${temp}" />
+       -->
     </target>
-
-
-    <!-- ======================= testing =================== -->
-
-
-    <!-- http://localhost:8080/ps-mdm-ls/services/MeasurementArchiveService 
-->
-
-
-
+       
+       
+       
+       <target name="build.base2">
+               <ant antfile="../ps-mdm-base2/ant/build.xml" 
target="create.base2" inheritrefs="false" inheritall="false"/>
+               <echo message=" base2.jar created"/>
+               <copy todir="lib/repository/perfosnar/perfsonar-base2/0.0.4/" 
file="../ps-mdm-base2/build/ps-mdm-base2-0.0.3.jar"/>
+               <echo message=" base2.jar copied"/>
+       </target>
+       
+       
+       <!--TOMCAT-->
+       
+       <target name="tomcat.start">
+               
+               <exec executable="xterm" spawn="true" 
dir="${tomcat.dir}/bin/">
+                       <arg line=" -hold -e "/>
+                       <arg line=" sh catalina.sh run "/>
+               </exec>
+               
+               <echo message="tomcat is running"/>
+               
+       </target>
+       
+       <target name="tomcat.stop">
+                       <exec executable="sh" dir="${tomcat.dir}/bin/">
+                               <arg line=" shutdown.sh "/>
+                       </exec>
+                       <echo message="tomcat stopped"/>
+       </target>
+       
+       <target name="tomcat.deploy" depends="tomcat.undeploy">
+               <copy todir="${tomcat.dir}/webapps/" 
file="build/${war.name}.war"/>
+       </target>
+       
+       <target name="tomcat.undeploy">
+               <delete includeemptydirs="true" 
dir="${tomcat.dir}/webapps/${war.name}/" description="delete ${war.name} from 
webapps "/>
+               <delete file="${tomcat.dir}/webapps/${war.name}.war"/>
+               <echo message=" ${war.name}.war and ${war.name} folder 
deleted from tomcat webapps"/>
+       </target>
+       
+       <!-- AXIS -->
+       
+       <target name="axis.start">
+               <exec executable="xterm" spawn="true" dir="${axis.dir}/bin/">
+                       <arg line=" -hold -e "/>
+                       <arg line=" sh axis2server.sh "/>
+               </exec>
+               <echo message="axis is running"/>
+       </target>
+       
+       <target name="axis.deploy">
+               <copy todir="${axis.dir}/repository/services/" 
file="build/${war.name}.aar"/>
+       </target>
+       
+       
 </project>
\ No newline at end of file

Added: branches/new-structure-with-base2/ps-mdm-ls/ant/server.properties