[MOBY-guts] biomoby commit
Andreas Groscurth
groscurt at dev.open-bio.org
Tue Feb 3 08:59:35 UTC 2009
groscurt
Tue Feb 3 03:59:35 EST 2009
Update of /home/repository/moby/moby-live/Java/src/webapps
In directory dev.open-bio.org:/tmp/cvs-serv22965/src/webapps
Modified Files:
remote.deploy.build.xml.template
Log Message:
corrected version for server deployment... backward compatible
moby-live/Java/src/webapps remote.deploy.build.xml.template,1.6,1.7
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/webapps/remote.deploy.build.xml.template,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- /home/repository/moby/moby-live/Java/src/webapps/remote.deploy.build.xml.template 2009/01/05 08:46:07 1.6
+++ /home/repository/moby/moby-live/Java/src/webapps/remote.deploy.build.xml.template 2009/02/03 08:59:35 1.7
@@ -20,13 +20,15 @@
<property name="lib.dir.2" location="${project.home}/lib2"/>
<property name="classes" location="${project.home}/classes"/>
- <!-- server/Axis/servlets related properties -->
- <property name="server.home" value="@SERVER_HOME@"/>
- <property name="server.port" value="@SERVER_PORT@"/>
- <property name="server.host" value="@SERVER_HOST@"/>
+ <!-- Tomcat/Axis/servlets related properties -->
+ <property name="tomcat.home" value="@TOMCAT_HOME@"/>
+ <property name="tomcat.port" value="@TOMCAT_PORT@"/>
+ <property name="tomcat.host" value="@TOMCAT_HOST@"/>
<property name="axis.relative.path" value="@AXIS_RELATIVE_PATH@"/>
<property name="axis.admin.url" value="@AXIS_ADMIN_URL@"/>
+ <property name="tomcat.webapps" value="@TOMCAT_WEBAPPS@"/>
+
<!-- ================================================================== -->
<!-- Message what and where will be deployed -->
<!-- ================================================================== -->
@@ -37,22 +39,25 @@
The following properties define where and how the services
will be deployed. You can still define new values for them.
-server.home = ${server.home}
+tomcat.home = ${tomcat.home}
All libraries (.jar files) will be moved here.
-server.host = ${server.host}
- Where is your server installed. If this is not localhost
+tomcat.host = ${tomcat.host}
+ Where is your Tomcat installed. If this is not localhost
you may need to allow remote control in server-config.wsdd
before deploying services.
-server.port = ${server.port}
- Where is your server listening.
+tomcat.port = ${tomcat.port}
+ Where is your Tomcat listening.
+
+tomcat.webapps = ${tomcat.webapps}
+ Where the deployment directory is 'e.g. webapps'
axis.relative.path = ${axis.relative.path}
- Where is Axis installed within Tomcat's 'webapps' dir or JBoss 'server/default/deploy' dir
+ Where is Axis installed within Tomcat's 'webapps' dir.
axis.admin.url = ${axis.admin.url}
- How to access your server/Axis.
+ How to access your Tomcat/Axis.
For the list of services that will be deployed when you call
'ant deploy' (or undeploy when you call 'ant undeploy')
@@ -65,11 +70,27 @@
<!-- Initialize (whatever needs to be done) -->
<!-- ================================================================== -->
<target name="init">
- <property name="real.catalina.home" value="${server.home}"/>
+
+ <condition property="real.catalina.home" value="${env.CATALINA_HOME}">
+ <isset property="env.CATALINA_HOME"/>
+ </condition>
+ <property name="real.catalina.home" value="${tomcat.home}"/>
+ <condition property="real.server.host" value="${tomcat.host}">
+ <isset property="tomcat.host"/>
+ </condition>
+ <condition property="real.server.port" value="${tomcat.port}">
+ <isset property="tomcat.port"/>
+ </condition>
+ <condition property="real.server.host" value="${server.host}">
+ <isset property="server.host"/>
+ </condition>
+ <condition property="real.server.port" value="${server.port}">
+ <isset property="server.port"/>
+ </condition>
<!-- properties set from other properties set in conditions above -->
<property name="deploy.axis.dir"
- location="${real.catalina.home}/${axis.relative.path}/WEB-INF"/>
+ location="${real.catalina.home}/${tomcat.webapps}/${axis.relative.path}/WEB-INF"/>
<!-- Classpath -->
<path id="build.classpath">
@@ -88,7 +109,7 @@
<!-- ================================================================== -->
<!-- Do it (deploy) -->
<!-- ================================================================== -->
- <target name="deploy" depends="init,server-running,server-populate"
+ <target name="deploy" depends="init,tomcat-running,tomcat-populate"
description="Deploy BioMoby services.">
<foreach
@@ -103,7 +124,7 @@
<!-- ================================================================== -->
<!-- Undeploy it -->
<!-- ================================================================== -->
- <target name="undeploy" depends="init,server-running"
+ <target name="undeploy" depends="init,tomcat-running"
description="Undeploy BioMoby services.">
<foreach
@@ -116,31 +137,31 @@
</target>
<!-- ================================================================== -->
- <!-- Make sure that a server has been started -->
+ <!-- Make sure that a Tomcat has been started -->
<!-- ================================================================== -->
- <target name="server-running" depends="init">
- <condition property="server.is.running">
- <socket server="${server.host}" port="${server.port}"/>
+ <target name="tomcat-running" depends="init">
+ <condition property="tomcat.is.running">
+ <socket server="${real.server.host}" port="${real.server.port}"/>
</condition>
- <fail unless="server.is.running">-
+ <fail unless="tomcat.is.running">-
'
ERROR: Server does not seem to be running.
------------------------------------------
- I have just checked ${server.host}:${server.port}...
+ I have just checked ${real.server.host}:${real.server.port}...
You may perhaps consider to start it.
Or to set differently the following properties:
- "server.host" (current value: ${server.host}), and
- "server.port" (current value: ${server.port})
+ "server.host" (current value: ${real.server.host}), and
+ "server.port" (current value: ${real.server.port})
</fail>
</target>
<!-- ================================================================== -->
- <!-- Populate local server with files needed for BioMoby Web Services -->
+ <!-- Populate local Tomcat with files needed for BioMoby Web Services -->
<!-- ================================================================== -->
- <target name="server-populate" depends="init">
+ <target name="tomcat-populate" depends="init">
- <!-- merge jar files in ${lib.dir.2} with the same-named jar files in Server/Axis -->
+ <!-- merge jar files in ${lib.dir.2} with the same-named jar files in Tomcat/Axis -->
<foreach
inheritall="yes"
target="-merge-jars"
@@ -148,13 +169,13 @@
<fileset dir="${lib.dir.2}" includes="*.jar"/>
</foreach>
- <!-- copy jar files to server/Axis - lib directory -->
+ <!-- copy jar files to Tomcat/Axis - lib directory -->
<copy todir="${deploy.axis.dir}/lib">
<fileset dir="${lib.dir}"/>
<fileset dir="${lib.dir.2}"/>
</copy>
- <!-- copy other files to server/Axis - classes directory -->
+ <!-- copy other files to Tomcat/Axis - classes directory -->
<copy todir="${deploy.axis.dir}/classes">
<fileset dir="${classes}"/>
</copy>
@@ -188,7 +209,7 @@
<!-- Calling an Axis Admin client to do the real [un]deploying. -->
<!-- parameter: ${wsdd.file} ... a file with a [un]deployment descr. -->
<!-- ================================================================== -->
- <target name="axis-admin" depends="server-running">
+ <target name="axis-admin" depends="tomcat-running">
<basename property="deploy.task.name" file="${wsdd.file}" suffix="wsdd"/>
@@ -196,9 +217,9 @@
<java classname="org.apache.axis.client.AdminClient" taskname="${deploy.task.name}"
classpathref="build.classpath" fork="true" failonerror="true">
<arg value="-h"/>
- <arg value="${server.host}"/>
+ <arg value="${tomcat.host}"/>
<arg value="-p"/>
- <arg value="${server.port}"/>
+ <arg value="${tomcat.port}"/>
<arg value="-s"/>
<arg value="${axis.admin.url}"/>
<arg file="${wsdd.file}"/>
More information about the MOBY-guts
mailing list