[MOBY-guts] biomoby commit
Martin Senger
senger at dev.open-bio.org
Thu Feb 14 06:13:37 UTC 2008
senger
Thu Feb 14 01:13:37 EST 2008
Update of /home/repository/moby/moby-live/Java/xmls
In directory dev.open-bio.org:/tmp/cvs-serv22473/xmls
Modified Files:
dashboardBuild.xml deployBuild.xml mobysyncBuild.xml
mosesBuild.xml rdfagentBuild.xml registryServletsBuild.xml
seahawkBuild.xml
Added Files:
install.xml junit.xml maven.xml project.pom tomcat.xml
upload2maven.xml
Removed Files:
exceptions.xml libraries.xml
Log Message:
Mavenization of jMoby. Many changes in build files and in the documentation.
moby-live/Java/xmls install.xml,NONE,1.1 junit.xml,NONE,1.1 maven.xml,NONE,1.1 project.pom,NONE,1.1 tomcat.xml,NONE,1.1 upload2maven.xml,NONE,1.1 dashboardBuild.xml,1.2,1.3 deployBuild.xml,1.2,1.3 mobysyncBuild.xml,1.1,1.2 mosesBuild.xml,1.1,1.2 rdfagentBuild.xml,1.2,1.3 registryServletsBuild.xml,1.1,1.2 seahawkBuild.xml,1.15,1.16 exceptions.xml,1.2,NONE libraries.xml,1.18,NONE
===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/dashboardBuild.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- /home/repository/moby/moby-live/Java/xmls/dashboardBuild.xml 2008/02/13 06:35:37 1.2
+++ /home/repository/moby/moby-live/Java/xmls/dashboardBuild.xml 2008/02/14 06:13:37 1.3
@@ -13,13 +13,10 @@
<property name="dashboard.config.jar" value="dashboard-config.jar"/>
<path id="dashboard.build.classpath">
- <path refid="build.classpath"/>
<path refid="samples.build.classpath"/>
<fileset dir="${build.lib}">
<include name="${dashboard.config.jar}"/>
</fileset>
- <fileset dir="${env.ANT_HOME}/lib">
- </fileset>
</path>
<property name="dashboard.arg.1" value="-nopXXX"/>
===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/deployBuild.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- /home/repository/moby/moby-live/Java/xmls/deployBuild.xml 2006/05/05 20:24:42 1.2
+++ /home/repository/moby/moby-live/Java/xmls/deployBuild.xml 2008/02/14 06:13:37 1.3
@@ -85,8 +85,8 @@
<!-- ================================================================== -->
<!-- Populate local Tomcat with files needed for BioMoby Web Services -->
<!-- ================================================================== -->
-<target name="tomcat-populate" depends="tomcat-init,jar,jar-datatypes,jar-services">
-
+<target name="tomcat-populate" depends="tomcat-init,jars,jar-datatypes,jar-services">
+
<!-- merge jar files in ${build.lib} with the same-named jar files in Tomcat/Axis -->
<foreach
inheritall="yes"
@@ -132,7 +132,7 @@
<!-- (used both for local and remote deployment) -->
<!-- ================================================================== -->
<!-- parameter: ${destination.axis.dir} -->
-<target name="-populate">
+<target name="-populate" depends="initmaven">
<!-- copy user-defined jar files to Tomcat/Axis -->
<if>
@@ -151,17 +151,37 @@
</if>
<!-- copy remaining jar files to Tomcat/Axis -->
- <!-- (TBD: perhaps the list of jar files should be in a property,
- so users can change it...) -->
- <copy todir="${destination.axis.dir}">
- <fileset dir="${lib.dir}">
- <include name="${alltools2}"/>
- <include name="${jdom}"/>
- <include name="${commons-lang}"/>
- </fileset>
+ <copy
+ todir="${destination.axis.dir}"
+ flatten="true">
+ <fileset refid="runtime.dependency.fileset"/>
+ </copy>
+ <!-- ...but keep here only some library files -->
+ <!--
+ <delete>
+ <fileset
+ dir="${destination.axis.dir}"
+ excludes="alltools2*,jdom*,commons-lang*,*xerces*"/>
+ </delete>
+ -->
+ <copy
+ todir="${destination.axis.dir}">
<fileset dir="${build.lib}" includes="*.jar"/>
</copy>
+ <!-- copy log4j configuration file -->
+ <property name="server.log.dir" value="$${catalina.home}/logs"/>
+ <property
+ name="server.log4j.configuration"
+ location="${src.config}/log4j.properties.template"/>
+ <copy
+ file="${server.log4j.configuration}"
+ tofile="${deploy.axis.dir}/classes/log4j.properties">
+ <filterset>
+ <filter token="LOGDIR" value="${server.log.dir}"/>
+ </filterset>
+ </copy>
+
</target>
<!-- ================================================================== -->
@@ -214,14 +234,16 @@
<!-- parameter: ${wsdd.file} ... a file with a [un]deployment descr. -->
<!-- parameter: ${deploy.task.name} ... a name given to this task -->
<!-- ================================================================== -->
-<target name="axis-deploy" depends="tomcat-running">
+<target name="axis-deploy" depends="initmaven,tomcat-running">
<!-- an optional parameter: how to name this task -->
<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}"
- classpathref="build.classpath" fork="true" failonerror="true">
+ classpathref="dependency.classpath"
+ fork="true"
+ failonerror="true">
<arg value="-h"/>
<arg value="${tomcat.host}"/>
<arg value="-p"/>
@@ -266,8 +288,16 @@
<!-- ================================================================== -->
<!-- Create a file that will be used to do a remote deployment -->
<!-- ================================================================== -->
-<target name="deploy-remote" depends="init,-find-services,jar,jar-datatypes,jar-services"
+<target name="deploy-remote" depends="init,-find-services,jars,jar-datatypes,jar-services"
description="Create a file helping to deploy services on a different machine">
+
+ <fail>
+'
+----------------------------------------------------
+Sorry, but due to changes in the jMoby distribution,
+this task is not now/yet available...
+----------------------------------------------------
+ </fail>
<tempfile property="build.remote.dir" destDir="${java.io.tmpdir}/mobyremotedeploy-${user.name}"/>
<property name="result.file" value="moby-services-to-deploy-${TODAY_SHORT}"/>
===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/mobysyncBuild.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/xmls/mobysyncBuild.xml 2007/08/24 09:38:57 1.1
+++ /home/repository/moby/moby-live/Java/xmls/mobysyncBuild.xml 2008/02/14 06:13:37 1.2
@@ -8,10 +8,20 @@
<!-- -->
<!-- ====================================================== -->
-<!-- ================================================================== -->
-<!-- Builds a jar file with MobySync classes -->
-<!-- ================================================================== -->
-<target name="jar_mobysync" depends="compile"
+<!-- ====================================================== -->
+<!-- Initiale some properties -->
+<!-- ====================================================== -->
+<target name="mobysync-init">
+
+ <property name="build.mobysync" location="${build.dir}/mobysync"/>
+ <mkdir dir="${build.mobysync}"/>
+
+</target>
+
+<!-- ====================================================== -->
+<!-- Builds a jar file with MobySync classes -->
+<!-- ====================================================== -->
+<target name="jar-mobysync" depends="mobysync-init,compile"
description="Create a jar file with MobySync classes.">
<dirname property="build.lib.dir" file="${lib.dir}"/>
<!-- dirsep may not be portable -->
@@ -34,7 +44,7 @@
<!-- ================================================================== -->
<!-- Builds MobySync files for binary distribution -->
<!-- ================================================================== -->
-<target name="bindist_mobysync" depends="compile,jar,jar_mobysync"
+<target name="bindist-mobysync" depends="compile,jars,jar-mobysync"
description="Create MOBYSync binary distribution.">
<!-- Name of the final binary distribution (without extension) -->
@@ -59,7 +69,10 @@
<fileset dir="${build.lib}" includes="MOBYSync.jar"/>
</copy>
<!--<copy file="${src.config}/Mo_config.xml" todir="${mobysync.dist}"/>-->
- <copy file="${src.config}/MOBYSync_config.txt" todir="${mobysync.dist}"/>
+
+ <property name="my.mobysync.properties"
+ location="${src.config}/mobysync.properties.template"/>
+ <copy file="${my.mobysync.properties}" todir="${mobysync.dist}"/>
<copy todir="${mobysync.dist}">
<fileset dir="${src.support}/mobysync" excludes="MANIFEST.MF"/>
</copy>
===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/mosesBuild.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/xmls/mosesBuild.xml 2006/04/28 00:13:41 1.1
+++ /home/repository/moby/moby-live/Java/xmls/mosesBuild.xml 2008/02/14 06:13:37 1.2
@@ -44,7 +44,7 @@
-->
<!-- A directories containing generated code -->
-<property name="dir.generated" location="${project.home}/generated"/>
+<!-- (the dir.generated is definedin the parent build.xml) -->
<property name="src.datatypes" location="${dir.generated}/datatypes"/>
<property name="src.skeletons" location="${dir.generated}/skeletons"/>
@@ -62,6 +62,7 @@
<!-- Additional classpath (includes classes of generated sources) -->
<path id="moses.build.classpath">
<path refid="build.classpath"/>
+ <path refid="dependency.classpath"/>
<pathelement location="${classes.datatypes}"/>
<pathelement location="${classes.skeletons}"/>
</path>
===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/rdfagentBuild.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- /home/repository/moby/moby-live/Java/xmls/rdfagentBuild.xml 2006/05/17 17:15:05 1.2
+++ /home/repository/moby/moby-live/Java/xmls/rdfagentBuild.xml 2008/02/14 06:13:37 1.3
@@ -9,10 +9,20 @@
<!-- -->
<!-- ====================================================== -->
+<!-- ====================================================== -->
+<!-- Initiale some properties -->
+<!-- ====================================================== -->
+<target name="rdfagent-init">
+
+ <property name="build.rdfagent" location="${build.dir}/rdfagent"/>
+ <mkdir dir="${build.rdfagent}"/>
+
+</target>
+
<!-- ================================================================== -->
<!-- Builds a jar file with RDFagent classes -->
<!-- ================================================================== -->
-<target name="jar_rdfagent" depends="compile"
+<target name="jar-rdfagent" depends="rdfagent-init,compile"
description="Create a jar file with RDF Agent classes.">
<dirname property="build.lib.dir" file="${lib.dir}"/>
<!-- dirsep may not be portable -->
@@ -35,7 +45,7 @@
<!-- ================================================================== -->
<!-- Builds RDF Agent files for binary distribution -->
<!-- ================================================================== -->
-<target name="bindist_rdfagent" depends="compile,jar,jar_rdfagent"
+<target name="bindist-rdfagent" depends="compile,jars,jar-rdfagent"
description="Create RDF Agent binary distribution.">
<!-- Name of the final binary distribution (without extension) -->
@@ -53,14 +63,16 @@
<fileset dir="${lib.dir}">
<include name="*.jar"/>
</fileset>
- <fileset file="${build.lib}/jmoby.jar"/>
- <fileset file="${build.lib}/jmoby-others.jar"/>
+ <fileset file="${build.lib}/${maven.project.artifactId}-${maven.project.version}.jar"/>
</copy>
<copy todir="${rdfagent.dist}">
<fileset dir="${build.lib}" includes="RDFagent.jar"/>
</copy>
- <copy file="${src.config}/RDFagent_config.xml" todir="${rdfagent.dist}"/>
- <copy file="${src.config}/RDFagent_config.txt" todir="${rdfagent.dist}"/>
+
+ <property name="my.rdfagent.properties"
+ location="${src.config}/rdfagent.properties.template"/>
+ <copy file="${my.rdfagent.properties}" tofile="${rdfagent.dist}/RDFagent_config.txt"/>
+
<copy todir="${rdfagent.dist}">
<fileset dir="${src.support}/rdfagent" excludes="MANIFEST.MF"/>
</copy>
===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/registryServletsBuild.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/xmls/registryServletsBuild.xml 2006/11/16 22:01:50 1.1
+++ /home/repository/moby/moby-live/Java/xmls/registryServletsBuild.xml 2008/02/14 06:13:37 1.2
@@ -12,7 +12,7 @@
<!-- ================================================================== -->
<!-- Builds Registry Servlets web archive files for binary distribution -->
<!-- ================================================================== -->
-<target name="bindist_registry" depends="compile,jar"
+<target name="bindist-registry" depends="compile,jars"
description="Create Registry Servlets distribution.">
<!-- Name of the final binary distribution (without extension) -->
===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/seahawkBuild.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- /home/repository/moby/moby-live/Java/xmls/seahawkBuild.xml 2008/02/14 03:04:44 1.15
+++ /home/repository/moby/moby-live/Java/xmls/seahawkBuild.xml 2008/02/14 06:13:37 1.16
@@ -55,6 +55,7 @@
<path id="seahawk.build.classpath">
<path refid="build.classpath"/>
+<!-- <path refid="dependency.classpath"/> -->
<pathelement location="${src.main}"/>
</path>
rcsdiff: /home/repository/moby/moby-live/Java/xmls/RCS/exceptions.xml,v: No such file or directory
rcsdiff: /home/repository/moby/moby-live/Java/xmls/RCS/libraries.xml,v: No such file or directory
More information about the MOBY-guts
mailing list