Version bump, uses new Java build system. Closes bug #63246.

(Portage version: 2.1.1_pre2-r4)

6 files changed, 338 insertions, 2 deletions

diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 52b2f913400b..6b918a4d5868 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-servers/resin
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.8 2005/04/29 14:31:00 luckyduck Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.9 2006/07/06 11:25:04 nelchael Exp $
+
+*resin-3.0.19 (01 Jul 2006)
+
+  01 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/3.0.19/resin.conf, +files/3.0.19/resin-3.0.19-gentoo.patch,
+  +files/3.0.19/resin.init, +resin-3.0.19.ebuild:
+  Version bump, uses new Java build system. Closes bug #63246.
 
   29 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> +files/3.0.12/gentoo.diff,
   resin-3.0.12.ebuild:
diff --git a/www-servers/resin/files/3.0.19/resin-3.0.19-gentoo.patch b/www-servers/resin/files/3.0.19/resin-3.0.19-gentoo.patch
new file mode 100644
index 000000000000..6a69d8c54739
--- /dev/null
+++ b/www-servers/resin/files/3.0.19/resin-3.0.19-gentoo.patch
@@ -0,0 +1,143 @@
+diff -Nru resin-3.0.19.vanilla/Makefile.in resin-3.0.19/Makefile.in
+--- resin-3.0.19.vanilla/Makefile.in	2006-05-27 17:02:08.000000000 +0200
++++ resin-3.0.19/Makefile.in	2006-05-27 17:03:04.000000000 +0200
+@@ -8,20 +8,20 @@
+ 
+ install	:
+ 	(cd modules/c/src; $(MAKE) install)
+-	if test $(PREFIX) != `pwd`; then \
+-	  mkdir -p $(PREFIX)/lib; \
+-	  mkdir -p $(PREFIX)/libexec; \
+-	  cp -r libexec/* $(PREFIX)/libexec; \
+-	  cp lib/*.jar $(PREFIX)/lib; \
+-	  mkdir -p $(PREFIX)/bin; \
+-	  cp bin/* $(PREFIX)/bin; \
+-	  mkdir -p $(PREFIX)/webapps; \
+-	  cp -r webapps/* $(PREFIX)/webapps; \
+-	  mkdir -p $(PREFIX)/conf; \
+-	  cp conf/resin.conf $(PREFIX)/conf/resin.conf.orig; \
+-	  cp conf/app-default.xml $(PREFIX)/conf/app-default.xml.orig; \
+-	  if test ! -r $(PREFIX)/conf/resin.conf; then \
+-	    cp conf/resin.conf $(PREFIX)/conf/resin.conf; \
+-	    cp conf/app-default.xml $(PREFIX)/conf/app-default.xml; \
++	if test $(DESTDIR)$(PREFIX) != `pwd`; then \
++	  mkdir -p $(DESTDIR)$(PREFIX)/lib; \
++	  mkdir -p $(DESTDIR)$(PREFIX)/libexec; \
++	  cp -r libexec/* $(DESTDIR)$(PREFIX)/libexec; \
++	  cp lib/*.jar $(DESTDIR)$(PREFIX)/lib; \
++	  mkdir -p $(DESTDIR)$(PREFIX)/bin; \
++	  cp bin/* $(DESTDIR)$(PREFIX)/bin; \
++	  mkdir -p $(DESTDIR)$(PREFIX)/webapps; \
++	  cp -r webapps/* $(DESTDIR)$(PREFIX)/webapps; \
++	  mkdir -p $(DESTDIR)$(PREFIX)/conf; \
++	  cp conf/resin.conf $(DESTDIR)$(PREFIX)/conf/resin.conf.orig; \
++	  cp conf/app-default.xml $(DESTDIR)$(PREFIX)/conf/app-default.xml.orig; \
++	  if test ! -r $(DESTDIR)$(PREFIX)/conf/resin.conf; then \
++	    cp conf/resin.conf $(DESTDIR)$(PREFIX)/conf/resin.conf; \
++	    cp conf/app-default.xml $(DESTDIR)$(PREFIX)/conf/app-default.xml; \
+ 	  fi; \
+ 	fi
+diff -Nru resin-3.0.19.vanilla/bin/wrapper.pl resin-3.0.19/bin/wrapper.pl
+--- resin-3.0.19.vanilla/bin/wrapper.pl	2006-05-27 17:01:59.000000000 +0200
++++ resin-3.0.19/bin/wrapper.pl	2006-05-27 17:03:34.000000000 +0200
+@@ -441,9 +441,6 @@
+ 	$pid=`cat $pid_file`;
+ 	chop($pid);
+ 
+-	if ($cmd eq "stop") {
+-	    print("Stopping ${name}\n");
+-	}
+ 	kill(15, $pid);
+ 	unlink($pid_file);
+     }
+@@ -729,8 +726,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 -Nru resin-3.0.19.vanilla/bin/wrapper.pl.in resin-3.0.19/bin/wrapper.pl.in
+--- resin-3.0.19.vanilla/bin/wrapper.pl.in	2006-05-27 17:01:59.000000000 +0200
++++ resin-3.0.19/bin/wrapper.pl.in	2006-05-27 17:03:52.000000000 +0200
+@@ -441,9 +441,6 @@
+ 	$pid=`cat $pid_file`;
+ 	chop($pid);
+ 
+-	if ($cmd eq "stop") {
+-	    print("Stopping ${name}\n");
+-	}
+ 	kill(15, $pid);
+ 	unlink($pid_file);
+     }
+@@ -729,8 +726,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 -Nru resin-3.0.19.vanilla/build.xml resin-3.0.19/build.xml
+--- resin-3.0.19.vanilla/build.xml	2006-05-27 17:02:08.000000000 +0200
++++ resin-3.0.19/build.xml	2006-05-27 17:04:57.000000000 +0200
+@@ -7,7 +7,6 @@
+ 
+   <property name="modules" location="${basedir}/modules"/>
+   <property name="src" location="${basedir}/src"/>
+-  <property name="ext" location="${basedir}/modules/ext"/>
+   <property name="doc" location="${basedir}/doc"/>
+ 
+   <property name="build" location="${install}/build"/>
+@@ -66,7 +65,7 @@
+   </target>
+ 
+   <target name="compile" 
+-          depends="init, ejb, ejb30, j2eedeploy, jaxrpc, jca, jms, jmx, jsdk, jstl, jta, mail, portlet, script, resin-jdk15, resin, quercus, webutil, deploy, conf, ext">
++          depends="init, ejb, ejb30, j2eedeploy, jaxrpc, jca, jms, jmx, jsdk, jstl, jta, mail, portlet, script, resin-jdk15, resin, quercus, webutil, deploy, conf">
+   </target>
+ 
+   <target name="ejb" depends="init, jta">
+@@ -266,9 +265,6 @@
+         <dirset dir="${modules}">
+           <include name="*/classes"/>
+        </dirset>
+-        <fileset dir="${ext}">
+-          <include name="**/*.jar"/>
+-        </fileset>
+       </classpath>
+     </javac>
+ 
+@@ -331,13 +327,6 @@
+     </copy>
+   </target>
+ 
+-  <target name="ext" depends="init, resin">
+-    <copy todir="${install}/lib" preservelastmodified="true">
+-      <fileset dir="${ext}">
+-      </fileset>
+-    </copy>
+-  </target>
+-
+   <target name="webapps" depends="init, doc, quercus">
+   </target>
+ 
+diff -Nru resin-3.0.19.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java resin-3.0.19/modules/resin/src/com/caucho/server/resin/Resin.java
+--- resin-3.0.19.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java	2006-05-27 17:02:07.000000000 +0200
++++ resin-3.0.19/modules/resin/src/com/caucho/server/resin/Resin.java	2006-05-27 17:05:48.000000000 +0200
+@@ -699,10 +699,10 @@
+       throw new ConfigException(L().l("The following system property must be set:\n  -Djava.util.logging.manager=com.caucho.log.LogManagerImpl\nThe JDK 1.4 Logging manager must be set to Resin's log manager."));
+     }
+ 
+-    validatePackage("javax.servlet.Servlet", new String[] {"2.4", "1.4"});
++    validatePackage("javax.servlet.Servlet", new String[] {"2.4", "1.5"});
+     validatePackage("javax.servlet.jsp.jstl.core.Config", new String[] {"1.1"});
+     validatePackage("javax.management.MBeanServer", new String[] { "1.2", "1.5" });
+-    validatePackage("javax.resource.spi.ResourceAdapter", new String[] {"1.5", "1.4"});
++    validatePackage("javax.resource.spi.ResourceAdapter", new String[] {"1.5", "1.5"});
+   }
+ 
+   /**
diff --git a/www-servers/resin/files/3.0.19/resin.conf b/www-servers/resin/files/3.0.19/resin.conf
new file mode 100644
index 000000000000..bd0a89cd3ecf
--- /dev/null
+++ b/www-servers/resin/files/3.0.19/resin.conf
@@ -0,0 +1,27 @@
+# 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.
+# WARNING! Prepend each option with -J, so -Xmx512m should be -J-Xmx512m
+# JAVA_OPTS=""
+
+# Where your Resin is installed
+RESIN_HOME=/usr/lib/resin
+
+# Resin Log Locations
+RESIN_OUT=/var/log/resin/resin_out.log
+RESIN_ERR=/var/log/resin/resin_err.log
+
+# The CLASSPATH for Resin to use, plus any others you need.
+CLASSPATH=$(java-config -p resin,iso-relax,aopalliance-1)
+
+# START/STOP settings
+RESIN_START="start"
+RESIN_STOP="stop"
diff --git a/www-servers/resin/files/3.0.19/resin.init b/www-servers/resin/files/3.0.19/resin.init
new file mode 100644
index 000000000000..a7ed58f2d29b
--- /dev/null
+++ b/www-servers/resin/files/3.0.19/resin.init
@@ -0,0 +1,21 @@
+#!/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.0.19/resin.init,v 1.1 2006/07/06 11:25:04 nelchael Exp $
+
+depend() {
+	need net
+	use dns logger mysql postgresql
+}
+
+start()	{
+	ebegin "Starting Resin"
+	su - resin -c "${RESIN_HOME}/bin/httpd.sh ${JAVA_OPTS} -pid-dir /var/run/resin/ -java_home ${JAVA_HOME} -resin_home ${RESIN_HOME} -cp ${CLASSPATH} -stdout ${RESIN_OUT} -stderr ${RESIN_ERR} ${RESIN_START}"
+	eend $?
+}
+
+stop()	{
+	ebegin "Stopping Resin"
+	su - resin -c "${RESIN_HOME}/bin/httpd.sh ${JAVA_OPTS} -pid-dir /var/run/resin/ ${RESIN_STOP}"
+	eend $?
+}
diff --git a/www-servers/resin/files/digest-resin-3.0.19 b/www-servers/resin/files/digest-resin-3.0.19
new file mode 100644
index 000000000000..26edb4c85522
--- /dev/null
+++ b/www-servers/resin/files/digest-resin-3.0.19
@@ -0,0 +1,3 @@
+MD5 7e50a5393752e9002d456758a228b45c resin-3.0.19-src.tar.gz 5031722
+RMD160 691fd9c6a47c93dd10ba356901901a3d736ffbf9 resin-3.0.19-src.tar.gz 5031722
+SHA256 d8d0210e098f370d499439a695c68033d3fbe3e2cacf4d0da884e6891f3defd3 resin-3.0.19-src.tar.gz 5031722
diff --git a/www-servers/resin/resin-3.0.19.ebuild b/www-servers/resin/resin-3.0.19.ebuild
new file mode 100644
index 000000000000..7c5833ff2831
--- /dev/null
+++ b/www-servers/resin/resin-3.0.19.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/resin-3.0.19.ebuild,v 1.1 2006/07/06 11:25:04 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2 eutils flag-o-matic
+
+DESCRIPTION="A fast Servlet 2.4 and JSP 2.0 engine."
+HOMEPAGE="http://www.caucho.com"
+SRC_URI="http://www.caucho.com/download/${P}-src.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="doc"
+
+# 2006/01/21: keywords (ppc, ppc64, sparc) dropped due to deps:
+#  - aopalliance has (amd64, x86)
+#  - iso-relax has (amd64, ppc, x86)
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jdk-1.5
+	>=dev-java/iso-relax-20050331"
+DEPEND="${RDEPEND}
+	dev-java/aopalliance
+	dev-java/ant-core
+	dev-libs/openssl"
+
+RESIN_HOME="/usr/lib/resin"
+
+src_unpack() {
+
+	unpack "${A}"
+	epatch "${FILESDIR}/${PV}/${P}-gentoo.patch"
+
+}
+
+pkg_setup() {
+
+	einfo "Adding resin:resin"
+	enewgroup resin
+	enewuser resin -1 /bin/bash ${RESIN_HOME} resin
+
+}
+
+src_compile() {
+
+	append-flags -fPIC -DPIC
+
+	chmod 755 ${S}/configure
+	econf --prefix=${RESIN_HOME} || die "econf failed"
+
+	einfo "Building libraries..."
+	# Broken with -jn where n > 1
+	emake -j1 || die "emake failed"
+
+	einfo "Building jars..."
+	eant -lib $(java-pkg_getjars iso-relax aopalliance-1) || die "ant failed"
+
+	if use doc; then
+		einfo "Building docs..."
+		eant doc || die "ant doc failed"
+	fi
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+
+	dodir /etc/
+	mv ${D}/${RESIN_HOME}/conf ${D}/etc/resin
+	dosym /etc/resin ${RESIN_HOME}/conf
+
+	keepdir /var/log/resin
+	keepdir /var/log/resin
+	keepdir /var/run/resin
+
+	dosym /var/log/resin ${RESIN_HOME}/logs
+	dosym /var/log/resin ${RESIN_HOME}/log
+
+	dodoc README
+
+	newinitd ${FILESDIR}/${PV}/resin.init resin
+	newconfd ${FILESDIR}/${PV}/resin.conf resin
+
+	java-pkg_dojar ${S}/lib/*.jar
+	rm -fr ${D}/${RESIN_HOME}/lib
+	dosym /usr/share/resin/lib ${RESIN_HOME}/lib
+
+	dodir /var/lib/resin/webapps
+	mv ${D}/${RESIN_HOME}/webapps/* ${D}/var/lib/resin/webapps
+	rm -rf ${D}/${RESIN_HOME}/webapps
+	dosym /var/lib/resin/webapps ${RESIN_HOME}/webapps
+
+	dosym /etc/resin/resin.conf /etc/resin/resin.xml
+
+	einfo "Removing unneeded files..."
+	rm -f ${D}/${RESIN_HOME}/bin/*.in
+	rm -f ${D}/etc/resin/*.orig
+
+	einfo "Fixing permissions..."
+	chown -R resin:resin ${D}${RESIN_HOME}
+	chown -R resin:resin ${D}/etc/resin
+	chown -R resin:resin ${D}/var/log/resin
+	chown -R resin:resin ${D}/var/lib/resin
+	chown -R resin:resin ${D}/var/run/resin
+
+	chmod 755 ${D}${RESIN_HOME}/bin/*
+	chmod 644 ${D}/etc/conf.d/resin
+	chmod 755 ${D}/etc/init.d/resin
+	chmod 750 ${D}/var/lib/resin
+	chmod 750 ${D}/var/run/resin
+	chmod 750 ${D}/etc/resin
+
+}
+
+pkg_postinst() {
+
+	einfo
+	einfo " User and group 'resin' have been added."
+	einfo
+	einfo " By default, Resin runs on port 8080.  You can change this"
+	einfo " value by editing /etc/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 " webapps directory was moved to /var/lib/resin/webapps "
+	einfo
+
+}