diff options
| author |   Ralph Sennhauser <sera@gentoo.org> | 2012-07-25 08:12:48 +0000 |
|---|---|---|
| committer | Ralph Sennhauser <sera@gentoo.org> | 2012-07-25 08:12:48 +0000 |
| commit | c1a3bf0e506614deaca5b79093c406dcd8a94231 (patch) | |
| tree | 93aeaebe9f0a7211fb81e1773b45be331921d422 /www-servers | |
| parent | whitespace (diff) | |
| download | historical-c1a3bf0e506614deaca5b79093c406dcd8a94231.tar.gz historical-c1a3bf0e506614deaca5b79093c406dcd8a94231.tar.bz2 historical-c1a3bf0e506614deaca5b79093c406dcd8a94231.zip | |
Pass to vm instead of catalina in init script. Thanks to Märt Bakhoff <spam3910807@gmail.com> #427664
Package-Manager: portage-2.1.11.9/cvs/Linux x86_64
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/tomcat/Manifest | 18 | ||||
| -rw-r--r-- | www-servers/tomcat/files/tomcat.init | 5 |
3 files changed, 24 insertions, 5 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 59eb7e72c318..27b7281ea43c 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/tomcat # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.295 2012/07/20 17:36:54 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.296 2012/07/25 08:12:48 sera Exp $ + + 25 Jul 2012; Ralph Sennhauser <sera@gentoo.org> files/tomcat.init: + Pass to vm instead of catalina in init script. Thanks to Märt Bakhoff + <spam3910807@gmail.com> #427664 *tomcat-7.0.29-r1 (20 Jul 2012) *tomcat-6.0.35-r1 (20 Jul 2012) diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest index 96f41ec3f3c3..1b1255fa5265 100644 --- a/www-servers/tomcat/Manifest +++ b/www-servers/tomcat/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX 6/catalina.policy 6956 SHA256 9399efda3f6cfc238fb783fb338060e67aff15d0044b31c3d0265e1f9e5769e5 SHA512 fd41389f562890994a181e120af6c3ecd358fdcce6a3891091375e53f088e254bc07fb8ee607c8d0f4533fd59ebee32981ec2fbced21de7a1a08b7b45e8d7169 WHIRLPOOL a903691689662cfec8a4fbe827a34183fbadaa0b3dae275a715762fcb6b04af0f8d7e3912a010fa3729a299aa87b8b3c84cf5cafbf7c9553d39f8b079919f72f AUX 6/tomcat.conf 2895 SHA256 b04b085618be755ad9e1796fcbcbb8c2e192eefda3b240f1c06b0d9cc88f2ff0 SHA512 2b182acaa636cc36358bffde693af7e78020e0321f4595c44c991a5dafdf1e386d93659a43a76626781ac1d73723c91cd8f86f93d9a41ba61cb8bffc2ece7d6a WHIRLPOOL dafa1ed7299041916a8362625f031c98ac98b630dcda6152529c162fee7af60bb0cfc5e5abe7259d58df5aa6bf1a1a7ca81a84577ac97c8cd3603ec67abb228e AUX 6/tomcat.init.2 4034 SHA256 55abf160871648ebeca531865b5918846cf298dadc9cdc5cc7ee060a8db487ad SHA512 79259b423df6f3b8c16f81acd4f3ad33711699d9397fdc313ac1de912121e94a38bb9e33f568b84b921d15fb7434244645ec7c552b59bd1a080d1f03f8947fa1 WHIRLPOOL 27ccf2e9259de6aaeb6098ecd8bb74d760a60fe6674f0bf7657a034d6548e8348809d8ddbc063a926f605c301ac95739ac7443fa2f6aa1096099355571e7d326 @@ -14,7 +17,7 @@ AUX tomcat-6.0.35-build.xml.patch 950 SHA256 33af0fd388c439e3ee74fd2271d94066169 AUX tomcat-7.0.29-build.xml.patch 3852 SHA256 6b003e9c58131cfec4b5d312a18dbcd088428774a544d8d29b896542d3c92c5a SHA512 01feaa4428345203e2c5f0e28ee40bb9f7fd9351446e2454b43d5c1f7f7775606b70b47905e452511661e38ab5965865ed0622979e7845661c87e01a64f0e8cd WHIRLPOOL c86197abec4af7417803d85bd05615e24942f944fbda6712cf3c29ccd4989306f017663d378a719c2d71dd069d5c8850d5e2f4ec57b2243f4758c46bfe7ce2ed AUX tomcat-instance-manager.bash 6403 SHA256 09ff73a51d6f11b83c78d6306322455091da302c8d6bd711a0fa4983d850dab4 SHA512 7b51b77447854dd4c6fd4a3bc16aa912edcb5e31d64a4c47f24102c3fc29c2a18f51d8b8f0e28723fba694451c8ab780dcac3d12dc553dc3f182c1d1372e7171 WHIRLPOOL ad845aedd608615df243722be6a4e3ad477890ee8e59b5d0061c4490d95058d7857346bf545c16d7756ecfa62a0b31f137d819095461cb6180cc75df1d81511d AUX tomcat.conf 1544 SHA256 6f74ff1ea148322d7595bb6bc10bd00a81851d1822046c01e7f42885b357a4cc SHA512 36ba5c4ccf9ac062acfaaecefd9aba1065fd5553df21cd9c2ffd2b320de472c3397d8499d3a2a96b51d8ef513aa86d5879a42287579da4152916802a988c7811 WHIRLPOOL f2ea708f87b21a004680f3f2865b98bfbeb4dbbee77ce19e7577a8d461df21d682136bda88591114c6b9c2e1dec42ed816ea4a981e6863ea1faaf3f0407dbce3 -AUX tomcat.init 2994 SHA256 1f4f70431c778f8dd3a6255f6d435d3ac6d5957cc0c290d94261ece9fd0227b5 SHA512 932b2e49dc66f39551ca3176afee56231ca46fc61639dfccc8202f6cfbe5eb11c9e91c1c5fbdb698ad991c959e825340fb4e0d118c906c71921df1a96dedd807 WHIRLPOOL 6b777b2bf0014742ffe081a10b6b82e2a6f81d451a665b5190f13b193e6ebcd4fb4468ad06afb48002659b6bac684bc65ac878140a6de1958ef4fb4934c8ecc9 +AUX tomcat.init 2989 SHA256 bae9e2663e5fda9c665fc97e916074cca46468560af17e3bbad030adf950e314 SHA512 0be4ed921efebc740326009bfb3cf33df0bcd3d24395381e8dfee09b993bbb1865369e7a1837710c5853d3d4534bbd4362a50edc05b30f2badbb942cf20ea65b WHIRLPOOL 0282df5c5a51449d81c8d4c38b64411c9cf0d9c66d2746f116760fc63dabb587c5f37361f2a87d1de22e2dc90ff7b53d5fc041be64caa12eddc701c7bf4fa154 DIST apache-tomcat-6.0.35-src.tar.gz 3403286 SHA256 6e5205834bd595250c8e0b640e2345ef643f23364ae0e099334b5132103be764 SHA512 fbf9d471f67d6dbd22c37f1963e24c1f45f39431049feedc78557efda86a793565ec5b0b5b31735d9d98a639a00a42c034ac6ddcf7b649cfdbcb8b4c6b160a39 WHIRLPOOL fe747f3ebe937b93bfce8cf15e1bf46a8d4fa9df860223f74021157c0333db9ddabee40a62cd04fc3248e817e3259a7c0fdb4fc452e7b5c095213d4e3cdb332c DIST apache-tomcat-7.0.23-src.tar.gz 4103854 SHA256 b86523095b06d58b9553683f480250dec7216ce1914c92ea8ecca0799e6ad3b0 DIST apache-tomcat-7.0.26-src.tar.gz 4127697 SHA256 864304e76ff6edb284fc56d7297f8e0711ce0968c9f735c89b2617d70694cc0e @@ -29,5 +32,16 @@ EBUILD tomcat-7.0.27.ebuild 7634 SHA256 a461a8ee10e01bb5fc5d5813462d5cf656a1a600 EBUILD tomcat-7.0.28.ebuild 7640 SHA256 2cd83c336add922ae80d0e20700d46f3ded17d321ef1a1ffd9972e4d67914b61 SHA512 d96c4bcd6938f9b1dc3dc785629e1bf530a28dadd692400ef7adbf0e6df247dddc1452658ebad15c5e6f9f1d532519d7e133de9da0322982dc2f5ad1ae0e4ec4 WHIRLPOOL ebaaa516eeb527dfc44fa638fb8e8747b0abe27bdc65cfc843bbe697ebc722f82150c0a627efd5b63d1d3f814489416d571cb9f5b7c81d6ae48b1fae261189e4 EBUILD tomcat-7.0.29-r1.ebuild 3728 SHA256 298e6a1468c43b7f520c987ddfb987be9f48f2e5432892a1369a7eee3f5e3126 SHA512 c83826a463a7d687df7933686fa5d39aded5dd9b958f469d65ef3b03a008448dfd7efcdf8da017f23b75ecdf3140a1043eb647b2ca7e59ea5d92be195a0fc509 WHIRLPOOL 1490353786d5c4d164b7ff926820638d606ff541362f2ce84cc0212931b7d4792af3004b3fe64fdca16d04fb5f3430b23ab6ba88bbb5d170df67c22c9b53b2fa EBUILD tomcat-7.0.29.ebuild 7640 SHA256 4c1f9e42a694c6832f23a8fe394fdd5058c2d8a2453d852166b25ec668d69be1 SHA512 70e3649793a2b893dc6d2bac92bf831bd9fe12c560b2bc716837be4aacb8c0918478563b571c71b441f8d9bb77b98ba17c1201858907c0507e6b7844cb8de590 WHIRLPOOL 9b01fe83b636f205a3a8f5138192c33aa706882b26932d3cf1cf38ff9fd5127370014090c0362124ffae2e1550fd5a39d5c219adb0fa5abd11da99c704f300a3 -MISC ChangeLog 72953 SHA256 76af20260adb2f5298dee2e53ea8e19ecc385a4c8b173acb241347ac1f4e91b2 SHA512 ec5a54ec84151bd57c97a5fe99bb15473fdb66dce327a4293c0aabab6e4e041ca256ed439ae8d252130c3a01d935e14a543a0e9d3cf9132c58f773f08f5423f2 WHIRLPOOL 8bcbe74f7c0e64ebc160fdb0b20b9ca75b5050d7ac58b38cb9a93dd5a0544a0c145ae1419084612a2d423196395bf25c36bc608aff3c7ecca7ee0b23d6070cf9 +MISC ChangeLog 73130 SHA256 fb1b7021593ee94eb24598f3b6af5dbfb41bb80934f12d2e363a8d419431543d SHA512 c5d9a3a73b4855197de283a63fc8f30e941e5931a624e1c81d90e0468a716ef548775daf8a294d2eeff4f36e7d6b59cd5796a9ef84740d13cfac603a2373d7f8 WHIRLPOOL 525e94fbd5bb9aa317f8ac3843269ff778ffc8eed8d1660b74d2e5c35ba8dc0d18f0bf4829bece363f4d198e44d12ef821ada6ee5b827f400ef17005462bfed8 MISC metadata.xml 561 SHA256 a53b91aa1c4371952ed465d0b570fde6eebd1a621804990aa3d2c31f3a8cecab SHA512 354849871d8ff7e9d3bba1bd412f78789693518f1f9804aac412b64e9e86622fb86080b8290bbe16424c760b3601e96824cb3f0b956edbc2245dfa5be299c8c5 WHIRLPOOL f740fcc281807c913934662fcff48a023d42065ec0b50564d4a12ff970ce09447cac0a71016a33ff4896a596dcd86cd9372b4a12286fb0bf46bb01bb6bd2c7e1 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBCAAGBQJQD6qXAAoJEIUJ+svaV163UJwH/3bO1wVFgQxBir7Gu3KsG0sX +2aoHFS6/XRWvYY4Ltta7Xb2eJIwJmJbkM4x5va2IGTsEICUyxX7lqxxKMEeXtLQt +THWMVBSKgHDCCHoS9pKYoblvBUwgV5Ibxe63eLQKkbt+aTpn90D4v6Zw5/5TVG9g +Ctar0cpxaaf/MByEl8aIXd2ydfFTeE+GCECj7SlWS+iWWeodlsCyfOuCGLFdihpo +m4XRHcM7EQ9swWvUvVFovbFp1hoCR3C6B3SXtGUUUBLNUSOi3Dg9GMwD/2RN1d9q +oCZsh5FwVhJsG3VxuvUJxPN9OG7j40Sadv8hrMgfQ9SIOOshev9AGRW7aifAhg0= +=ZZzQ +-----END PGP SIGNATURE----- diff --git a/www-servers/tomcat/files/tomcat.init b/www-servers/tomcat/files/tomcat.init index b076f99b6bdf..1f806810ce22 100644 --- a/www-servers/tomcat/files/tomcat.init +++ b/www-servers/tomcat/files/tomcat.init @@ -49,7 +49,7 @@ start() { args="${args} ${JPDA_OPTS}" fi if [ -r "${CATALINA_HOME}"/bin/tomcat-juli.jar ]; then - JAVA_OPTS="${JAVA_OPTS} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \ + args="${args} -Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager \ -Djava.util.logging.config.file=${CATALINA_BASE}/conf/logging.properties" fi @@ -61,13 +61,14 @@ start() { --exec ${JAVA_HOME}/bin/${cmd} \ -- \ ${JAVA_OPTS} \ + ${args} \ -Dcatalina.base="${CATALINA_BASE}" \ -Dcatalina.home="${CATALINA_HOME}" \ -Djava.io.tmpdir="${CATALINA_TMPDIR}" \ -classpath "${CLASSPATH}" \ org.apache.catalina.startup.Bootstrap \ ${CATALINA_OPTS} \ - ${args} ${TOMCAT_START} + ${TOMCAT_START} eend $? } |