[MOBY-guts] biomoby commit

[Gary Schiltz]

gss
Thu Sep 22 13:37:11 EDT 2005
Update of /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build
In directory pub.open-bio.org:/tmp/cvs-serv18935/build

Modified Files:
	build.xml 
Log Message:
Misc fixes

moby-live/S-MOBY/ref-impl/semanticmoby.org/build build.xml,1.2,1.3
===================================================================
RCS file: /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build/build.xml	2005/09/21 23:08:04	1.2
+++ /home/repository/moby/moby-live/S-MOBY/ref-impl/semanticmoby.org/build/build.xml	2005/09/22 17:37:11	1.3
@@ -55,8 +55,23 @@
         </javac>
     </target>
     
+    <!-- The smoby.properties file is not managed by CVS, but must exist
+         in the WEB-INF directory (the developer should use a copy of the
+         file smoby.example.properties). Check that it exists, and if it
+         doesn't, then print a message and fail -->
+    <target name="check-moby-props-file">
+    	<available file="${webinf-dir}/smoby.properties"
+    	           property="smoby-props-file-present"/>
+    	<fail unless="smoby-props-file-present">
+    	    The file smoby.properties is missing from the WebRoot/WEB-INF
+    	    directory. The file smoby.example.properties should be copied
+    	    to smoby.properties, which should then be modified to include
+    	    appropriate values for database connections, etc.
+    	</fail>
+    </target>
+    
     <!-- Package the compiled source files into the main jar file -->
-    <target name="war" depends="compile">
+    <target name="war" depends="check-moby-props-file, compile">
         <ant dir="../core"
              antfile="../core/build/build.xml"
              target="javadoc"
@@ -69,9 +84,13 @@
             <fileset dir="${htdocs-dir}">
                 <!-- web.xml is automatically included by the war task -->
                 <exclude name="WEB-INF/web.xml"/>
-            	<!-- Don't include files used for development & testing only -->
+                <exclude name="WEB-INF/smoby.example.properties"/>
             </fileset>
-            <lib dir="${lib-dir}" includes="*.jar"/>
+            <lib dir="${lib-dir}">
+                <include name="*.jar"/>
+                <!-- The servlet api is provided by the servlet container -->
+                <exclude name="servlet-api.jar"/>
+            </lib>
         </war>
     </target>
 
@@ -86,9 +105,10 @@
 
 	<!-- Remove the classes directory and jar file -->
 	<target name="clean">
-		<delete dir="${classes-dir}" includeEmptyDirs="true"/>
+		<delete dir="${classes-dir}"/>
         <delete file="${war-file-path}"/>
         <delete dir="${core-javadoc-dir}"/>
+        <delete dir="${javadoc-dir}"/>
 	</target>
     
 </project>