[MOBY-guts] biomoby commit

Andreas Groscurth groscurt at dev.open-bio.org
Mon Jan 5 08:46:08 UTC 2009


groscurt
Mon Jan  5 03:46:07 EST 2009
Update of /home/repository/moby/moby-live/Java/src/webapps
In directory dev.open-bio.org:/tmp/cvs-serv23910/src/webapps

Modified Files:
	remote.deploy.build.xml.template 
Log Message:
changed to allow deployment on tomcat AND jboss
moby-live/Java/src/webapps remote.deploy.build.xml.template,1.5,1.6
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/webapps/remote.deploy.build.xml.template,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- /home/repository/moby/moby-live/Java/src/webapps/remote.deploy.build.xml.template	2008/03/03 14:11:08	1.5
+++ /home/repository/moby/moby-live/Java/src/webapps/remote.deploy.build.xml.template	2009/01/05 08:46:07	1.6
@@ -20,15 +20,13 @@
    <property name="lib.dir.2"          location="${project.home}/lib2"/>
    <property name="classes"            location="${project.home}/classes"/>
 
-   <!-- 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@"/>
+   <!-- 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@"/>
    <property name="axis.relative.path" value="@AXIS_RELATIVE_PATH@"/>
    <property name="axis.admin.url"     value="@AXIS_ADMIN_URL@"/>
 
-   <property name="tomcat.webapps" value="webapps"/>
-
    <!-- ================================================================== -->
    <!-- Message what and where will be deployed                            -->
    <!-- ================================================================== -->
@@ -39,22 +37,22 @@
 The following properties define where and how the services
 will be deployed. You can still define new values for them.
 
-tomcat.home = ${tomcat.home}
+server.home = ${server.home}
    All libraries (.jar files) will be moved here.
 
-tomcat.host = ${tomcat.host}
-   Where is your Tomcat installed. If this is not localhost
+server.host = ${server.host}
+   Where is your server installed. If this is not localhost
    you may need to allow remote control in server-config.wsdd
    before deploying services.
 
-tomcat.port = ${tomcat.port}
-   Where is your Tomcat listening.
+server.port = ${server.port}
+   Where is your server listening.
 
 axis.relative.path = ${axis.relative.path}
-   Where is Axis installed within Tomcat's 'webapps' dir.
+   Where is Axis installed within Tomcat's 'webapps' dir or JBoss 'server/default/deploy' dir
    
 axis.admin.url = ${axis.admin.url}
-   How to access your Tomcat/Axis.
+   How to access your server/Axis.
    
 For the list of services that will be deployed when you call
 'ant deploy' (or undeploy when you call 'ant undeploy')
@@ -67,15 +65,11 @@
    <!-- Initialize (whatever needs to be done)                             -->
    <!-- ================================================================== -->
    <target name="init">
-
-     <condition property="real.catalina.home" value="${env.CATALINA_HOME}">
-       <isset property="env.CATALINA_HOME"/>
-     </condition>
-     <property name="real.catalina.home" value="${tomcat.home}"/>
+     <property name="real.catalina.home" value="${server.home}"/>
 
      <!-- properties set from other properties set in conditions above -->
      <property name="deploy.axis.dir"
-       location="${real.catalina.home}/${tomcat.webapps}/${axis.relative.path}/WEB-INF"/>
+       location="${real.catalina.home}/${axis.relative.path}/WEB-INF"/>
      
      <!-- Classpath -->
      <path id="build.classpath">
@@ -94,7 +88,7 @@
    <!-- ================================================================== -->
    <!-- Do it (deploy)                                                     -->
    <!-- ================================================================== -->
-   <target name="deploy" depends="init,tomcat-running,tomcat-populate"
+   <target name="deploy" depends="init,server-running,server-populate"
      description="Deploy BioMoby services.">
 
      <foreach
@@ -109,7 +103,7 @@
    <!-- ================================================================== -->
    <!-- Undeploy it                                                        -->
    <!-- ================================================================== -->
-   <target name="undeploy" depends="init,tomcat-running"
+   <target name="undeploy" depends="init,server-running"
      description="Undeploy BioMoby services.">
 
      <foreach
@@ -122,31 +116,31 @@
    </target>
 
    <!-- ================================================================== -->
-   <!-- Make sure that a Tomcat has been started                           -->
+   <!-- Make sure that a server has been started                           -->
    <!-- ================================================================== -->
-    <target name="tomcat-running" depends="init">
-      <condition property="tomcat.is.running">
-        <socket server="${tomcat.host}" port="${tomcat.port}"/>
+    <target name="server-running" depends="init">
+      <condition property="server.is.running">
+        <socket server="${server.host}" port="${server.port}"/>
       </condition>
-      <fail unless="tomcat.is.running">-
+      <fail unless="server.is.running">-
 '
 
-    ERROR: Tomcat does not seem to be running.
+    ERROR: Server does not seem to be running.
     ------------------------------------------
-    I have just checked ${tomcat.host}:${tomcat.port}...
+    I have just checked ${server.host}:${server.port}...
     You may perhaps consider to start it.
     Or to set differently the following properties:
-    "tomcat.host" (current value: ${tomcat.host}), and
-    "tomcat.port" (current value: ${tomcat.port})
+    "server.host" (current value: ${server.host}), and
+    "server.port" (current value: ${server.port})
       </fail>
     </target>
 
    <!-- ================================================================== -->
-   <!-- Populate local Tomcat with files needed for BioMoby Web Services   -->
+   <!-- Populate local server with files needed for BioMoby Web Services   -->
    <!-- ================================================================== -->
-   <target name="tomcat-populate" depends="init">
+   <target name="server-populate" depends="init">
 
-     <!-- merge jar files in ${lib.dir.2} with the same-named jar files in Tomcat/Axis -->
+     <!-- merge jar files in ${lib.dir.2} with the same-named jar files in Server/Axis -->
      <foreach
        inheritall="yes"
        target="-merge-jars"
@@ -154,13 +148,13 @@
        <fileset dir="${lib.dir.2}" includes="*.jar"/>
      </foreach>
 
-     <!-- copy jar files to Tomcat/Axis - lib directory -->
+     <!-- copy jar files to server/Axis - lib directory -->
      <copy todir="${deploy.axis.dir}/lib">
        <fileset dir="${lib.dir}"/>
        <fileset dir="${lib.dir.2}"/>
      </copy>
 
-     <!-- copy other files to Tomcat/Axis - classes directory -->
+     <!-- copy other files to server/Axis - classes directory -->
      <copy todir="${deploy.axis.dir}/classes">
        <fileset dir="${classes}"/>
      </copy>
@@ -194,7 +188,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="tomcat-running">
+   <target name="axis-admin" depends="server-running">
      
      <basename property="deploy.task.name" file="${wsdd.file}" suffix="wsdd"/>
 
@@ -202,9 +196,9 @@
      <java classname="org.apache.axis.client.AdminClient" taskname="${deploy.task.name}"
        classpathref="build.classpath" fork="true" failonerror="true">
        <arg value="-h"/>
-       <arg value="${tomcat.host}"/>
+       <arg value="${server.host}"/>
        <arg value="-p"/>
-       <arg value="${tomcat.port}"/>
+       <arg value="${server.port}"/>
        <arg value="-s"/>
        <arg value="${axis.admin.url}"/>
        <arg file="${wsdd.file}"/>




More information about the MOBY-guts mailing list