[Tynstep-svn] r54 - in trunk: StepDataLoader StepDataLoader/src/com/tyndalehouse/step/dataloader step-server/src step-server/src/com/tyndalehouse/step/server

[ChrisBurrell at crosswire.org]

Author: ChrisBurrell
Date: 2009-12-18 01:32:19 -0700 (Fri, 18 Dec 2009)
New Revision: 54

Removed:
   trunk/step-server/src/Manifest.mf
Modified:
   trunk/StepDataLoader/.classpath
   trunk/StepDataLoader/src/com/tyndalehouse/step/dataloader/Dataloader.java
   trunk/step-server/src/com/tyndalehouse/step/server/StepServer.java
Log:
update for integration server

Modified: trunk/StepDataLoader/.classpath
===================================================================
--- trunk/StepDataLoader/.classpath	2009-12-15 12:10:03 UTC (rev 53)
+++ trunk/StepDataLoader/.classpath	2009-12-18 08:32:19 UTC (rev 54)
@@ -3,7 +3,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="sql"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/StepWebApp"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/step-web-app"/>
 	<classpathentry kind="lib" path="lib/SuperCSV-1.52.jar"/>
 	<classpathentry kind="lib" path="lib/spiffy-all-0.05.jar"/>
 	<classpathentry kind="lib" path="lib/commons-io-1.4.jar"/>

Modified: trunk/StepDataLoader/src/com/tyndalehouse/step/dataloader/Dataloader.java
===================================================================
--- trunk/StepDataLoader/src/com/tyndalehouse/step/dataloader/Dataloader.java	2009-12-15 12:10:03 UTC (rev 53)
+++ trunk/StepDataLoader/src/com/tyndalehouse/step/dataloader/Dataloader.java	2009-12-18 08:32:19 UTC (rev 54)
@@ -6,11 +6,6 @@
 
 import org.apache.commons.dbutils.DbUtils;
 import org.crosswire.jsword.passage.NoSuchKeyException;
-import org.crosswire.jsword.passage.Passage;
-import org.crosswire.jsword.passage.PassageKeyFactory;
-import org.crosswire.jsword.passage.RestrictionType;
-import org.crosswire.jsword.passage.RocketPassage;
-import org.crosswire.jsword.passage.VerseRange;
 
 import com.tyndalehouse.step.dataloader.common.DateParsingException;
 import com.tyndalehouse.step.dataloader.loaders.SchemaLoader;

Deleted: trunk/step-server/src/Manifest.mf
===================================================================
--- trunk/step-server/src/Manifest.mf	2009-12-15 12:10:03 UTC (rev 53)
+++ trunk/step-server/src/Manifest.mf	2009-12-18 08:32:19 UTC (rev 54)
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: com.tyndalehouse.step.server.StepServer

Modified: trunk/step-server/src/com/tyndalehouse/step/server/StepServer.java
===================================================================
--- trunk/step-server/src/com/tyndalehouse/step/server/StepServer.java	2009-12-15 12:10:03 UTC (rev 53)
+++ trunk/step-server/src/com/tyndalehouse/step/server/StepServer.java	2009-12-18 08:32:19 UTC (rev 54)
@@ -41,7 +41,7 @@
 		//This needs to be parameterised
 		String pathToWar = System.getProperty("path.to.war");
 		if(pathToWar == null) {
-			pathToWar = "../step-web-app/war";
+			pathToWar = "../../public_html";
 		}
 		
 		File warPath = new File(rd, pathToWar);