[MOBY-guts] biomoby commit

[Martin Senger]

senger
Mon Mar  3 09:11:08 EST 2008
Update of /home/repository/moby/moby-live/Java/xmls
In directory dev.open-bio.org:/tmp/cvs-serv4034/xmls

Modified Files:
	deployBuild.xml tomcat.xml 
Log Message:
Remote deployment scripts fixed.

moby-live/Java/xmls deployBuild.xml,1.5,1.6 tomcat.xml,1.1,1.2
===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/deployBuild.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- /home/repository/moby/moby-live/Java/xmls/deployBuild.xml	2008/02/21 13:19:35	1.5
+++ /home/repository/moby/moby-live/Java/xmls/deployBuild.xml	2008/03/03 14:11:08	1.6
@@ -97,7 +97,8 @@
   
   <!-- copy user-defined and remaining jar files to Tomcat/Axis -->
   <antcall target="-populate">
-    <param name="destination.axis.dir" location="${deploy.axis.dir}/lib"/>
+    <param name="destination.axis.lib.dir"     location="${deploy.axis.dir}/lib"/>
+    <param name="destination.axis.classes.dir" location="${deploy.axis.dir}/classes"/>
   </antcall>
   
 </target>
@@ -131,14 +132,15 @@
 <!-- Sub-target of tomcat-populate                                      -->
 <!-- (used both for local and remote deployment)                        -->
 <!-- ================================================================== -->
-<!-- parameter: ${destination.axis.dir} -->
+<!-- parameter: ${destination.axis.lib.dir} -->
+<!-- parameter: ${destination.axis.classes.dir} -->
 <target name="-populate" depends="initmaven">
   
   <!-- copy user-defined jar files to Tomcat/Axis -->
   <if>
     <isset property="users.lib.dir"/>
     <then>
-      <copy todir="${destination.axis.dir}">
+      <copy todir="${destination.axis.lib.dir}">
         <fileset dir="${users.lib.dir}" includes="*.jar"/>
       </copy>
     </then>
@@ -146,13 +148,13 @@
   <if>
     <isset property="users.lib.file"/>
     <then>
-      <copy todir="${destination.axis.dir}" file="${users.lib.file}"/>
+      <copy todir="${destination.axis.lib.dir}" file="${users.lib.file}"/>
     </then>
   </if>
   
   <!-- copy remaining jar files to Tomcat/Axis -->
   <copy
-    todir="${destination.axis.dir}"
+    todir="${destination.axis.lib.dir}"
     flatten="true">
     <fileset refid="runtime.dependency.fileset"/>
   </copy>
@@ -160,12 +162,12 @@
   <!--
   <delete>
     <fileset
-      dir="${destination.axis.dir}"
+      dir="${destination.axis.lib.dir}"
       excludes="alltools2*,jdom*,commons-lang*,*xerces*"/>
   </delete>
   -->
   <copy
-    todir="${destination.axis.dir}">
+    todir="${destination.axis.lib.dir}">
     <fileset dir="${build.lib}" includes="*.jar"/>
   </copy>
   
@@ -176,7 +178,7 @@
     location="${src.config}/log4j.properties.template"/>
   <copy
     file="${server.log4j.configuration}"
-    tofile="${deploy.axis.dir}/classes/log4j.properties">
+    tofile="${destination.axis.classes.dir}/log4j.properties">
     <filterset>
       <filter token="LOGDIR" value="${server.log.dir}"/>
     </filterset>
@@ -318,7 +320,8 @@
   
   <!-- add user-defined and other jar files (but not those already in lib2) -->
   <antcall target="-populate">
-    <param name="destination.axis.dir" location="${result.dir}/lib"/>
+    <param name="destination.axis.lib.dir"     location="${result.dir}/lib"/>
+    <param name="destination.axis.classes.dir" location="${result.dir}/classes"/>
   </antcall>
   <delete quiet="true">
     <fileset dir="${result.dir}/lib" includes="${datatypes.jar},${skeletons.jar}"/>

===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/tomcat.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/xmls/tomcat.xml	2008/02/14 06:13:37	1.1
+++ /home/repository/moby/moby-live/Java/xmls/tomcat.xml	2008/03/03 14:11:08	1.2
@@ -28,6 +28,10 @@
     <isset property="tomcat.home"/>
   </condition>
 
+  <!-- properties set from other properties that were set in conditions above -->
+  <property name="deploy.axis.dir"
+    location="${real.catalina.home}/${tomcat.webapps}/${axis.relative.path}/WEB-INF"/>
+    
   <!-- check that we know about Tomcat -->
   <fail unless="real.catalina.home">
 '