[jsword-svn] r2029 - in trunk: bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents bibledesktop/etc/jnlp jsword jsword/jar jsword/jar/commons-codec-1.4 jsword-web/src/main/webapp/iBD

dmsmith at crosswire.org dmsmith at crosswire.org
Tue Nov 30 09:05:40 MST 2010

Author: dmsmith
Date: 2010-11-30 09:05:40 -0700 (Tue, 30 Nov 2010)
New Revision: 2029

JS-135: Upgrade commons-codec from 1.3 to 1.4

Modified: trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist
--- trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist	2010-11-30 14:17:06 UTC (rev 2028)
+++ trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist	2010-11-30 16:05:40 UTC (rev 2029)
@@ -45,7 +45,7 @@
-			<string>$JAVAROOT/commons-codec-1.3.jar</string>
+			<string>$JAVAROOT/commons-codec-1.4.jar</string>

Modified: trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
--- trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp	2010-11-30 14:17:06 UTC (rev 2028)
+++ trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp	2010-11-30 16:05:40 UTC (rev 2029)
@@ -34,7 +34,7 @@
     <jar href="jsword-common-aqua-1.0.6.jar"/>
     <jar href="javatar-2.5.jar"/>
     <jar href="jdom-1.1.1.jar"/>
-    <jar href="commons-codec-1.3.jar"/>
+    <jar href="commons-codec-1.4.jar"/>
     <jar href="commons-httpclient-3.1.jar"/>
     <jar href="commons-logging-1.1.1.jar"/>
     <jar href="commons-net-1.4.1.jar"/>

Modified: trunk/jsword/.classpath
--- trunk/jsword/.classpath	2010-11-30 14:17:06 UTC (rev 2028)
+++ trunk/jsword/.classpath	2010-11-30 16:05:40 UTC (rev 2029)
@@ -8,7 +8,6 @@
 	<classpathentry exported="true" kind="lib" path="jar/lucene-2.9.1/lucene-core-2.9.1.jar" sourcepath="jar/lucene-2.9.1/lucene-2.9.1-src.zip"/>
 	<classpathentry exported="true" kind="lib" path="jar/lucene-2.9.1/lucene-smartcn-2.9.1.jar" sourcepath="jar/lucene-2.9.1/lucene-2.9.1-src.zip"/>
 	<classpathentry exported="true" kind="lib" path="jar/lucene-2.9.1/lucene-snowball-2.9.1.jar" sourcepath="jar/lucene-2.9.1/lucene-2.9.1-src.zip"/>
-	<classpathentry exported="true" kind="lib" path="jar/commons-codec-1.3/commons-codec-1.3.jar" sourcepath="jar/commons-codec-1.3/commons-codec-1.3-src.zip"/>
 	<classpathentry exported="true" kind="lib" path="jar/commons-httpclient-3.1/commons-httpclient-3.1.jar" sourcepath="jar/commons-httpclient-3.1/commons-httpclient-3.1-src.zip"/>
 	<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/commons-net-1.4.1/commons-net-1.4.1.jar" sourcepath="jar/commons-net-1.4.1/commons-net-1.4.1-src.zip"/>
@@ -18,5 +17,6 @@
 	<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 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 kind="output" path="bin"/>

Added: trunk/jsword/jar/commons-codec-1.4/LICENSE.txt
--- trunk/jsword/jar/commons-codec-1.4/LICENSE.txt	                        (rev 0)
+++ trunk/jsword/jar/commons-codec-1.4/LICENSE.txt	2010-11-30 16:05:40 UTC (rev 2029)
@@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+   1. Definitions.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      implied, including, without limitation, any warranties or conditions
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+   APPENDIX: How to apply the Apache License to your work.
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+   Copyright [yyyy] [name of copyright owner]
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+       http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Property changes on: trunk/jsword/jar/commons-codec-1.4/LICENSE.txt
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/jsword/jar/commons-codec-1.4/NOTICE.txt
--- trunk/jsword/jar/commons-codec-1.4/NOTICE.txt	                        (rev 0)
+++ trunk/jsword/jar/commons-codec-1.4/NOTICE.txt	2010-11-30 16:05:40 UTC (rev 2029)
@@ -0,0 +1,14 @@
+Apache Commons Codec
+Copyright 2002-2009 The Apache Software Foundation
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java contains 
+test data from http://aspell.sourceforge.net/test/batch0.tab.
+Copyright (C) 2002 Kevin Atkinson (kevina at gnu.org). Verbatim copying
+and distribution of this entire article is permitted in any medium,
+provided this notice is preserved.

Property changes on: trunk/jsword/jar/commons-codec-1.4/NOTICE.txt
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/jsword/jar/commons-codec-1.4/RELEASE-NOTES.txt
--- trunk/jsword/jar/commons-codec-1.4/RELEASE-NOTES.txt	                        (rev 0)
+++ trunk/jsword/jar/commons-codec-1.4/RELEASE-NOTES.txt	2010-11-30 16:05:40 UTC (rev 2029)
@@ -0,0 +1,57 @@
+			 Commons Codec Package
+			    Version 1.4
+			   Release Notes
+The codec package contains simple encoder and decoders for various formats 
+such as Base64 and Hexadecimal. In addition to these widely used encoders and 
+decoders, the codec package also maintains a collection of phonetic encoding 
+o Codec 1.4 is binary compatible with Codec 1.3
+o Codec 1.4 has a minimum requirement of JDK 1.4
+Changes in this version include:
+  New Features:
+o [CODEC-60] Implement Caverphone.
+o [CODEC-52] Digest on InputStreams.
+o [CODEC-39] DigestUtils: Add methods for SHA-256, SHA-384, and SHA-512.
+o [CODEC-69] Streaming Base64 (Base64InputStream and Base64OutputStream added).
+o [CODEC-59] Add methods to Base64 which work with String instead of byte[]
+  Fixed bugs:
+o [CODEC-77] Base64 bug with empty input (new byte[0]).
+o [CODEC-72] Soundex and RefinedSoundex issues with character arrays.
+o [CODEC-71] Base64.isArrayByteBase64() method is inefficient for large byte arrays.
+o [CODEC-70] Thread safety and malicious code safety improvements.
+o [CODEC-68] isBase64 throws ArrayIndexOutOfBoundsException on some non-BASE64 bytes.
+o [CODEC-65] Fix case-insensitive string handling.
+o [CODEC-61] Base64.encodeBase64() throws NegativeArraySizeException on large files.
+o [CODEC-58] Character set used by Base64 not documented.
+o [CODEC-56] RefinedSoundex creates instance before al fields have been initialized.
+o [CODEC-51] Test failures in SoundexTest
+o [CODEC-10] Using US_ENGLISH in Soundex caused an NullPointerException.
+o [CODEC-6]  Source tarball spews files all over the place.
+o [CODEC-22] Base64.isArrayByteBase64() throws an ArrayIndexOutOfBoundsException for negative octets
+o [CODEC-78] Base64: Improve Code Coverage
+o [CODEC-81] Base64's new constructor parameters ignored
+o [CODEC-83] Improve Double Metaphone test coverage
+o [CODEC-84] Double Metaphone bugs in alternative encoding
+o [CODEC-73] Make string2byte conversions indepedent of platform default encoding
+  Changes:
+o [CODEC-75] Make Base64 URL-safe
+o [CODEC-74] Allow for uppercase letters output in Hex.encodeHex().
+o [CODEC-40] Add crypto-compatible BigInteger encoding support to Base64.
+Have fun!
+-The commons-codec team
\ No newline at end of file

Property changes on: trunk/jsword/jar/commons-codec-1.4/RELEASE-NOTES.txt
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/jsword/jar/commons-codec-1.4/commons-codec-1.4-src.zip
(Binary files differ)

Property changes on: trunk/jsword/jar/commons-codec-1.4/commons-codec-1.4-src.zip
Added: svn:needs-lock
   + *
Added: svn:mime-type
   + application/zip

Added: trunk/jsword/jar/commons-codec-1.4/commons-codec-1.4.jar
(Binary files differ)

Property changes on: trunk/jsword/jar/commons-codec-1.4/commons-codec-1.4.jar
Added: svn:mime-type
   + application/octet-stream

Added: trunk/jsword/jar/commons-codec-1.4-bin.tar.gz
(Binary files differ)

Property changes on: trunk/jsword/jar/commons-codec-1.4-bin.tar.gz
Added: svn:needs-lock
   + *
Added: svn:mime-type
   + application/x-gzip

Modified: trunk/jsword-web/src/main/webapp/iBD/tutorial.html
--- trunk/jsword-web/src/main/webapp/iBD/tutorial.html	2010-11-30 14:17:06 UTC (rev 2028)
+++ trunk/jsword-web/src/main/webapp/iBD/tutorial.html	2010-11-30 16:05:40 UTC (rev 2029)
@@ -33,7 +33,7 @@
                 |-- jsword-1.6.jar
                 |-- javatar-2.5.jar
                 |-- jdom-1.1.1.jar
-                |-- commons-codec-1.3.jar
+                |-- commons-codec-1.4.jar
                 |-- commons-httpclient-3.1.jar
                 |-- commons-logging-1.1.1.jar
                 |-- commons-net-1.4.1.jar

More information about the jsword-svn mailing list