[Tynstep-svn] r55 - trunk/step-web-app

[ChrisBurrell at crosswire.org]

Author: ChrisBurrell
Date: 2009-12-18 01:40:50 -0700 (Fri, 18 Dec 2009)
New Revision: 55

Removed:
   trunk/step-web-app/Copy of build.xml
Modified:
   trunk/step-web-app/.classpath
   trunk/step-web-app/build.properties
   trunk/step-web-app/build.xml
Log:
update for integration server

Modified: trunk/step-web-app/.classpath
===================================================================
--- trunk/step-web-app/.classpath	2009-12-18 08:32:19 UTC (rev 54)
+++ trunk/step-web-app/.classpath	2009-12-18 08:40:50 UTC (rev 55)
@@ -19,6 +19,7 @@
 	<classpathentry kind="lib" path="war/WEB-INF/lib/commons-dbutils-1.3.jar" sourcepath="D:/STEPSVN/StepSharedLibraries/lib/commons-dbutils-1.2-sources.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/gwt-log-3.0.0.jar"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/gxt.jar"/>
+	<classpathentry kind="lib" path="war/WEB-INF/lib/derbyclient.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
 	<classpathentry kind="con" path="com.google.gwt.eclipse.core.GWT_CONTAINER/GWT (2)"/>
 	<classpathentry kind="lib" path="war/WEB-INF/lib/gwt-servlet.jar"/>

Deleted: trunk/step-web-app/Copy of build.xml
===================================================================
--- trunk/step-web-app/Copy of build.xml	2009-12-18 08:32:19 UTC (rev 54)
+++ trunk/step-web-app/Copy of build.xml	2009-12-18 08:40:50 UTC (rev 55)
@@ -1,55 +0,0 @@
-<?xml version="1.0" ?>
-<project default="clean-build">
-	<property name="lib.dir" value="war/WEB-INF/lib" />
-	<property name="output.dir" value="build" />
-	<property name="output.web.dir" value="${output.dir}/www" />
-	<property name="gwt.dir" value="compiler_lib" />
-	<property name="package" value="com.tyndalehouse.step.web" />
-	<property name="module" value="stepwebapp" />
-
-	<path id="classpath">
-		<fileset dir="${lib.dir}" includes="**/*.jar" />
-		<fileset dir="${gwt.dir}" includes="**/*.jar" />
-	</path>
-
-	<path id="src">
-		<fileset dir="src" includes="**/*.java" />
-	</path>
-	
-	<target name="clean">
-		<delete dir="${output.dir}" />
-	</target>
-
-	<target name="compile" depends="" description="Compiling web-app">
-		<mkdir dir="${output.dir}" />
-		<javac srcdir="src" destdir="${output.dir}" classpathref="classpath">
-		</javac>
-	</target>
-
-
-	<target name="compile-gwt" depends="">
-		<java
-			failonerror="true" 
-			fork="true" 
-			classname="com.google.gwt.dev.Compiler"
-			>
-		      <classpath>
-		        <pathelement location="src/main/java"/>
-		        <path refid="classpath"/>
-		      </classpath>
-			
-			<jvmarg value="-Xmx256M"/>
-			<arg value="com.tyndalehouse.step.web.stepwebapp"/>
-
-		</java>
-
-		<!--		
-		<copy todir="${classes.dir}">
-            <fileset dir="${src.data.dir}" />
-            <fileset dir="${src.sql.dir}" />
-        </copy>
-        -->
-	</target>
-
-	<target name="clean-build" depends="compile-gwt" />
-</project>
\ No newline at end of file

Modified: trunk/step-web-app/build.properties
===================================================================
--- trunk/step-web-app/build.properties	2009-12-18 08:32:19 UTC (rev 54)
+++ trunk/step-web-app/build.properties	2009-12-18 08:40:50 UTC (rev 55)
@@ -3,7 +3,7 @@
 junit.jar=${junit.dir}/junit.jar
 tomcat.dir=../../public_html
 servlet-api.jar=${tomcat.dir}/common/lib/servlet-api.jar
-
+jetty.dir=../step-server/webapps
 module=stepwebapp
 package=com.tyndalehouse.step.web
 test=*

Modified: trunk/step-web-app/build.xml
===================================================================
--- trunk/step-web-app/build.xml	2009-12-18 08:32:19 UTC (rev 54)
+++ trunk/step-web-app/build.xml	2009-12-18 08:40:50 UTC (rev 55)
@@ -55,7 +55,6 @@
 	</copy>
   	-->  	
 
-  	
   	<delete includeemptydirs="true">
   		<fileset dir="${tomcat.dir}" includes="**/*" defaultexcludes="no"/>
   	</delete>