[MOBY-guts] biomoby commit

[Martin Senger]

senger
Thu Feb 21 08:12:36 EST 2008
Update of /home/repository/moby/moby-live/Java/src/webapps
In directory dev.open-bio.org:/tmp/cvs-serv24982/src/webapps

Modified Files:
	remote.deploy.build.xml.template 
Removed Files:
	cp.bat deploy deploy.bat 
Log Message:
mavenization of ant scripts

moby-live/Java/src/webapps remote.deploy.build.xml.template,1.2,1.3 cp.bat,1.1,NONE deploy,1.1,NONE deploy.bat,1.2,NONE
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/webapps/remote.deploy.build.xml.template,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- /home/repository/moby/moby-live/Java/src/webapps/remote.deploy.build.xml.template	2005/09/25 09:07:22	1.2
+++ /home/repository/moby/moby-live/Java/src/webapps/remote.deploy.build.xml.template	2008/02/21 13:12:36	1.3
@@ -1,11 +1,6 @@
 <?xml version="1.0"?>
 <project name="jMoby: Remote service deployment" default="deploy" basedir=".">
 
-  <!-- ================================================================== -->
-  <!--                        Contributed tasks                           -->
-  <!-- ================================================================== -->
-  <taskdef resource="net/sf/antcontrib/antlib.xml"/>
-
    <!-- ================================================================== -->
    <!--                            Properties                              -->
    <!-- ================================================================== -->
@@ -19,11 +14,11 @@
    <property file="${user.home}/build.properties"/>
 
    <!-- The directory containing things to be deployed -->
-   <property name="wsdd.deploy.dir"    value="${project.home}/deploy-wsdd"/>
-   <property name="wsdd.undeploy.dir"  value="${project.home}/undeploy-wsdd"/>
-   <property name="lib.dir"   value="${project.home}/lib"/>
-   <property name="lib.dir.2" value="${project.home}/lib2"/>
-   <property name="lib.axis"  value="${project.home}/axis-lib"/>
+   <property name="wsdd.deploy.dir"    location="${project.home}/deploy-wsdd"/>
+   <property name="wsdd.undeploy.dir"  location="${project.home}/undeploy-wsdd"/>
+   <property name="lib.dir"            location="${project.home}/lib"/>
+   <property name="lib.dir.2"          location="${project.home}/lib2"/>
+   <property name="lib.axis"           location="${project.home}/axis-lib"/>
 
    <!-- Tomcat/Axis/servlets related properties -->
    <property name="tomcat.home"        value="@TOMCAT_HOME@"/>
@@ -41,7 +36,7 @@
      description="Print what and where can be deploy">
      <echo taskname="info">
 ===========================================================
-The following properties defines where and how the services
+The following properties define where and how the services
 will be deployed. You can still define new values for them.
 
 tomcat.home = ${tomcat.home}
@@ -62,7 +57,7 @@
    How to access your Tomcat/Axis.
    
 For the list of services that will be deployed when you call
-'sh deploy' (or undeploy when you call 'sh deploy undeploy')
+'ant deploy' (or undeploy when you call 'ant undeploy')
 see the contents of 'deploy-wsdd' or 'undeploy-wsdd'.
 ===========================================================
      </echo>
@@ -73,15 +68,27 @@
    <!-- ================================================================== -->
    <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}"/>
-
-      <!-- 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"/>
-
+     <condition property="real.catalina.home" value="${env.CATALINA_HOME}">
+       <isset property="env.CATALINA_HOME"/>
+     </condition>
+     <property name="real.catalina.home" value="${tomcat.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"/>
+     
+     <!-- Classpath -->
+     <path id="build.classpath">
+       <fileset dir="${lib.dir}">
+         <include name="*.jar"/>
+       </fileset>
+     </path>
+     
+     <!-- contributed tasks -->
+     <taskdef resource="net/sf/antcontrib/antlib.xml">
+       <classpath refid="build.classpath"/>
+     </taskdef>
+     
    </target>
 
    <!-- ================================================================== -->
@@ -122,11 +129,15 @@
         <socket server="${tomcat.host}" port="${tomcat.port}"/>
       </condition>
       <fail unless="tomcat.is.running">-
- 
-        Tomcat does not seem to be running
-        ==================================
-        I have just checked ${tomcat.host}:${tomcat.port}...
-        You may perhaps consider to start it.
+'
+
+    ERROR: Tomcat does not seem to be running.
+    ------------------------------------------
+    I have just checked ${tomcat.host}:${tomcat.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})
       </fail>
     </target>
 
@@ -182,13 +193,6 @@
      
      <basename property="deploy.task.name" file="${wsdd.file}" suffix="wsdd"/>
 
-     <!-- Classpath -->
-     <path id="build.classpath">
-       <fileset dir="${lib.axis}">
-         <include name="*.jar"/>
-       </fileset>
-     </path>
-     
      <!-- 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">

rcsdiff: /home/repository/moby/moby-live/Java/src/webapps/RCS/cp.bat,v: No such file or directory

rcsdiff: /home/repository/moby/moby-live/Java/src/webapps/RCS/deploy,v: No such file or directory

rcsdiff: /home/repository/moby/moby-live/Java/src/webapps/RCS/deploy.bat,v: No such file or directory