[MOBY-guts] biomoby commit

[Andreas Groscurth]

groscurt
Mon Jan  5 04:40:36 EST 2009
Update of /home/repository/moby/moby-live/Java/xmls
In directory dev.open-bio.org:/tmp/cvs-serv24699/xmls

Modified Files:
	deployBuild.xml tomcat.xml 
Log Message:
changed to allow deployment on tomcat AND jboss
moby-live/Java/xmls deployBuild.xml,1.7,1.8 tomcat.xml,1.4,1.5
===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/deployBuild.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- /home/repository/moby/moby-live/Java/xmls/deployBuild.xml	2009/01/05 08:46:07	1.7
+++ /home/repository/moby/moby-live/Java/xmls/deployBuild.xml	2009/01/05 09:40:36	1.8
@@ -328,7 +328,7 @@
   </delete>
   
   <!-- add separate build.xml for deployment, and scripts to use it -->
-  <property name="cross.server.home"        value="${real.catalina.home}"/>
+  <property name="cross.server.home"        value="${real.server.home}"/>
   <property name="cross.server.port"        value="${server.port}"/>
   <property name="cross.server.host"        value="${server.host}"/>
   <property name="cross.axis.relative.path" value="${axis.relative.path}"/>

===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/tomcat.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- /home/repository/moby/moby-live/Java/xmls/tomcat.xml	2009/01/05 09:38:13	1.4
+++ /home/repository/moby/moby-live/Java/xmls/tomcat.xml	2009/01/05 09:40:36	1.5
@@ -17,29 +17,29 @@
 <!-- ================================================================== -->
 <target name="server-init">
   <!-- server location -->
-  <condition property="real.catalina.home" value="${env.CATALINA_HOME}">
+  <condition property="real.server.home" value="${env.CATALINA_HOME}">
     <isset property="env.CATALINA_HOME"/>
   </condition>
-  <condition property="real.catalina.home" value="${server.home}">
+  <condition property="real.server.home" value="${server.home}">
     <isset property="server.home"/>
   </condition>
 
   <!-- properties set from other properties that were set in conditions above -->
   <property name="deploy.axis.dir"
-    location="${real.catalina.home}/${axis.relative.path}/WEB-INF"/>
+    location="${real.server.home}/${axis.relative.path}/WEB-INF"/>
     
   <!-- check that we know about server -->
-  <fail unless="real.catalina.home">
+  <fail unless="real.server.home">
 '
 
     ERROR: Server not found.
     -------------------------------
     Please set environment variable CATALINA_HOME to point to it,
     or create a file 'build.properties' and put there the line:
-    catalina.home = &lt;location of your server&gt;
+    server.home = &lt;location of your server&gt;
     (do not include '&lt;' and '&gt;' there),
     or start your Ant with this property on the command-line:
-    ant -Dcatalina.home=&lt;location of your server&gt; 
+    ant -Dserver.home=&lt;location of your server&gt; 
   </fail>
 </target>
 
@@ -65,6 +65,6 @@
 <!-- ================================================================== -->
 <!--
 <target name="_cleandeploy" depends="tomcat-init">
-  <delete dir="${real.catalina.home}/webapps/${param.context.name}"/>
+  <delete dir="${real.server.home}/webapps/${param.context.name}"/>
 </target>
 -->