L!7M3$aZqi

9 files changed, 206 insertions, 19 deletions

diff --git a/net-www/resin/ChangeLog b/net-www/resin/ChangeLog
index 85be4f3b3ca5..cdeb183c6362 100644
--- a/net-www/resin/ChangeLog
+++ b/net-www/resin/ChangeLog
@@ -1,10 +1,19 @@
 # ChangeLog for net-www/resin
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/resin/ChangeLog,v 1.7 2004/07/27 20:22:22 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/resin/ChangeLog,v 1.8 2004/07/30 00:59:15 axxo Exp $
 
-  27 Jul 2004; Thomas Matthijs <axxo@gentoo.org> :
+*resin-3.0.8 (30 Jul 2004)
+
+  30 Jul 2004; Thomas Matthijs <axxo@gentoo.org> +files/3.0.8/21resin,
+  +files/3.0.8/resin.conf, +files/3.0.8/resin.init,
+  +files/3.0.8/wrapper.pl.diff, resin-2.1.14.ebuild, +resin-3.0.8.ebuild:
   new upstream version
 
+*resin-2.1.14 (30 Jul 2004)
+
+  27 Jul 2004; Thomas Matthijs <axxo@gentoo.org> resin-2.1.14.ebuild:
+  Version bump
+
   26 Jul 2004; Thomas Matthijs <axxo@gentoo.org> +metadata.xml,
   resin-2.1.9.ebuild:
   ebuild cleanup
diff --git a/net-www/resin/Manifest b/net-www/resin/Manifest
index ab5c746a324c..a7e2c49a2128 100644
--- a/net-www/resin/Manifest
+++ b/net-www/resin/Manifest
@@ -1,24 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1110cce8c66aea62c2086f25e94bf03a ChangeLog 1128
+MD5 2869a9dfb2af23919b2a73db3ac5caba resin-3.0.8.ebuild 3011
+MD5 1de862916fa840f33d95316e33cee37b ChangeLog 1168
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
-MD5 08069082fca7f48f879ef7d9d566d107 resin-2.1.14.ebuild 3118
+MD5 48e59c52df9741c7d45712cb1f12b30b resin-2.1.14.ebuild 3046
 MD5 9c83a0cca4668dbc79df30c1385a5e4c resin-2.1.9.ebuild 3117
 MD5 0e0d2bb7422b3b0f88fe7bb4302738a1 files/digest-resin-2.1.14 65
 MD5 5837c42d665786c9555b544428725ff6 files/digest-resin-2.1.9 64
+MD5 fb879fef5b9755ced18f4715f5c8d0ca files/digest-resin-3.0.8 64
 MD5 177e0d5de914991fbf4bc14297cb1cea files/2.1.9/resin.conf 1239
 MD5 cc895b3b901369aa2c6d80fb88369113 files/2.1.9/resin.diff 504
 MD5 30f17d8fdd8dc59b8cb96cbcb6d2dd47 files/2.1.9/resin.init 748
 MD5 a810be4b68e920ebc5d2cf8160a5642a files/2.1.9/21resin 53
+MD5 9d811f26f2edcbd8240cfd589f16e620 files/3.0.8/resin.conf 1121
+MD5 f772b71f904af36a38433f060ec7a92c files/3.0.8/resin.init 540
+MD5 a810be4b68e920ebc5d2cf8160a5642a files/3.0.8/21resin 53
+MD5 fc791301841bde6c69ec74e35fcc07e9 files/3.0.8/wrapper.pl.diff 526
 MD5 edcf8dbbfe51e68a46e710c40d9b4913 files/2.1.14/resin.conf 1172
 MD5 cc895b3b901369aa2c6d80fb88369113 files/2.1.14/resin.diff 504
 MD5 5a2a223ab9c787831c5b95a4707f676a files/2.1.14/resin.init 745
 MD5 a810be4b68e920ebc5d2cf8160a5642a files/2.1.14/21resin 53
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.4 (GNU/Linux)
-
-iD8DBQFBBrn//rLF9B432nYRAnVwAKCxwhaoeDD6LvS98sU18nUYWN9T0ACgms/m
-QypRZlGRcE9cJqdNxc7QoOs=
-=RC8f
------END PGP SIGNATURE-----
diff --git a/net-www/resin/files/3.0.8/21resin b/net-www/resin/files/3.0.8/21resin
new file mode 100644
index 000000000000..5a3ecc5b6e96
--- /dev/null
+++ b/net-www/resin/files/3.0.8/21resin
@@ -0,0 +1,2 @@
+RESIN_HOME=/opt/resin
+CONFIG_PROTECT=/opt/resin/conf
diff --git a/net-www/resin/files/3.0.8/resin.conf b/net-www/resin/files/3.0.8/resin.conf
new file mode 100644
index 000000000000..c3eab668c4ba
--- /dev/null
+++ b/net-www/resin/files/3.0.8/resin.conf
@@ -0,0 +1,36 @@
+# $Header: /var/cvsroot/gentoo-x86/net-www/resin/files/3.0.8/resin.conf,v 1.1 2004/07/30 00:59:15 axxo Exp $
+
+# JVM Runtime
+# Using the default setting, it will determine your JVM from the system-vm
+# set using java-config.
+# See java-config(1) manual page for assistance in determining this value.
+#
+# You can override this value with whatever path you wish.  
+# Example: JAVA_HOME=/opt/sun-jdk-1.4.1.01
+
+#JAVA_HOME=`java-config -O`
+
+# (Optional) Java runtime options used when the "start", "stop", or "run"
+# commands are executed.
+# JAVA_OPTS=""
+
+# Where your Resin is installed
+RESIN_HOME=/opt/resin
+SERVER_ROOT=${RESIN_HOME}
+
+# Resin's User
+RESIN_USER=resin
+
+# Resin Log Locations
+RESIN_OUT=/var/log/resin/resin_out.log
+RESIN_ERR=/var/log/resin/resin_err.log
+
+# Location of the Resin JARs and classes
+RESIN_LIBDIR=/usr/share/resin/lib
+
+# The CLASSPATH for Resin to use, plus any others you need.
+CLASSPATH=$(java-config -p resin 2>/dev/null):${RESIN_LIBDIR}/lib
+
+# START/STOP settings
+RESIN_START="-java_home ${JAVA_HOME} -resin_home ${RESIN_HOME} -stdout ${RESIN_OUT} -stderr ${RESIN_ERR} start"
+RESIN_STOP="stop"
diff --git a/net-www/resin/files/3.0.8/resin.init b/net-www/resin/files/3.0.8/resin.init
new file mode 100644
index 000000000000..f78e41a0dc0b
--- /dev/null
+++ b/net-www/resin/files/3.0.8/resin.init
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/resin/files/3.0.8/resin.init,v 1.1 2004/07/30 00:59:15 axxo Exp $
+
+depend() {
+	need net
+	use dns logger mysql postgresql
+}
+
+start()	{
+	ebegin "Starting Resin"
+	cd ${RESIN_HOME}
+	su - ${RESIN_USER} -c "/opt/resin/bin/httpd.sh ${RESIN_START}" 
+	eend $?
+}
+
+stop()	{
+	ebegin "Stopping Resin"
+	su - ${RESIN_USER} -c "/opt/resin/bin/httpd.sh ${RESIN_STOP}"
+	sleep 2
+	eend $?
+}
diff --git a/net-www/resin/files/3.0.8/wrapper.pl.diff b/net-www/resin/files/3.0.8/wrapper.pl.diff
new file mode 100644
index 000000000000..0bd8702e6a0f
--- /dev/null
+++ b/net-www/resin/files/3.0.8/wrapper.pl.diff
@@ -0,0 +1,21 @@
+--- bin/wrapper.pl.in	2004-07-30 01:59:20.680348752 +0200
++++ bin/wrapper.pl.in	2004-07-30 02:04:38.745995424 +0200
+@@ -418,9 +418,6 @@
+ 	$pid=`cat $pid_file`;
+ 	chop($pid);
+ 
+-	if ($cmd eq "stop") {
+-	    print("Stopping ${name}\n");
+-	}
+ 	kill(15, $pid);
+ 	unlink($pid_file);
+     }
+@@ -679,8 +676,6 @@
+       $date = `date`;
+       chop($date);
+ 
+-      print "Resin $name $cmd at $date\n";
+-
+       # create a keepalive socket
+       # when the wrapper dies, the httpd class will detect that and
+       # close gracefully
diff --git a/net-www/resin/files/digest-resin-3.0.8 b/net-www/resin/files/digest-resin-3.0.8
new file mode 100644
index 000000000000..129da14e35e0
--- /dev/null
+++ b/net-www/resin/files/digest-resin-3.0.8
@@ -0,0 +1 @@
+MD5 30498b230b287d45ce914befdeaa0fee resin-3.0.8.tar.gz 5757738
diff --git a/net-www/resin/resin-2.1.14.ebuild b/net-www/resin/resin-2.1.14.ebuild
index 15410ca6f40e..4fc13fd80313 100644
--- a/net-www/resin/resin-2.1.14.ebuild
+++ b/net-www/resin/resin-2.1.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/resin/resin-2.1.14.ebuild,v 1.1 2004/07/27 20:22:22 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/resin/resin-2.1.14.ebuild,v 1.2 2004/07/30 00:59:15 axxo Exp $
 
 inherit java-pkg eutils
 
@@ -72,10 +72,6 @@ src_install() {
 		xsl \
 	${D}${RESIN_HOME} || die
 	dosym /usr/share/${PN}/lib ${RESIN_HOME}/lib
-
-	dodir /etc/env.d
-	insinto /etc/env.d
-	doins ${FILESDIR}/${PV}/21resin
 }
 
 pkg_postinst() {
diff --git a/net-www/resin/resin-3.0.8.ebuild b/net-www/resin/resin-3.0.8.ebuild
new file mode 100644
index 000000000000..f767051b91be
--- /dev/null
+++ b/net-www/resin/resin-3.0.8.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/resin/resin-3.0.8.ebuild,v 1.1 2004/07/30 00:59:15 axxo Exp $
+
+inherit java-pkg eutils
+
+S=${WORKDIR}/${P}
+DESCRIPTION="A fast Servlet 2.4 and JSP 2.0 engine with EJB and distributed session load balancing."
+SRC_URI="http://www.caucho.com/download/${P}.tar.gz"
+HOMEPAGE="http://www.caucho.com"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+LICENSE="CAUCHO"
+SLOT="0"
+DEPEND="!net-www/resin-ee"
+RDEPEND=">=virtual/jdk-1.3
+		dev-lang/perl"
+IUSE=""
+
+RESIN_HOME="/opt/resin"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}/wrapper.pl.diff
+}
+
+pkg_preinst() {
+	enewgroup resin
+	enewuser resin -1 /bin/bash /opt/resin resin
+	chown -R resin:resin ${D}${RESIN_HOME}
+	chown -R resin:resin ${D}/var/log/${PN}
+}
+
+src_compile() {
+	./configure --prefix=${D}${RESIN_HOME}
+	make
+}
+src_install() {
+	dodir ${RESIN_HOME} /etc/resin
+	cp -r libexec bin webapps doc ${D}${RESIN_HOME}
+
+	dodir /etc/resin
+	cp -r conf ${D}/etc/resin
+	dosym /etc/resin ${D}${RESIN_HOME}/conf
+
+	dodir /var/log/${PN}
+	dosym /var/log/${PN} ${RESIN_HOME}/logs
+	keepdir /var/log/${PN}/
+
+	# INIT SCRIPTS AND ENV
+	insinto /etc/init.d ; insopts -m0750 ; newins ${FILESDIR}/${PV}/resin.init resin
+	insinto /etc/conf.d ; insopts -m0755 ; newins ${FILESDIR}/${PV}/resin.conf resin
+	insinto /etc/env.d  ; insopts -m0755 ; doins ${FILESDIR}/${PV}/21resin
+
+	dodoc LICENSE readme.txt
+	java-pkg_dojar ${S}/lib/*.jar
+
+	dosym /usr/share/${PN}/lib ${RESIN_HOME}/lib
+}
+
+pkg_postinst() {
+	einfo " "
+	einfo " NOTICE!"
+	einfo " User and group 'resin' have been added."
+	einfo " "
+	einfo " FILE LOCATIONS:"
+	einfo " 1.  Resin home directory: ${RESIN_HOME}"
+	einfo "     Contains application data, configuration files."
+	einfo " 2.  Runtime settings: /etc/conf.d/resin"
+	einfo "     Contains CLASSPATH and JAVA_HOME settings."
+	einfo " 3.  Logs:  /var/log/resin/"
+	einfo " 4.  Executables, libraries:  /usr/share/resin/"
+	einfo " "
+	einfo " "
+	einfo " STARTING AND STOPPING RESIN:"
+	einfo "   /etc/init.d/resin start"
+	einfo "   /etc/init.d/resin stop"
+	einfo "   /etc/init.d/resin restart"
+	einfo " "
+	einfo " "
+	einfo " NETWORK CONFIGURATION:"
+	einfo " By default, Resin runs on port 8080.  You can change this"
+	einfo " value by editing ${RESIN_HOME}/conf/resin.conf."
+	einfo " "
+	einfo " To test Resin while it's running, point your web browser to:"
+	einfo " http://localhost:8080/"
+	einfo " "
+	einfo " Resin cannot run on port 80 as non-root (as of this time)."
+	einfo " The best way to get Resin to respond on port 80 is via port"
+	einfo " forwarding -- by installing a firewall on the machine running"
+	einfo " Resin or the network gateway.  Simply redirect port 80 to"
+	einfo " port 8080."
+	einfo " "
+	einfo " BUGS:"
+	einfo " Please file any bugs at http://bugs.gentoo.org/ or else it"
+	einfo " may not get seen.  Thank you."
+	einfo " "
+}
+
+pkg_postrm() {
+	einfo "You may want to remove the resin user and group"
+}
+