net-nds/jxplorer: fixed bug #381557

(Portage version: 2.1.10.29/cvs/Linux x86_64)

3 files changed, 100 insertions, 2 deletions

diff --git a/net-nds/jxplorer/ChangeLog b/net-nds/jxplorer/ChangeLog
index 8cd58592707f..a6223abdf236 100644
--- a/net-nds/jxplorer/ChangeLog
+++ b/net-nds/jxplorer/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-nds/jxplorer
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/ChangeLog,v 1.28 2008/01/10 23:14:59 caster Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/ChangeLog,v 1.29 2011/10/19 16:37:41 fordfrog Exp $
+
+*jxplorer-3.2-r1 (19 Oct 2011)
+
+  19 Oct 2011; Miroslav Šulc <fordfrog@gentoo.org>
+  +files/3.2-com.ca.level.patch, +jxplorer-3.2-r1.ebuild:
+  Fixed startup exception complaining about bad logging level (bug #381557,
+  based on patches from John Crist <johncrist88@gmail.com>)
 
   10 Jan 2008; Vlastimil Babka <caster@gentoo.org>
   -files/jxplorer-gentoo.patch, -jxplorer-3.1-r5.ebuild,
diff --git a/net-nds/jxplorer/files/3.2-com.ca.level.patch b/net-nds/jxplorer/files/3.2-com.ca.level.patch
new file mode 100644
index 000000000000..0f2fabeba208
--- /dev/null
+++ b/net-nds/jxplorer/files/3.2-com.ca.level.patch
@@ -0,0 +1,20 @@
+diff --git a/jxplorer/src/com/ca/directory/jxplorer/JXplorer.java b/jxplorer/src/com/ca/directory/jxplorer/JXplorer.java
+index a36110c..0b748f5 100644
+--- a/jxplorer/src/com/ca/directory/jxplorer/JXplorer.java
++++ b/jxplorer/src/com/ca/directory/jxplorer/JXplorer.java
+@@ -584,7 +584,7 @@ public class
+ 

+         setDefaultProperty(".level", "WARNING", "(java loggin variable) - allowable values are 'OFF', 'SEVERE', 'WARNING', 'INFO', 'FINE', 'FINER', 'FINEST' and 'ALL'");

+ 

+-        setDefaultProperty("com.ca.level", "UNUSED", " (java loggin variable) partial logging is also available.  Be warned that the Sun logging system is a very buggy partial reimplementation of log4j, and doesn't seem to do inheritance well.");

++        setDefaultProperty("com.ca.level", "WARNING", " (java loggin variable) partial logging is also available.  Be warned that the Sun logging system is a very buggy partial reimplementation of log4j, and doesn't seem to do inheritance well.");

+ 

+ 

+         //setDefaultProperty("logging", "console");

+@@ -1986,4 +1986,4 @@ public class
+     {

+         return buttonRegister;

+     }

+-}
+\ No newline at end of file
++}

diff --git a/net-nds/jxplorer/jxplorer-3.2-r1.ebuild b/net-nds/jxplorer/jxplorer-3.2-r1.ebuild
new file mode 100644
index 000000000000..a3fa7cc02a58
--- /dev/null
+++ b/net-nds/jxplorer/jxplorer-3.2-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/jxplorer-3.2-r1.ebuild,v 1.1 2011/10/19 16:37:41 fordfrog Exp $
+
+EAPI="4"
+JAVA_PKG_IUSE="doc source"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A fully functional ldap browser written in java."
+HOMEPAGE="http://jxplorer.org/"
+SRC_URI="mirror://sourceforge/${PN}/JXv${PV}src.tar.bz2
+	mirror://sourceforge/${PN}/JXv${PV}deploy.tar.bz2"
+LICENSE="CAOSL"
+IUSE=""
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+RDEPEND=">=virtual/jre-1.4
+	>=dev-java/javahelp-2.0.02_p46
+	>=dev-java/log4j-1.2.8
+	=dev-java/junit-3.8*"
+DEPEND=">=virtual/jdk-1.4
+	${RDEPEND}"
+
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	epatch "${FILESDIR}/${PV}-com.ca.level.patch"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	cp "${FILESDIR}/build.xml" ./build.xml || die
+
+	# Contains stuff for javahelp
+	mkdir dist
+	cp jars/help.jar dist || die
+
+	rm -v jars/*.jar || die
+	mkdir lib/ && cd lib/
+	java-pkg_jar-from javahelp
+	java-pkg_jar-from log4j
+	java-pkg_jar-from junit
+}
+
+EANT_DOC_TARGET="docs"
+EANT_FILTER_COMPILER="jikes"
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar dist/help.jar
+
+	dodir /usr/share/${PN}
+	for i in "icons images htmldocs language templates security connections.txt log4j.xml"
+	do
+		cp -r ${i} "${D}/usr/share/${PN}" || die
+	done
+
+	dodoc RELEASE.TXT || die
+
+	# By default the config dir is ${HOME}/jxplorer
+	java-pkg_dolauncher ${PN} \
+		--main com.ca.directory.jxplorer.JXplorer \
+		--pwd '"${HOME}/.jxplorer"' \
+		--pkg_args console \
+		-pre "${FILESDIR}/${PN}-pre-r1"
+
+	use source && java-pkg_dosrc src/com
+	use doc && java-pkg_dojavadoc docs
+}