[MOBY-guts] biomoby commit

[Paul Gordon]

gordonp
Wed Dec  6 11:07:10 EST 2006
Update of /home/repository/moby/moby-live/Java
In directory dev.open-bio.org:/tmp/cvs-serv24370

Modified Files:
	build.xml 
Log Message:
Major commit to allow automated construction of MobyServlet.war, and revised cvode for Java annotation-based service meta-data specification
moby-live/Java build.xml,1.61,1.62
===================================================================
RCS file: /home/repository/moby/moby-live/Java/build.xml,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- /home/repository/moby/moby-live/Java/build.xml	2006/11/21 13:04:15	1.61
+++ /home/repository/moby/moby-live/Java/build.xml	2006/12/06 16:07:10	1.62
@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <!DOCTYPE project [
-  <!ENTITY libraries      SYSTEM "file:xmls/libraries.xml">
-  <!ENTITY exceptions     SYSTEM "file:xmls/exceptions.xml">
-  <!ENTITY deployBuild    SYSTEM "file:xmls/deployBuild.xml">
-  <!ENTITY servletsBuild  SYSTEM "file:xmls/servletsBuild.xml">
-  <!ENTITY rdfagentBuild  SYSTEM "file:xmls/rdfagentBuild.xml">
-  <!ENTITY registryServletsBuild  SYSTEM "file:xmls/registryServletsBuild.xml">
-  <!ENTITY samplesBuild   SYSTEM "file:xmls/samplesBuild.xml">
-  <!ENTITY mosesBuild     SYSTEM "file:xmls/mosesBuild.xml">
-  <!ENTITY dashboardBuild SYSTEM "file:xmls/dashboardBuild.xml">
-  <!ENTITY seahawkBuild   SYSTEM "file:xmls/seahawkBuild.xml">
+  <!ENTITY libraries      SYSTEM "xmls/libraries.xml">
+  <!ENTITY exceptions     SYSTEM "xmls/exceptions.xml">
+  <!ENTITY deployBuild    SYSTEM "xmls/deployBuild.xml">
+  <!ENTITY servletsBuild  SYSTEM "xmls/servletsBuild.xml">
+  <!ENTITY rdfagentBuild  SYSTEM "xmls/rdfagentBuild.xml">
+  <!ENTITY registryServletsBuild  SYSTEM "xmls/registryServletsBuild.xml">
+  <!ENTITY samplesBuild   SYSTEM "xmls/samplesBuild.xml">
+  <!ENTITY mosesBuild     SYSTEM "xmls/mosesBuild.xml">
+  <!ENTITY dashboardBuild SYSTEM "xmls/dashboardBuild.xml">
+  <!ENTITY seahawkBuild   SYSTEM "xmls/seahawkBuild.xml">
 ]>
 
 <!-- =================== Build for jMoby =================== -->
@@ -34,6 +34,8 @@
    <property file="${project.home}/build.properties"/>
    <property file="${user.home}/build.properties"/>
 
+   <property name="test.outdir" location="./testout"/>
+
    <!-- The directories containing sources and supporting files -->
    <property name="src.root"      value="${project.home}/src"/>
    <property name="src.main"      value="${src.root}/main"/>
@@ -519,10 +521,14 @@
    <target name="all" depends="clean,compile,docs,jar,jar_rdfagent,bindist,wardist,bindist_rdfagent"
            description="Clean, compile, generate docs, then build all distributions."/>
 
+   <target name="test-warn" description="(Internal) Print CLASSPATH warning with regards to use of JUnit">
+     <echo message="NOTA BENE: Due to an Ant bug prior to version 1.7, (http://issues.apache.org/bugzilla/show_bug.cgi?id=38799), JUnit tests cannot be run without ensuring that junit.jar is part of your CLASSPATH enviroment variable" level="warning"/>
+  </target>
+
    <!-- ================================================================== -->
    <!-- Just for testing...                                                -->
    <!-- ================================================================== -->
-   <target name="testing" depends="init">
+   <target name="testing" depends="init, compile, test-warn">
           <echo message="${log4j.configuration}"/>
 
           <!--
@@ -539,7 +545,23 @@
        property="result.properties"/>
      <echo>${result.properties}</echo>
      -->
+     <mkdir dir="${test.outdir}"/>
+
+     <junit printsummary="yes" fork="no" haltonfailure="yes">
+      <formatter type="plain"/>
 
+      <batchtest fork="no" todir="${test.outdir}">
+        <fileset dir="${src.main}">
+          <include name="org/biomoby/service/test/MobyServletTestCase.java"/>
+        </fileset>
+      </batchtest>
+
+      <classpath>
+        <pathelement path="${src.main}"/> <!-- so testing resource xml file, etc. can be found -->
+        <pathelement path="${src.webapps}"/> <!-- so testing resource xml file, etc. can be found -->
+        <path refid="build.classpath"/>
+      </classpath>
+    </junit>
    </target>
 
    <!-- ================================================================== -->