[jsword-svn] r2035 - in trunk: jsword jsword/jar jsword/jar/icu4j-4.4.2 jsword-web/src/main/webapp/iBD

[dmsmith at crosswire.org]

Author: dmsmith
Date: 2010-12-01 19:12:34 -0700 (Wed, 01 Dec 2010)
New Revision: 2035

Added:
   trunk/jsword/jar/icu4j-4.4.2/
   trunk/jsword/jar/icu4j-4.4.2/icu4j-4_4_2-src.jar
   trunk/jsword/jar/icu4j-4.4.2/icu4j-4_4_2.jar
   trunk/jsword/jar/icu4j-4.4.2/icu4j-charsets-4_4_2.jar
Removed:
   trunk/jsword/jar/icu4j-4.0/
Modified:
   trunk/jsword-web/src/main/webapp/iBD/tutorial.html
   trunk/jsword/.classpath
   trunk/jsword/core.xml
Log:
JS-135: Upgrade ICU4J from 4.0 to 4.4.2 (requires Java 5)

Modified: trunk/jsword/.classpath
===================================================================
--- trunk/jsword/.classpath	2010-12-02 01:38:07 UTC (rev 2034)
+++ trunk/jsword/.classpath	2010-12-02 02:12:34 UTC (rev 2035)
@@ -5,19 +5,19 @@
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry exported="true" kind="lib" path="jar/commons-logging-1.1.1/commons-logging-1.1.1.jar" sourcepath="jar/commons-logging-1.1.1/commons-logging-1.1.1-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="jar/icu4j-4.0/icu4j-charsets-4_0.jar"/>
 	<classpathentry exported="true" kind="lib" path="jar/jaf-1.1/activation.jar"/>
 	<classpathentry exported="true" kind="lib" path="jar/javatar-2.5/javatar-2.5.jar"/>
 	<classpathentry exported="true" kind="lib" path="jar/junit-3.8.1/junit.jar" sourcepath="jar/junit-3.8.1/junit-3.8.1-src.jar"/>
-	<classpathentry kind="lib" path="jar/icu4j-4.0/icu4j-4_0.jar" sourcepath="jar/icu4j-4.0/icu4j-4_0-src.jar"/>
 	<classpathentry exported="true" kind="lib" path="jar/jdom-1.1.1/jdom-1.1.1.jar" sourcepath="jar/jdom-1.1.1/jdom-1.1.1-src.zip"/>
 	<classpathentry exported="true" kind="lib" path="jar/commons-codec-1.4/commons-codec-1.4.jar" sourcepath="jar/commons-codec-1.4/commons-codec-1.4-src.zip"/>
 	<classpathentry exported="true" kind="lib" path="jar/commons-net-2.2/commons-net-2.2.jar" sourcepath="jar/commons-net-2.2/commons-net-2.2-src.zip"/>
-	<classpathentry kind="lib" path="jar/httpcomponents-core-4.1/httpcore-4.1.jar" sourcepath="jar/httpcomponents-core-4.1/httpcomponents-core-4.1-src.zip"/>
-	<classpathentry kind="lib" path="jar/httpcomponents-client-4.1-beta1/httpclient-4.1-beta1.jar" sourcepath="jar/httpcomponents-client-4.1-beta1/httpcomponents-client-4.1-beta1-src.zip"/>
-	<classpathentry kind="lib" path="jar/lucene-3.0.2/lucene-analyzers-3.0.2.jar" sourcepath="jar/lucene-3.0.2/lucene-3.0.2-src.zip"/>
-	<classpathentry kind="lib" path="jar/lucene-3.0.2/lucene-core-3.0.2.jar" sourcepath="jar/lucene-3.0.2/lucene-3.0.2-src.zip"/>
-	<classpathentry kind="lib" path="jar/lucene-3.0.2/lucene-smartcn-3.0.2.jar" sourcepath="jar/lucene-3.0.2/lucene-3.0.2-src.zip"/>
-	<classpathentry kind="lib" path="jar/lucene-3.0.2/lucene-snowball-3.0.2.jar" sourcepath="jar/lucene-3.0.2/lucene-3.0.2-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="jar/httpcomponents-core-4.1/httpcore-4.1.jar" sourcepath="jar/httpcomponents-core-4.1/httpcomponents-core-4.1-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="jar/httpcomponents-client-4.1-beta1/httpclient-4.1-beta1.jar" sourcepath="jar/httpcomponents-client-4.1-beta1/httpcomponents-client-4.1-beta1-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="jar/lucene-3.0.2/lucene-analyzers-3.0.2.jar" sourcepath="jar/lucene-3.0.2/lucene-3.0.2-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="jar/lucene-3.0.2/lucene-core-3.0.2.jar" sourcepath="jar/lucene-3.0.2/lucene-3.0.2-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="jar/lucene-3.0.2/lucene-smartcn-3.0.2.jar" sourcepath="jar/lucene-3.0.2/lucene-3.0.2-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="jar/lucene-3.0.2/lucene-snowball-3.0.2.jar" sourcepath="jar/lucene-3.0.2/lucene-3.0.2-src.zip"/>
+	<classpathentry exported="true" kind="lib" path="jar/icu4j-4.4.2/icu4j-4_4_2.jar" sourcepath="jar/icu4j-4.4.2/icu4j-4_4_2-src.jar"/>
+	<classpathentry exported="true" kind="lib" path="jar/icu4j-4.4.2/icu4j-charsets-4_4_2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: trunk/jsword/core.xml
===================================================================
--- trunk/jsword/core.xml	2010-12-02 01:38:07 UTC (rev 2034)
+++ trunk/jsword/core.xml	2010-12-02 02:12:34 UTC (rev 2035)
@@ -65,7 +65,8 @@
     <include name="**/jsword-common-aqua-*.jar"/>
     <include name="**/javatar-*.jar"/>
     <!-- Exclude ICU4J for now.
-  	<exclude name="**/icu4j-charsets-*.jar"/>
+    <exclude name="**/icu4j-charsets-*.jar"/>
+    <exclude name="**/icu4j-*-src.jar"/>
   	<include name="**/icu4j-*.jar"/> -->
     <!--
     <include name="**/activation.jar"/>

Added: trunk/jsword/jar/icu4j-4.4.2/icu4j-4_4_2-src.jar
===================================================================
(Binary files differ)


Property changes on: trunk/jsword/jar/icu4j-4.4.2/icu4j-4_4_2-src.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/jsword/jar/icu4j-4.4.2/icu4j-4_4_2.jar
===================================================================
(Binary files differ)


Property changes on: trunk/jsword/jar/icu4j-4.4.2/icu4j-4_4_2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/jsword/jar/icu4j-4.4.2/icu4j-charsets-4_4_2.jar
===================================================================
(Binary files differ)


Property changes on: trunk/jsword/jar/icu4j-4.4.2/icu4j-charsets-4_4_2.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/jsword-web/src/main/webapp/iBD/tutorial.html
===================================================================
--- trunk/jsword-web/src/main/webapp/iBD/tutorial.html	2010-12-02 01:38:07 UTC (rev 2034)
+++ trunk/jsword-web/src/main/webapp/iBD/tutorial.html	2010-12-02 02:12:34 UTC (rev 2035)
@@ -42,7 +42,7 @@
                 |-- lucene-snowball-2.9.1.jar
                 |-- lucene-analyzers-2.9.1.jar
                 |-- lucene-smartcn-2.9.1.jar
-                |-- icu4j-4_0.jar
+                |-- icu4j-4_4_2.jar
                 |-- dwr.jar
 </pre>
 <p>