[pkg-jboss-commits] cvs commit to jboss3/debian by agx

[pkg-jboss-commits@lists.alioth.debian.org]

Update of /cvsroot/pkg-jboss/jboss3/debian
In directory haydn:/tmp/cvs-serv30647

Modified Files:
	jboss3.init changelog jboss3.default 
Log Message:
look for jdk 1.3, fix typos

Index: jboss3.init
===================================================================
RCS file: /cvsroot/pkg-jboss/jboss3/debian/jboss3.init,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- jboss3.init	18 Jun 2004 13:03:47 -0000	1.8
+++ jboss3.init	21 Jun 2004 11:43:46 -0000	1.9
@@ -29,16 +29,15 @@
 
 # the first existing directory is used for JAVA_HOME ,if JAVA_HOME isn't
 # defined in $DEFAULT
-JDK_DIRS="/usr/lib/j2sdk1.4 /usr/lib/j2se/1.4"
+JDK_DIRS="/usr/lib/j2sdk1.4 /usr/lib/j2se/1.4 /usr/lib/j2se/1.3"
 
 # include jboss defaults if available
 if [ -f $DEFAULT ] ; then
 	. $DEFAULT
 fi
 
-if [ -z "$JBOSS_USER" ]; then
-	echo "Not starting/stopping $DESC as configured (JBOSS_USER is"
-	echo "empty in $DEFAULT)."
+if [ -z "$JBOSS_USER" -a ! -z "$1" ]; then
+	echo "Not ${1}ing $DESC as configured (JBOSS_USER is empty in $DEFAULT)."
 	exit 0
 fi
 

Index: changelog
===================================================================
RCS file: /cvsroot/pkg-jboss/jboss3/debian/changelog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- changelog	19 Jun 2004 15:22:39 -0000	1.6
+++ changelog	21 Jun 2004 11:43:46 -0000	1.7
@@ -1,3 +1,12 @@
+jboss3 (3.2.4.final-2) unstable; urgency=low
+
+ - Guido:
+   * jboss3.init: also look for j2sdk 1.3
+   * jboss3.init: fix startup message if JBOSS_USER is empty
+   * jboss3.default: fix typos
+
+ -- Guido Guenther <agx@debian.org>  Mon, 21 Jun 2004 12:29:08 +0200
+
 jboss3 (3.2.4.final-1) unstable; urgency=low
 
   - Philipp:

Index: jboss3.default
===================================================================
RCS file: /cvsroot/pkg-jboss/jboss3/debian/jboss3.default,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- jboss3.default	18 Jun 2004 07:45:57 -0000	1.4
+++ jboss3.default	21 Jun 2004 11:43:46 -0000	1.5
@@ -1,8 +1,8 @@
 # Defaults for JBoss initscript (/etc/init.d/jboss3)
 # This is a POSIX shell fragment
 
-# Run JBoss this user ID (default: jboss). Set this to an empty string
-# to prevent Tomcat from starting.
+# Run JBoss with this user ID (default: jboss). Set this to an empty string to
+# prevent JBoss from starting.
 #JBOSS_USER=jboss
 
 # The home directory of the Java development kit (JDK).