[jsword-svn] r1984 - in trunk: bibledesktop-web bibledesktop-web/src jsword-web jsword-web/src

[dmsmith at crosswire.org]

Author: dmsmith
Date: 2010-02-21 12:31:35 -0700 (Sun, 21 Feb 2010)
New Revision: 1984

Added:
   trunk/bibledesktop-web/src/webapp/
   trunk/jsword-web/src/webapp/
Removed:
   trunk/bibledesktop-web/src/web/
   trunk/jsword-web/src/web/
Modified:
   trunk/bibledesktop-web/build.xml
   trunk/jsword-web/build.xml
Log:
Mavenize the projects. POMs from Trenton Adams.

Modified: trunk/bibledesktop-web/build.xml
===================================================================
--- trunk/bibledesktop-web/build.xml	2010-02-21 19:05:55 UTC (rev 1983)
+++ trunk/bibledesktop-web/build.xml	2010-02-21 19:31:35 UTC (rev 1984)
@@ -6,8 +6,8 @@
   <property name="dependency.install" value="../${dependency}/${target.root}/${dependency}"/>
 
   <!--=======================================================================-->
-  <property name="source.web"          value="${source.root}/web"/>
-  <property name="webapp.bibledesktop" value="${target.root}/web"/> <!-- override -->
+  <property name="source.web"          value="${source.root}/webapp"/>
+  <property name="webapp.bibledesktop" value="${target.root}/webapp"/> <!-- override -->
 
   <!--=======================================================================-->
   <target name="webapp" description="Build an unpacked war file">

Modified: trunk/jsword-web/build.xml
===================================================================
--- trunk/jsword-web/build.xml	2010-02-21 19:05:55 UTC (rev 1983)
+++ trunk/jsword-web/build.xml	2010-02-21 19:31:35 UTC (rev 1984)
@@ -8,9 +8,9 @@
   <property name="dependency.jar"     value="../bibledesktop/${target.jar}"/>
 
   <!--=======================================================================-->
-  <property name="source.web"       value="${source.root}/web"/>
+  <property name="source.web"       value="${source.root}/webapp"/>
 
-  <property name="webapp.jsword"    value="${target.root}/web"/> <!-- override -->
+  <property name="webapp.jsword"    value="${target.root}/webapp"/> <!-- override -->
   <property name="jnlp.hostname"    value="localhost:8080"/> <!-- override -->
   <property name="ftp.base"         value="${basedir}/${target.root}/download"/> <!-- override -->
   <property name="ftp.prefix"       value="../download"/> <!-- override -->