[Tynstep-svn] r52 - in trunk: step-server step-web-app

[ChrisBurrell at crosswire.org]

Author: ChrisBurrell
Date: 2009-12-15 04:30:03 -0700 (Tue, 15 Dec 2009)
New Revision: 52

Modified:
   trunk/step-server/build.xml
   trunk/step-web-app/build.xml
Log:
updates to build files

Modified: trunk/step-server/build.xml
===================================================================
--- trunk/step-server/build.xml	2009-12-14 19:46:38 UTC (rev 51)
+++ trunk/step-server/build.xml	2009-12-15 11:30:03 UTC (rev 52)
@@ -6,7 +6,7 @@
 
 	<path id="classpath">
 		<fileset dir="lib" includes="**/*.jar" />
-		<fileset dir="../step-web-app/war/WEB-INF/lib" includes="**/*.jar" />
+		<fileset dir="../../public_html/WEB-INF/lib" includes="**/*.jar" />
 	</path>
 	
 	<target name="clean" description="deletes all generated files">
@@ -26,10 +26,10 @@
 			</manifest>
 		</jar>
 	</target>
-
+	
 	<target name="run" depends="compile">
 		<java fork="true" classname="com.tyndalehouse.step.server.StepServer" >
-			<sysproperty key="step.db.location" value="../step-web-app/war/StepDB" />
+			<sysproperty key="step.db.location" value="../../public_html/StepDB" />
 			<classpath>
 				<path refid="classpath" />
 				<path location="build/step-server.jar" />

Modified: trunk/step-web-app/build.xml
===================================================================
--- trunk/step-web-app/build.xml	2009-12-14 19:46:38 UTC (rev 51)
+++ trunk/step-web-app/build.xml	2009-12-15 11:30:03 UTC (rev 52)
@@ -35,14 +35,8 @@
     <javac srcdir="src" destdir="build"
       classpathref="classpath" debug="true">
     </javac>
+   </target>
 
-  	<!-- update the subversion repository -->
-  	<exec>
-  		<arg value="svn update ~/trunk"/>	
-  	</exec>
-  
-  </target>
-
   <target name="compile.gwt" depends="compile"
     description="compiles Java source files to JavaScript">
     <!-- Consider adding -Xms256m -Xmx512m to improve performance. -->
@@ -55,9 +49,13 @@
   </target>
 	
 	<!-- compile, compile.gwt -->
-  <target name="deploy" depends="compile.gwt" 
-    description="deploys the war file to Tomcat">
+  <target name="deploy" depends="" description="deploys the war file to Tomcat">
+<!--  	<copy todir="${jetty.dir}">
+		<fileset dir="build/${war}" />
+	</copy>
+  	-->  	
 
+  	
   	<delete includeemptydirs="true">
   		<fileset dir="${tomcat.dir}" includes="**/*" defaultexcludes="no"/>
   	</delete>
@@ -66,7 +64,16 @@
 		<fileset dir="build/com" />
 	</copy>
   	
+
   	<copy todir="${tomcat.dir}">
+		<fileset dir="war" includes="StepDB/**" />
+	</copy>
+
+  	<copy todir="${tomcat.dir}">
+		<fileset dir="war" includes="css/**" />
+	</copy>
+
+	<copy todir="${tomcat.dir}">
   		<fileset dir="build/www" />	
   	</copy>
 
@@ -75,13 +82,18 @@
   	</copy>
 
  	<copy todir="${tomcat.dir}/WEB-INF/">
-  		<fileset dir="war/WEB-INF/lib" includes="web.xml" />
+  		<fileset dir="war/WEB-INF" includes="web.xml" />
   	</copy>
   	
   	<copy todir="${tomcat.dir}">
   		<fileset dir="war" includes="Step.html" />
-  	</copy>
-  	  	
+  	</copy>  	
+
+  
+  	<jar destfile="${tomcat.dir}/WEB-INF/lib/step-guice-servlet.jar" basedir="build">
+  		<fileset dir="build" includes="com/tyndalehouse/step/server/**" />
+  	</jar>
+
   </target>
 
 	
@@ -108,7 +120,7 @@
   <target name="war" depends="compile, compile.gwt"
     description="builds the war file">
     <delete file="build/${war}"/>
-    <war warfile="build/${war}" webxml="web.xml" >
+    <war warfile="build/${war}" webxml="war/WEB-INF/web.xml" >
       <!-- bytecode from your Java code -->
       <classes dir="build" includes="**/*.class"/>
       <!-- generated HTML/JavaScript plus your CSS -->