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

pkg-jboss-commits@lists.alioth.debian.org pkg-jboss-commits@lists.alioth.debian.org
Wed, 07 Jul 2004 07:26:07 -0600


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

Modified Files:
	control rules jboss3.init 
Added Files:
	jboss3-win-files.dirs 
Log Message:
- move windows batch files into a separate package
- debian/rules: remove jdom bug workaround
- debian/jboss3.init: clean jboss.web for all configs


--- NEW FILE: jboss3-win-files.dirs ---
usr/share/jboss3/bin

Index: control
===================================================================
RCS file: /cvsroot/pkg-jboss/jboss3/debian/control,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- control	22 Jun 2004 08:50:59 -0000	1.12
+++ control	7 Jul 2004 13:26:04 -0000	1.13
@@ -65,4 +65,13 @@
 Description: J2EE based application server documentation
  JBoss is a Java Application Server fully implemented in Java.
  .
- This package contains some documentation.
+ This package contains some documentation, DTDs and examples.
+
+Package: jboss3-win-files
+Architecture: all
+Replaces: jboss3 (<< 3.2.4.final-2)
+Depends: ${misc:Depends}
+Description: J2EE based application server windows files
+ JBoss is a Java Application Server fully implemented in Java.
+ .
+ This package contains the batch files for MS Windows.

Index: rules
===================================================================
RCS file: /cvsroot/pkg-jboss/jboss3/debian/rules,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- rules	22 Jun 2004 07:25:54 -0000	1.10
+++ rules	7 Jul 2004 13:26:05 -0000	1.11
@@ -79,11 +79,11 @@
 	mv $(JBOSS_DIR)-server-all/usr/share/${PKG}/server/all/farm/ \
 	        $(JBOSS_DIR)-server-all/var/cache/${PKG}/all/
 
-	# Bug: install missing jdom package:
-	for i in all default; do			\
-	cp thirdparty/jdom/lib/jdom.jar    		\
-	    	$(JBOSS_DIR)-server-$$i/usr/share/${PKG}/server/$$i/lib/; \
-	done
+	# Bug in 3.2.4.rc1: install missing jdom package:
+	#for i in all default; do			\
+	#cp thirdparty/jdom/lib/jdom.jar    		\
+	#    	$(JBOSS_DIR)-server-$$i/usr/share/${PKG}/server/$$i/lib/; \
+	#done
 
 	# Bug: fix minimal config (https://sourceforge.net/tracker/?func=detail&atid=376685&aid=969292&group_id=22866)
 	cp server/output/lib/jboss.jar \
@@ -95,7 +95,15 @@
 	cp $(CURDIR)/debian/${PKG}-server-debian.jboss-service.xml $(JBOSS_DIR)-server-debian/etc/${PKG}/debian/jboss-service.xml
 	cp $(CURDIR)/debian/${PKG}-server-debian.server.xml $(JBOSS_DIR)-server-debian/usr/share/jboss3/server/debian/deploy/jbossweb-tomcat50.sar/server.xml
 
+	# move windows batch files to an extra package
+	mv $(BUILD_DIR)/bin/*.bat $(JBOSS_DIR)-win-files/usr/share/${PKG}/bin/
+
+	# copy files for jboss server package
 	cp -a $(BUILD_DIR)/* $(JBOSS_DIR)/usr/share/${PKG}
+
+	# install debian specific stuff:
+	${INSTALL} -m 755 debian/create-server-config \
+			$(JBOSS_DIR)/usr/share/${PKG}/bin
 
 
 # Build architecture-independent files here.

Index: jboss3.init
===================================================================
RCS file: /cvsroot/pkg-jboss/jboss3/debian/jboss3.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- jboss3.init	21 Jun 2004 11:43:46 -0000	1.9
+++ jboss3.init	7 Jul 2004 13:26:05 -0000	1.10
@@ -6,8 +6,8 @@
 #		Written by Miquel van Smoorenburg <miquels@cistron.nl>.
 #		Modified for Debian 
 #		by Ian Murdock <imurdock@gnu.ai.mit.edu>.
-#               addepted for jboss3 by Guido Guenther <agx@sigxcpu.org>
-#               with parts borrowed from tomcat4s startup script
+#               adopted for jboss3 by Guido Guenther <agx@sigxcpu.org>
+#               with parts borrowed from tomcat4's startup script
 #
 # Version:	$Id$
 NAME=jboss3
@@ -81,8 +81,10 @@
 		--user $JBOSS_USER --startas "$JAVA_HOME/bin/java"   \
 		>/dev/null; then
 
-		# Bug: startup off "all" fails when this dir exists
-		rm -rf /var/cache/jboss3/all/jboss.web/*
+		# Bug: startup off "all" fails when this dir exists 
+		# There might be other configs, too so we clean up a bit more
+		rm -rf /var/cache/jboss3/*/jboss.web/*
+
 		# Bug: jboss needs the cwd writeable
   		cd /var/cache/$NAME/tmp