version bump. now we build jxplorer from source and we also dont make use of packed jars any longer. fixes bug #63243.

(Portage version: 2.0.51-r14)

9 files changed, 240 insertions, 5 deletions

diff --git a/net-nds/jxplorer/ChangeLog b/net-nds/jxplorer/ChangeLog
index 29813105e653..d292a8f64e07 100644
--- a/net-nds/jxplorer/ChangeLog
+++ b/net-nds/jxplorer/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-nds/jxplorer
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/ChangeLog,v 1.4 2004/09/10 11:24:56 blubb Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/ChangeLog,v 1.5 2005/01/22 15:35:19 luckyduck Exp $
+
+*jxplorer-3.1_rc4 (22 Jan 2005)
+
+  22 Jan 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  +files/jxplorer-gentoo.patch, +files/jxplorer-log4j.patch,
+  +files/jxplorer.sh, +jxplorer-3.1_rc4.ebuild:
+  version bump. now we build jxplorer from source and we also dont make use of
+  packed jars any longer. fixes bug #63243.
 
   10 Sep 2004; <blubb@gentoo.org> jxplorer-3.1_beta1.ebuild:
   added ~amd64 keyword
diff --git a/net-nds/jxplorer/Manifest b/net-nds/jxplorer/Manifest
index 82fc27d2714e..ea0e5b2c809b 100644
--- a/net-nds/jxplorer/Manifest
+++ b/net-nds/jxplorer/Manifest
@@ -1,4 +1,10 @@
-MD5 8c8614bf4f9dea5543befdfddc873776 ChangeLog 597
+MD5 cb7b4eb5e943b4b9d89a47e32dab1b8e jxplorer-3.1_rc4.ebuild 1424
 MD5 5e589342decffbc6600dbb739d951b75 jxplorer-3.1_beta1.ebuild 691
+MD5 8c8614bf4f9dea5543befdfddc873776 ChangeLog 597
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 02193c618856347b1d7ec23ec21e4475 files/jxplorer-log4j.patch 613
+MD5 c2de8cca5efcd98939e5baf3728a3692 files/jxplorer-gentoo.patch 2578
+MD5 b04073e642024032d31552ae958c3149 files/digest-jxplorer-3.1_rc4 134
+MD5 19c309ed0cfd34dc531818b1607a2a47 files/build.xml 1871
 MD5 f2edd981dbec6678640f94950ab48032 files/digest-jxplorer-3.1_beta1 68
+MD5 c71a48763e3bab86565e7c87fd7034b1 files/jxplorer.sh 888
diff --git a/net-nds/jxplorer/files/build.xml b/net-nds/jxplorer/files/build.xml
new file mode 100644
index 000000000000..819f7ed311a0
--- /dev/null
+++ b/net-nds/jxplorer/files/build.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+
+<project name="jxplorer" default="jar">
+	<!-- some properties -->
+	<property name="src.dir" value="src" />
+	<property name="build.dir" value="build" />
+	<property name="docs.dir" value="docs" />
+	<property name="lib.dir" value="lib" />
+	<property name="dist.dir" value="dist" />
+	<property name="jarfile" value="${dist.dir}/jxplorer.jar" />
+	<property name="target.jdk" value="1.4" />
+
+	<path id="jxplorer.classpath">
+		<fileset dir="${lib.dir}">
+			<include name="**/*.jar" />
+		</fileset>
+	</path>
+	
+	<!-- init -->
+	<target name="init">
+		<mkdir dir="${dist.dir}" />
+		<mkdir dir="${build.dir}" />
+		<mkdir dir="${docs.dir}" />
+	</target>	
+
+	<!-- compile everything -->
+	<target name="compile" depends="init">
+		<mkdir dir="${build.dir}" />
+		<javac srcdir="${src.dir}" 
+			destdir="${build.dir}"
+			source="${target.jdk}"
+			target="${target.jdk}"
+			classpathref="jxplorer.classpath"/>
+	</target>
+
+	<!-- build the jar file -->
+	<target name="jar" depends="compile">
+		<jar jarfile="${jarfile}" basedir="${build.dir}">
+			<manifest>
+			<attribute name="Main-Class" value="com.ca.directory.jxplorer.JXplorer" />
+			</manifest>
+		</jar>
+	</target>
+	
+	<!-- generate javadocs -->
+	<target name="docs" depends="init">
+		<javadoc sourcepath="${src.dir}"
+			packagenames="com.*"
+           		destdir="${docs.dir}"
+           		author="true"
+           		version="true"
+           		use="true"
+           		windowtitle="${ant.project.name} API" />
+	</target>
+	
+	<!-- clean up -->
+	<target name="clean">
+		<delete dir="${build.dir}" />
+		<delete dir="${docs.dir}" />
+		<delete dir="${dist.dir}" />
+	</target>
+
+        <!-- zip the sources -->
+        <target name="sourcezip">
+                <zip destfile="$dist}/${ant.project.name}-src.zip">
+                        <zipfileset dir="${src.dir}" />
+                </zip>
+        </target>
+
+</project>
diff --git a/net-nds/jxplorer/files/digest-jxplorer-3.1_rc4 b/net-nds/jxplorer/files/digest-jxplorer-3.1_rc4
new file mode 100644
index 000000000000..c31194edd662
--- /dev/null
+++ b/net-nds/jxplorer/files/digest-jxplorer-3.1_rc4
@@ -0,0 +1,2 @@
+MD5 67cdcf798ca8e526a99a0bacb2473909 JXv3.1rc4src.tar.bz2 408207
+MD5 2a22c59b2233d10bfc3f4721cbe9c519 JXv3.1rc4deploy.tar.bz2 3017420
diff --git a/net-nds/jxplorer/files/jxplorer-gentoo.patch b/net-nds/jxplorer/files/jxplorer-gentoo.patch
new file mode 100644
index 000000000000..a9f8e54f4c12
--- /dev/null
+++ b/net-nds/jxplorer/files/jxplorer-gentoo.patch
@@ -0,0 +1,49 @@
+diff -uprN jxplorer.orig/src/com/ca/commons/cbutil/CBOpenConWin.java jxplorer/src/com/ca/commons/cbutil/CBOpenConWin.java
+--- jxplorer.orig/src/com/ca/commons/cbutil/CBOpenConWin.java	2004-12-28 19:30:42.000000000 +0100
++++ jxplorer/src/com/ca/commons/cbutil/CBOpenConWin.java	2005-01-02 17:24:15.765367432 +0100
+@@ -501,4 +501,4 @@ public abstract class CBOpenConWin exten
+      */

+ 

+     public abstract void connect(ConnectionData connectData);

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

+diff -uprN jxplorer.orig/src/com/ca/commons/cbutil/CBUtility.java jxplorer/src/com/ca/commons/cbutil/CBUtility.java
+--- jxplorer.orig/src/com/ca/commons/cbutil/CBUtility.java	2004-12-28 19:30:42.000000000 +0100
++++ jxplorer/src/com/ca/commons/cbutil/CBUtility.java	2005-01-02 17:10:12.559554200 +0100
+@@ -1399,7 +1399,7 @@ if (debug) System.out.println("\n\n Star
+             String pathToConfigFile;

+ 

+             // the potential path to a config file in the user home directory

+-            String userHomeConfigDir = System.getProperty("user.home") + File.separator + "jxplorer" ;

++            String userHomeConfigDir = System.getProperty("user.home") + File.separator + ".jxplorer" ;

+             String userHomeConfigFilePath = userHomeConfigDir + File.separator + configFileName;

+ 

+             // the default config location is to the directory JXplorer is run from.

+@@ -1440,4 +1440,4 @@ if (debug) System.out.println("\n\n Star
+             // the directory JXplorer is run from.

+             return defaultConfigFilePath;

+         }

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

+diff -uprN jxplorer.orig/src/com/ca/directory/jxplorer/editor/PostalAddressEditor.java jxplorer/src/com/ca/directory/jxplorer/editor/PostalAddressEditor.java
+--- jxplorer.orig/src/com/ca/directory/jxplorer/editor/PostalAddressEditor.java	2004-12-28 19:30:42.000000000 +0100
++++ jxplorer/src/com/ca/directory/jxplorer/editor/PostalAddressEditor.java	2004-12-28 19:57:10.000000000 +0100
+@@ -240,4 +240,4 @@ public class PostalAddressEditor extends
+         setVisible(false);

+         dispose();

+     }

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

+diff -uprN jxplorer.orig/src/com/ca/directory/jxplorer/JXplorer.java jxplorer/src/com/ca/directory/jxplorer/JXplorer.java
+--- jxplorer.orig/src/com/ca/directory/jxplorer/JXplorer.java	2004-12-28 19:30:42.000000000 +0100
++++ jxplorer/src/com/ca/directory/jxplorer/JXplorer.java	2005-01-02 17:09:17.747886840 +0100
+@@ -1874,4 +1874,4 @@ public class JXplorer extends JFrame    
+     {

+         return buttonRegister;

+     }

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

diff --git a/net-nds/jxplorer/files/jxplorer-log4j.patch b/net-nds/jxplorer/files/jxplorer-log4j.patch
new file mode 100644
index 000000000000..ab84e2b7e7cd
--- /dev/null
+++ b/net-nds/jxplorer/files/jxplorer-log4j.patch
@@ -0,0 +1,11 @@
+--- ../jxplorer-deploy.orig/log4j.xml	2004-12-18 06:29:43.000000000 +0100
++++ log4j.xml	2004-12-28 01:03:57.975167024 +0100
+@@ -3,7 +3,7 @@
+     <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"> 

+   

+         <appender name="JX" class="org.apache.log4j.FileAppender"> 

+-                <param name="File"   value="JX.log" /> 

++		<param name="File"   value="/tmp/jxplorer.log" /> 

+                 <param name="Append" value="false" />

+                 <layout class="org.apache.log4j.PatternLayout"> 

+                     <param name="ConversionPattern" value="%t %-5p %c{2} - %m%n"/> 

diff --git a/net-nds/jxplorer/files/jxplorer.sh b/net-nds/jxplorer/files/jxplorer.sh
new file mode 100644
index 000000000000..1358b165c915
--- /dev/null
+++ b/net-nds/jxplorer/files/jxplorer.sh
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+java=`java-config -J`
+jxplorer_home=/usr/share/jxplorer
+
+cp=`java-config -p jxplorer`:`java-config -p javahelp-bin`
+cp=${cp}:`java-config -p log4j`:`java-config -p sun-jaf-bin`
+cp=${cp}:`java-config -p commons-logging`:`java-config -p dom4j-1`
+cp=${cp}:`java-config -p sun-javamail-bin`:`java-config -p axis-1`
+cp=${cp}:`java-config -p sun-dsml-bin-2`:`java-config -p commons-discovery`
+
+if [ ! -d ${HOME}/.jxplorer ]; then
+	mkdir ${HOME}/.jxplorer
+	cp ${jxplorer_home}/connections.txt ${HOME}/.jxplorer
+	touch ${HOME}/.jxplorer/dxconfig.txt
+fi
+if [ -d ${HOME}/.jxplorer ]; then
+	if [ ! -f ${HOME}/.jxplorer/dxconfig.txt ]; then
+		touch ${HOME}/.jxplorer/dxconfig.txt
+	fi
+	if [ ! -f ${HOME}/.jxplorer/connections.txt ]; then
+		cp ${jxplorer_home}/connections.txt ${HOME}/.jxplorer
+	fi
+fi
+
+cd ${jxplorer_home}
+${java} -cp ${cp} com.ca.directory.jxplorer.JXplorer >& /dev/null 
+
diff --git a/net-nds/jxplorer/jxplorer-3.1_beta1.ebuild b/net-nds/jxplorer/jxplorer-3.1_beta1.ebuild
index 53f55362ca20..d1a9cac166b5 100644
--- a/net-nds/jxplorer/jxplorer-3.1_beta1.ebuild
+++ b/net-nds/jxplorer/jxplorer-3.1_beta1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/jxplorer-3.1_beta1.ebuild,v 1.4 2004/09/10 11:24:56 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/jxplorer-3.1_beta1.ebuild,v 1.5 2005/01/22 15:35:19 luckyduck Exp $
 
 DESCRIPTION="A fully functional ldap browser written in java."
 HOMEPAGE="http://jxplorer.org/"
diff --git a/net-nds/jxplorer/jxplorer-3.1_rc4.ebuild b/net-nds/jxplorer/jxplorer-3.1_rc4.ebuild
new file mode 100644
index 000000000000..b0b23074702a
--- /dev/null
+++ b/net-nds/jxplorer/jxplorer-3.1_rc4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/jxplorer/jxplorer-3.1_rc4.ebuild,v 1.1 2005/01/22 15:35:20 luckyduck Exp $
+
+inherit eutils java-pkg
+
+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"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="doc"
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jre-1.4
+	>=dev-java/commons-discovery-0.2
+	>=dev-java/commons-logging-1.0.4
+	>=dev-java/dom4j-1.4
+	>=dev-java/javahelp-bin-2.0.01
+	>=dev-java/log4j-1.2.8
+	>=dev-java/sun-dsml-bin-2.1.2_pre1
+	>=dev-java/sun-jaf-bin-1.0.2
+	>=dev-java/sun-javamail-bin-1.3.1
+	>=www-servers/axis-1.1"
+RESTRICT="nomirror"
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	cp ${FILESDIR}/build.xml ./build.xml
+
+	epatch ${FILESDIR}/jxplorer-log4j.patch
+	epatch ${FILESDIR}/jxplorer-gentoo.patch
+
+	mkdir lib/ && cd lib/
+	java-pkg_jar-from javahelp-bin
+}
+
+src_compile() {
+	# jikes build not possible atm
+	local antflags="jar"
+	use doc && antflags="${antflags} docs"
+	ant ${antflags} || die "compile failed"
+}
+
+src_install() {
+	java-pkg_dojar dist/${PN}.jar jars/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}
+	done
+
+	newbin ${FILESDIR}/jxplorer.sh jxplorer
+}