diff options
author | Krzysztof Pawlik <nelchael@gentoo.org> | 2006-08-02 22:39:38 +0000 |
---|---|---|
committer | Krzysztof Pawlik <nelchael@gentoo.org> | 2006-08-02 22:39:38 +0000 |
commit | 5bc1dea1fa075a1f6f355e2749956e15d8918194 (patch) | |
tree | 154bb1145dde83e21977628c6e885eff90315922 /www-servers | |
parent | Add better configure handling, with --as-needed fix. (diff) | |
download | historical-5bc1dea1fa075a1f6f355e2749956e15d8918194.tar.gz historical-5bc1dea1fa075a1f6f355e2749956e15d8918194.tar.bz2 historical-5bc1dea1fa075a1f6f355e2749956e15d8918194.zip |
Version bump.
Package-Manager: portage-2.1.1_pre4-r1
Diffstat (limited to 'www-servers')
-rw-r--r-- | www-servers/resin/ChangeLog | 9 | ||||
-rw-r--r-- | www-servers/resin/Manifest | 36 | ||||
-rw-r--r-- | www-servers/resin/files/3.0.20/resin-3.0.20-gentoo.patch | 244 | ||||
-rw-r--r-- | www-servers/resin/files/3.0.20/resin.conf | 27 | ||||
-rw-r--r-- | www-servers/resin/files/3.0.20/resin.init | 21 | ||||
-rw-r--r-- | www-servers/resin/files/digest-resin-3.0.20 | 3 | ||||
-rw-r--r-- | www-servers/resin/resin-3.0.20.ebuild | 146 |
7 files changed, 477 insertions, 9 deletions
diff --git a/www-servers/resin/ChangeLog b/www-servers/resin/ChangeLog index e5ba9d97885c..4e5170ca1aec 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.12 2006/07/29 16:24:22 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.13 2006/08/02 22:39:38 nelchael Exp $ + +*resin-3.0.20 (02 Aug 2006) + + 02 Aug 2006; Krzysiek Pawlik <nelchael@gentoo.org> + +files/3.0.20/resin.conf, +files/3.0.20/resin-3.0.20-gentoo.patch, + +files/3.0.20/resin.init, +resin-3.0.20.ebuild: + Version bump. *resin-2.1.17 (29 Jul 2006) diff --git a/www-servers/resin/Manifest b/www-servers/resin/Manifest index 5d5840315a8d..14bef80740ea 100644 --- a/www-servers/resin/Manifest +++ b/www-servers/resin/Manifest @@ -65,6 +65,18 @@ AUX 3.0.19/resin.init 695 RMD160 afc2432fb0f23000f13be60930b3062984e824d2 SHA1 4 MD5 6be83e8d3f0d574593bbfeacfc6ca3ba files/3.0.19/resin.init 695 RMD160 afc2432fb0f23000f13be60930b3062984e824d2 files/3.0.19/resin.init 695 SHA256 b9f050a5f378aa51307af97c6e424a3d3930372eb64962ac8b1d01f2102dda85 files/3.0.19/resin.init 695 +AUX 3.0.20/resin-3.0.20-gentoo.patch 8877 RMD160 c3137d58920362ce0db8ce1ecc3df5cc5918f312 SHA1 8337829cea359d02b5b47687cfd81a29b1b81d65 SHA256 8f79f96e18b4a80c2b72b5074622c5a505187d7a3379e60a2c1e8cdeb82f79ee +MD5 f2551e208e8687ec383e4446bf681769 files/3.0.20/resin-3.0.20-gentoo.patch 8877 +RMD160 c3137d58920362ce0db8ce1ecc3df5cc5918f312 files/3.0.20/resin-3.0.20-gentoo.patch 8877 +SHA256 8f79f96e18b4a80c2b72b5074622c5a505187d7a3379e60a2c1e8cdeb82f79ee files/3.0.20/resin-3.0.20-gentoo.patch 8877 +AUX 3.0.20/resin.conf 761 RMD160 a678720ffe61406f25a22bc2cfe38f67bb2802c4 SHA1 ba5ead5fcc379c68dd6183c462e47eefc699ba8e SHA256 f0101ef5428f9d6cc6fbcee91263400d8e8c355154f80017aac1a147449b03b5 +MD5 d47030173a0582e27b6f4251c3d3e572 files/3.0.20/resin.conf 761 +RMD160 a678720ffe61406f25a22bc2cfe38f67bb2802c4 files/3.0.20/resin.conf 761 +SHA256 f0101ef5428f9d6cc6fbcee91263400d8e8c355154f80017aac1a147449b03b5 files/3.0.20/resin.conf 761 +AUX 3.0.20/resin.init 695 RMD160 1707b093528c08410ff731dc3d512b7eaad79e8c SHA1 104dde03ada6b7b9401666fe3d5bdfc57c640f08 SHA256 0ab7d87b3dfdd73d92a8eb69ad4666d6b4c26b16343b5ca762606cc4a25eaeae +MD5 c92cf53fb4d08788f25e93954c7dd254 files/3.0.20/resin.init 695 +RMD160 1707b093528c08410ff731dc3d512b7eaad79e8c files/3.0.20/resin.init 695 +SHA256 0ab7d87b3dfdd73d92a8eb69ad4666d6b4c26b16343b5ca762606cc4a25eaeae files/3.0.20/resin.init 695 AUX 3.0.8/21resin 22 RMD160 7af99b554ef48988e8ca8be40d7cd416755edf0f SHA1 cc11fbfa74f3008dff06e790bab78284ab52328b SHA256 b8f9cd430391555f8e62b97a8708873cc724c9a7a9754a644cc75029a8f4d123 MD5 5e72e20b51a6013bf62800c1d4c4629e files/3.0.8/21resin 22 RMD160 7af99b554ef48988e8ca8be40d7cd416755edf0f files/3.0.8/21resin 22 @@ -85,6 +97,7 @@ DIST resin-2.1.14.tar.gz 3305648 DIST resin-2.1.17.tar.gz 3239401 RMD160 5fcf2e7680bfad1531cf75d384dcd8f15c19f639 SHA1 2d45e885874122931e63d7c59baed50a75f60618 SHA256 70c681d45f34b1992fbdfb2024970c52a6be20b8cd23855903630e1476a89b92 DIST resin-3.0.12.tar.gz 6965320 DIST resin-3.0.19-src.tar.gz 5031722 RMD160 691fd9c6a47c93dd10ba356901901a3d736ffbf9 SHA1 9de0832abcb3ec18d717702afd8108f61c102aac SHA256 d8d0210e098f370d499439a695c68033d3fbe3e2cacf4d0da884e6891f3defd3 +DIST resin-3.0.20-src.tar.gz 5396774 RMD160 0e82848e3e88048db10019563d0c731e71b52b66 SHA1 b262642aedc1d131b39d6405412a894f7b968a35 SHA256 b78f94ae294289292eb954a11ae4cbe10ed7e8e8de068b14f916cb46e2cd735e DIST resin-3.0.8.tar.gz 5757738 EBUILD resin-2.1.14.ebuild 2980 RMD160 e3e8eecab447ef6d0b44af4dae12968c5cd608b6 SHA1 81b0d5a73b1118708f4a37cd75e939267fc1d9fb SHA256 f4657b6982e64a1394a382b3d0a04c8292177b72cd927fffb9b4814d7f16e8b5 MD5 493369717a39d721e008936cfe2e34ac resin-2.1.14.ebuild 2980 @@ -102,14 +115,18 @@ EBUILD resin-3.0.19.ebuild 3365 RMD160 5c783fc4ac60d2d8427f0b5ec5c765ff7d356e5f MD5 f8f44a42fdf3caadd07a3be0fe072f96 resin-3.0.19.ebuild 3365 RMD160 5c783fc4ac60d2d8427f0b5ec5c765ff7d356e5f resin-3.0.19.ebuild 3365 SHA256 ec9ec7da82b7466e495b5b863f17dcaf5cda4857c67b987c95132d9b88ec023d resin-3.0.19.ebuild 3365 +EBUILD resin-3.0.20.ebuild 3580 RMD160 633a55619b6daae74cc5a7a30886e7a27cb083e4 SHA1 aea72d0bce653327d5a719461505b642a7b4b25d SHA256 3e30052c7977b58c107b1e3fc40e184205227d94e9a80bd459695ee8a27cb60d +MD5 dd51cc50146eec683819b5994e484e49 resin-3.0.20.ebuild 3580 +RMD160 633a55619b6daae74cc5a7a30886e7a27cb083e4 resin-3.0.20.ebuild 3580 +SHA256 3e30052c7977b58c107b1e3fc40e184205227d94e9a80bd459695ee8a27cb60d resin-3.0.20.ebuild 3580 EBUILD resin-3.0.8-r1.ebuild 3421 RMD160 a058566d36d377c03b1c618a443c035226c2231a SHA1 2ce387170258e2026bcddd76c7d05eec6e5b05d4 SHA256 ff35a28739d3017122de22fd2c695e94136f8b01f98b9f920c323cb82ee3e0de MD5 0648422e68fa0423df7cd06655baed13 resin-3.0.8-r1.ebuild 3421 RMD160 a058566d36d377c03b1c618a443c035226c2231a resin-3.0.8-r1.ebuild 3421 SHA256 ff35a28739d3017122de22fd2c695e94136f8b01f98b9f920c323cb82ee3e0de resin-3.0.8-r1.ebuild 3421 -MISC ChangeLog 4172 RMD160 5917f7fc21e891e4cfa61ff54badd21f3cbe9003 SHA1 0daa19ca826e4dbb5399ceb3aac44f0d3319f65d SHA256 649db48b906b8efbe3a1806502c8843afac30126f477323b668c78ebf3296da0 -MD5 d80f69ed3f654e6f8c4cfb86fef1699e ChangeLog 4172 -RMD160 5917f7fc21e891e4cfa61ff54badd21f3cbe9003 ChangeLog 4172 -SHA256 649db48b906b8efbe3a1806502c8843afac30126f477323b668c78ebf3296da0 ChangeLog 4172 +MISC ChangeLog 4390 RMD160 272566e3eec47a65a0ea0bd456fba2e90bd30d3d SHA1 958f97e381637851baae2e6c36d45acf7b543cdf SHA256 07386a76910812d53c4aac419848061761f53714852614aa49a25b66835f34aa +MD5 9491757d339ef4513e2655107d413618 ChangeLog 4390 +RMD160 272566e3eec47a65a0ea0bd456fba2e90bd30d3d ChangeLog 4390 +SHA256 07386a76910812d53c4aac419848061761f53714852614aa49a25b66835f34aa ChangeLog 4390 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -126,13 +143,16 @@ SHA256 3e02fb910717eb0d1ff43aee169f1a6ed64861aeab6dabd755e4f10823ce26a1 files/di MD5 0c5de37c2495a8cd57a0ccafa02eca53 files/digest-resin-3.0.19 253 RMD160 72e08fd9c7fb5e14df3f4579ea3a8c442b83aea4 files/digest-resin-3.0.19 253 SHA256 092bf61d5004c321668d0e000c821dd9a7f2a8fce1acaaa42059f37f7dcd6fe4 files/digest-resin-3.0.19 253 +MD5 6296765725f98c29390e1f34c15d69d7 files/digest-resin-3.0.20 253 +RMD160 01a32245b86cd2aeb34982ae43eb29d5d1668431 files/digest-resin-3.0.20 253 +SHA256 2b0b455e54b71e73ea2ff94fe33d9fae7288707dbaac66829c388d322d87e4b7 files/digest-resin-3.0.20 253 MD5 fb879fef5b9755ced18f4715f5c8d0ca files/digest-resin-3.0.8-r1 64 RMD160 1ed3e5fee0a5bfc62d0e47c1b5cdbc25799070e6 files/digest-resin-3.0.8-r1 64 SHA256 a5d9f4b822a2524029ae0cf42f3124949513da515f7c8e9281269bfb8a02b3b4 files/digest-resin-3.0.8-r1 64 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.3 (GNU/Linux) +Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFEzNiPI1lqEGTUzyQRApukAJsEM5HQzt0jPWurXkdpj88OvPcovQCdGnKn -S6Ti8e0T3IbHbDMQMjiz3Bg= -=yWlL +iD8DBQFE0SnVgo/w9rxVVVERAkeGAKCgnAXF9tcOXpkufjNRjxseernCCACeLK2p +uSZpEMcKKPsv3vfDNqwJITs= +=tWxf -----END PGP SIGNATURE----- diff --git a/www-servers/resin/files/3.0.20/resin-3.0.20-gentoo.patch b/www-servers/resin/files/3.0.20/resin-3.0.20-gentoo.patch new file mode 100644 index 000000000000..e9418588a74c --- /dev/null +++ b/www-servers/resin/files/3.0.20/resin-3.0.20-gentoo.patch @@ -0,0 +1,244 @@ +diff -Nru resin-3.0.20.vanilla/Makefile.in resin-3.0.20/Makefile.in +--- resin-3.0.20.vanilla/Makefile.in 2006-08-02 23:15:09.000000000 +0200 ++++ resin-3.0.20/Makefile.in 2006-08-02 23:16:48.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.20.vanilla/bin/wrapper.pl resin-3.0.20/bin/wrapper.pl +--- resin-3.0.20.vanilla/bin/wrapper.pl 2006-08-02 23:15:02.000000000 +0200 ++++ resin-3.0.20/bin/wrapper.pl 2006-08-02 23:18:03.000000000 +0200 +@@ -447,9 +447,6 @@ + $pid=`cat $pid_file`; + chop($pid); + +- if ($cmd eq "stop") { +- print("Stopping ${name}\n"); +- } + $signal = 15; + $count = 10; + while (kill($signal, $pid) && $count-- > 0) { +@@ -565,8 +562,6 @@ + $SIG{CHLD} = 'IGNORE'; + } + +- print "\n\nResin wrapper.pl closing.\n\n"; +- + close(S); + close(C); # closing the accepted socket should start orderly shutdown + # unlink needs to happen relatively soon so restart's pid won't +@@ -743,8 +738,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.20.vanilla/bin/wrapper.pl.in resin-3.0.20/bin/wrapper.pl.in +--- resin-3.0.20.vanilla/bin/wrapper.pl.in 2006-08-02 23:15:02.000000000 +0200 ++++ resin-3.0.20/bin/wrapper.pl.in 2006-08-02 23:18:32.000000000 +0200 +@@ -447,9 +447,6 @@ + $pid=`cat $pid_file`; + chop($pid); + +- if ($cmd eq "stop") { +- print("Stopping ${name}\n"); +- } + $signal = 15; + $count = 10; + while (kill($signal, $pid) && $count-- > 0) { +@@ -565,8 +562,6 @@ + $SIG{CHLD} = 'IGNORE'; + } + +- print "\n\nResin wrapper.pl closing.\n\n"; +- + close(S); + close(C); # closing the accepted socket should start orderly shutdown + # unlink needs to happen relatively soon so restart's pid won't +@@ -743,8 +738,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.20.vanilla/build.xml resin-3.0.20/build.xml +--- resin-3.0.20.vanilla/build.xml 2006-08-02 23:15:09.000000000 +0200 ++++ resin-3.0.20/build.xml 2006-08-03 00:00:17.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"/> +@@ -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.4"/> +- + <property name="jar.compress" value="false"/> + <property name="jar.index" value="true"/> + <property name="jar.update" value="false"/> +@@ -66,7 +63,7 @@ + </target> + + <target name="compile" +- depends="init, ejb, ejb30, j2ee-deploy, j2ee-management, jaxrpc, jca, jms, jmx, jsdk, jstl, jta, portlet, script, resin-jdk15, resin, quercus, webutil, deploy, conf, ext"> ++ depends="init, ejb, ejb30, j2ee-deploy, j2ee-management, jaxrpc, jca, jms, jmx, jsdk, jstl, jta, portlet, script, resin-jdk15, resin, quercus, webutil, deploy, conf"> + </target> + + <target name="ejb" depends="init, jta"> +@@ -80,7 +77,6 @@ + <antcall target="module" inheritRefs="true"> + <param name="module.name" value="ejb30"/> + <param name="module.jar" value="ejb-30.jar"/> +- <param name="javac.source" value="1.5"/> + </antcall> + </target> + +@@ -102,7 +98,6 @@ + <antcall target="module" inheritRefs="true"> + <param name="module.name" value="jaxrpc"/> + <param name="module.jar" value="jaxrpc.jar"/> +- <param name="javac.source" value="1.5"/> + </antcall> + </target> + +@@ -116,7 +111,6 @@ + <target name="resin-jdk15" depends="init"> + <antcall target="module" inheritRefs="true"> + <param name="module.name" value="resin-jdk15"/> +- <param name="javac.source" value="1.5"/> + </antcall> + </target> + +@@ -217,7 +211,6 @@ + + <antcall target="module" inheritRefs="true"> + <param name="module.name" value="resin"/> +- <param name="javac.source" value="1.5"/> + </antcall> + </target> + +@@ -242,14 +235,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> + +@@ -282,16 +273,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> + +@@ -355,13 +345,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> + +@@ -500,9 +483,6 @@ + <dirset dir="${modules}"> + <include name="*/classes"/> + </dirset> +- <fileset dir="${modules}/ext"> +- <include name="**/*.jar"/> +- </fileset> + </classpath> + </java> + +diff -Nru resin-3.0.20.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java resin-3.0.20/modules/resin/src/com/caucho/server/resin/Resin.java +--- resin-3.0.20.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java 2006-08-02 23:15:08.000000000 +0200 ++++ resin-3.0.20/modules/resin/src/com/caucho/server/resin/Resin.java 2006-08-02 23:20:19.000000000 +0200 +@@ -700,10 +700,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.20/resin.conf b/www-servers/resin/files/3.0.20/resin.conf new file mode 100644 index 000000000000..99210edc27b9 --- /dev/null +++ b/www-servers/resin/files/3.0.20/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) + +# START/STOP settings +RESIN_START="start" +RESIN_STOP="stop" diff --git a/www-servers/resin/files/3.0.20/resin.init b/www-servers/resin/files/3.0.20/resin.init new file mode 100644 index 000000000000..9a439e667d0f --- /dev/null +++ b/www-servers/resin/files/3.0.20/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.20/resin.init,v 1.1 2006/08/02 22:39:38 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.20 b/www-servers/resin/files/digest-resin-3.0.20 new file mode 100644 index 000000000000..6ba5b302e614 --- /dev/null +++ b/www-servers/resin/files/digest-resin-3.0.20 @@ -0,0 +1,3 @@ +MD5 8ae9651a4a8a928b696352288636e5f7 resin-3.0.20-src.tar.gz 5396774 +RMD160 0e82848e3e88048db10019563d0c731e71b52b66 resin-3.0.20-src.tar.gz 5396774 +SHA256 b78f94ae294289292eb954a11ae4cbe10ed7e8e8de068b14f916cb46e2cd735e resin-3.0.20-src.tar.gz 5396774 diff --git a/www-servers/resin/resin-3.0.20.ebuild b/www-servers/resin/resin-3.0.20.ebuild new file mode 100644 index 000000000000..efa8e8e37643 --- /dev/null +++ b/www-servers/resin/resin-3.0.20.ebuild @@ -0,0 +1,146 @@ +# 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.20.ebuild,v 1.1 2006/08/02 22:39:38 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 ~ppc ~ppc64 ~x86" + +RDEPEND=">=virtual/jdk-1.5 + >=dev-java/iso-relax-20050331" +DEPEND="${RDEPEND} + dev-java/aopalliance + >=dev-java/sun-javamail-bin-1.4 + dev-java/sun-jaf-bin + dev-java/ant-core + dev-libs/openssl" + +RESIN_HOME="/usr/lib/resin" + +src_unpack() { + + unpack ${A} + epatch "${FILESDIR}/${PV}/${P}-gentoo.patch" + +} + +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-bin + java-pkg_jar-from sun-javamail-bin + 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 + + 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 + + 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 + +} |