Version bump.
authorKrzysztof Pawlik <nelchael@gentoo.org>
Sun, 19 Nov 2006 12:23:22 +0000 (12:23 +0000)
committerKrzysztof Pawlik <nelchael@gentoo.org>
Sun, 19 Nov 2006 12:23:22 +0000 (12:23 +0000)
Package-Manager: portage-2.1.2_rc2

www-servers/resin/ChangeLog
www-servers/resin/Manifest
www-servers/resin/files/3.0.22/resin-3.0.22-gentoo.patch [new file with mode: 0644]
www-servers/resin/files/3.0.22/resin.conf [new file with mode: 0644]
www-servers/resin/files/3.0.22/resin.init [new file with mode: 0644]
www-servers/resin/files/digest-resin-3.0.22 [new file with mode: 0644]
www-servers/resin/resin-3.0.22.ebuild [new file with mode: 0644]

index 784189cf77dda182d324083b3a76f43a2865f6f0..6e39eb5d79df70ff7fbcf58de2279f19d9075597 100644 (file)
@@ -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.25 2006/11/10 15:42:09 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/resin/ChangeLog,v 1.26 2006/11/19 12:23:22 nelchael Exp $
+
+*resin-3.0.22 (19 Nov 2006)
+
+  19 Nov 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/3.0.22/resin.conf, +files/3.0.22/resin-3.0.22-gentoo.patch,
+  +files/3.0.22/resin.init, +resin-3.0.22.ebuild:
+  Version bump.
 
   10 Nov 2006; Krzysiek Pawlik <nelchael@gentoo.org> resin-3.0.21.ebuild:
   Stable on x86.
index 56f385eee8774791255923e035af2eb04b559426..80df7d243cd21116a8861286c79b3bb8a4d86e57 100644 (file)
@@ -29,6 +29,18 @@ AUX 3.0.21/resin.init 817 RMD160 7b622a03ac095e4b623bd5875ad800e923c1cbe0 SHA1 a
 MD5 62dcb11fc5581ecf81db03a0575d0032 files/3.0.21/resin.init 817
 RMD160 7b622a03ac095e4b623bd5875ad800e923c1cbe0 files/3.0.21/resin.init 817
 SHA256 58e742d75c3772d9ded2f0e580b2517ac3b4ef237f6ecb2ee151a0ab800d77ef files/3.0.21/resin.init 817
+AUX 3.0.22/resin-3.0.22-gentoo.patch 8968 RMD160 fa80a57b440f7190a7868d80a2d90bae07b33dde SHA1 ce0ac4676f0f25aca71ebc7431d87acf49da65d5 SHA256 d22af4a1dd4c3f334d55c5ec32200a31698286e0046994a3f125eb227e046966
+MD5 2ec1578b643e44da2f7808b85858d438 files/3.0.22/resin-3.0.22-gentoo.patch 8968
+RMD160 fa80a57b440f7190a7868d80a2d90bae07b33dde files/3.0.22/resin-3.0.22-gentoo.patch 8968
+SHA256 d22af4a1dd4c3f334d55c5ec32200a31698286e0046994a3f125eb227e046966 files/3.0.22/resin-3.0.22-gentoo.patch 8968
+AUX 3.0.22/resin.conf 791 RMD160 25d1e43da35f4949c739eb8b03839da12e8a7e8d SHA1 367ebbd3a8e585a50fa447494a2a7be8683728a3 SHA256 fb990310ffd4816d2c96d4b1b025c5cef10b07260334addea6a6c0c077d067a2
+MD5 8f51d7fb61fce013a95c317f5dc8e9ac files/3.0.22/resin.conf 791
+RMD160 25d1e43da35f4949c739eb8b03839da12e8a7e8d files/3.0.22/resin.conf 791
+SHA256 fb990310ffd4816d2c96d4b1b025c5cef10b07260334addea6a6c0c077d067a2 files/3.0.22/resin.conf 791
+AUX 3.0.22/resin.init 817 RMD160 c65d1c0260163242631cae4b4536aac4b923c2d7 SHA1 e609e812d7277fcefd3bdc2e6f5b5107ce45c760 SHA256 a4309f92c7b46b3adc717baaecc97aa80ffd4562d6f27d757cdfdac2ee49852e
+MD5 cfe5d87efbe6b8cafbe3581d72816d6d files/3.0.22/resin.init 817
+RMD160 c65d1c0260163242631cae4b4536aac4b923c2d7 files/3.0.22/resin.init 817
+SHA256 a4309f92c7b46b3adc717baaecc97aa80ffd4562d6f27d757cdfdac2ee49852e files/3.0.22/resin.init 817
 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
@@ -47,6 +59,7 @@ RMD160 9bcbd2cf6d966a3b8ea06edfe06a7a947a12c330 files/3.0.8/wrapper.pl.diff 526
 SHA256 758e29b77fef50fbdcf4b00b9535b46199ef5d833fd6bb133cc3a3cb6dda5125 files/3.0.8/wrapper.pl.diff 526
 DIST resin-2.1.17.tar.gz 3239401 RMD160 5fcf2e7680bfad1531cf75d384dcd8f15c19f639 SHA1 2d45e885874122931e63d7c59baed50a75f60618 SHA256 70c681d45f34b1992fbdfb2024970c52a6be20b8cd23855903630e1476a89b92
 DIST resin-3.0.21-src.tar.gz 5401440 RMD160 1f4d90a28aa772a4dc14259816325285ffea1957 SHA1 00a928d470f69f39c1fac511356b6d368ade54e5 SHA256 c9de627433fbe3ec940507fd604a4a2409e70a16342994ffab881a51f8db1055
+DIST resin-3.0.22-src.tar.gz 5467522 RMD160 093cdcfa8bcd14a30ff54cc9cb8001ace10bbfc6 SHA1 23d4f2fd233033adb0b08f8fcdcb81a1f0aab3fe SHA256 0da5617b6867a0d40e59d2dfe2518158567506fea2c1273d56290c146a64849a
 DIST resin-3.0.8.tar.gz 5757738 RMD160 3571c6982091924a9578296b2b1e6d783fccedd2 SHA1 08007086191736da039339ea2f4c62c4e2013c80 SHA256 98d640083806ceaefce7376677ce705bc8963ab88db92ad9783200754706d771
 EBUILD resin-2.1.17.ebuild 2977 RMD160 1a2aa63fa6d79e1e34cfaf4803993b3f513188a0 SHA1 eea21775ba7c4dc99ee471b18a0a3114108f739f SHA256 6b9e63e50e6c1658e2fe614a4c76f9ce64e8dc5fbbc4a431c050383a5342c009
 MD5 69eaf963bc4fe22b3a0dbcd58d545771 resin-2.1.17.ebuild 2977
@@ -56,14 +69,18 @@ EBUILD resin-3.0.21.ebuild 3639 RMD160 b2e8066241a3ad198b8cb6990354b7df15fb24f8
 MD5 0b8046753ce9db00568280068b8183b3 resin-3.0.21.ebuild 3639
 RMD160 b2e8066241a3ad198b8cb6990354b7df15fb24f8 resin-3.0.21.ebuild 3639
 SHA256 04c3ace38e795d43784d97858a1f767c2c07511e1f2b4344d71b01fd0f810a96 resin-3.0.21.ebuild 3639
+EBUILD resin-3.0.22.ebuild 3640 RMD160 61d992563c06ec48a1afffe455d64a21b9b6d9f9 SHA1 624f66de46def2c8ff34629f2e29bac19aab8d65 SHA256 a3cdf5098c7e80649c7b711efa0ce3909579224d488bae0b4ef2c85409aecfa1
+MD5 6ae67018be5d40d7e647f388235dbea7 resin-3.0.22.ebuild 3640
+RMD160 61d992563c06ec48a1afffe455d64a21b9b6d9f9 resin-3.0.22.ebuild 3640
+SHA256 a3cdf5098c7e80649c7b711efa0ce3909579224d488bae0b4ef2c85409aecfa1 resin-3.0.22.ebuild 3640
 EBUILD resin-3.0.8-r1.ebuild 3419 RMD160 e68aa013cd2714e217a6242cb722fc3ac589280e SHA1 8eca1f995d08975f744ad6a80393549435574d36 SHA256 dd19dd3589482c1c98f9c504bc147f8f5fc5d69d7e0b83b7cc9c329b64f1646b
 MD5 ba825fb5c178485be174f5eb8f530e45 resin-3.0.8-r1.ebuild 3419
 RMD160 e68aa013cd2714e217a6242cb722fc3ac589280e resin-3.0.8-r1.ebuild 3419
 SHA256 dd19dd3589482c1c98f9c504bc147f8f5fc5d69d7e0b83b7cc9c329b64f1646b resin-3.0.8-r1.ebuild 3419
-MISC ChangeLog 6421 RMD160 d10f029582d0a6621db00b61f0b2b54b0be40e42 SHA1 d5fd52e27cd1e8c03814a1d003de24826d30cc3e SHA256 c0b1a8f998c3bc93ff79945d5b432f722ae86d4f70880b9d8b4256ef8ca36354
-MD5 8a051fcbb6aa9882dd11ab08a7460872 ChangeLog 6421
-RMD160 d10f029582d0a6621db00b61f0b2b54b0be40e42 ChangeLog 6421
-SHA256 c0b1a8f998c3bc93ff79945d5b432f722ae86d4f70880b9d8b4256ef8ca36354 ChangeLog 6421
+MISC ChangeLog 6639 RMD160 181e0868a2589f378109a3d212c20925a7594081 SHA1 01ebce41f9150843965429fcea73502f3d8b8758 SHA256 e4e0c4e17904b402dfa8e1fdc62300c777ab129be71b52366f762106180b120a
+MD5 9e25b69f912b5c2241fe63e3ba9aca78 ChangeLog 6639
+RMD160 181e0868a2589f378109a3d212c20925a7594081 ChangeLog 6639
+SHA256 e4e0c4e17904b402dfa8e1fdc62300c777ab129be71b52366f762106180b120a ChangeLog 6639
 MISC metadata.xml 229 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 SHA1 087c10f53259e3702a47b6c43c4365fd16d8c201 SHA256 79bb370ed491d8c5f4c42086fcbd3affc893943b56254f98b5a9c9f369792884
 MD5 2696a2548331ef205bf10abad6802180 metadata.xml 229
 RMD160 a9b4042458f9aae459c108c2917745af68bd1d45 metadata.xml 229
@@ -74,13 +91,16 @@ SHA256 bc4da846dca614d5ad2d9ddd735df2109aabd6bfc9a7d4c6f550198a5ecd9440 files/di
 MD5 5e94a4e010b7907c1f3f12e58cedf48b files/digest-resin-3.0.21 253
 RMD160 e8190934daf9ec6c037ea5b58b9f84e30aaac20d files/digest-resin-3.0.21 253
 SHA256 a41462d28571aee053b0bb80907636bc065420f0422b8c3e6661ac5986f2f39d files/digest-resin-3.0.21 253
+MD5 1df6f758925c19f33df250705d01755e files/digest-resin-3.0.22 253
+RMD160 bd3fd0cce1c7cccefb0440cd6520d7d58f3625eb files/digest-resin-3.0.22 253
+SHA256 22df3f8469cc556d0c7f3e0238eb0a7bfc0ebf2f64fdf30fee739e286e1505cb files/digest-resin-3.0.22 253
 MD5 442b5a36c17b9793e71568e4a9797ed1 files/digest-resin-3.0.8-r1 238
 RMD160 4eddc94430080a5202dd6543343505b5c7282093 files/digest-resin-3.0.8-r1 238
 SHA256 aaf2f8d9a3a62b9c835352938dfc9fc2ff2d493ba262d62486c68474fb61b1fc files/digest-resin-3.0.8-r1 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD4DBQFFVJ3ego/w9rxVVVERAm8NAJdh+wylwdlW/ZNWUVkIa6raZ+h1AKCkXM/I
-/ZVnFBAq6G+deormcMi/ZQ==
-=okLA
+iD8DBQFFYEzHgo/w9rxVVVERAgxkAJ94W7yZAbd2vYZwzMs9RZSRvvlWMwCfS+MQ
+5+PPwLWAOyIaRKeu56FhpFo=
+=j+ob
 -----END PGP SIGNATURE-----
diff --git a/www-servers/resin/files/3.0.22/resin-3.0.22-gentoo.patch b/www-servers/resin/files/3.0.22/resin-3.0.22-gentoo.patch
new file mode 100644 (file)
index 0000000..04c771e
--- /dev/null
@@ -0,0 +1,252 @@
+diff -Nru resin-3.0.22.vanilla/Makefile.in resin-3.0.22/Makefile.in
+--- resin-3.0.22.vanilla/Makefile.in   2006-11-19 12:59:49.000000000 +0100
++++ resin-3.0.22/Makefile.in   2006-11-19 13:00:27.000000000 +0100
+@@ -1,6 +1,6 @@
+ PREFIX=@prefix@
+-all   : 
++all   :
+       (cd modules/c/src; $(MAKE))
+ clean :
+@@ -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.22.vanilla/bin/wrapper.pl resin-3.0.22/bin/wrapper.pl
+--- resin-3.0.22.vanilla/bin/wrapper.pl        2006-11-19 12:59:41.000000000 +0100
++++ resin-3.0.22/bin/wrapper.pl        2006-11-19 13:00:27.000000000 +0100
+@@ -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.22.vanilla/bin/wrapper.pl.in resin-3.0.22/bin/wrapper.pl.in
+--- resin-3.0.22.vanilla/bin/wrapper.pl.in     2006-11-19 12:59:41.000000000 +0100
++++ resin-3.0.22/bin/wrapper.pl.in     2006-11-19 13:00:27.000000000 +0100
+@@ -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.22.vanilla/build.xml resin-3.0.22/build.xml
+--- resin-3.0.22.vanilla/build.xml     2006-11-19 12:59:49.000000000 +0100
++++ resin-3.0.22/build.xml     2006-11-19 13:00:27.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.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>
+@@ -358,13 +348,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>
+@@ -503,9 +486,6 @@
+         <dirset dir="${modules}">
+           <include name="*/classes"/>
+         </dirset>
+-        <fileset dir="${modules}/ext">
+-          <include name="**/*.jar"/>
+-        </fileset>
+       </classpath>
+     </java>
+diff -Nru resin-3.0.22.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java resin-3.0.22/modules/resin/src/com/caucho/server/resin/Resin.java
+--- resin-3.0.22.vanilla/modules/resin/src/com/caucho/server/resin/Resin.java  2006-11-19 12:59:48.000000000 +0100
++++ resin-3.0.22/modules/resin/src/com/caucho/server/resin/Resin.java  2006-11-19 13:00:27.000000000 +0100
+@@ -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.22/resin.conf b/www-servers/resin/files/3.0.22/resin.conf
new file mode 100644 (file)
index 0000000..7f01b42
--- /dev/null
@@ -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 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
+
+# (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.22/resin.init b/www-servers/resin/files/3.0.22/resin.init
new file mode 100644 (file)
index 0000000..6a66fb9
--- /dev/null
@@ -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.0.22/resin.init,v 1.1 2006/11/19 12:23:22 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 "${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() {
+       export JAVA_HOME=$(java-config --select-vm=${GENTOO_VM} -O)
+       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.22 b/www-servers/resin/files/digest-resin-3.0.22
new file mode 100644 (file)
index 0000000..1803584
--- /dev/null
@@ -0,0 +1,3 @@
+MD5 29770606e396f6c2c0d476ceb54c08c2 resin-3.0.22-src.tar.gz 5467522
+RMD160 093cdcfa8bcd14a30ff54cc9cb8001ace10bbfc6 resin-3.0.22-src.tar.gz 5467522
+SHA256 0da5617b6867a0d40e59d2dfe2518158567506fea2c1273d56290c146a64849a resin-3.0.22-src.tar.gz 5467522
diff --git a/www-servers/resin/resin-3.0.22.ebuild b/www-servers/resin/resin-3.0.22.ebuild
new file mode 100644 (file)
index 0000000..a834ea0
--- /dev/null
@@ -0,0 +1,153 @@
+# 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.22.ebuild,v 1.1 2006/11/19 12:23:22 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 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
+
+       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 source && {
+               einfo "Zipping source..."
+               java-pkg_dosrc ${S}/modules/*/src/* 2> /dev/null
+       }
+
+       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
+
+}