bugs 21133, 23612 and 21119

6 files changed, 140 insertions, 5 deletions

diff --git a/net-www/jboss/ChangeLog b/net-www/jboss/ChangeLog
index 333960b0a64b..c7d23f3ab8de 100644
--- a/net-www/jboss/ChangeLog
+++ b/net-www/jboss/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/jboss
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/jboss/ChangeLog,v 1.8 2003/06/10 00:46:21 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/jboss/ChangeLog,v 1.9 2003/07/11 04:25:37 mkennedy Exp $
+
+*jboss-3.2.1-r1 (10 Jul 2003)
+
+  10 Jul 2003; Matthew Kennedy <mkennedy@gentoo.org> jboss-3.2.1-r1.ebuild,
+  files/3.2.1/conf.d/jboss, files/3.2.1/init.d/jboss:
+  fixes bugs 21119, 21133 and 23612. thanks Dan A. Dickey <ddickey@wamnet.com>
+  of bug 21133 for the patch
 
   09 Jun 2003; <msterret@gentoo.org> jboss-3.2.1.ebuild:
   DEPEND on sed >= 4
diff --git a/net-www/jboss/Manifest b/net-www/jboss/Manifest
index a25fa7722e85..fc0f655a50ba 100644
--- a/net-www/jboss/Manifest
+++ b/net-www/jboss/Manifest
@@ -1,8 +1,8 @@
 MD5 48e1267c9670d6bfd78655833bd9b3aa jboss-3.0.6.ebuild 2665
-MD5 e9302dff8153dfa320163ba3a8958760 ChangeLog 1456
+MD5 16a56d9d71071d25203e1ad3257c17b6 ChangeLog 1726
 MD5 385353f6bbc7ac519c75d1c14501a33c jboss-3.0.1_rc1.ebuild 2589
-MD5 fd2e99282938c4044ec294925cda228f jboss-3.2.1.ebuild 3098
-MD5 fd2e99282938c4044ec294925cda228f jboss-3.2.1-r1.ebuild 3098
+MD5 04e3a3d3f02c0d9acca7eee4c0837537 jboss-3.2.1.ebuild 3103
+MD5 140380e2f35d6b9c2b509e51037f73ad jboss-3.2.1-r1.ebuild 3101
 MD5 ee6dd298b26237545eb64c6fa1f576b5 files/digest-jboss-3.0.6 66
 MD5 9ed2cbd53ccd4ad24130fa8a0bd44fab files/digest-jboss-3.0.1_rc1 69
 MD5 b6da382577bcc6d139c83cb0e11bc466 files/log4j.xml 5632
diff --git a/net-www/jboss/files/3.2.1/conf.d/jboss b/net-www/jboss/files/3.2.1/conf.d/jboss
index 523ad038e73f..9ccd5483fff8 100644
--- a/net-www/jboss/files/3.2.1/conf.d/jboss
+++ b/net-www/jboss/files/3.2.1/conf.d/jboss
@@ -1,3 +1,14 @@
+# We need to have JBOSS_HOME and JAVA_HOME set in order to start jboss.
+
+if [ -z "$JBOSS_HOME" ]; then
+	JBOSS_HOME=`grep JBOSS_HOME /etc/profile.env | sed -e "s;.*=;;" -e "s;';;g"`
+	export JBOSS_HOME
+fi
+if [ -z "$JAVA_HOME" ]; then
+	JAVA_HOME=`java-config --jdk-home`
+	export JAVA_HOME
+fi
+
 # You can choose which configuration you want to run JBoss with.  The
 # default configuration is, you guessed it, 'default'. The Gentoo
 # JBoss installation ships with two other predefined configurations;
diff --git a/net-www/jboss/files/3.2.1/init.d/jboss b/net-www/jboss/files/3.2.1/init.d/jboss
index 93fbf3aa2d02..c1913082f876 100644
--- a/net-www/jboss/files/3.2.1/init.d/jboss
+++ b/net-www/jboss/files/3.2.1/init.d/jboss
@@ -8,7 +8,15 @@ depend() {
 
 start() {
 	ebegin "Starting JBoss"
-	cd $JBOSS_HOME/bin
+	if [ -z "$JBOSS_HOME" ]; then
+		eerror "The JBOSS_HOME environment variable is not set."
+		return 1
+	fi
+	if [ ! -d "$JBOSS_HOME/server/$JBOSS_CONF/tmp" ]; then
+		mkdir "$JBOSS_HOME/server/$JBOSS_CONF/tmp"
+		chown jboss.jboss "$JBOSS_HOME/server/$JBOSS_CONF/tmp"
+	fi
+	cd $JBOSS_HOME/server/$JBOSS_CONF/tmp
 	if [ -z "$SUBIT" ]; then
 		eval $CMD_START >${JBOSS_CONSOLE} 2>&1 &
 	else
@@ -26,3 +34,4 @@ stop () {
 	fi 
 	eend $?
 }
+
diff --git a/net-www/jboss/files/digest-jboss-3.2.1-r1 b/net-www/jboss/files/digest-jboss-3.2.1-r1
new file mode 100644
index 000000000000..20b8409558a0
--- /dev/null
+++ b/net-www/jboss/files/digest-jboss-3.2.1-r1
@@ -0,0 +1 @@
+MD5 98a66b0f148c4a8303907e96963a8bcb jboss-3.2.1-src.tgz 28592569
diff --git a/net-www/jboss/jboss-3.2.1-r1.ebuild b/net-www/jboss/jboss-3.2.1-r1.ebuild
new file mode 100644
index 000000000000..38caf05645b6
--- /dev/null
+++ b/net-www/jboss/jboss-3.2.1-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/jboss/jboss-3.2.1-r1.ebuild,v 1.1 2003/07/11 04:25:37 mkennedy Exp $
+
+MY_P="${P}-src"
+
+DESCRIPTION="The Open Source J2EE app server implementation"
+SRC_URI="mirror://sourceforge/jboss/${MY_P}.tgz"
+HOMEPAGE="http://www.jboss.org"
+LICENSE="LGPL-2"
+IUSE="doc"
+SLOT="0"
+KEYWORDS="~x86"
+
+RDEPEND=">=virtual/jdk-1.3"
+DEPEND="${RDEPEND}
+	>=sys-apps/sed-4
+	dev-java/ant"
+
+INSTALL_DIR=/opt/${P}
+
+S=${WORKDIR}/${MY_P}
+
+src_compile() {
+	export JAVA_HOME=${JDK_HOME}
+	cd build
+	sh build.sh || die
+}
+
+src_install() {
+	dodir ${INSTALL_DIR}
+	dodir ${INSTALL_DIR}/bin
+
+	cp build/output/${PN}-${PV}/bin/run.sh ${D}/${INSTALL_DIR}/bin
+	cp build/output/${PN}-${PV}/bin/shutdown.sh ${D}/${INSTALL_DIR}/bin
+	cp build/output/${PN}-${PV}/bin/run.jar ${D}/${INSTALL_DIR}/bin
+	cp build/output/${PN}-${PV}/bin/shutdown.jar ${D}/${INSTALL_DIR}/bin
+
+	exeinto /etc/init.d
+	doexe ${FILESDIR}/${PV}/init.d/jboss
+
+	dodir /etc/conf.d
+	cp ${FILESDIR}/${PV}/conf.d/jboss ${D}/etc/conf.d
+
+	dodir /etc/env.d
+	cp ${FILESDIR}/${PV}/env.d/50jboss ${D}/etc/env.d
+	sed -i "s#@JBOSSPREFIX@#${INSTALL_DIR}#" ${D}/etc/env.d/50jboss
+
+	einfo ">>> Setting up configuration files and library packages..."
+	local dirs="build/output/${PN}-${PV}/server build/output/${PN}-${PV}/lib build/output/${PN}-${PV}/client"
+	for i in $dirs ; do
+		cp -a $i ${D}/${INSTALL_DIR}/
+	done
+	cp ${FILESDIR}/${PV}/log4j.xml ${D}/${INSTALL_DIR}/server/all/conf
+	cp ${FILESDIR}/${PV}/log4j.xml ${D}/${INSTALL_DIR}/server/default/conf
+	cp ${FILESDIR}/${PV}/log4j.xml ${D}/${INSTALL_DIR}/server/minimal/conf
+
+	# We probably should not do this, because a wide variety of tools
+	# assume everything under a common JBoss file system.
+
+ 	einfo ">>> Installing client libraries..."
+ 	local dirs="build/output/${PN}-${PV}/client/*"
+ 	for i in $dirs ; do
+ 		dojar $i
+ 	done
+
+	einfo ">>> Setting up documentation..."
+	dodoc server/src/docs/LICENSE.txt ${FILESDIR}/README.gentoo
+	if [ -n "`use doc`" ] ; then
+		dohtml -a html,htm,png,gif,css,java -r build/output/${PN}-${PV}/docs/
+	fi
+
+	einfo ">>> Creating log directory..."
+	dodir /var/log/jboss
+	touch ${D}/var/log/jboss/.keep
+}
+
+pkg_postinst() {
+	chown -R jboss ${INSTALL_DIR}/server
+	chgrp -R jboss ${INSTALL_DIR}/server
+	chown jboss /var/log/jboss
+	chgrp jboss /var/log/jboss
+	chmod -R g+w ${INSTALL_DIR}/server
+
+	einfo ""
+	einfo "Access summary"
+	einfo "--------------"
+	einfo "  * User jboss and group jboss ownership for"
+	einfo "    ${INSTALL_DIR}/server and higher and "
+	einfo "    /var/log/jboss"
+	einfo "  * User and group read/write permissions for"
+	einfo "    ${INSTALL_DIR}/server and higher"
+	einfo ""
+	einfo "Gentoo specific documentation for JBoss is available at"
+	einfo "/usr/share/doc/${P}/README.gentoo"
+	einfo ""
+}
+
+pkg_preinst() {
+	einfo ">>> Adding user and group for JBoss"
+	if ! groupmod jboss ; then
+		groupadd jboss || die "problem adding jboss group"
+	fi
+	if ! id jboss ; then
+		useradd jboss -g jboss || die "problem adding jboss user"
+	fi
+}