Update jdom to 1.1.1.

Based on PR#43608 by Wen Heping.

* * * * * * JDOM 1.1.1 (tag: jdom_1_1_1) from JDOM 1.1 * * * * * *

Fixed a synchronization issue in the Namespace class that could cause a
hang when doing concurrent builds.

Added output support for Unicode surrogate pairs.

Added a new flag on SAXBuilder named setFastReconfigure() which, when set,
can speed reconfiguration by skipping repeated attempts to set features that
are determined not to be present on a parser.  Useful when doing many builds
per second.

Updated the provided Jaxen library from a modified Jaxen 1.0 to the latest
which is Jaxen 1.1.1.

Added reflection code in the error reporting system to support Android's
Dalvik VM which doesn't have the java.rmi.* classes.


* * * * * * JDOM 1.1 (tag: jdom_1_1) from JDOM 1.0 * * * * * *

Added an additional constructor to JDOMSource with an EntityResolver which is
passed to the internal DocumentReader allowing the SAXOutputter to properly
resolve DTDs.

Added a forceNamespaceAware property to DOMOutputter which specifies you want
a DOM constructed with namespaces even if the source JDOM document has no
namespaces.

Added support for attribute "INF" and "-INF" values, to indicate positive and
negative infinity, as XML Schema allows.

Moved isXMLWhitespace() method from private in XMLOutputter to public in
Verifier.

Clarified XMLOutputter behavior with newlines and indents:
  setIndent(" ") means newlines and " " indents
  setIndent("") means newlines and "" indents
  setIndent(null) means no newlines and no indents

Added set/getIgnoringBoundaryWhitespace() methods and features to SAXBuilder
and SAXHandler.

Added a setFactory() method on XSLTransformer to control the object types
built by the transform.

Added a string constant for the JDOM_OBJECT_MODEL_URI used by JAXP 1.3.  It
deserves being part of the public API.

Fixed bug in SAXOutputter where default namespaces would be declared as
xmlns:="" with a spurious colon.

Fixed bug when using attributes without a namespace and outputting to a
JDOMResult.

Removing check that a comment not start with a hyphen. A careful reading of
production 15 in the XML 1.0 spec indicates leading hyphens are in fact
allowed.

Fixed bug where outputFragment() on SAXOutputter could cause a
NullPointerException because the locator would be null during the call.

Fixed bug where serializing ElementFilter causes a NullPointerException if the
filter has no assigned namespace

Fixed some subtle bad behaviors in listIterator.add() logic, using brand new
iterator logic.

Allowed a String to be passed to ContentList.add(int, Object).

Simplified JDOMAbout and renamed info.xml to jdom-info.xml, so
getResourceAsStream() won't suffer any name collision.

Fixed tiny issue where CDATA could be set with illegal character content.

Added logic to escape some special characters in namespace URIs.

Fixed bug where the attribute type would change on a setAttribute() call.

Improved performance on Namespace handling.

Improved and clarified Javadocs.

3 files changed, 16 insertions, 10 deletions

diff --git a/textproc/jdom/Makefile b/textproc/jdom/Makefile
index 52a4f5544e7..914960bbc80 100644
--- a/textproc/jdom/Makefile
+++ b/textproc/jdom/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2008/07/14 12:56:13 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2010/07/15 12:12:10 obache Exp $
 #
 
-DISTNAME=	jdom-1.0
+DISTNAME=	jdom-1.1.1
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.jdom.org/dist/binary/
 EXTRACT_SUFX=	.zip
@@ -16,10 +16,14 @@ BUILD_DEPENDS+=	zip-[0-9]*:../../archivers/zip
 
 USE_LANGUAGES=	# only Java
 USE_TOOLS+=	pax
-AUTO_MKDIRS=			yes
+AUTO_MKDIRS=	yes
+WRKSRC=		${WRKDIR}/jdom
+
+FIND_PREFIX:=	ZIP_DIR=zip
+.include "../../mk/find-prefix.mk"
 
 do-build:
-	cd ${WRKSRC}/src/java && ${LOCALBASE}/bin/zip -r ${WRKSRC}/jdom-src.zip org
+	cd ${WRKSRC}/src/java && ${ZIP_DIR}/bin/zip -r ${WRKSRC}/jdom-src.zip org
 
 do-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} build/jdom.jar jdom-src.zip ${DESTDIR}${PREFIX}/lib/java/
diff --git a/textproc/jdom/PLIST b/textproc/jdom/PLIST
index 4dd32a1ed8d..878a3b3a49c 100644
--- a/textproc/jdom/PLIST
+++ b/textproc/jdom/PLIST
@@ -1,7 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/10/19 11:07:34 rillig Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/07/15 12:12:10 obache Exp $
 lib/java/jdom-src.zip
 lib/java/jdom.jar
 share/doc/jdom/allclasses-frame.html
+share/doc/jdom/allclasses-noframe.html
+share/doc/jdom/constant-values.html
 share/doc/jdom/deprecated-list.html
 share/doc/jdom/help-doc.html
 share/doc/jdom/index-files/index-1.html
@@ -162,6 +164,6 @@ share/doc/jdom/overview-frame.html
 share/doc/jdom/overview-summary.html
 share/doc/jdom/overview-tree.html
 share/doc/jdom/package-list
-share/doc/jdom/packages.html
+share/doc/jdom/resources/inherit.gif
 share/doc/jdom/serialized-form.html
 share/doc/jdom/stylesheet.css
diff --git a/textproc/jdom/distinfo b/textproc/jdom/distinfo
index 558c0225c53..72302338d6d 100644
--- a/textproc/jdom/distinfo
+++ b/textproc/jdom/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/10/19 11:07:34 rillig Exp $
+$NetBSD: distinfo,v 1.2 2010/07/15 12:12:10 obache Exp $
 
-SHA1 (jdom-1.0.zip) = 7cc98b9fc4b6f38556aff4ded1b4d73c09772ca2
-RMD160 (jdom-1.0.zip) = 97953154092503bff0b8871c9f9b3aa5f0d22618
-Size (jdom-1.0.zip) = 3912599 bytes
+SHA1 (jdom-1.1.1.zip) = e887ce82ccc1f03991b48ba8a190b2d42b2129da
+RMD160 (jdom-1.1.1.zip) = 7b20b46822b50e1a7a39a1693ebe01010caf6e61
+Size (jdom-1.1.1.zip) = 4054268 bytes