[MOBY-guts] biomoby commit

[Martin Senger]

senger
Sun Sep 25 05:07:22 EDT 2005
Update of /home/repository/moby/moby-live/Java
In directory pub.open-bio.org:/tmp/cvs-serv11299

Modified Files:
	build.xml 
Log Message:


moby-live/Java build.xml,1.37,1.38
===================================================================
RCS file: /home/repository/moby/moby-live/Java/build.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- /home/repository/moby/moby-live/Java/build.xml	2005/09/22 09:47:43	1.37
+++ /home/repository/moby/moby-live/Java/build.xml	2005/09/25 09:07:22	1.38
@@ -112,9 +112,11 @@
       <fileset dir="${lib.dir}">
          <include name="*.jar"/>
       </fileset>
+      <!--
       <fileset dir="${lib.dir}/ant_home/lib">
          <include name="*.jar"/>
       </fileset>
+      -->
    </path>
 
    <!-- Additional classpath (includes classes of generated sources) -->
@@ -690,6 +692,7 @@
         Targets for local deployment are:
            deploy-services
               tomcat-populate
+                 -populate
               deploy-wsdd
                  -find-services
                  create-wsdd
@@ -697,7 +700,7 @@
            undeploy-services  (TBD: does not work)
 
         Targets for remote deployment are:
-           TBD
+           deploy-remote
 
         -->
 
@@ -922,8 +925,8 @@
    <!-- ================================================================== -->
    <!-- Create a file that will be used to do a remote deployment          -->
    <!-- ================================================================== -->
-   <target name="deploy-remote" depends="init,-find-services"
-     description="Create a file for the service deployment of services">
+   <target name="deploy-remote" depends="init,-find-services,jar,jar-datatypes,jar-services"
+     description="Create a file helping to deploy services on a different machine">
 
      <tempfile property="build.remote.dir" destDir="${java.io.tmpdir}/mobyremotedeploy-${user.name}"/>
      <property name="result.file" value="moby-services-to-deploy-${TODAY_SHORT}"/>
@@ -994,7 +997,7 @@
      </copy>
 
      <!-- add Axis libraries -->
-     <copy todir="${result.dir}/lib">
+     <copy todir="${result.dir}/axis-lib">
        <fileset dir="${lib.dir}">
          <include name="activation.jar"/>
          <include name="axis-ant.jar"/>
@@ -1293,7 +1296,7 @@
    <target name="jar-datatypes" depends="moses-compile"
      description="Generate jar file with generated data types">
      <jar destfile="${build.lib}/${datatypes.jar}">
-       <fileset dir="${classes.datatypes}"/>
+       <fileset dir="${classes.datatypes}" excludes="**/doc-files/*"/>
        <manifest>
          <attribute name="Built-By" value="${user.name}"/>
        </manifest>
@@ -1350,7 +1353,7 @@
    <target name="jar-services" depends="moses-compile"
      description="Jar files with generated services.">
      <jar destfile="${build.lib}/${skeletons.jar}">
-       <fileset dir="${classes.skeletons}"/>
+       <fileset dir="${classes.skeletons}" excludes="**/doc-files/*"/>
        <manifest>
          <attribute name="Built-By" value="${user.name}"/>
        </manifest>