[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Tue Jan 29 19:14:11 EST 2008
Update of /home/repository/moby/moby-live/Java/xmls
In directory dev.open-bio.org:/tmp/cvs-serv11216/xmls

Modified Files:
	seahawkBuild.xml 
Log Message:
Moved MinJarMaker ('Minnow') to its own package, as it doesn't depend on Seahawk
moby-live/Java/xmls seahawkBuild.xml,1.13,1.14
===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/seahawkBuild.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- /home/repository/moby/moby-live/Java/xmls/seahawkBuild.xml	2007/12/17 18:43:06	1.13
+++ /home/repository/moby/moby-live/Java/xmls/seahawkBuild.xml	2008/01/30 00:14:11	1.14
@@ -31,10 +31,10 @@
   <property name="acdservlet.classname" value="ca.ucalgary.servlets.ACDService"/>
   <property name="acdservlet.warname" value="ACDServlet"/>
 
-  <property name="jarmaker.dir" location="${build.dir}/jarmaker"/>
-  <property name="jarmaker.fullname" value="ca.ucalgary.seahawk.util.MinJarMaker"/>
+  <property name="jarmaker.dir" location="${build.dir}/minnow"/>
+  <property name="jarmaker.fullname" value="ca.ucalgary.minnow.MinJarMaker"/>
   <property name="jarmaker.name" value="MinJarMaker"/>
-  <property name="jarmaker.path" value="ca/ucalgary/seahawk/util"/>
+  <property name="jarmaker.path" value="ca/ucalgary/minnow"/>
   <property name="jarmaker.classPathProperty" value="jarmaker.class.path"/>
   <property name="jarmaker.extraClassesProperty" value="jarmaker.class.extras"/>
   <!-- Because we may be using the automated tests to build the minimal jar
@@ -44,6 +44,7 @@
   <!-- The following should be the path to a JRE install with nothing but the
 	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="/export/data/programs/jdk1.5.0_06/bin/java"/>
   
   <path id="seahawk.build.classpath">
@@ -96,12 +97,14 @@
       <classpath>
 	<pathelement path="${jarmaker.dir}"/>
       </classpath>
+        <!--<jvmarg value="-verbose:class"/>
+        <jvmarg value="-Dverbose.class=true"/>-->
 	<jvmarg value="-D${jarmaker.classPathProperty}=${scp}:${src.webapps}"/>
 	<jvmarg value="-D${jarmaker.manifestMainClassProperty}=${servlet.tester.classname}"/>
 	<!-- The following is a list of classes that aren't picked up by the unit
 	     tests, but which the applet might need.  -->
-	<jvmarg value="-D${jarmaker.extraClassesProperty}=org/apache/xerces/xs/*PSVI.class:org/biomoby/**Exception.class:org/apache/**Exception.class:org/apache/**Error.class:org/apache/**ErrorResources.class:org/apache/**Messages.class:org/apache/log4j/spi/*.class:org/apache/axis/utils/*.class:org/apache/**.properties:javax/**/soap/*.class:org/jdom/*.class"/>
-
+	<jvmarg value="-D${jarmaker.extraClassesProperty}=org/biomoby/**Exception.class:org/apache/**Exception.class:org/apache/**Error.class:org/apache/**ErrorResources.class:org/apache/**Messages.class:org/apache/log4j/spi/*.class:org/apache/axis/utils/*.class:org/apache/**.properties:javax/**/soap/*.class:org/jdom/*.class"/>
+	<!--<jvmarg value="-D${jarmaker.extraClassesProperty}=org/apache/xerces/xs/*PSVI.class:org/biomoby/**Exception.class:org/apache/**Exception.class:org/apache/**Error.class:org/apache/**ErrorResources.class:org/apache/**Messages.class:org/apache/log4j/spi/*.class:org/apache/axis/utils/*.class:org/apache/**.properties:javax/**/soap/*.class:org/jdom/*.class"/>-->
 	<arg value="${build.clients.absolute}/${servlet.warname}.war"/>
 	<arg value="${servlet.auto.classname}"/>
     </java>