From c3d2748416edb95c13b3d6df2fc599e939ce236b Mon Sep 17 00:00:00 2001 From: Krzysztof Pawlik Date: Fri, 18 May 2007 13:10:16 +0000 Subject: Fix starting of resin (bug #178149). (Portage version: 2.1.2.7) --- www-servers/resin/ChangeLog | 6 +++++- www-servers/resin/files/3.1.1/resin.conf | 4 ++-- www-servers/resin/files/3.1.1/resin.init | 9 +++++++-- www-servers/resin/resin-3.1.1-r1.ebuild | 4 ++-- 4 files changed, 16 insertions(+), 7 deletions(-) (limited to 'www-servers/resin') 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 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/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} -- cgit v1.2.3-65-gdbad