[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Wed Aug  1 14:21:17 EDT 2007
Update of /home/repository/moby/moby-live/Java/xmls
In directory dev.open-bio.org:/tmp/cvs-serv13140/xmls

Modified Files:
	seahawkBuild.xml 
Log Message:
Fixed up management of the various web.xml files used to run test cases for ACDServlet and MobyServlet
moby-live/Java/xmls seahawkBuild.xml,1.11,1.12
===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/seahawkBuild.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- /home/repository/moby/moby-live/Java/xmls/seahawkBuild.xml	2007/07/28 03:50:47	1.11
+++ /home/repository/moby/moby-live/Java/xmls/seahawkBuild.xml	2007/08/01 18:21:17	1.12
@@ -24,6 +24,7 @@
   <property name="servlet.auto.classname" value="org.biomoby.service.test.MobyServletTestCase"/>
   <property name="servlet.classname" value="org.biomoby.service.MobyServlet"/>
   <property name="servlet.tester.classname" value="org.biomoby.service.test.ServletTester"/>
+  <property name="servlet.webxml" value="org/biomoby/service/test/web.xml"/>
   <property name="servlet.warname" value="MobyServlet"/>
 
   <property name="acdservlet.auto.classname" value="ca.ucalgary.services.test.ACDServiceTestCase"/>
@@ -87,6 +88,7 @@
 
   <target name="servlet-war" depends="compile, make_maker" description="(User) Builds the MobyServlet WAR for MOBY-S service creation">
     <echo message="Building servlet standalone WAR to ${build.clients.absolute}"/>
+    <copy file="${src.main}/${servlet.webxml}" todir="${jarmaker.dir}/WEB-INF/" overwrite="true"/>
     <java dir="${jarmaker.dir}" jvm="${jarmaker.virgin_jvm}" classname="${jarmaker.fullname}" fork="true">
       <classpath>
 	<pathelement path="${jarmaker.dir}"/>
@@ -105,7 +107,7 @@
 	<mkdir dir="${build.classes}/WEB-INF/classes"/>
 	<mkdir dir="${build.classes}/WEB-INF/lib"/>
 	<unjar src="${build.clients.absolute}/${servlet.warname}.war" dest="${build.classes}/WEB-INF/classes"/>
-        <copy file="${src.webapps}/WEB-INF/web.xml" todir="${build.classes}/WEB-INF"/>
+        <copy file="${src.main}/${servlet.webxml}" todir="${build.classes}/WEB-INF"/>
 
         <!-- Okay, we had to unjar the classes, and repack them (2nd copy) into WEB-INF/classes so 
              the servlet container can see them (unfortunately) -->
@@ -138,7 +140,7 @@
     <echo message="Building ACD servlet standalone WAR to ${build.clients.absolute}"/>
 
     <mkdir dir="${jarmaker.dir}/WEB-INF"/>
-    <copy file="${src.webapps}/WEB-INF/acdweb.xml" tofile="${jarmaker.dir}/WEB-INF/web.xml"/>
+    <copy file="${src.webapps}/WEB-INF/acdweb.xml" tofile="${jarmaker.dir}/WEB-INF/web.xml" overwrite="true"/>
     <java dir="${jarmaker.dir}" jvm="${jarmaker.virgin_jvm}" classname="${jarmaker.fullname}" fork="true">
       <classpath>
 	<pathelement path="${jarmaker.dir}"/>