perfsonar development work

Author: trzaszcz
Date: 2009-09-28 08:04:31 -0400 (Mon, 28 Sep 2009)
New Revision: 5288

Modified:
   branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml
Log:
ant script inproved

Modified: branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml
===================================================================
--- branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml   2009-09-28 
11:53:06 UTC (rev 5287)
+++ branches/new-structure-with-base2/ps-mdm-ls/ant/build.xml   2009-09-28 
12:04:31 UTC (rev 5288)
@@ -68,10 +68,10 @@
 
         <artifact:dependencies>
                
-                <dependency groupId="org.apache.ws.commons.schema"          
artifactId="XmlSchema"       version="1.4.3"/>
-                <dependency groupId="org.apache.axis2"   
artifactId="axis2-jaxws"        version="1.4.1"/>
+               
                 <dependency groupId="perfsonar"          
artifactId="ps-mdm-base2"       version="0.0.4"/>
                 <dependency groupId="commons-digester"   
artifactId="commons-digester"   version="2.0"/>
+                <dependency groupId="org.apache.axis2"   
artifactId="axis2-jaxws"        version="1.4.1"/>
 
             <localRepository  refid="local.repository"/>
             <remoteRepository refid="remote.repository"/>
@@ -87,11 +87,10 @@
     <property name="lib.dir"      value="${basedir}/lib"/>
 
     <property name="jar.name"     value="ps-mdm-ls"/>
-       <property name="axis.version" value="1.5"/>
     <property name="jar.version"  value="4.0"/>
 
     <property name="config.file.name"   value="configuration.xml" />
-       <property name="axis.dir"   value="resources/axis2-${axis.version}" />
+       <property name="axis.dir"   value="resources/axis2-1.4.1" />
        
     <path id="service.classpath">
       <fileset dir="${lib.dir}">
@@ -218,6 +217,7 @@
 
     </target>
 
+
     <target  name="create.war"
              depends="clean,create.service,init,prepare.repo">
        <war destfile="${build.dir}/${war.name}.war" 
webxml="${axis.dir}/webapp/WEB-INF/web.xml">
@@ -272,12 +272,14 @@
        <!--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">
@@ -287,16 +289,12 @@
                        <echo message="tomcat stopped"/>
        </target>
        
-       <target name="tomcat.deploy" depends="create.war">
+       <target name="tomcat.deploy" depends="tomcat.undeploy">
                <copy todir="${tomcat.dir}/webapps/" 
file="build/${war.name}.war"/>
        </target>
        
-       <target name="hitAndRun" depends="tomcat.deploy,tomcat.start"/>
-       
        <target name="tomcat.undeploy">
-               <delete includeemptydirs="true" 
dir="${tomcat.dir}/webapps/${war.name}/" description="delete ${war.name} from 
webapps ">
-                       <include name="**/**/*"/>
-               </delete>
+               <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>