Fix starting of resin (bug #178149).

Package-Manager: portage-2.1.2.7

5 files changed, 35 insertions, 26 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 6dcafe0a2da1..49cb0a94318c 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-servers/resin
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.44 2007/05/16 10:52:02 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.45 2007/05/18 13:10:16 nelchael Exp $
+
+  18 May 2007; Krzysiek Pawlik <nelchael@gentoo.org> files/3.1.1/resin.conf,
+  files/3.1.1/resin.init, resin-3.1.1-r1.ebuild:
+  Fix starting of resin (bug #178149).
 
 *resin-3.1.1-r1 (16 May 2007)
 *resin-3.0.23-r1 (16 May 2007)
diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest
index 5b08391ec71d..c592b70cf374 100644
--- a/www-servers/resin/Manifest
+++ b/www-servers/resin/Manifest
@@ -45,14 +45,14 @@ AUX 3.1.1/resin-3.1.1-gentoo.patch 7476 RMD160 9f03bcd1fcacc301b7cbe74f4948d300d
 MD5 55a57949a29acb38a65f7fb2f5254ee0 files/3.1.1/resin-3.1.1-gentoo.patch 7476
 RMD160 9f03bcd1fcacc301b7cbe74f4948d300d358a3ed files/3.1.1/resin-3.1.1-gentoo.patch 7476
 SHA256 c03d506f97cfc301dc134c350ccfb44ec8d168dd51eb9ca724717c366f5c42ce files/3.1.1/resin-3.1.1-gentoo.patch 7476
-AUX 3.1.1/resin.conf 448 RMD160 d4b7405f55e36eedf4a737c9ced892f1e83d34a4 SHA1 6fb88c341a5271488d2b09aeb27c451619ee0015 SHA256 649d05d7fb515a9ba3c035adb19b9e39b66275e8a06cf452582b7ae5eb3ef667
-MD5 3065ffbced3b5961423f78283136730b files/3.1.1/resin.conf 448
-RMD160 d4b7405f55e36eedf4a737c9ced892f1e83d34a4 files/3.1.1/resin.conf 448
-SHA256 649d05d7fb515a9ba3c035adb19b9e39b66275e8a06cf452582b7ae5eb3ef667 files/3.1.1/resin.conf 448
-AUX 3.1.1/resin.init 760 RMD160 53aaec63352f09faa7874d57b010b81b9d204ea2 SHA1 453368c17e80b5eee0eb4ff1f1fdc54e4297cef3 SHA256 c60e75bf62736d89038658ff0d796ee0e043a7919df4685c24078ed672efb798
-MD5 bf013ca53a5d97bda9f88c699b9a4188 files/3.1.1/resin.init 760
-RMD160 53aaec63352f09faa7874d57b010b81b9d204ea2 files/3.1.1/resin.init 760
-SHA256 c60e75bf62736d89038658ff0d796ee0e043a7919df4685c24078ed672efb798 files/3.1.1/resin.init 760
+AUX 3.1.1/resin.conf 425 RMD160 1819e2e38f95b5dbeb950cac7fd28ccb492fbe8c SHA1 c332de715146a0cb2836f0e7a6152e83eb1838bc SHA256 e5822b13d15e35ffaf3b60c16c3cbd9f3d3b7916c7ab3ae421f923895713158c
+MD5 4ccfaa3a9f3c4f386c77659a6ef91f71 files/3.1.1/resin.conf 425
+RMD160 1819e2e38f95b5dbeb950cac7fd28ccb492fbe8c files/3.1.1/resin.conf 425
+SHA256 e5822b13d15e35ffaf3b60c16c3cbd9f3d3b7916c7ab3ae421f923895713158c files/3.1.1/resin.conf 425
+AUX 3.1.1/resin.init 839 RMD160 06ec56cb0a4d9c3e89fb59fcda981d30202b1598 SHA1 ba07f8f1a399ec1d1d80f6c4d76bd9e1a7f87597 SHA256 6bc198f37f6abfd5baa48c28a354ff7a5bda039d2bb2977488407b090187e746
+MD5 09b4820aa49c8e9af8a5bbf566e3c869 files/3.1.1/resin.init 839
+RMD160 06ec56cb0a4d9c3e89fb59fcda981d30202b1598 files/3.1.1/resin.init 839
+SHA256 6bc198f37f6abfd5baa48c28a354ff7a5bda039d2bb2977488407b090187e746 files/3.1.1/resin.init 839
 DIST resin-2.1.17.tar.gz 3239401 RMD160 5fcf2e7680bfad1531cf75d384dcd8f15c19f639 SHA1 2d45e885874122931e63d7c59baed50a75f60618 SHA256 70c681d45f34b1992fbdfb2024970c52a6be20b8cd23855903630e1476a89b92
 DIST resin-3.0.22-src.tar.gz 5467522 RMD160 093cdcfa8bcd14a30ff54cc9cb8001ace10bbfc6 SHA1 23d4f2fd233033adb0b08f8fcdcb81a1f0aab3fe SHA256 0da5617b6867a0d40e59d2dfe2518158567506fea2c1273d56290c146a64849a
 DIST resin-3.0.23-src.tar.gz 5470406 RMD160 1a991b14b3f832141c10f0d4ba7c83cc143844ef SHA1 9b767c79c20003b76637095bed7150e784fea3ce SHA256 21f1a805865a23f90cf2f8b217670b4c039bcd891450c6730c8e78a55b8d2d9d
@@ -69,14 +69,14 @@ EBUILD resin-3.0.23-r1.ebuild 3763 RMD160 cd71832aee0fa747a55de4e7974fbd651e3c74
 MD5 f3f955fa7e618fb85cca7153eb2fb111 resin-3.0.23-r1.ebuild 3763
 RMD160 cd71832aee0fa747a55de4e7974fbd651e3c74c4 resin-3.0.23-r1.ebuild 3763
 SHA256 43b6f55c0c01134bc290858c8c4cd316a053d00d31197932c2963906804e239f resin-3.0.23-r1.ebuild 3763
-EBUILD resin-3.1.1-r1.ebuild 3534 RMD160 b41ea2fed9fa15d5d709610bf6778961c5094343 SHA1 8771b2b870083715e55f718bf952703ae57381f0 SHA256 489e2aea038341821b97bff433b4d45d45a352bb7c2f937a4396eb6e4277375c
-MD5 3d4c9b04fa5835fe9e5fbfdc65e6499c resin-3.1.1-r1.ebuild 3534
-RMD160 b41ea2fed9fa15d5d709610bf6778961c5094343 resin-3.1.1-r1.ebuild 3534
-SHA256 489e2aea038341821b97bff433b4d45d45a352bb7c2f937a4396eb6e4277375c resin-3.1.1-r1.ebuild 3534
-MISC ChangeLog 9526 RMD160 289fe8eda34f5fe3f44b8a8966f461f0e8c1ef5f SHA1 2cbc8651d1469254ade08e1e094e574b0799e5b2 SHA256 29af6f11fc1450783b52154b90da5f5c24442d22fc856f567026c1d00f359815
-MD5 f54446dfff06fcf3744301cff85faa2f ChangeLog 9526
-RMD160 289fe8eda34f5fe3f44b8a8966f461f0e8c1ef5f ChangeLog 9526
-SHA256 29af6f11fc1450783b52154b90da5f5c24442d22fc856f567026c1d00f359815 ChangeLog 9526
+EBUILD resin-3.1.1-r1.ebuild 3568 RMD160 22cff6278cdc5c8379bb4fa18a42a73e62dc0fcf SHA1 e60e5d81f029e7c71e66e755329a63b4d6927442 SHA256 017d161cf41a741e2823fc99cac2f8649b8a5d59bd6fcdf6fadaff31d7d0ce52
+MD5 972cfa2bdf9f5c1c9d812ad99aa3de4d resin-3.1.1-r1.ebuild 3568
+RMD160 22cff6278cdc5c8379bb4fa18a42a73e62dc0fcf resin-3.1.1-r1.ebuild 3568
+SHA256 017d161cf41a741e2823fc99cac2f8649b8a5d59bd6fcdf6fadaff31d7d0ce52 resin-3.1.1-r1.ebuild 3568
+MISC ChangeLog 9692 RMD160 e33148a716786e95323cb77e3094de561f917214 SHA1 eaaee3fad489bb2039a5630ab0e6b576a8ad1f1b SHA256 3303de2f3a9929757314ee8db0018e0774a0cbc0db8e213a19fc6d65e567b9f6
+MD5 314c0e9f9b68bee3a0d59a7f0821b03a ChangeLog 9692
+RMD160 e33148a716786e95323cb77e3094de561f917214 ChangeLog 9692
+SHA256 3303de2f3a9929757314ee8db0018e0774a0cbc0db8e213a19fc6d65e567b9f6 ChangeLog 9692
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 MD5 2696a2548331ef205bf10abad6802180 metadata.xml 229
 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 metadata.xml 229
@@ -96,7 +96,7 @@ SHA256 13233a3d52b314e7f3392c9012a48c289b7f61c2378b80257f92a19265fdc32a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGSuKigo/w9rxVVVERAtGMAKCWvAbOWCy+glTw33IpMxW5TbJf6wCfTfV0
-C2oAmQE430R2V2vn8F6gQ6s=
-=4vJY
+iD8DBQFGTaYKgo/w9rxVVVERAtoCAJwImvGGO3pUp5PYQBm46XHIBFsCRgCgvV1u
+IGibe35158u3qcmJbWZ9Uhg=
+=yEGf
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/3.1.1/resin.conf b/www-servers/resin/files/3.1.1/resin.conf
index 5fb064e1ba6c..0895ad30fbf4 100644
--- a/www-servers/resin/files/3.1.1/resin.conf
+++ b/www-servers/resin/files/3.1.1/resin.conf
@@ -8,5 +8,5 @@
 #   java-config -L
 #GENTOO_VM=sun-jdk-1.5
 
-# The CLASSPATH for Resin to use, plus any others you need.
-CLASSPATH="$(java-config -p resin)"
+# Verbose starting and stopping? (yes/no, defaults to no)
+#VERBOSE="yes"
diff --git a/www-servers/resin/files/3.1.1/resin.init b/www-servers/resin/files/3.1.1/resin.init
index b8513dbe7e47..7863a112a7ba 100644
--- a/www-servers/resin/files/3.1.1/resin.init
+++ b/www-servers/resin/files/3.1.1/resin.init
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.1.1/resin.init,v 1.1 2007/05/15 16:36:50 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/files/3.1.1/resin.init,v 1.2 2007/05/18 13:10:16 nelchael Exp $
 
 depend() {
 	need net
@@ -14,10 +14,15 @@ function runResin() {
 	[[ -n "${GENTOO_VM}" ]] && JAVA_HOME=$(java-config --select-vm="${GENTOO_VM}" -O)
 	export JAVA_HOME
 
+	local extraArgs=
+	if [[ "${VERBOSE}" = "yes" ]]; then
+		extraArgs="-verbose"
+	fi
+
 	local msg="${1}"
 	shift
 
-	local cmdline="${JAVA_HOME}/bin/java -cp ${CLASSPATH} -jar /usr/share/resin/lib/resin.jar -resin-home /usr/lib/resin ${@}"
+	local cmdline="${JAVA_HOME}/bin/java -jar /usr/share/resin/lib/resin.jar ${extraArgs} -resin-home /usr/lib/resin ${@}"
 
 	ebegin "${msg}"
 	su - resin -c "${cmdline}"
diff --git a/www-servers/resin/resin-3.1.1-r1.ebuild b/www-servers/resin/resin-3.1.1-r1.ebuild
index 2dfc372bb89d..5004d5244b9a 100644
--- a/www-servers/resin/resin-3.1.1-r1.ebuild
+++ b/www-servers/resin/resin-3.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.1-r1.ebuild,v 1.1 2007/05/16 10:52:02 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.1.1-r1.ebuild,v 1.2 2007/05/18 13:10:16 nelchael Exp $
 
 JAVA_PKG_IUSE="doc source"
 
@@ -67,7 +67,7 @@ src_compile() {
 	java-pkg_jar-from sun-javamail
 	java-pkg_jar-from iso-relax
 	java-pkg_jar-from aopalliance-1
-	java-pkg_jar-from resin-servlet-api-2.5
+	java-pkg_jar-from resin-servlet-api-2.5 resin-servlet-api.jar jsdk-15.jar
 	ln -s $(java-config --jdk-home)/lib/tools.jar
 	cd ${S}