[MOBY-guts] biomoby commit
senger@ebi.ac.uk
senger at pub.open-bio.org
Mon Oct 18 14:35:05 UTC 2004
senger
Mon Oct 18 10:35:05 EDT 2004
Update of /home/repository/moby/moby-live/Java
In directory pub.open-bio.org:/tmp/cvs-serv2405
Modified Files:
build.properties.template build.xml
Log Message:
searching data paths and more, see docs/ChangeLog
moby-live/Java build.properties.template,1.2,1.3 build.xml,1.7,1.8
===================================================================
RCS file: /home/repository/moby/moby-live/Java/build.properties.template,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- /home/repository/moby/moby-live/Java/build.properties.template 2003/11/09 01:05:02 1.2
+++ /home/repository/moby/moby-live/Java/build.properties.template 2004/10/18 14:35:05 1.3
@@ -25,3 +25,8 @@
cache.url = http://localhost/jmobycache
default.endpoint = http://localhost/cgi-bin/moby
default.namespace = http://mobycentral.cbr.nrc.ca/MOBY/Central
+
+servlet.name.graphs = graphs
+servlet.url.graphs = /graphs/*
+
+registry.cache.dir = /tmp/mobycache
===================================================================
RCS file: /home/repository/moby/moby-live/Java/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- /home/repository/moby/moby-live/Java/build.xml 2004/09/23 00:18:00 1.7
+++ /home/repository/moby/moby-live/Java/build.xml 2004/10/18 14:35:05 1.8
@@ -46,6 +46,16 @@
<property name="build.webapps" value="${build.dir}/webapps/jmoby"/>
<property name="build.run" value="${build.dir}/run"/>
+ <!-- Tomcat/Axis/servlets related properties -->
+ <!-- (note that the Tomcat real path is defined inside the 'init' target -->
+ <!-- because it uses some conditional settings) -->
+ <property name="tomcat.port" value="8080"/>
+ <property name="tomcat.host" value="localhost"/>
+ <property name="tomcat.webapps" value="webapps"/>
+ <property name="axis.relative.path" value="axis"/>
+ <property name="axis.apath" value="${axis.relative.path}/servlet/AxisServlet"/>
+ <property name="servlets.relative.path" value="."/>
+
<!-- Classpath -->
<path id="build.classpath">
<pathelement location="${build.classes}"/>
@@ -81,6 +91,7 @@
<property name="activation" value="activation.jar"/>
<property name="adenine" value="adenine.jar"/>
<property name="jena" value="jena.jar"/>
+ <property name="taverna" value="taverna.jar"/>
<property name="jaxen-core" value="jaxen-core.jar"/>
<property name="jaxen-jdom" value="jaxen-jdom.jar"/>
@@ -130,6 +141,8 @@
<get src="${remote.dir}/${adenine}" dest="${lib.dir}/${adenine}" usetimestamp="true"/>
<get src="${remote.dir}/${jena}" dest="${lib.dir}/${jena}" usetimestamp="true"/>
+ <get src="${remote.dir}/${taverna}" dest="${lib.dir}/${taverna}" usetimestamp="true"/>
+
<get src="${remote.dir}/${jaxen-core}" dest="${lib.dir}/${jaxen-core}" usetimestamp="true"/>
<get src="${remote.dir}/${jaxen-jdom}" dest="${lib.dir}/${jaxen-jdom}" usetimestamp="true"/>
<get src="${remote.dir}/${saxpath}" dest="${lib.dir}/${saxpath}" usetimestamp="true"/>
@@ -185,6 +198,7 @@
<available file="${lib.dir}/${activation}"/>
<available file="${lib.dir}/${adenine}"/>
<available file="${lib.dir}/${jena}"/>
+ <available file="${lib.dir}/${taverna}"/>
<available file="${lib.dir}/${jaxen-core}"/>
<available file="${lib.dir}/${jaxen-jdom}"/>
@@ -250,6 +264,15 @@
<condition property="dot.path" value="">
<not><isset property="dot.path"/></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>
+ <condition property="servlet.url.graphs" value="/graphs/*">
+ <not><isset property="servlet.url.graphs"/></not>
+ </condition>
<!-- Files dependent on the timestamp of the local build.properties -->
<dependset>
@@ -411,7 +434,7 @@
<property name="deploy.war.file" value="${build.webapps}/jmoby.war"/>
<!-- ================================================================== -->
- <!-- Move distribution of packed servlets (.war file) -->
+ <!-- Move distribution of packed servlets (.war file) -->
<!-- ================================================================== -->
<target name="wardist" depends="war"
description="Move a 'war' file (with servlets) to the distribution directory.">
@@ -439,60 +462,67 @@
</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)"/>
+ description="Deploy jMoby Web Services to local Tomcat.">
+ <echo message="There are no Web Services to be deployed (yet)"/>
</target>
<target name="war" depends="compile"
- description="Create a war file with jMoby servlets.">
- <mkdir dir="${build.webapps}"/>
- <mkdir dir="${build.webapps}/cache"/>
- <copy file="${src.webapps}/web.xml.template"
- tofile="${build.webapps}/web.xml"
- overwrite="yes">
- <filterset>
- <filter token="PROVIDER_NAME" value="${provider.name}"/>
- <filter token="PROVIDER_EMAIL" value="${provider.email}"/>
- <filter token="REFRESH_INTERVAL" value="${refresh.interval}"/>
- <filter token="CACHE_DIR" value="${cache.dir}"/>
- <filter token="CACHE_URL" value="${cache.url}"/>
- <filter token="DEFAULT_ENDPOINT" value="${default.endpoint}"/>
- <filter token="DEFAULT_NAMESPACE" value="${default.namespace}"/>
- <filter token="PROXY_SET" value="${proxySet}"/>
- <filter token="PROXY_HOST" value="${http.proxyHost}"/>
- <filter token="PROXY_PORT" value="${http.proxyPort}"/>
- <filter token="DOT_PATH" value="${dot.path}"/>
- </filterset>
- </copy>
- <war destfile="${deploy.war.file}"
- webxml="${build.webapps}/web.xml">
- <fileset dir="${docs.dir}/graphs"/>
- <classes dir="${build.classes}"/>
- <classes dir="${build.clients}"/>
- <lib dir="${lib.dir}">
- <include name="*.jar"/>
- <exclude name="ant_home/*"/>
- <exclude name="servlet.jar"/>
-
- <!-- remove it from this list only if you need something for servlets -->
- <exclude name="jaxen-core"/>
- <exclude name="jaxen-jdom"/>
- <exclude name="saxpath"/>
- <exclude name="xalan"/>
- <exclude name="concurrent"/>
- <exclude name="icu4j"/>
- <exclude name="jakarta-oro"/>
- <exclude name="jdom"/>
- <exclude name="junit"/>
- <exclude name="mail"/>
- <exclude name="rdf-api"/>
-
- </lib>
- <zipfileset dir="${build.webapps}/cache"
- prefix="cache"/>
- </war>
+ description="Create a war file with jMoby servlets.">
+ <mkdir dir="${build.webapps}"/>
+ <mkdir dir="${build.webapps}/cache"/>
+ <copy file="${src.webapps}/web.xml.template"
+ tofile="${build.webapps}/web.xml"
+ overwrite="yes">
+ <filterset>
+ <!-- how are the servlets named and what are theit URL patterns -->
+ <filter token="SERVLET_NAME_GRAPHS" value="${servlet.name.graphs}"/>
+ <filter token="SERVLET_URL_GRAPHS" value="${servlet.url.graphs}"/>
+
+ <!-- shared by more servles -->
+ <filter token="PROVIDER_NAME" value="${provider.name}"/>
+ <filter token="PROVIDER_EMAIL" value="${provider.email}"/>
+ <filter token="DEFAULT_ENDPOINT" value="${default.endpoint}"/>
+ <filter token="DEFAULT_NAMESPACE" value="${default.namespace}"/>
+
+ <!-- for 'graphs' servlet -->
+ <filter token="REFRESH_INTERVAL" value="${refresh.interval}"/>
+ <filter token="CACHE_DIR" value="${cache.dir}"/>
+ <filter token="CACHE_URL" value="${cache.url}"/>
+ <filter token="PROXY_SET" value="${proxySet}"/>
+ <filter token="PROXY_HOST" value="${http.proxyHost}"/>
+ <filter token="PROXY_PORT" value="${http.proxyPort}"/>
+ <filter token="DOT_PATH" value="${dot.path}"/>
+ <filter token="REGISTRY_CACHE_DIR" value="${registry.cache.dir}"/>
+ </filterset>
+ </copy>
+ <war destfile="${deploy.war.file}"
+ webxml="${build.webapps}/web.xml">
+ <fileset dir="${docs.dir}/graphs"/>
+ <classes dir="${build.classes}"/>
+ <classes dir="${build.clients}"/>
+ <lib dir="${lib.dir}">
+ <include name="*.jar"/>
+ <exclude name="ant_home/*"/>
+ <exclude name="servlet.jar"/>
+
+ <!-- remove it from this list only if you need something for servlets -->
+ <exclude name="jaxen-core"/>
+ <exclude name="jaxen-jdom"/>
+ <exclude name="saxpath"/>
+ <exclude name="xalan"/>
+ <exclude name="concurrent"/>
+ <exclude name="icu4j"/>
+ <exclude name="jakarta-oro"/>
+ <exclude name="junit"/>
+ <exclude name="mail"/>
+ <exclude name="rdf-api"/>
+
+ </lib>
+ <zipfileset dir="${build.webapps}/cache"
+ prefix="cache"/>
+ </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"/>
@@ -516,5 +546,37 @@
<echo message="${TODAY_SHORT}"/>
</target>
+ <!-- work in progress -->
+
+ <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.apath}"/>
+ <arg file="${src.config}/mobydigest.wsdd"/>
+ </java>
+
+ <echo message="Moby Services [re-]deployed, you may need to restart Tomcat"/>
+ </target>
+
+ <!-- populate local Tomcat with files needed for OpenBQS 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"/>
+ </fileset>
+ <fileset dir="${build.lib}" includes="*.jar"/>
+ </copy>
+ </target>
+
</project>
More information about the MOBY-guts
mailing list