[Tynstep-svn] r50 - in trunk/step-server: . src/com/tyndalehouse/step/server

[ChrisBurrell at crosswire.org]

Author: ChrisBurrell
Date: 2009-12-14 11:53:45 -0700 (Mon, 14 Dec 2009)
New Revision: 50

Modified:
   trunk/step-server/build.xml
   trunk/step-server/src/com/tyndalehouse/step/server/StepServer.java
Log:
updates to build script for step server

Modified: trunk/step-server/build.xml
===================================================================
--- trunk/step-server/build.xml	2009-12-14 18:23:44 UTC (rev 49)
+++ trunk/step-server/build.xml	2009-12-14 18:53:45 UTC (rev 50)
@@ -6,7 +6,7 @@
 
 	<path id="classpath">
 		<fileset dir="lib" includes="**/*.jar" />
-		<fileset dir="../StepWebApp/war/WEB-INF/lib" includes="**/*.jar" />
+		<fileset dir="../step-web-app/war/WEB-INF/lib" includes="**/*.jar" />
 	</path>
 	
 	<target name="clean" description="deletes all generated files">
@@ -27,9 +27,9 @@
 		</jar>
 	</target>
 
-	<target name="run" >
+	<target name="run" depends="compile">
 		<java fork="true" classname="com.tyndalehouse.step.server.StepServer" >
-			<sysproperty key="step.db.location" value="../StepWebApp/war/StepDB" />
+			<sysproperty key="step.db.location" value="../step-web-app/war/StepDB" />
 			<classpath>
 				<path refid="classpath" />
 				<path location="build/step-server.jar" />

Modified: trunk/step-server/src/com/tyndalehouse/step/server/StepServer.java
===================================================================
--- trunk/step-server/src/com/tyndalehouse/step/server/StepServer.java	2009-12-14 18:23:44 UTC (rev 49)
+++ trunk/step-server/src/com/tyndalehouse/step/server/StepServer.java	2009-12-14 18:53:45 UTC (rev 50)
@@ -41,7 +41,7 @@
 		//This needs to be parameterised
 		String pathToWar = System.getProperty("path.to.war");
 		if(pathToWar == null) {
-			pathToWar = "../StepWebApp/war";
+			pathToWar = "../step-web-app/war";
 		}
 		
 		File warPath = new File(rd, pathToWar);