From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 9D9D413877A for ; Tue, 15 Jul 2014 18:18:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 77B54E09EE; Tue, 15 Jul 2014 18:18:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E6BBDE09EF for ; Tue, 15 Jul 2014 18:18:16 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9FBC133F616 for ; Tue, 15 Jul 2014 18:18:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 897371807D for ; Tue, 15 Jul 2014 18:18:13 +0000 (UTC) From: "Andrew John Hughes" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew John Hughes" Message-ID: <1397853865.638af11babdc0fef3d04127dea3a7c77e81596cb.gnu_andrew@gentoo> Subject: [gentoo-commits] proj/java:master commit in: dev-java/aspectwerkz/files/, dev-java/aspectwerkz/ X-VCS-Repository: proj/java X-VCS-Files: dev-java/aspectwerkz/ChangeLog dev-java/aspectwerkz/Manifest dev-java/aspectwerkz/aspectwerkz-2.0.ebuild dev-java/aspectwerkz/files/aspectwerkz-2.0-modernise_api.patch X-VCS-Directories: dev-java/aspectwerkz/files/ dev-java/aspectwerkz/ X-VCS-Committer: gnu_andrew X-VCS-Committer-Name: Andrew John Hughes X-VCS-Revision: 638af11babdc0fef3d04127dea3a7c77e81596cb X-VCS-Branch: master Date: Tue, 15 Jul 2014 18:18:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6a992c4b-0fc8-4bca-805d-656818322c29 X-Archives-Hash: cf3efd50d49f745804cccd5762c6d80c commit: 638af11babdc0fef3d04127dea3a7c77e81596cb Author: Andrew John Hughes member fsf org> AuthorDate: Fri Apr 18 20:44:25 2014 +0000 Commit: Andrew John Hughes member fsf org> CommitDate: Fri Apr 18 20:44:25 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/java.git;a=commit;h=638af11b Use final java.util.concurrent API so it can be built against >=1.5 without additional dependencies Package-Manager: portage-2.2.10 Manifest-Sign-Key: 248BDC07 --- dev-java/aspectwerkz/ChangeLog | 7 +- dev-java/aspectwerkz/Manifest | 33 ++++----- dev-java/aspectwerkz/aspectwerkz-2.0.ebuild | 5 +- .../files/aspectwerkz-2.0-modernise_api.patch | 82 ++++++++++++++++++++++ 4 files changed, 107 insertions(+), 20 deletions(-) diff --git a/dev-java/aspectwerkz/ChangeLog b/dev-java/aspectwerkz/ChangeLog index 901e76f..fbe730d 100644 --- a/dev-java/aspectwerkz/ChangeLog +++ b/dev-java/aspectwerkz/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for dev-java/aspectwerkz -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/ChangeLog,v 1.34 2013/09/01 11:42:11 grobian Exp $ + 18 Apr 2014; Andrew John Hughes + +files/aspectwerkz-2.0-modernise_api.patch, aspectwerkz-2.0.ebuild: + Use final java.util.concurrent API so it can be built against >=1.5 without + additional dependencies + 01 Sep 2013; Fabian Groffen aspectwerkz-2.0.ebuild: Marked *-macos diff --git a/dev-java/aspectwerkz/Manifest b/dev-java/aspectwerkz/Manifest index 6f872bc..6eb32d6 100644 --- a/dev-java/aspectwerkz/Manifest +++ b/dev-java/aspectwerkz/Manifest @@ -2,26 +2,27 @@ Hash: SHA256 AUX aspectwerkz-2.0-gentoo.patch 8362 SHA256 3ec2444b5bce5f43c6bebb1ee0dc74359b93424955f0dd7b521dc2cb5713fb05 SHA512 33d1b35c56ad0ed31104f4328336f10e4bc0140594191fdba4a2a7bf4931b566a786bb7560731883afca1d801fd39bcb703d687c0c2865b6780e59ff30ee213b WHIRLPOOL fc835a8ff2dfd10b0790f5f4f474d956d019eb7d109b3734bd0413fc7699d3eaeafc8ef6f002de44f81d01f435d14b8674937c09a678d547976690e5fdf93318 +AUX aspectwerkz-2.0-modernise_api.patch 3556 SHA256 f585b3e2ccb759ecba9d3e0da0adeaf35b49bee3bbe19b5e310a07126ef0d9a4 SHA512 1f9ca2ff92092edbcd134b4b156ce5fcc615c46abc1f3b4af28c48d70aecbee25ef6471792fdf747e48b73f26fabb2171239c6df92612e0db93e9411a86c27f6 WHIRLPOOL 5f3dc87e627e531c650cfe1f75d45473800703f6bd9ea77c3ad92a98d1424c3f68f14104491b6eca3dc4a86be6be3adf41eff33b0d905e3137129fa8b27cac3e AUX aspectwerkz-2.0_rc2-gentoo.patch 4866 SHA256 262f71feb10fc60b4fd2d6c160041c9ade5388c7d6b885ef9da18d4f8e4a3b29 SHA512 471a1a1fd9680dd6646b2424085b856bd98a2827237baf1c8ec299935bcd3a8fe158ecc00e540f337465d2c1b1825468c98ba0eb266f613ea4351aba0cc30b7d WHIRLPOOL 9f66d6cec9319f15a0227a784279993c8e2f194cf4bea3a9ed477c81f7393a058a5b7a4e5fd71efc15c189682c76ba1be0940ec7b3630f164f82776d57ae8510 AUX aspectwerkz-2.0_rc2-jdk15.patch 4503 SHA256 7e0efe23f8f831bf0e11cc1e252c37387eede1b770847b44d803e0aeef7820de SHA512 b2c570d3a3fad540400fbb16034fad3cdfd2b4ee37eea26f85ec401cea2aba5d64c14bf0164788b11f649213acd53d13410868a6aa04b27caf36fd83f4311eec WHIRLPOOL c66f84803933032644e6c8ffc05f81f9a78e375965c98b428f1e88976626d5186375300efaaad85b364af9d1b3cfe1f685ac3c390c7e15682d0b53be35661951 DIST aspectwerkz-2.0.zip 14166266 SHA256 6d0f94338539dd0cbb0837337f65a64f65495a4194647e93fa96b27829ba9b46 SHA512 80052e36fcfb67c50c7ddaf3d76bc135add57f8d5eafe80d8e7ec214bc2636c9a22bf72f3c6ed473c042f2c2fadf64a525c2a123466d6426446aa7bfd3305a3f WHIRLPOOL a07d6e6aba5fe2da923314c12ca845010ab853a62caad305256792ea5d4844533efc908feee9233f80362de65887e9b6d0293f77e60aaf399243eb26d0f16c7c -EBUILD aspectwerkz-2.0.ebuild 1673 SHA256 81d800f5d7504c73370255397ac595bae84914d82d41d39447925a79571dafad SHA512 97afa08a7ef26d9f79912d7d2a9c9617a596682af3462449403c12ba06961bbbee120d4b11617852d4a29e71be278442fdb6facbf0482abf11c3e110eb151727 WHIRLPOOL e88f4796dc9780f927dc4b0a4321ee85c082eb0702edab3eac1d95fe8c58cf95b3280612b7d535850937c9ffab47aab0ebe9096023eafd9b72af55fb533e158b -MISC ChangeLog 5111 SHA256 f59c07b4564a202914ddd66b3755105ff3610cfeceef7fd4a6a79531265e692f SHA512 ee98b37c1ecd31e5334efc94e70b64d373039637dcc51772731553e04c4402ee35fc30419f73ad45680c1747e2477f994c140cab60f613a6298e96b63ac25f6e WHIRLPOOL 220970b75a74615a8598e177c36c8f3a41744b372c829c05697c5c56130e63062a9b6dce06c4932686abb8bb161ad2078cdcb6b264339fad3bddcae04149020a +EBUILD aspectwerkz-2.0.ebuild 1657 SHA256 a79a2416fe2cb24229ee4e82b1ec63896c9213847eb424fa025b5dd7e7000523 SHA512 2ca8340cf53f408963a07ef10b71e2dc6953fd05546f8db4cdc36ba25a1357995f53db3f6ad8e532dda294ed967c65e8956bc8c30fe72c8d749380a9c91cbf2b WHIRLPOOL bed39cd733ceea1dd2da05b2fbada1814f8dc8fcf4d039237c3d366dc6a50f0a101667557a0f101ac3aa927a100b4d3e11f9a50a84e4ca9385d7a4c498ce9531 +MISC ChangeLog 5348 SHA256 678b182324ceacc9844b21329e167a226044a879b5ed2357918131b155a8f0d7 SHA512 a5d5ef0b0ee52082e078db59f4c75f14493aa3e031e53b87a0517d44cccd8887a52184c47ea971eab2c922ffcd435f4673a641536c3a1f12b521556abfe50c2c WHIRLPOOL ae4a0d357759704cdd934b1b41d6747aeff7954273436cbe9f26e853ef48202dbaa71748089c39be33fb0cc4f81fd30763d78028b82486159a2262f9edd3a3ee MISC metadata.xml 158 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb SHA512 54f88fc3270968439ba87295b04365a89101c55d33a8c209a56036dc60244e5c73f78ec09484b3e5af28de9dee2159b1dab670cbd5d80a9e0c4543145c0390a3 WHIRLPOOL fcffc4fb6751b5a6eec33aa833f9d7dea0168d3ab67f7e34565370f92fd917ed882bcc57585481bf4d31e601f83a592d99d1c3f50fc793f1c38cd174cc8b2f26 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.20 (GNU/Linux) +Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCAAGBQJSSPmlAAoJEDuWpXgki9wHf40P/1MWDatULH0ZPvFAaBqoF5LL -MhiwXjpR5ZwJd+ZjGxY2HoXzaONgn8thj6R/E0Eh1+E471ZYDSud0YgtzzDJuFGQ -a6VI8iLZpOq9ThSboahxLMssDIQOw5sEQfLPsp+pwnd8eXfnM0/BiWBp98VdMuxC -+B/RKUIImadBj3lKrLxXJjfwK1jXwJSr3wCJ2DYq8qX9f7dUJBCGisEji1cNaKHb -ObfacmWPHSBeZFx82EfBufkOtgHR4R4Bm8qCEoZqZq514gBA/MfKswedovWjBFGk -S6lYUelq7DaYMrTTMBx+KiUNfTnsywcMMeuWFshyesg/na/hoxU+h6Y59GnhvXh0 -diUoVQ775YKXDf9OHU2Bb2j5+tQpUT6rLCUHFqrFGy0qdRgam2jIkwfLCeCR0jKt -1gxQri6Phqo7ETqQOfy3P871ERU/qj9WD8E5RXhmj1HrMKRXuNmm0cgusIoEbU0P -ui79uabNU29rSsjmhnu91dctslpI8d98Yp5mWlt0fT6DJIYlxJfc0/uHGjKIE/Rb -zzHZJXFgBi3A0T4SXE1wC1xJ+EXOmqTFiRX+6cxzy4iZw40M+sj2wgcSShxuMkHL -yb5/SgAM5dyYTn7yehFB3q4+WMTzWOGwhwuT/Fuyl0YEHHENFgKBf4akIRSqdyX/ -RFYiq/83jIBmVkuGzc8g -=+tHy +iQIcBAEBCAAGBQJTUY6oAAoJEDuWpXgki9wHyukP/1tUrIIv+Hl6tE54gtCF7bBp +QEhoqbxHW9znqAzwoSBjA2fpLGlrugvHwB1tOm+QjhDopyQUkPqAHb8i0OYKUDmD +ySaBYCoTpTY1JWdQ3asuPhvZC16NKQsmSiLdcLPRwbd7xtEPPbIbbOgGXJLMQxR9 +BSEZnVveruW/lCmX1WUtGbFjp4tPKjgiWK2rsrwS9YgWRg3SXmBs+EpAQzquDPa8 +QtWqZS7ARYhJ6o/gGsC0AO7Cqq5RWsCTYL7InzX9up8xqepsjUegT5Hl/Uit5CsH +wIigL1Mozopenf2+D57+ggPBX5FH90YyLaFs2Xso31yINQQQi0QNgEHrFzMpU2Lo +y6HE2N8xdz4kdbqTy3e5kNs7r11puxQcJ5a+BZdiEpxItIqxK67bx0ore7Du+f9a +cafR8nKDLPXlQIf2dAplI15fHP4mj98c5fdcl2zASTti5DBqjh1hmqL7HT0nq/AT +DPpbrlPp8RHfH4Voww4LIFhkAIPdk7HBeovhQGrZUBKP8iQ66DVxJtDmSH3ne9EH +XG1Z8beoAIUNjZPFebU8XbnLuDQ+runRTg6W8UrpNPNjReV5nCI/W447eBvsc4tV +p1kapnH3hCl27hvLvDtFClqp2qYb+/qaz7g9xTbWBCZz88TURVO42ktIKMCyO9PI +HWJEM7efhkQ1GiiYpsMl +=3BA5 -----END PGP SIGNATURE----- diff --git a/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild b/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild index 65e99e2..ef24c69 100644 --- a/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild +++ b/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/aspectwerkz/aspectwerkz-2.0.ebuild,v 1.8 2013/09/01 09:33:06 grobian Exp $ @@ -20,7 +20,6 @@ RESTRICT="test" COMMON_DEP=" dev-java/asm:1.5 - dev-java/concurrent-util:0 dev-java/dom4j:1 dev-java/jrexx:0 dev-java/trove:0 @@ -39,12 +38,12 @@ java_prepare() { # unit tests need this chmod +x "bin/${PN}" || die epatch "${FILESDIR}/${P}-gentoo.patch" + epatch "${FILESDIR}/${P}-modernise_api.patch" find . -name '*.jar' -delete || die cd "${S}/lib" java-pkg_jar-from asm-1.5 - java-pkg_jar-from concurrent-util java-pkg_jar-from dom4j-1 java-pkg_jar-from jrexx java-pkg_jar-from junit diff --git a/dev-java/aspectwerkz/files/aspectwerkz-2.0-modernise_api.patch b/dev-java/aspectwerkz/files/aspectwerkz-2.0-modernise_api.patch new file mode 100644 index 0000000..8d930e8 --- /dev/null +++ b/dev-java/aspectwerkz/files/aspectwerkz-2.0-modernise_api.patch @@ -0,0 +1,82 @@ +--- src/main/org/codehaus/aspectwerkz/connectivity/RemoteProxyServer.java.old 2013-09-30 02:03:20.703138370 +0100 ++++ src/main/org/codehaus/aspectwerkz/connectivity/RemoteProxyServer.java 2013-09-30 05:49:54.768369910 +0100 +@@ -7,9 +7,13 @@ + **************************************************************************************/ + package org.codehaus.aspectwerkz.connectivity; + +-import EDU.oswego.cs.dl.util.concurrent.BoundedBuffer; +-import EDU.oswego.cs.dl.util.concurrent.LinkedQueue; +-import EDU.oswego.cs.dl.util.concurrent.PooledExecutor; ++import java.util.concurrent.ArrayBlockingQueue; ++import java.util.concurrent.BlockingQueue; ++import java.util.concurrent.LinkedBlockingQueue; ++import java.util.concurrent.RejectedExecutionHandler; ++import java.util.concurrent.ThreadPoolExecutor; ++import java.util.concurrent.TimeUnit; ++ + import org.codehaus.aspectwerkz.exception.WrappedRuntimeException; + + import java.io.FileInputStream; +@@ -152,7 +156,7 @@ + /** + * The thread pool. + */ +- private PooledExecutor m_threadPool = null; ++ private ThreadPoolExecutor m_threadPool = null; + + /** + * The class loader to use. +@@ -262,13 +266,30 @@ + final int threadPoolInitSize, + final int keepAliveTime, + final boolean waitWhenBlocked) { +- m_threadPool = new PooledExecutor(new BoundedBuffer(threadPoolInitSize), threadPoolMaxSize); +- m_threadPool.setKeepAliveTime(keepAliveTime); +- m_threadPool.createThreads(threadPoolInitSize); +- m_threadPool.setMinimumPoolSize(threadPoolMinSize); ++ m_threadPool = new ThreadPoolExecutor(threadPoolInitSize, threadPoolMaxSize, ++ keepAliveTime, TimeUnit.MILLISECONDS, ++ new ArrayBlockingQueue(threadPoolInitSize) { ++ protected void afterExecute(Runnable r, ThreadPoolExecutor e) { ++ if (waitWhenBlocked) e.notifyAll(); ++ } ++ }); ++ m_threadPool.prestartAllCoreThreads(); ++ m_threadPool.setCorePoolSize(threadPoolMinSize); + if (waitWhenBlocked) { +- m_threadPool.waitWhenBlocked(); +- } ++ m_threadPool.setRejectedExecutionHandler(new RejectedExecutionHandler() { ++ public void rejectedExecution(Runnable r, ThreadPoolExecutor e) { ++ if (e.isTerminating() || e.isTerminated()) ++ return; ++ BlockingQueue tasks = e.getQueue(); ++ int maxSize = e.getMaximumPoolSize(); ++ while (tasks.remainingCapacity() == 0 || e.getPoolSize() == maxSize) ++ try { e.wait(); } catch (InterruptedException ex) {} ++ e.execute(r); ++ } ++ }); ++ } else { ++ m_threadPool.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy()); ++ } + } + + /** +@@ -281,9 +302,10 @@ + private void createDynamicThreadPool(final int threadPoolMinSize, + final int threadPoolInitSize, + final int keepAliveTime) { +- m_threadPool = new PooledExecutor(new LinkedQueue()); +- m_threadPool.setKeepAliveTime(keepAliveTime); +- m_threadPool.createThreads(threadPoolInitSize); +- m_threadPool.setMinimumPoolSize(threadPoolMinSize); ++ m_threadPool = new ThreadPoolExecutor(threadPoolInitSize, Integer.MAX_VALUE, ++ keepAliveTime, TimeUnit.MILLISECONDS, ++ new LinkedBlockingQueue()); ++ m_threadPool.prestartAllCoreThreads(); ++ m_threadPool.setCorePoolSize(threadPoolMinSize); + } +-} +\ No newline at end of file ++}