perfsonar development work

Author: roman
Date: 2006-10-19 10:49:52 -0400 (Thu, 19 Oct 2006)
New Revision: 1702

Modified:
   branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
   branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml
Log:
still improving deploymet for multiple services in one tomcat

Modified: branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml       
2006-10-19 13:58:52 UTC (rev 1701)
+++ branches/romradz-ant4rel-20061017/ant/axis-deploy-targets.xml       
2006-10-19 14:49:52 UTC (rev 1702)
@@ -71,8 +71,8 @@
         <copy 
file="./lib/repository/axis/axis-jaxrpc/1.4/axis-jaxrpc-1.4.jar"              
   todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
         <copy file="./lib/repository/axis/axis-saaj/1.4/axis-saaj-1.4.jar"   
                  todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
         <copy 
file="./lib/repository/axis/axis-wsdl4j/1.5.1/axis-wsdl4j-1.5.1.jar"          
   todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
-        <copy 
file="./lib/repository/commons-digester/commons-digester/1.7/commons-digester-1.7.jar"
  todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
-        <copy 
file="./lib/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"
 todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar"
  todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
+        <copy 
file="./lib/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"
    todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
 
 
         <copy file="./lib/repository/jdom/jdom/1.0b8/jdom-1.0b8.jar"         
                  todir="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib"/>
@@ -97,7 +97,7 @@
         <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/axis-jaxrpc-1.4.jar"/>
         <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/axis-saaj-1.4.jar"/>
         <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/axis-wsdl4j-1.5.1.jar"/>
-        <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/commons-digester-1.7.jar"/>
+        <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/commons-discovery-0.2.jar"/>
         <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/commons-logging-1.0.4.jar"/>
 
         <delete 
file="${tomcat.home}/webapps/${deploy.root}/WEB-INF/lib/jdom-1.0b8.jar"/>

Modified: 
branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml
===================================================================
--- branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml 
  2006-10-19 13:58:52 UTC (rev 1701)
+++ branches/romradz-ant4rel-20061017/ant/rrdma/rrdma-axis-deploy-targets.xml 
  2006-10-19 14:49:52 UTC (rev 1702)
@@ -95,30 +95,40 @@
     </target>
 
 
-    <target name="deploy" depends="copy-rrdma-jar, add-context-listener"
-                description="Deploys RRD MA service">
+    <target name="deploy-adminclient">
 
-        <antcall target="tomcat-start" />
-
-        
         <java classname="org.apache.axis.client.AdminClient">
             <arg line="-l ${adminService} ${deployFile}"/>
             <classpath refid="classpath"/>
         </java>
+
+    </target>
+
+
+    <target name="deploy" depends="copy-rrdma-jar, add-context-listener"
+                description="Deploys RRD MA service">
+
+        <antcall target="tomcat-start" />
+        <antcall target="deploy-adminclient" />
         
     </target>
 
 
-    <target name="undeploy"
-                description="Undeploys RRD MA service">
+    <target name="undeploy-adminclient">
 
-        <!--
         <java classname="org.apache.axis.client.AdminClient">
             <arg line="-l ${adminService} ${undeployFile}"/>
             <classpath refid="classpath"/>
         </java>
-        -->
 
+    </target>
+    
+
+    <target name="undeploy"
+                description="Undeploys RRD MA service">
+
+        <antcall target="undeploy-adminclient" />
+
         <antcall target="rem-context-listener" />
         <antcall target="delete-jars-for-rrdma"/>