Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www-servers/resin/ChangeLog9
-rw-r--r--www-servers/resin/files/3.1.0/resin-3.1.0-gentoo.patch181
-rw-r--r--www-servers/resin/files/3.1.0/resin.conf15
-rw-r--r--www-servers/resin/files/3.1.0/resin.init23
-rw-r--r--www-servers/resin/files/digest-resin-3.1.03
-rw-r--r--www-servers/resin/resin-3.1.0.ebuild151
6 files changed, 381 insertions, 1 deletions
diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog
index 10d7d311ffeb..88b22a83f23f 100644
--- a/www-servers/resin/ChangeLog
+++ b/www-servers/resin/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for www-servers/resin
# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.30 2006/11/24 21:52:37 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.31 2006/12/26 01:49:46 nelchael Exp $
+
+*resin-3.1.0 (26 Dec 2006)
+
+ 26 Dec 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+ +files/3.1.0/resin.conf, +files/3.1.0/resin-3.1.0-gentoo.patch,
+ +files/3.1.0/resin.init, +resin-3.1.0.ebuild:
+ Version bump.
24 Nov 2006; Krzysiek Pawlik <nelchael@gentoo.org> -files/3.0.8/21resin,
-files/3.0.8/resin.conf, -files/3.0.8/resin.init,
diff --git a/www-servers/resin/files/3.1.0/resin-3.1.0-gentoo.patch b/www-servers/resin/files/3.1.0/resin-3.1.0-gentoo.patch
new file mode 100644
index 000000000000..0f55b63d8a60
--- /dev/null
+++ b/www-servers/resin/files/3.1.0/resin-3.1.0-gentoo.patch
@@ -0,0 +1,181 @@
+diff -Nru resin-3.1.0.vanilla/Makefile.in resin-3.1.0/Makefile.in
+--- resin-3.1.0.vanilla/Makefile.in 2006-12-26 01:39:34.000000000 +0100
++++ resin-3.1.0/Makefile.in 2006-12-26 01:40:38.000000000 +0100
+@@ -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.1.0.vanilla/build.xml resin-3.1.0/build.xml
+--- resin-3.1.0.vanilla/build.xml 2006-12-26 01:39:34.000000000 +0100
++++ resin-3.1.0/build.xml 2006-12-26 01:53:05.000000000 +0100
+@@ -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"/>
+@@ -17,14 +16,12 @@
+
+
+ <property name="javac.verbose" value="off"/>
+- <property name="javac.debug" value="on"/>
++ <property name="javac.debug" value="off"/>
+ <property name="javac.optimize" value="off"/>
+ <property name="javac.deprecation" value="off"/>
+ <property name="javac.nowarn" value="on"/>
+ <property name="javac.memoryMaximumSize" value="256m"/>
+
+- <property name="javac.source" value="1.5"/>
+-
+ <property name="jar.compress" value="false"/>
+ <!--
+ <property name="jar.index" value="true"/>
+@@ -66,14 +63,13 @@
+ </target>
+
+ <target name="compile"
+- depends="init, jaxrpc, ejb, jpa, j2ee-deploy, j2ee-management, jca, jms, jsdk, jstl, jta, portlet, script, resin-util, quercus, resin, ecmascript, webutil, deploy, conf, ext, jsf">
++ depends="init, jaxrpc, ejb, jpa, j2ee-deploy, j2ee-management, jca, jms, jsdk, jstl, jta, portlet, script, resin-util, quercus, resin, ecmascript, webutil, deploy, conf, jsf">
+ </target>
+
+ <target name="ant" depends="init">
+ <antcall target="module" inheritRefs="true">
+ <param name="module.name" value="ant"/>
+ <param name="module.jar" value="resin-ant.jar"/>
+- <param name="javac.source" value="1.5"/>
+ </antcall>
+ </target>
+
+@@ -81,7 +77,6 @@
+ <antcall target="module" inheritRefs="true">
+ <param name="module.name" value="ejb"/>
+ <param name="module.jar" value="ejb-15.jar"/>
+- <param name="javac.source" value="1.5"/>
+ </antcall>
+ </target>
+
+@@ -89,7 +84,6 @@
+ <antcall target="module" inheritRefs="true">
+ <param name="module.name" value="jpa"/>
+ <param name="module.jar" value="jpa-15.jar"/>
+- <param name="javac.source" value="1.5"/>
+ </antcall>
+ </target>
+
+@@ -111,7 +105,6 @@
+ <antcall target="module" inheritRefs="true">
+ <param name="module.name" value="jaxrpc"/>
+ <param name="module.jar" value="jaxrpc-15.jar"/>
+- <param name="javac.source" value="1.5"/>
+ </antcall>
+ </target>
+
+@@ -233,7 +226,6 @@
+
+ <antcall target="module" inheritRefs="true">
+ <param name="module.name" value="resin"/>
+- <param name="javac.source" value="1.5"/>
+ </antcall>
+ </target>
+
+@@ -258,14 +250,12 @@
+ <target name="webutil" depends="init, resin">
+ <antcall target="module" inheritRefs="true">
+ <param name="module.name" value="webutil"/>
+- <param name="javac.source" value="1.5"/>
+ </antcall>
+ </target>
+
+ <target name="quercus-dev" depends="init">
+ <antcall target="module" inheritRefs="true">
+ <param name="module.name" value="quercus"/>
+- <param name="javac.source" value="1.5"/>
+ </antcall>
+ </target>
+
+@@ -274,7 +264,6 @@
+ <target name="ecmascript" depends="init">
+ <antcall target="module" inheritRefs="true">
+ <param name="module.name" value="ecmascript"/>
+- <param name="javac.source" value="1.5"/>
+ </antcall>
+ </target>
+
+@@ -306,16 +295,15 @@
+ verbose="${javac.verbose}"
+ debug="${javac.debug}" optimize="${javac.optimize}"
+ deprecation="${javac.deprecation}" nowarn="${javac.nowarn}"
+- source="${javac.source}"
+ excludes="**/.svn/**"
+ memoryMaximumSize="${javac.memoryMaximumSize}">
+ <classpath>
+ <dirset dir="${modules}">
+ <include name="*/classes"/>
+ </dirset>
+- <fileset dir="${ext}">
+- <include name="**/*.jar"/>
+- </fileset>
++ <fileset dir="lib/">
++ <include name="*.jar"/>
++ </fileset>
+ </classpath>
+ </javac>
+
+@@ -385,13 +373,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>
+
+@@ -527,9 +508,6 @@
+ <dirset dir="${modules}">
+ <include name="*/classes"/>
+ </dirset>
+- <fileset dir="${modules}/ext">
+- <include name="**/*.jar"/>
+- </fileset>
+ </classpath>
+ </java>
+
diff --git a/www-servers/resin/files/3.1.0/resin.conf b/www-servers/resin/files/3.1.0/resin.conf
new file mode 100644
index 000000000000..b3c218276ad7
--- /dev/null
+++ b/www-servers/resin/files/3.1.0/resin.conf
@@ -0,0 +1,15 @@
+# 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 JDK 1.5 you want.
+# For a list of valid values for GENTOO_VM see output of
+# java-config -L
+#GENTOO_VM=sun-jdk-1.5
+
+# Where your Resin is installed
+RESIN_HOME=/usr/lib/resin
+
+# The CLASSPATH for Resin to use, plus any others you need.
+CLASSPATH=$(java-config -p resin)
diff --git a/www-servers/resin/files/3.1.0/resin.init b/www-servers/resin/files/3.1.0/resin.init
new file mode 100644
index 000000000000..ed7095efde77
--- /dev/null
+++ b/www-servers/resin/files/3.1.0/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/www-servers/resin/files/3.1.0/resin.init,v 1.1 2006/12/26 01:49:46 nelchael Exp $
+
+depend() {
+ need net
+ use dns logger mysql postgresql
+}
+
+start() {
+ export JAVA_HOME=$(java-config --select-vm=${GENTOO_VM} -O)
+ ebegin "Starting Resin"
+ su - resin -c "${JAVA_HOME}/bin/java -Dresin.home=${RESIN_HOME} -cp ${CLASSPATH} -jar /usr/share/resin/lib/resin.jar start"
+ eend $?
+}
+
+stop() {
+ export JAVA_HOME=$(java-config --select-vm=${GENTOO_VM} -O)
+ ebegin "Stopping Resin"
+ su - resin -c "${JAVA_HOME}/bin/java -Dresin.home=${RESIN_HOME} -jar /usr/share/resin/lib/resin.jar stop"
+ eend $?
+}
diff --git a/www-servers/resin/files/digest-resin-3.1.0 b/www-servers/resin/files/digest-resin-3.1.0
new file mode 100644
index 000000000000..82f68ed4827c
--- /dev/null
+++ b/www-servers/resin/files/digest-resin-3.1.0
@@ -0,0 +1,3 @@
+MD5 bee26233a9bf67935c75fbb8136e9001 resin-3.1.0-src.tar.gz 5708227
+RMD160 6e347dc2810b328eddeafb39886bfe146c65f409 resin-3.1.0-src.tar.gz 5708227
+SHA256 735af3cd4ed9962631969d2da4ddea26ab28c3d0fd96d0e831e5a2058ef77440 resin-3.1.0-src.tar.gz 5708227
diff --git a/www-servers/resin/resin-3.1.0.ebuild b/www-servers/resin/resin-3.1.0.ebuild
new file mode 100644
index 000000000000..4d12eb072eb2
--- /dev/null
+++ b/www-servers/resin/resin-3.1.0.ebuild
@@ -0,0 +1,151 @@
+# 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.1.0.ebuild,v 1.1 2006/12/26 01:49:46 nelchael Exp $
+
+inherit java-pkg-2 java-ant-2 eutils flag-o-matic
+
+DESCRIPTION="A fast Servlet 2.5 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="admin doc source"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="=virtual/jdk-1.5*
+ >=dev-java/iso-relax-20050331"
+DEPEND="${RDEPEND}
+ dev-java/aopalliance
+ >=dev-java/sun-javamail-1.4
+ >=dev-java/sun-jaf-1.1
+ dev-java/ant-core
+ dev-libs/openssl"
+
+RESIN_HOME="/usr/lib/resin"
+
+# Rewrites build.xml in documentation
+JAVA_PKG_BSFIX="off"
+
+src_unpack() {
+
+ unpack ${A}
+ epatch "${FILESDIR}/${PV}/${P}-gentoo.patch"
+
+ java-ant_bsfix_one "${S}/build.xml"
+
+}
+
+pkg_setup() {
+
+ 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"
+
+ mkdir ${S}/lib
+ cd ${S}/lib
+ java-pkg_jar-from sun-jaf
+ java-pkg_jar-from sun-javamail
+ java-pkg_jar-from iso-relax
+ java-pkg_jar-from aopalliance-1
+ ln -s $(java-config --jdk-home)/lib/tools.jar
+ cd ${S}
+
+ einfo "Building jars..."
+ eant || 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 ${S}/conf/*.conf
+
+ newinitd ${FILESDIR}/${PV}/resin.init resin
+ newconfd ${FILESDIR}/${PV}/resin.conf resin
+
+ rm -f ${S}/lib/tools.jar
+ 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
+
+ use admin && {
+ cp -a ${S}/php ${D}/${RESIN_HOME}/ || die "cp failed"
+ }
+
+ use source && {
+ einfo "Zipping source..."
+ java-pkg_dosrc ${S}/modules/*/src/* 2> /dev/null
+ }
+
+ einfo "Removing unneeded files..."
+ rm -fr ${D}/${RESIN_HOME}/bin
+ 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 " webapps directory was moved to /var/lib/resin/webapps"
+ einfo
+ einfo " Most options has been moved from /etc/conf.d/resin to"
+ einfo " /etc/resin/resin.conf."
+ einfo
+
+}