[MOBY-guts] biomoby commit

[Martin Senger]

senger
Tue Jul 19 08:39:58 EDT 2005
Update of /home/repository/moby/moby-live/Java
In directory pub.open-bio.org:/tmp/cvs-serv19358

Modified Files:
	build.xml 
Log Message:


moby-live/Java build.xml,1.16,1.17
===================================================================
RCS file: /home/repository/moby/moby-live/Java/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- /home/repository/moby/moby-live/Java/build.xml	2005/05/19 20:18:53	1.16
+++ /home/repository/moby/moby-live/Java/build.xml	2005/07/19 12:39:58	1.17
@@ -207,11 +207,13 @@
       </fail>
       <javac srcdir="${src.main}"
         destdir="${build.classes}"
+debug="yes"
         excludes="${project.excludes},${version.excludes}">
         <classpath refid="build.classpath"/>
       </javac>
       <javac srcdir="${src.clients}"
         destdir="${build.clients}"
+debug="yes"
         excludes="${project.excludes}">
         <classpath refid="build.classpath"/>
       </javac>
@@ -256,7 +258,7 @@
 
      <javadoc
        packagenames="*.*"
-       excludepackagenames="org.biomoby.service.generated"
+       excludepackagenames="org.biomoby.service.generated,org.biomoby.service.notyet,notyet"
        destdir="${javadoc.dir}"
        classpathref="build.classpath"
        defaultexcludes="yes"
@@ -266,7 +268,6 @@
        author="true"
        version="true"
        use="true"
-       nodeprecatedlist="true"
        public="true">
 
        <!-- included files -->
@@ -501,13 +502,28 @@
 
    <target name="tomcat-init" depends="init">
       <fail unless="real.catalina.home"> 
-         Tomcat Catalina not found.
-         Please set environment variable CATALINA_HOME to point to it, or
-         create a file 'build.properties' and put there the line:
-            catalina.home = &lt;location of your CATALINA&gt;
-         (do not include '&lt;' and '&gt;' there)
+
+        Tomcat Catalina not found.
+        -----------------------------------
+        Please set environment variable CATALINA_HOME to point to it, or
+        create a file 'build.properties' and put there the line:
+        catalina.home = &lt;location of your CATALINA&gt;
+        (do not include '&lt;' and '&gt;' there)
       </fail>
-   </target>
+    </target>
+
+    <target name="tomcat-running" depends="tomcat-init">
+      <condition property="tomcat.is.running">
+        <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.
+      </fail>
+    </target>
 
    <target name="deploy-ws" depends="tomcat-init,compile"
      description="Deploy jMoby Web Services to local Tomcat.">
@@ -606,6 +622,9 @@
       </condition>
       <echo message="${real.java.version.latest}"/>
 
+      <get src="http://cvs.open-bio.org/cgi-bin/viewcvs/viewcvs.cgi/*checkout*/jars-archive/current/${alltools}?rev=HEAD&amp;cvsroot=biomoby&amp;content-type=text/plain"
+          dest="${lib.dir}/${alltools}"   usetimestamp="true"/>
+
    </target>
 
    <!-- work in progress -->
@@ -626,7 +645,7 @@
      <echo message="Moby Services [re-]deployed, you may need to restart Tomcat"/>
    </target>
 
-   <!-- populate local Tomcat with files needed for OpenBQS Web Services -->
+   <!-- populate local Tomcat with files needed for 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"/>