version bump and cleanups

8 files changed, 311 insertions, 4 deletions

diff --git a/net-www/jboss/ChangeLog b/net-www/jboss/ChangeLog
index 8ccfc1557d69..3c5828b2d91d 100644
--- a/net-www/jboss/ChangeLog
+++ b/net-www/jboss/ChangeLog
@@ -1,6 +1,14 @@
 # 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.6 2003/03/26 12:24:10 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/jboss/ChangeLog,v 1.7 2003/05/08 15:47:48 mkennedy Exp $
+
+*jboss-3.2.1 (08 May 2003)
+
+  08 May 2003; Matthew Kennedy <mkennedy@gentoo.org> jboss-3.2.1.ebuild,
+  files/3.2.1/log4j.xml, files/3.2.1/conf.d/jboss, files/3.2.1/env.d/50jboss,
+  files/3.2.1/init.d/jboss, files/conf.d/jboss:
+  Resolves bug #19929. New configuration and improvements from Alex Winawer
+  <gentoo@winawer.net>
 
 *jboss-3.0.6 (17 Mar 2003)
 
diff --git a/net-www/jboss/files/3.2.1/conf.d/jboss b/net-www/jboss/files/3.2.1/conf.d/jboss
new file mode 100644
index 000000000000..523ad038e73f
--- /dev/null
+++ b/net-www/jboss/files/3.2.1/conf.d/jboss
@@ -0,0 +1,27 @@
+# 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;
+# 'all' and 'minimal'. The configurations are located in
+# $JBOSS_HOME/server/
+
+JBOSS_CONF="default"
+# JBOSS_CONF="all"
+# JBOSS_CONF="minimal"
+
+# Console logging defaults to '/dev/null'. This env variable is
+# included for debugging purposes.  You might have to run add
+# $JBOSS_USER to the 'console' group to gain access to '/dev/console'.
+
+JBOSS_CONSOLE="/dev/null" 
+# JBOSS_CONSOLE="/dev/console"
+
+# The user JBoss will run as. Comment the next line to run as root
+
+JBOSS_USER="jboss"
+
+# Commands used in starting/stopping the server
+CMD_START="$JBOSS_HOME/bin/run.sh -c $JBOSS_CONF" 
+
+CMD_STOP="$JAVA_HOME/bin/java -classpath $JBOSS_HOME/bin/shutdown.jar:$JBOSS_HOME/lib/jboss-system.jar:`java-config --classpath=jboss` org.jboss.Shutdown -S"
+
+SUBIT="su $JBOSS_USER -c "
diff --git a/net-www/jboss/files/3.2.1/env.d/50jboss b/net-www/jboss/files/3.2.1/env.d/50jboss
new file mode 100644
index 000000000000..92bc5e1feb30
--- /dev/null
+++ b/net-www/jboss/files/3.2.1/env.d/50jboss
@@ -0,0 +1 @@
+JBOSS_HOME="@JBOSSPREFIX@"
diff --git a/net-www/jboss/files/3.2.1/init.d/jboss b/net-www/jboss/files/3.2.1/init.d/jboss
new file mode 100644
index 000000000000..93fbf3aa2d02
--- /dev/null
+++ b/net-www/jboss/files/3.2.1/init.d/jboss
@@ -0,0 +1,28 @@
+#!/sbin/runscript
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+	need net
+}
+
+start() {
+	ebegin "Starting JBoss"
+	cd $JBOSS_HOME/bin
+	if [ -z "$SUBIT" ]; then
+		eval $CMD_START >${JBOSS_CONSOLE} 2>&1 &
+	else
+		$SUBIT "$CMD_START >${JBOSS_CONSOLE} 2>&1 &" 
+	fi
+	eend $?
+}
+
+stop () {
+	ebegin "Stopping JBoss"
+	if [ -z "$SUBIT" ]; then
+		$CMD_STOP
+	else
+		$SUBIT "$CMD_STOP"
+	fi 
+	eend $?
+}
diff --git a/net-www/jboss/files/3.2.1/log4j.xml b/net-www/jboss/files/3.2.1/log4j.xml
new file mode 100644
index 000000000000..1d9f9a6249d7
--- /dev/null
+++ b/net-www/jboss/files/3.2.1/log4j.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  Log4j Configuration                                                  -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- $Id: log4j.xml,v 1.1 2003/05/08 15:47:48 mkennedy Exp $ -->
+
+<!--
+   | For more configuration infromation and examples see the Jakarta Log4j
+   | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+  <!-- ================================= -->
+  <!-- Preserve messages in a local file -->
+  <!-- ================================= -->
+
+  <!-- A time/date based rolling appender -->
+  <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+    <param name="File" value="/var/log/jboss/server.log"/>
+    <param name="Append" value="false"/>
+
+    <!-- Rollover at midnight each day -->
+<!--    <param name="DatePattern" value="'.'yyyy-MM-dd"/> -->
+
+    <!-- Rollover at the top of each hour -->
+    <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+
+    <layout class="org.apache.log4j.PatternLayout">
+      <!-- The default pattern: Date Priority [Category] Message\n -->
+      <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+
+      <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n
+      <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+       -->
+
+    </layout>	    
+  </appender>
+
+  <!-- A size based file rolling appender
+  <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+    <param name="File" value="${jboss.server.home.dir}/log/server.log"/>
+    <param name="Append" value="false"/>
+    <param name="MaxFileSize" value="500KB"/>
+    <param name="MaxBackupIndex" value="1"/>
+
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+    </layout>	    
+  </appender>
+  -->
+
+  <!-- ============================== -->
+  <!-- Append messages to the console -->
+  <!-- ============================== -->
+
+  <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+    <param name="Threshold" value="INFO"/>
+    <param name="Target" value="System.out"/>
+
+    <layout class="org.apache.log4j.PatternLayout">
+      <!-- The default pattern: Date Priority [Category] Message\n -->
+      <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+    </layout>
+  </appender>
+
+
+  <!-- ====================== -->
+  <!-- More Appender examples -->
+  <!-- ====================== -->
+
+  <!-- Buffer events and log them asynchronously
+  <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
+    <appender-ref ref="FILE"/>
+    <appender-ref ref="CONSOLE"/>
+    <appender-ref ref="SMTP"/>
+  </appender>
+  -->
+
+  <!-- EMail events to an administrator
+  <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
+    <param name="Threshold" value="ERROR"/>
+    <param name="To" value="admin@myhost.domain.com"/>
+    <param name="From" value="nobody@myhost.domain.com"/>
+    <param name="Subject" value="JBoss Sever Errors"/>
+    <param name="SMTPHost" value="localhost"/>
+    <param name="BufferSize" value="10"/>
+    <layout class="org.apache.log4j.PatternLayout">
+      <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
+    </layout>
+  </appender>
+  -->
+
+  <!-- Syslog events
+  <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
+    <param name="Facility" value="LOCAL7"/>
+    <param name="FacilityPrinting" value="true"/>
+    <param name="SyslogHost" value="localhost"/>
+  </appender>
+  -->
+ 
+
+  <!-- Log events to JMS (requires a topic to be created)
+  <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
+    <param name="Threshold" value="ERROR"/>
+    <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
+    <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
+  </appender>
+  -->
+
+  <!-- ================ -->
+  <!-- Limit categories -->
+  <!-- ================ -->
+
+  <!-- Limit JBoss categories to INFO
+  <category name="org.jboss">
+    <priority value="INFO"/>
+  </category>
+  -->
+
+  <!-- Increase the priority threshold for the DefaultDS category
+  <category name="DefaultDS">
+    <priority value="FATAL"/>
+  </category>
+  -->
+
+  <!-- Decrease the priority threshold for the org.jboss.varia category
+  <category name="org.jboss.varia">
+    <priority value="DEBUG"/>
+  </category>
+  -->
+
+  <!--
+     | An example of enabling the custom TRACE level priority that is used
+     | by the JBoss internals to diagnose low level details. This example
+     | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
+     | subpackages. This will produce A LOT of logging output.
+       If you use replace the log4j 1.2 jar with a 1.1.3 jar you will need to
+       change this from XLevel to XPriority.
+  <category name="org.jboss.system">
+    <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+  </category>
+  <category name="org.jboss.ejb.plugins">
+    <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+  </category>
+  -->
+
+  <!-- ======================= -->
+  <!-- Setup the Root category -->
+  <!-- ======================= -->
+
+  <root>
+    <appender-ref ref="CONSOLE"/>
+    <appender-ref ref="FILE"/>
+  </root>
+  
+</log4j:configuration>
diff --git a/net-www/jboss/files/conf.d/jboss b/net-www/jboss/files/conf.d/jboss
index 87cd6eea1d39..d72298ca8abd 100644
--- a/net-www/jboss/files/conf.d/jboss
+++ b/net-www/jboss/files/conf.d/jboss
@@ -1,6 +1,3 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-
 # The directory containing bin, server and lib dirs.
 JBOSS_HOME="@jbossprefix@"
 
diff --git a/net-www/jboss/files/digest-jboss-3.2.1 b/net-www/jboss/files/digest-jboss-3.2.1
new file mode 100644
index 000000000000..20b8409558a0
--- /dev/null
+++ b/net-www/jboss/files/digest-jboss-3.2.1
@@ -0,0 +1 @@
+MD5 98a66b0f148c4a8303907e96963a8bcb jboss-3.2.1-src.tgz 28592569
diff --git a/net-www/jboss/jboss-3.2.1.ebuild b/net-www/jboss/jboss-3.2.1.ebuild
new file mode 100644
index 000000000000..4ba54cb211c9
--- /dev/null
+++ b/net-www/jboss/jboss-3.2.1.ebuild
@@ -0,0 +1,83 @@
+# 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.ebuild,v 1.1 2003/05/08 15:47:48 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}
+	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"
+	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
+
+	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() {
+	einfo ">>> Assigning access rights..."
+	chown -R jboss ${INSTALL_DIR}/server
+	chgrp -R jboss ${INSTALL_DIR}/server
+	chown jboss /var/log/jboss
+	chgrp jboss /var/log/jboss
+
+	einfo ">>> Gentoo specific documentation for JBoss is available at"
+	einfo ">>> /usr/share/doc/${P}/README.gentoo"
+}