### Eclipse Workspace Patch 1.0
#P jsword
Index: ivy.xml
===================================================================
--- ivy.xml	(revision 0)
+++ ivy.xml	(revision 0)
@@ -0,0 +1,22 @@
+<ivy-module version="2.0">
+  <info organisation="org.crosswire" module="jsword"/>
+  <dependencies>
+    <dependency org="commons-codec"             name="commons-codec"    rev="1.4"       conf="default->master,sources" />
+    <dependency org="commons-logging"           name="commons-logging"  rev="1.1.1"     conf="default->master,sources" />
+    <dependency org="commons-net"               name="commons-net"      rev="2.2"       conf="default->master,sources" />
+    <dependency org="org.apache.httpcomponents" name="httpcore"         rev="4.1"       conf="default->master,sources" />
+    <dependency org="org.apache.httpcomponents" name="httpclient"       rev="4.1-beta1" conf="default->master,sources" />
+    <dependency org="javatar"                   name="javatar"          rev="2.5"       />
+    <!-- dependency org="org.jdom"                  name="jdom"             rev="1.1.1"       conf="default->master,sources" /> Should be rev="1.1.1" -->
+    <dependency org="org.apache.lucene"         name="lucene-core"      rev="3.0.3"     conf="default->master,sources" />
+    <dependency org="org.apache.lucene"         name="lucene-analyzers" rev="3.0.3"     conf="default->master,sources" />
+    <dependency org="org.apache.lucene"         name="lucene-smartcn"   rev="3.0.3"     conf="default->master,sources" />
+    <dependency org="org.apache.lucene"         name="lucene-snowball"  rev="3.0.3"     conf="default->master,sources" />
+    <!-- dependency org="junit"                     name="junit"            rev="3.8.1"     / -->
+    <!-- dependency org="com.ibm.icu"               name="icu4j"            rev="4.6"       / -->
+    <!-- dependency org="jaf"                       name="activation"       rev="1.1"       / -->
+    <!-- dependency org="xalan"                     name="xalan"            rev="2.7.1"     / -->
+    <!-- dependency org="xalan"                     name="serializer"       rev="2.7.1"     / -->
+    <!-- dependency org="xerces"                    name="xercesImpl"       rev="2.11.0"    / -->
+  </dependencies>
+</ivy-module>
\ No newline at end of file
Index: core.xml
===================================================================
--- core.xml	(revision 2041)
+++ core.xml	(working copy)
@@ -19,7 +19,7 @@
   <property name="source.test"      value="${source.root}/test"/>
   <property name="target.root"      value="target"/>
   <property name="target.classes"   value="${target.root}/classes"/>
-  <property name="target.jar"       value="${target.root}/jar"/>
+  <property name="target.jar"       value="lib"/>
   <property name="target.installed" value="${target.root}/installed"/> <!-- override -->
   <property name="test.root"        value="${target.root}/test"/>
   <property name="test.classes"     value="${test.root}/classes"/>
@@ -47,26 +47,17 @@
   <!--=======================================================================
     == These jars are necessary for Bible Desktop to be compiled and run.
     == The version numbers in jar files is replaced w/ *.
+    == Note: This only includes files not managed via ivy/maven.
     == This way we can upgrade without impacting this ant build file.
     =========================================================================-->
   <patternset id="external.runtime.jars">
-  	<exclude name="**/*-src.jar"/>
+    <exclude name="**/*-src.jar"/>
+    <exclude name="**/*-source.jar"/>
     <include name="**/jdom-*.jar"/>
-    <include name="**/commons-codec-*.jar"/>
-    <include name="**/httpcore-*.jar"/>
-    <include name="**/httpclient-*.jar"/>
-    <include name="**/commons-logging-*.jar"/>
-    <include name="**/commons-net-*.jar"/>
-    <include name="**/lucene-core-*.jar"/>
-    <include name="**/lucene-analyzers-*.jar"/>
-    <include name="**/lucene-smartcn-*.jar"/>
-    <include name="**/lucene-snowball-*.jar"/>
     <include name="**/jlfgr-*.jar"/>
     <include name="**/jsword-common-aqua-*.jar"/>
-    <include name="**/javatar-*.jar"/>
     <!-- Exclude ICU4J for now.
     <exclude name="**/icu4j-charsets-*.jar"/>
-    <exclude name="**/icu4j-*-src.jar"/>
   	<include name="**/icu4j-*.jar"/> -->
     <!--
     <include name="**/activation.jar"/>
@@ -174,6 +165,7 @@
           depends="init, clean.dependency"
           description="Remove the target directory">
     <delete dir="${target.root}"/>
+    <delete dir="${target.jar}"/>
     <antcall target="clean.extra"/>
   </target>
 
@@ -293,9 +285,7 @@
           description="Prepare the build by copying needed jars and files.">
     <!-- Copy the jars from the std location to the target jar directory -->
     <antcall target="prepare.dependency"/>
-<!-- Not currently needed.
     <antcall target="prepare.extra"/>
--->
   </target>
 
   <!--=======================================================================
Index: build.xml
===================================================================
--- build.xml	(revision 2041)
+++ build.xml	(working copy)
@@ -1,8 +1,78 @@
-<project name="jsword" default="all">
+<project xmlns:ivy="antlib:org.apache.ivy.ant" 
+         name="jsword"
+         default="all">
 
   <!-- This build uses the core build targets -->
   <import file="../jsword/core.xml"/>
 
+  <!--=======================================================================
+    == Use ivy to manage external jars.
+    == These are properties related to ivy.
+    =========================================================================-->
+  <property name="ivy.install.version"          value="2.2.0" />
+  <property name="ivy.jar.dir"                  value="${basedir}/tools/ivy" />
+  <property name="ivy.jar.file"                 value="${ivy.jar.dir}/ivy-${ivy.install.version}.jar" />
+  <property name="ivy.default.ivy.user.dir"     value="${basedir}/ivy"/>
+  <available file="${ivy.jar.file}" type="file" property="ivy.present"/>
+
+  <!--=======================================================================
+    == Get ivy from the maven repository
+    =========================================================================-->
+  <target name="ivy.download" unless="ivy.present">
+    <mkdir dir="${ivy.jar.dir}"/>
+    <!-- download Ivy from web site so that it can be used even without any special installation -->
+    <echo message="installing ivy..."/>
+    <get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
+         dest="${ivy.jar.file}" usetimestamp="true"/>
+  </target>
+  
+  <!--=======================================================================
+    == Make ivy visible to ant
+    =========================================================================-->
+  <target name="ivy" depends="ivy.download" description="Make ivy visible to Ant">
+    <!-- try to load ivy here from local ivy dir, in case the user has not already dropped
+         it into ant's lib dir (note that the latter copy will always take precedence).
+         We will not fail as long as local lib dir exists (it may be empty) and
+         ivy is in at least one of ant's lib dir or the local lib dir. -->
+    <path id="ivy.lib.path">
+      <fileset dir="${ivy.jar.dir}" includes="*.jar"/>
+    </path>
+    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" classpathref="ivy.lib.path"/>
+  </target>    
+  
+  <!--=======================================================================
+        target: ivy.clean            
+    =========================================================================-->
+  <target name="ivy.clean" description="Remove the ivy installation">
+    <delete dir="${ivy.jar.dir}"/>
+  </target>
+  
+  <!--=======================================================================
+    == target: ivy.clean-cache              
+    =========================================================================-->
+  <target name="ivy.clean-cache" depends="ivy" 
+          description="Remove dependent jars that ivy manages">
+    <ivy:cleancache />
+  </target>
+
+  <!--=======================================================================
+    == Get all the dependencies that have been registered in ivy.xml
+    =========================================================================-->
+  <target name="ivy.resolve" depends="ivy" description="Retrieve dependencies with ivy">
+    <ivy:retrieve />
+  </target>
+
+  <!--=======================================================================
+    == Use the prepare.extra hook to get dependency jars.
+    =========================================================================-->
+  <target name="prepare.extra" depends="ivy.resolve"
+          description="Prepare extras files.">
+    <echo message="Done getting 3-rd Party dependencies."/>
+  </target>
+
+  <!--=======================================================================
+    == When we clean jsword, we also have to delete the keystore file.
+    =========================================================================-->
   <target name="clean.extra" description="Extra stuff to do after calling clean">
     <delete dir="${keystore.file}"/>
   </target>