[MOBY-guts] biomoby commit

Paul Gordon gordonp at dev.open-bio.org
Thu Feb 14 03:04:44 UTC 2008


gordonp
Wed Feb 13 22:04:44 EST 2008
Update of /home/repository/moby/moby-live/Java/xmls
In directory dev.open-bio.org:/tmp/cvs-serv19467/xmls

Modified Files:
	seahawkBuild.xml 
Log Message:
Initial commit of CGIService, including ACDServlet refactor causing LegacyService addition
moby-live/Java/xmls seahawkBuild.xml,1.14,1.15
===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/seahawkBuild.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- /home/repository/moby/moby-live/Java/xmls/seahawkBuild.xml	2008/01/30 00:14:11	1.14
+++ /home/repository/moby/moby-live/Java/xmls/seahawkBuild.xml	2008/02/14 03:04:44	1.15
@@ -30,6 +30,12 @@
   <property name="acdservlet.auto.classname" value="ca.ucalgary.services.test.ACDServiceTestCase"/>
   <property name="acdservlet.classname" value="ca.ucalgary.servlets.ACDService"/>
   <property name="acdservlet.warname" value="ACDServlet"/>
+  <property name="acdservlet.web.xml" value="acdweb.xml"/>
+
+  <property name="cgiservlet.auto.classname" value="ca.ucalgary.services.test.CGIServiceTestCase"/>
+  <property name="cgiservlet.classname" value="ca.ucalgary.servlets.CGIService"/>
+  <property name="cgiservlet.warname" value="CGIServlet"/>
+  <property name="cgiservlet.web.xml" value="cgiweb.xml"/>
 
   <property name="jarmaker.dir" location="${build.dir}/minnow"/>
   <property name="jarmaker.fullname" value="ca.ucalgary.minnow.MinJarMaker"/>
@@ -45,7 +51,7 @@
 	default libraries, so that we don't miss classes in the jar making because
 	they're part of our system's custom Java. -->
   <!--<property name="jarmaker.virgin_jvm" location="/export/data/programs/jdk1.6.0_04/bin/java"/>-->
-  <property name="jarmaker.virgin_jvm" location="/export/data/programs/jdk1.5.0_06/bin/java"/>
+  <property name="jarmaker.virgin_jvm" location="/usr/bin/java"/>
   
   <path id="seahawk.build.classpath">
     <path refid="build.classpath"/>
@@ -146,7 +152,7 @@
     <echo message="Building ACD servlet standalone WAR to ${build.clients.absolute}"/>
 
     <mkdir dir="${jarmaker.dir}/WEB-INF"/>
-    <copy file="${src.webapps}/WEB-INF/acdweb.xml" tofile="${jarmaker.dir}/WEB-INF/web.xml" overwrite="true"/>
+    <copy file="${src.webapps}/WEB-INF/${acdservlet.web.xml}" tofile="${jarmaker.dir}/WEB-INF/web.xml" overwrite="true"/>
     <java dir="${jarmaker.dir}" jvm="${jarmaker.virgin_jvm}" classname="${jarmaker.fullname}" fork="true">
       <classpath>
 	<pathelement path="${jarmaker.dir}"/>
@@ -166,7 +172,7 @@
 	<mkdir dir="${build.classes}/WEB-INF/classes"/>
 	<mkdir dir="${build.classes}/WEB-INF/lib"/>
 	<unjar src="${build.clients.absolute}/${acdservlet.warname}.war" dest="${build.classes}/WEB-INF/classes"/>
-        <copy file="${src.webapps}/WEB-INF/acdweb.xml" tofile="${build.classes}/WEB-INF/web.xml"/>
+        <copy file="${src.webapps}/WEB-INF/${acdservlet.web.xml}" tofile="${build.classes}/WEB-INF/web.xml"/>
 
 	<jar destfile="${build.clients.absolute}/${acdservlet.warname}.war"
 		filesonly="true"
@@ -193,6 +199,57 @@
     
   </target>
 
+  <target name="cgiservlet-war" depends="compile, make_maker" description="(User) Builds the CGIServlet WAR for MOBY-S service creation based on wrapping moby-annotated HTML CGI forms on the Web">
+    <echo message="Building CGI servlet standalone WAR to ${build.clients.absolute}"/>
+
+    <mkdir dir="${jarmaker.dir}/WEB-INF"/>
+    <copy file="${src.webapps}/WEB-INF/${cgiservlet.web.xml}" tofile="${jarmaker.dir}/WEB-INF/web.xml" overwrite="true"/>
+    <java dir="${jarmaker.dir}" jvm="${jarmaker.virgin_jvm}" classname="${jarmaker.fullname}" fork="true">
+      <classpath>
+	<pathelement path="${jarmaker.dir}"/>
+      </classpath>
+	<jvmarg value="-Dmoby.debug=1"/>
+        <jvmarg value="-D${jarmaker.classPathProperty}=${scp}:${src.webapps}"/>
+	<jvmarg value="-D${jarmaker.manifestMainClassProperty}=${servlet.tester.classname}"/>
+	<!-- The following is a list of classes that aren't picked up by the unit
+	     tests, but which the applet might need.  -->
+	<jvmarg value="-D${jarmaker.extraClassesProperty}=org/apache/xerces/xs/*PSVI.class:org/biomoby/**Exception.class:org/apache/**Exception.class:org/apache/**Error.class:org/apache/**ErrorResources.class:org/apache/**Messages.class:org/apache/log4j/spi/*.class:org/apache/axis/utils/*.class:org/apache/**.properties:javax/**/soap/*.class:org/jdom/*.class"/>
+
+	<arg value="${build.clients.absolute}/${cgiservlet.warname}.war"/>
+	<arg value="${cgiservlet.auto.classname}"/>
+    </java>
+
+	<mkdir dir="${build.classes}/WEB-INF"/>
+	<mkdir dir="${build.classes}/WEB-INF/classes"/>
+	<mkdir dir="${build.classes}/WEB-INF/lib"/>
+	<unjar src="${build.clients.absolute}/${cgiservlet.warname}.war" dest="${build.classes}/WEB-INF/classes"/>
+        <copy file="${src.webapps}/WEB-INF/${cgiservlet.web.xml}" tofile="${build.classes}/WEB-INF/web.xml"/>
+
+	<jar destfile="${build.clients.absolute}/${cgiservlet.warname}.war"
+		filesonly="true"
+		update="true"
+		compress="true"
+	        includes="WEB-INF/**"
+	        excludes="WEB-INF/classes/javax/servlet/**"
+		basedir="${build.classes}">
+            <manifest>
+		<attribute name="Built-By" value="${user.name}"/>
+		<attribute name="Main-Class" value="${servlet.tester.classname}"/>
+		<section name="common">
+		<attribute name="Implementation-Title" value="CGIServlet: A Framework for providing MOBY-S Web Services based on wrapping moby-annotation HTML CGI forms on the Web"/>
+		<attribute name="Implementation-Version" value="${version}"/>
+		<attribute name="Implementation-Vendor"
+                   value="University of Calgary, Sun Center of Excellence for Visual Genomics"/>
+		</section>
+    	    </manifest>
+        </jar>
+	
+	<delete dir="${build.classes}/WEB-INF"/>
+
+	<echo message="The CGI servlet standalone WAR is ${build.clients.absolute}/${cgiservlet.warname}.war"/>
+    
+  </target>
+
   <property name="url" value=""/>
   <target name="seahawk" depends="compile" description="(User) Run the Seahawk MOBY client interface as a standalone application">
       <java classname="${seahawk.classname}" classpathref="seahawk.build.classpath" fork="true">




More information about the MOBY-guts mailing list