[MOBY-guts] biomoby commit

Martin Senger senger at pub.open-bio.org
Sun Sep 4 13:45:37 UTC 2005


senger
Sun Sep  4 09:45:36 EDT 2005
Update of /home/repository/moby/moby-live/Java
In directory pub.open-bio.org:/tmp/cvs-serv27838

Modified Files:
	build.xml 
Log Message:


moby-live/Java build.xml,1.28,1.29
===================================================================
RCS file: /home/repository/moby/moby-live/Java/build.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- /home/repository/moby/moby-live/Java/build.xml	2005/09/02 07:38:35	1.28
+++ /home/repository/moby/moby-live/Java/build.xml	2005/09/04 13:45:36	1.29
@@ -66,6 +66,21 @@
    <property name="axis.admin.url" value="${axis.relative.path}/servlet/AxisServlet"/>
    <property name="servlets.relative.path" value="."/>
 
+   <!-- other properties (we want them to have a default value -->
+   <property name="provider.name" value=""/>
+   <property name="provider.email" value=""/>
+   <property name="refresh.interval" value=""/>
+   <property name="cache.dir" value=""/>
+   <property name="cache.url" value=""/>
+   <property name="default.endpoint" value=""/>
+   <property name="default.namespace" value=""/>
+   <property name="http.proxyHost" value=""/>
+   <property name="http.proxyPort" value=""/>
+   <property name="proxySet" value=""/>
+
+   <property name="dot.location" value="&quot;&quot;"/>
+   <property name="registry.cache.dir" value="&quot;&quot;"/>
+
    <!-- A directories containing classes from generated code -->
    <property name="classes.datatypes" location="${build.others}/datatypes"/>
    <property name="classes.skeletons" location="${build.others}/skeletons"/>
@@ -148,42 +163,6 @@
          <isset property="catalina.home"/>
       </condition>
 
-      <condition property="provider.name" value="">
-         <not><isset property="provider.name"/></not>
-      </condition>
-      <condition property="provider.email" value="">
-         <not><isset property="provider.email"/></not>
-      </condition>
-      <condition property="refresh.interval" value="">
-         <not><isset property="refresh.interval"/></not>
-      </condition>
-      <condition property="cache.dir" value="">
-         <not><isset property="cache.dir"/></not>
-      </condition>
-      <condition property="cache.url" value="">
-         <not><isset property="cache.url"/></not>
-      </condition>
-      <condition property="default.endpoint" value="">
-         <not><isset property="default.endpoint"/></not>
-      </condition>
-      <condition property="default.namespace" value="">
-         <not><isset property="default.namespace"/></not>
-      </condition>
-      <condition property="http.proxyHost" value="">
-         <not><isset property="http.proxyHost"/></not>
-      </condition>
-      <condition property="http.proxyPort" value="">
-         <not><isset property="http.proxyPort"/></not>
-      </condition>
-      <condition property="proxySet" value="">
-         <not><isset property="proxySet"/></not>
-      </condition>
-      <condition property="dot.location" value="">
-         <not><isset property="dot.location"/></not>
-      </condition>
-      <condition property="registry.cache.dir" value="">
-         <not><isset property="registry.cache.dir"/></not>
-      </condition>
       <condition property="servlet.name.graphs" value="graphs">
          <not><isset property="servlet.name.graphs"/></not>
       </condition>
@@ -214,6 +193,11 @@
         </and>
       </condition>
 
+      <!-- properties set from other properties thata were set in conditions above -->
+      <property name="deploy.axis.dir"
+        location="${real.catalina.home}/${tomcat.webapps}/${axis.relative.path}/WEB-INF"/>
+
+
    </target>
 
    <!-- ================================================================== -->
@@ -489,26 +473,9 @@
 
    </target>
 
-   <property name="deploy.war.file" value="${build.webapps}/jmoby.war"/>
-  
-   <!-- ================================================================== -->
-   <!-- Move distribution of packed servlets (.war file)                   -->
-   <!-- ================================================================== -->
-   <target name="wardist" depends="war"
-      description="Move a 'war' file (with servlets) to the distribution directory.">
-      <copy file="${deploy.war.file}"
-            tofile="${dist.dir}/jmoby-${TODAY_SHORT}.war"
-            overwrite="yes"/>
-   </target>
-
-
    <!-- ================================================================== -->
-   <!-- Deploys servlets and web services to local Tomcat                  -->
+   <!-- Make sure that the Tomcat location is known                        -->
    <!-- ================================================================== -->
-   <target name="deploy" depends="deploy-servlets,deploy-ws"
-      description="Deploy both jMoby servlets and Web Services to local Tomcat.">
-   </target>
-
    <target name="tomcat-init" depends="init">
       <fail unless="real.catalina.home">-
 
@@ -521,6 +488,9 @@
       </fail>
     </target>
 
+   <!-- ================================================================== -->
+   <!-- Make sure that a Tomcat has been started                           -->
+   <!-- ================================================================== -->
     <target name="tomcat-running" depends="tomcat-init">
       <condition property="tomcat.is.running">
         <socket server="${tomcat.host}" port="${tomcat.port}"/>
@@ -534,11 +504,66 @@
       </fail>
     </target>
 
-   <target name="deploy-ws" depends="tomcat-init,compile"
-     description="Deploy jMoby Web Services to local Tomcat.">
-     <echo message="There are no Web Services to be deployed (yet)"/>
+   <!-- ================================================================== -->
+   <!-- all: builds everything (except for gathering external libraries    -->
+   <!--                         and for deploying to local Tomcat)         -->
+   <!-- ================================================================== -->
+   <target name="all" depends="clean,compile,docs,jar,jar_rdfagent,bindist,wardist,bindist_rdfagent"
+           description="Clean, compile, generate docs, then build all distributions."/>
+
+   <!-- ================================================================== -->
+   <!-- Just for testing...                                                -->
+   <!-- ================================================================== -->
+   <target name="testing" depends="init">
+     <!--
+          <echo message="${TODAY_LONG}"/>
+          <echo message="${TODAY_SHORT}"/>
+          <echo message="${ant.java.version}"/>
+          <echo message="${java.version}"/>
+          -->
+
+     <property name="my.property" value="&quot;&quot;"/>
+     <property name="my.property.2" value=""/>
+
+     <!--     <splash/> -->
+
+     <!--
+     <java classname="TestArgs" taskname="testing"
+       classpathref="build.classpath" fork="true" failonerror="true">
+       <sysproperty key="with_tools" value="${with_tools}"/>
+       <arg value="-my.poperty"/>
+       <arg value="${my.property}"/>
+       <arg value="-my.poperty.2"/>
+       <arg value="${my.property.2}"/>
+       <arg value="-end"/>
+     </java>
+     -->
+     <!--
+     <tempfile property="my.temp.dir" destDir="${java.io.tmpdir}/deploy-${user.name}"/>
+     <mkdir dir="${my.temp.dir}"/>
+     <delete dir="${my.temp.dir}"/>
+-->
    </target>
 
+
+   <!-- ================================================================== -->
+   <!--                                                                    -->
+   <!-- Deploys servlets to local Tomcat                                   -->
+   <!--                                                                    -->
+   <!-- ================================================================== -->
+   <property name="deploy.war.file" value="${build.webapps}/jmoby.war"/>
+  
+   <target name="deploy-servlets" depends="tomcat-init,war"
+      description="Deploy jMoby servlets to local Tomcat.">
+      <property name="deploy.webapp.dir" location="${real.catalina.home}/webapps"/>
+      <delete dir="${deploy.webapp.dir}/jmoby"/>
+      <copy file="${deploy.war.file}" todir="${deploy.webapp.dir}"/>
+      <echo message="jMoby [re-]deployed, you may need to restart Tomcat"/>
+   </target>
+
+   <!-- ================================================================== -->
+   <!-- Create .war file with Moby servlets... (TBD better)                -->
+   <!-- ================================================================== -->
    <target name="war" depends="compile"
      description="Create a war file with jMoby servlets.">
      <mkdir dir="${build.webapps}"/>
@@ -596,114 +621,213 @@
      </war>
    </target>
    
-   <target name="deploy-servlets" depends="tomcat-init,war"
-      description="Deploy jMoby servlets to local Tomcat.">
-      <property name="deploy.webapp.dir" location="${real.catalina.home}/webapps"/>
-      <delete dir="${deploy.webapp.dir}/jmoby"/>
-      <copy file="${deploy.war.file}" todir="${deploy.webapp.dir}"/>
-      <echo message="jMoby [re-]deployed, you may need to restart Tomcat"/>
-   </target>
-
    <!-- ================================================================== -->
-   <!-- all: builds everything (except for gathering external libraries    -->
-   <!--                         and for deploying to local Tomcat)         -->
-   <!-- ================================================================== -->
-   <target name="all" depends="clean,compile,docs,jar,jar_rdfagent,bindist,wardist,bindist_rdfagent"
-           description="Clean, compile, generate docs, then build all distributions."/>
-
-   <!-- ================================================================== -->
-   <!-- Just for testing...                                                -->
+   <!-- Move distribution of packed servlets (.war file)                   -->
    <!-- ================================================================== -->
-   <target name="testing" depends="init">
-     <!--
-          <echo message="${TODAY_LONG}"/>
-          <echo message="${TODAY_SHORT}"/>
-          <echo message="${ant.java.version}"/>
-          <echo message="${java.version}"/>
-          -->
-     <property name="my.property" value=""/>
-
-     <java classname="TestArgs" taskname="testing"
-       classpathref="build.classpath" fork="true" failonerror="true">
-       <arg value="-cacheDir"/>
-       <arg value="${my.property}"/>
-       <arg value="-dt"/>
-     </java>
-
+   <target name="wardist" depends="war"
+      description="Move a 'war' file (with servlets) to the distribution directory.">
+      <copy file="${deploy.war.file}"
+            tofile="${dist.dir}/jmoby-${TODAY_SHORT}.war"
+            overwrite="yes"/>
    </target>
 
 
 
+   <!-- ================================================================== -->
+   <!--                                                                    -->
+   <!-- Deploying Bimoby services...                                       -->
+   <!--                                                                    -->
+   <!-- ================================================================== -->
 
+   <!--
+        Deploying a service means usually two things: (a) copying
+        necessary classes to Tomcat, and (b) creating a deployment
+        descriptor (an XML file) and calling Axis's AdminClient to
+        install this deployment descriptor into Axis's configuration
+        file (WEB-INF/server-config.wsdd).
+
+        Also, there are two kinds of deployments: (a) to a local
+        Tomcat, and (b) to a Tomcat running of a different machine
+        than this Ant. For the latter case, a tarred file is created
+        with all necessary contents - it must be then manually moved
+        to the remote machine.
+
+        Additionally to all usual properties, it takes also properties
+        defining where is jar file (or files) with the service
+        implementation (because that usually is not part of the jMoby
+        packages):
+             users.lib.dir ... take all *.jar files from thid directory
+             users.lib.file ... take this one jar file
+
+        Targets for local deployment are:
+           deploy-services
+              tomcat-populate
+              deploy-wsdd
+                 -find-services
+                 create-wsdd
+                 axis-deploy
+           undeploy-services  (TBD: does not work)
 
+        Targets for remote deployment are:
+           TBD
 
+        -->
 
-
-   <!-- work in progress -->
-
-
-
-
-
-
-
+   <!-- ================================================================== -->
+   <!-- Do it all (for the local deployment)...                            -->
+   <!-- ================================================================== -->
+   <target name="deploy-services" depends="tomcat-running,tomcat-populate,deploy-wsdd"
+     description="Deploy (given) BioMoby services.">
+   </target>
 
 
+   <!-- ================================================================== -->
+   <!-- Undeploy services (given by 'service.NNN', or by 'service.list')   -->
+   <!-- ================================================================== -->
+   <target name="undeploy-services" depends="tomcat-running,-find-services"
+     description="Undeploy (given) BioMoby services.">
 
+     <!-- undeploy each service -->
+     <!-- (note that 'services.list' has been set by target '-find-services' -->
+     <foreach list="${services.list}"
+       delimiter=","
+       inheritall="yes"
+       target="-undeploy-a-service"
+       param="service.name" />
+   </target>
+   
+   <!-- parameter: ${service.name} -->
+   <target name="-undeploy-a-service">
+     <tempfile property="dd.tmp.file" />
+     <echo file="${dd.tmp.file}">
+       &lt;undeployment xmlns="http://xml.apache.org/axis/wsdd/"&gt;
+         &lt;service name="${service.name}"/&gt;
+       &lt;/undeployment&gt;
+     </echo>
+     <antcall target="axis-deploy">
+       <param name="wsdd.file"        value="${dd.tmp.file}"/>
+       <param name="deploy.task.name" value="Undeploy ${service.name}"/>
+     </antcall>
+     <delete file="${dd.tmp.file}" quiet="true"/>
+   </target>
+   
+   <!-- ================================================================== -->
+   <!-- Populate local Tomcat with files needed for BioMoby Web Services   -->
+   <!-- ================================================================== -->
+   <target name="tomcat-populate" depends="tomcat-init,jar,jar-datatypes,jar-services">
 
+     <!-- merge jar files in ${build.lib} with the same-named jar files in Tomcat/Axis -->
+     <foreach
+       inheritall="yes"
+       target="-merge-jars"
+       param="jarfile.name">
+       <fileset dir="${build.lib}" includes="${datatypes.jar},${skeletons.jar}"/>
+     </foreach>
+
+     <!-- copy user-defined jar files to Tomcat/Axis -->
+     <if>
+       <isset property="users.lib.dir"/>
+       <then>
+         <copy todir="${deploy.axis.dir}/lib">
+           <fileset dir="${users.lib.dir}" includes="*.jar"/>
+         </copy>
+       </then>
+     </if>
+     <if>
+       <isset property="users.lib.file"/>
+       <then>
+         <copy todir="${deploy.axis.dir}/lib" file="${users.lib.file}"/>
+       </then>
+     </if>
 
+     <!-- copy remaining jar files to Tomcat/Axis -->
+     <copy todir="${deploy.axis.dir}/lib">
+       <fileset dir="${lib.dir}">
+         <include name="${alltools2}"/>
+         <include name="${jdom}"/>
+       </fileset>
+       <fileset dir="${build.lib}" includes="*.jar"/>
+     </copy>
 
+   </target>
 
+   <!-- parameter: ${jarfile.name} -->
+   <target name="-merge-jars">
+     <basename property="jarfile.base.name" file="${jarfile.name}"/>
+     <if>
+       <available file="${deploy.axis.dir}/lib/${jarfile.base.name}" type="file"/>
+       <then>
+         <tempfile property="merging.dir" destDir="${java.io.tmpdir}/mobydeploy-${user.name}"/>
+         <mkdir dir="${merging.dir}"/>
+         <unjar dest="${merging.dir}" src="${deploy.axis.dir}/lib/${jarfile.base.name}"/>
+         <unjar dest="${merging.dir}" src="${jarfile.name}"/>
+         <jar destfile="${jarfile.name}">
+           <fileset dir="${merging.dir}"/>
+           <manifest>
+             <attribute name="Built-By" value="${user.name}"/>
+           </manifest>
+         </jar>
+         <delete dir="${merging.dir}"/>
+       </then>
+     </if>
 
-   <target name="deploy-digest" depends="tomcat-populate">
-     <!-- deploy services (using a deployment descriptor) -->
-     <java classname="org.apache.axis.client.AdminClient" taskname="AdminClient"
-       classpathref="build.classpath" fork="true" failonerror="true">
-       <arg value="-h"/>
-       <arg value="${tomcat.host}"/>
-       <arg value="-p"/>
-       <arg value="${tomcat.port}"/>
-       <arg value="-s"/>
-       <arg value="${axis.admin.url}"/>
-       <arg file="${src.config}/mobydigest.wsdd"/>
-     </java>
- 
-     <echo message="Moby Services [re-]deployed, you may need to restart Tomcat"/>
    </target>
 
 
+   <!-- ================================================================== -->
+   <!-- Find all services (in properties), create and use their wsdd files -->
+   <!-- ================================================================== -->
+   <target name="deploy-wsdd" depends="init,-find-services">
+     
+     <!-- deploy each service -->
+     <!-- (note that 'services.list' has been set by target -find-services' -->
+     <foreach list="${services.list}"
+       delimiter=","
+       inheritall="yes"
+       target="-deploy-a-service"
+       param="service.name" />
+     
+   </target>
+   
+   <!-- parameter: ${service.name} -->
+   <target name="-deploy-a-service">
+     <antcall target="create-wsdd">
+       <param name="service.name"     value="${service.name}"/>
+       <param name="wsdd.file"        location="${build.dir}/wsdd/${service.name}.wsdd"/>
+     </antcall>
+     <antcall target="axis-deploy">
+       <param name="wsdd.file"        location="${build.dir}/wsdd/${service.name}.wsdd"/>
+       <param name="deploy.task.name" value="Deploy ${service.name}"/>
+     </antcall>
+   </target>
 
 
    <!-- ================================================================== -->
-   <!-- populate local Tomcat with files needed for BioMoby Web Services   -->
-   <target name="tomcat-populate" depends="tomcat-init,jar">
-     <property name="deploy.axis.dir"
-       location="${real.catalina.home}/${tomcat.webapps}/${axis.relative.path}/WEB-INF"/>
-
-     <!-- jar files to the 'lib' subdirectory -->
-     <copy todir="${deploy.axis.dir}/lib">
-       <fileset dir="${lib.dir}">
-         <include name="alltools.jar"/>
-         <include name="alltools2.jar"/>
-         <include name="jdom.jar"/>
-       </fileset>
-       <fileset dir="${build.lib}" includes="*.jar"/>
+   <!-- Create a wsdd descriptor for given service in 'build/wsdd'         -->
+   <!--    parameter: ${service.name}  ... for which service               -->
+   <!--    parameter: ${wsdd.file}     ... what file to create             -->
+   <!-- ================================================================== -->
+   <target name="create-wsdd" depends="init">
+     <property name="wsdd.template" value="${src.webapps}/standard.wsdd.template"/>
+     <propertycopy property="impl.class" from="service.${service.name}" override="true"/>
+     <copy file="${wsdd.template}" tofile="${wsdd.file}" overwrite="true"
+       taskname="Create ${service.name}.wsdd">
+       <filterset>
+         <filter token="SERVICE_NAME" value="${service.name}"/>
+         <filter token="IMPL_CLASS" value="${impl.class}"/>
+       </filterset>
      </copy>
    </target>
-   
+
    <!-- ================================================================== -->
    <!-- Calling an Axis Admin client to do the real [un]deploying.         -->
-   <!-- This target is usually called with 'antcall' getting parameter:    -->
-   <!--      ${wsdd.file} ... a file with a [un]deployment descriptor      -->
-   <!--      ${deploy.task.name} ... a name given to this task (optional)  -->
-   <!-- (that's why it does not define any dependent targets here)         -->
+   <!--    parameter: ${wsdd.file} ... a file with a [un]deployment descr. -->
+   <!--    parameter: ${deploy.task.name} ... a name given to this task    -->
    <!-- ================================================================== -->
-   <target name="-deploy">
+   <target name="axis-deploy" depends="tomcat-running">
      
      <!-- an optional parameter: how to name this task -->
-     <condition property="deploy.task.name" value="Deploy">
-       <not><isset property="deploy.task.name"/></not>
-     </condition>
+     <property name="deploy.task.name" value="Deploy"/>
      
      <!-- deploy (or undeploy) services (using given deployment descriptor) -->
      <java classname="org.apache.axis.client.AdminClient" taskname="${deploy.task.name}"
@@ -733,70 +857,22 @@
        casesensitive="false" />
      <fail unless="services.list">-
 
-       No list of service names found.
-       ===============================
-       A list can be defined in one of the following ways:
-          a) Create a property 'services.list' containing
-             a comma-delimited list of names of services, or
-          b) For each service, create a property 'service.&lt;service-name&gt;
-             (replace &lt;service-name&gt; with a real name of service).
+     No list of service names found.
+     ===============================
+     Each service that you want to deploy should de defined
+     by a property of the following form (parts in upper-cases should be
+     replaced by the real values):
+        service.SERVICE-NAME = IMPLEMENTATION-CLASS-NAME
+
+     Each service that you want to undeploy can be defined in the same
+     way (implementation class is not needed), or simpler by creating
+     a property 'services.list' containing a comma-delimited list of
+     names of services to be undeployed.
      </fail>
      <echo message="${services.list}" taskname="Services names"/>
    </target>
    
    <!-- ================================================================== -->
-   <target name="deploy-services"
-     depends="tomcat-running,tomcat-populate,-find-services"
-     description="Deploy (given) BioMoby services.">
-     
-     <!-- deploy each service -->
-     <!-- (note that target '-find-services' has set 'services.list' -->
-     <foreach list="${services.list}"
-       delimiter=","
-       inheritall="yes"
-       target="-deploy-a-service"
-       param="service.name" />
-     
-   </target>
-   
-   <!-- parameter: ${service.name} -->
-   <target name="-deploy-a-service">
-     <antcall target="-deploy">
-       <param name="wsdd.file"        value="${build.dir}/wsdd/${service.name}.wsdd"/>
-       <param name="deploy.task.name" value="Deploy ${service.name}"/>
-     </antcall>
-   </target>
-   
-   <!-- ================================================================== -->
-   <target name="undeploy-services" depends="tomcat-running,-find-services"
-     description="Undeploy (given) BioMoby services.">
-
-     <!-- undeploy each service -->
-     <!-- (note that target '-find-services' has set 'services.list' -->
-     <foreach list="${services.list}"
-       delimiter=","
-       inheritall="yes"
-       target="-undeploy-a-service"
-       param="service.name" />
-   </target>
-   
-   <!-- parameter: ${service.name} -->
-   <target name="-undeploy-a-service">
-     <tempfile property="dd.tmp.file" />
-     <echo file="${dd.tmp.file}">
-       &lt;undeployment xmlns="http://xml.apache.org/axis/wsdd/"&gt;
-         &lt;service name="${service.name}"/&gt;
-       &lt;/undeployment&gt;
-     </echo>
-     <antcall target="-deploy">
-       <param name="wsdd.file"        value="${dd.tmp.file}"/>
-       <param name="deploy.task.name" value="Undeploy ${service.name}"/>
-     </antcall>
-     <delete file="${dd.tmp.file}" quiet="true"/>
-   </target>
-   
-
-   <!-- ================================================================== -->
    <!--                                                                    -->
    <!-- Samples, tutorials...                                              -->
    <!--                                                                    -->
@@ -976,6 +1052,10 @@
    <!-- A directory containing API of (all) generated code -->
    <property name="moses.javadoc.dir" location="${docs.dir}/APIservices"/>
 
+   <!-- Names of Moses jar files -->
+   <property name="skeletons.jar" value="biomoby-skeletons.jar"/>
+   <property name="datatypes.jar" value="biomoby-datatypes.jar"/>
+
 
    <!-- ================================================================== -->
    <!-- Moses datatypes: do everything                                     -->
@@ -991,18 +1071,7 @@
    <target name="generate-datatypes" depends="moses-init"
      description="Generate sources of Biomoby data types (needs registry)">
 
-     <condition property="moses.filter.dt" value="">
-       <not><isset property="moses.filter.dt"/></not>
-     </condition>
-
-     <condition property="moses.quiet" value="no"><not><isset property="moses.quiet"/></not></condition>
-     <condition property="real.moses.quiet" value="-q"><istrue value="${moses.quiet}"/></condition>
-
-     <condition property="moses.nogener" value="no"><not><isset property="moses.nogener"/></not></condition>
-     <condition property="real.moses.nogener" value="-n"><istrue value="${moses.nogener}"/></condition>
-
-     <condition property="moses.nographs" value="no"><not><isset property="moses.nographs"/></not></condition>
-     <condition property="real.moses.nographs" value="-ng"><istrue value="${moses.nographs}"/></condition>
+     <property name="moses.filter.dt" value="&quot;&quot;"/>
 
      <java classname="MosesGenerators" taskname="Data Types"
        classpathref="build.classpath" fork="true" failonerror="true">
@@ -1044,7 +1113,7 @@
    <!-- ================================================================== -->
    <target name="jar-datatypes" depends="moses-compile"
      description="Generate jar file with generated data types">
-     <jar destfile="${build.lib}/biomoby-datatypes.jar">
+     <jar destfile="${build.lib}/${datatypes.jar}">
        <fileset dir="${classes.datatypes}"/>
        <manifest>
          <attribute name="Built-By" value="${user.name}"/>
@@ -1070,21 +1139,8 @@
    <target name="generate-services" depends="moses-init,service-check"
      description="Generate sources of Biomoby service(s) (needs registry)">
 
-     <condition property="moses.service" value="">
-       <not><isset property="moses.service"/></not>
-     </condition>
-     <condition property="moses.authority" value="">
-       <not><isset property="moses.authority"/></not>
-     </condition>
-
-     <condition property="moses.quiet" value="no"><not><isset property="moses.quiet"/></not></condition>
-     <condition property="real.moses.quiet" value="-q"><istrue value="${moses.quiet}"/></condition>
-
-     <condition property="moses.nogener" value="no"><not><isset property="moses.nogener"/></not></condition>
-     <condition property="real.moses.nogener" value="-n"><istrue value="${moses.nogener}"/></condition>
-
-     <condition property="moses.nographs" value="no"><not><isset property="moses.nographs"/></not></condition>
-     <condition property="real.moses.nographs" value="-ng"><istrue value="${moses.nographs}"/></condition>
+     <property name="moses.service" value="&quot;&quot;"/>
+     <property name="moses.authority" value="&quot;&quot;"/>
 
      <java classname="MosesGenerators" taskname="Service(s)"
        classpathref="moses.build.classpath" fork="true" failonerror="true">
@@ -1114,7 +1170,7 @@
    <!-- ================================================================== -->
    <target name="jar-services" depends="moses-compile"
      description="Jar files with generated services.">
-     <jar destfile="${build.lib}/biomoby-skeletons.jar">
+     <jar destfile="${build.lib}/${skeletons.jar}">
        <fileset dir="${classes.skeletons}"/>
        <manifest>
          <attribute name="Built-By" value="${user.name}"/>
@@ -1156,6 +1212,16 @@
      <mkdir dir="${src.skeletons}"/>
      <mkdir dir="${classes.datatypes}"/>
      <mkdir dir="${classes.skeletons}"/>
+
+     <condition property="moses.quiet" value="no"><not><isset property="moses.quiet"/></not></condition>
+     <condition property="real.moses.quiet" value="-q"><istrue value="${moses.quiet}"/></condition>
+
+     <condition property="moses.nogener" value="no"><not><isset property="moses.nogener"/></not></condition>
+     <condition property="real.moses.nogener" value="-n"><istrue value="${moses.nogener}"/></condition>
+
+     <condition property="moses.nographs" value="no"><not><isset property="moses.nographs"/></not></condition>
+     <condition property="real.moses.nographs" value="-ng"><istrue value="${moses.nographs}"/></condition>
+
    </target>
 
    <!-- ================================================================== -->




More information about the MOBY-guts mailing list