[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Thu Feb 14 05:19:46 EST 2008
Update of /home/repository/moby/moby-live/Java/xmls
In directory dev.open-bio.org:/tmp/cvs-serv24452/xmls

Modified Files:
	seahawkBuild.xml 
Log Message:
Updates to use the new maven-based dependencies in the classpath
moby-live/Java/xmls seahawkBuild.xml,1.16,1.17
===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/seahawkBuild.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- /home/repository/moby/moby-live/Java/xmls/seahawkBuild.xml	2008/02/14 06:13:37	1.16
+++ /home/repository/moby/moby-live/Java/xmls/seahawkBuild.xml	2008/02/14 10:19:46	1.17
@@ -51,15 +51,18 @@
 	default libraries, so that we don't miss classes in the jar making because
 	they're part of our system's custom Java. -->
   <!--<property name="jarmaker.virgin_jvm" location="/export/data/programs/jdk1.6.0_04/bin/java"/>-->
-  <property name="jarmaker.virgin_jvm" location="/usr/bin/java"/>
+  <property name="jarmaker.virgin_jvm" location="/export/data/programs/jdk1.5.0_06/bin/java"/>
+  <!--<property name="jarmaker.virgin_jvm" location="/usr/bin/java"/>-->
   
-  <path id="seahawk.build.classpath">
-    <path refid="build.classpath"/>
-<!--    <path refid="dependency.classpath"/> -->
-    <pathelement location="${src.main}"/>
-  </path>
+  <target name="seahawk-init" depends="init">
+    <path id="seahawk.build.classpath">
+      <path refid="build.classpath"/>
+      <path refid="dependency.classpath"/>
+      <pathelement location="${src.main}"/>
+    </path>
 
-  <property name="scp" refid="seahawk.build.classpath"/>
+    <property name="scp" refid="seahawk.build.classpath"/>
+  </target>
 
   <target name="make_maker">
     <echo message="Making sure minimal jar maker is up to date" level="info"/>
@@ -71,7 +74,7 @@
   </target>
 
   <property name="build.clients.absolute" location="${build.clients}"/>
-  <target name="seahawk-jar" depends="compile, make_maker" description="(User) Builds the Seahawk MOBY-S interface as a standalone JAR">
+  <target name="seahawk-jar" depends="seahawk-init, compile, make_maker" description="(User) Builds the Seahawk MOBY-S interface as a standalone JAR">
 
     <echo message="Building seahawk standalone JAR to ${build.clients.absolute}"/>
     <echo message="Note that the test cases run will hijack your desktop for a few minutes."/>
@@ -97,7 +100,7 @@
   <!-- Note: if you want to build the servlet war from scratch, you need to build it (with an exception), deploy it, then
        rebuild it a second time an deploy, since the unit tests rely on a working copy of the WAR to test the
        remote functionality (see org/biomoby.service.test.MobyServletTestCase for the deployment URL) -->
-  <target name="servlet-war" depends="compile, make_maker" description="(User) Builds the MobyServlet WAR for MOBY-S service creation">
+  <target name="servlet-war" depends="seahawk-init, 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">
@@ -149,7 +152,7 @@
     
   </target>
 
-  <target name="acdservlet-war" depends="compile, make_maker" description="(User) Builds the ACDServlet WAR for MOBY-S service creation based on wrapping EMBOSS command-line programs described by ACD files">
+  <target name="acdservlet-war" depends="seahawk-init, compile, make_maker" description="(User) Builds the ACDServlet WAR for MOBY-S service creation based on wrapping EMBOSS command-line programs described by ACD files">
     <echo message="Building ACD servlet standalone WAR to ${build.clients.absolute}"/>
 
     <mkdir dir="${jarmaker.dir}/WEB-INF"/>
@@ -200,7 +203,7 @@
     
   </target>
 
-  <target name="cgiservlet-war" depends="compile, make_maker" description="(User) Builds the CGIServlet WAR for MOBY-S service creation based on wrapping moby-annotated HTML CGI forms on the Web">
+  <target name="cgiservlet-war" depends="seahawk-init, compile, make_maker" description="(User) Builds the CGIServlet WAR for MOBY-S service creation based on wrapping moby-annotated HTML CGI forms on the Web">
     <echo message="Building CGI servlet standalone WAR to ${build.clients.absolute}"/>
 
     <mkdir dir="${jarmaker.dir}/WEB-INF"/>
@@ -209,6 +212,7 @@
       <classpath>
 	<pathelement path="${jarmaker.dir}"/>
       </classpath>
+	<sysproperty key="log4j.configuration" value="file:${log4j.configuration}"/>
 	<jvmarg value="-Dmoby.debug=1"/>
         <jvmarg value="-D${jarmaker.classPathProperty}=${scp}:${src.webapps}"/>
 	<jvmarg value="-D${jarmaker.manifestMainClassProperty}=${servlet.tester.classname}"/>
@@ -252,7 +256,7 @@
   </target>
 
   <property name="url" value=""/>
-  <target name="seahawk" depends="compile" description="(User) Run the Seahawk MOBY client interface as a standalone application">
+  <target name="seahawk" depends="seahawk-init, compile" description="(User) Run the Seahawk MOBY client interface as a standalone application">
       <java classname="${seahawk.classname}" classpathref="seahawk.build.classpath" fork="true">
 	<jvmarg value="-Dmoby.debug=1"/>
 	<!--<jvmarg value="-Dcom.sun.management.jmxremote=1"/>-->