diff options
| -rw-r--r-- | dev-java/jetty-continuation/Manifest | 19 | ||||
| -rw-r--r-- | dev-java/jetty-continuation/files/jetty-continuation-8.1.10-build.xml | 171 | ||||
| -rw-r--r-- | dev-java/jetty-continuation/files/jetty-continuation-8.1.10-j6c.patch | 75 | ||||
| -rw-r--r-- | dev-java/jetty-continuation/jetty-continuation-8.1.10.ebuild | 63 | ||||
| -rw-r--r-- | dev-java/jetty-continuation/metadata.xml | 11 | ||||
| -rw-r--r-- | dev-java/jetty-servlet/Manifest | 16 | ||||
| -rw-r--r-- | dev-java/jetty-servlet/jetty-servlet-8.1.10.ebuild | 2 |
7 files changed, 347 insertions, 10 deletions
diff --git a/dev-java/jetty-continuation/Manifest b/dev-java/jetty-continuation/Manifest new file mode 100644 index 0000000..6c71392 --- /dev/null +++ b/dev-java/jetty-continuation/Manifest @@ -0,0 +1,19 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +AUX jetty-continuation-8.1.10-build.xml 8591 SHA256 cf6ecbd6e9d43a46d2e7256a2c84ef28f43a241f57293ba787adda424fd8bca4 SHA512 86b39f397f25d6b3dd482d7102a8192dbfc4ae61eefde79faacca7eacb9eb9fc0c2de4cbcca23d9b4142026d6085cb214680c4d45379c25a1e4c66bdb20760e9 WHIRLPOOL 917f5d32f0237107372e412134f4ce635c009dd6ed4c348da80b37747d62881ccc00fcf4f9f8283dd685060bcca53c0eff6167ae2673572b02078dc78bb6e78f +AUX jetty-continuation-8.1.10-j6c.patch 2383 SHA256 6f22b462f4e83b2186a57f34aa39e9335ea4276047e6fd2399392cdaef0406dc SHA512 f1831489cfc420d3275fad87216da6317ddf816d22806900aea219f519accdfb9e5ab879c10a1ac178a6da71dd49257c5e92f0726682de1f07d2f47f2c03589c WHIRLPOOL 25c71b0455ee64dcdc80041abfb321711e4c6424befb3eb3e274831314caff56f009284fe4413f0994407c81aa3b9ecf8e640672537144e3dba51696bdd94a81 +DIST jetty-continuation-8.1.10.v20130312-sources.jar 17548 SHA256 74dcdc266d19696995e0a24d1e00dd8f028f7d314911aac7974cdadc8c10018e SHA512 e9ffa0dbad28a88ad0834ca69235ef4b2487346e3510fed46d1f9ed8a108a687b5bd38cd61514e6ffcc3b2409da4a4a476738e9346c91b273b5390e145418588 WHIRLPOOL 8ccd90a9e945609f12a63e0c08ffd1776481acd58a6b90da3ff7ff5b0f17524d9c21bd4b44e9be75a980147edd8af851190e7630e915752bcd7670ef22171653 +EBUILD jetty-continuation-8.1.10.ebuild 1512 SHA256 f115e2c53eba811517426dd1296a9750234b9708ca7ad2e8d07d0e7cad0808c8 SHA512 c390719f978741e621e8c01ee6199ecf5f1cd47ec7bd72f19feca4b998f747de5d891c7830b7536b2e8b41f66f8280086336ddf8b885d7920dd130c93f6f1856 WHIRLPOOL 0c2ccd5740eb711a4a1918482e2de495205b91c86fc8a49719d4caae160a5714894580e1fe025d600c1528ef20bb7ab400ff5dbd40dc3fe3eb51b450f029e0b9 +MISC metadata.xml 308 SHA256 19815eca0ac57912bd09776024fd16bed8c04f96d8f3758d5fcfdb853f5dce60 SHA512 6a63d3296e3eff4a4d629e7d2cae071ee2ad51d5c1e672933716efe0a97f2be55b12fca825926ed2d351cd40a8b2e3156b162ea4d32c798a72d7602648af0cf6 WHIRLPOOL ae54221549efcd82743628bc1806725f46177ea19dbc9754fdc1bec1f2566485857c2fe24977d62558d02041addc510a52e5a7bfc627e47e77a0251bfa5589eb +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBCAAGBQJRkzyEAAoJEJWyH81tNOV9IgQIAIZe1H56Rms3V7Bz3D3LsBLB +de8x1tsudz92mgaee069ntoUN4LgMdgoluMiiplQRialAm5zppsB2TA76GvdtGTG +9WkfHOgZtsnI6hdPXBFtCwXKjAr7+5ilE41Z0pAu2/u7x7zz0YapsIZU0bMFO0EO +IK9PyA+gQ3ik4fjgNuceU2Ka1/FWRdZROGkBjto5RU8UEk8ylm0a32JWD0UF6tK4 +mBOxfzilOMKrFxlmUyRer9GOoaC5cyQZLgCuBh0t8CG5Puk2GJ+okMXFfuEDsTgY +Q6qtz/adjBnFVtfLn9fuS3jTKUh9s/x+7N07Ts+rkibAtPpJWuqQXLsQ4aCLlU0= +=vYW2 +-----END PGP SIGNATURE----- diff --git a/dev-java/jetty-continuation/files/jetty-continuation-8.1.10-build.xml b/dev-java/jetty-continuation/files/jetty-continuation-8.1.10-build.xml new file mode 100644 index 0000000..be78942 --- /dev/null +++ b/dev-java/jetty-continuation/files/jetty-continuation-8.1.10-build.xml @@ -0,0 +1,171 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- ====================================================================== --> +<!-- Ant build file (http://ant.apache.org/) for Ant 1.6.2 or above. --> +<!-- ====================================================================== --> + +<!-- ====================================================================== --> +<!-- ===================== - DO NOT EDIT THIS FILE! - ===================== --> +<!-- ====================================================================== --> +<!-- --> +<!-- Any modifications will be overwritten. --> +<!-- --> +<!-- Generated by Maven Ant Plugin on 5/15/13 9:37 AM --> +<!-- See: http://maven.apache.org/plugins/maven-ant-plugin/ --> +<!-- --> +<!-- ====================================================================== --> + +<project name="jetty-continuation-from-maven" default="package" basedir="."> + + <!-- ====================================================================== --> + <!-- Build environment properties --> + <!-- ====================================================================== --> + + <property file="${user.home}/.m2/maven.properties"/> + <property file="maven-build.properties"/> + + <property name="maven.build.finalName" value="jetty-continuation-8.1.10.v20130312"/> + <property name="maven.build.dir" value="target"/> + <property name="maven.build.outputDir" value="${maven.build.dir}/classes"/> + <property name="maven.build.srcDir.0" value="src/main/java"/> + <property name="maven.build.resourceDir.0" value="src/main/resources"/> + <property name="maven.build.testOutputDir" value="${maven.build.dir}/test-classes"/> + <property name="maven.build.testDir.0" value="src/test/java"/> + <property name="maven.build.testResourceDir.0" value="src/test/resources"/> + <property name="maven.test.reports" value="${maven.build.dir}/test-reports"/> + <property name="maven.reporting.outputDirectory" value="${maven.build.dir}/site"/> + + <property name="maven.repo.local" value="${user.home}/.m2/repository"/> + <property name="maven.settings.offline" value="false"/> + <property name="maven.settings.interactiveMode" value="true"/> + + <!-- ====================================================================== --> + <!-- Defining classpaths --> + <!-- ====================================================================== --> + + <path id="build.classpath"> + <pathelement location="${maven.repo.local}/org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar"/> + <pathelement location="${maven.repo.local}/org/mortbay/jetty/jetty-util/6.1.26/jetty-util-6.1.26.jar"/> + </path> + <path id="build.test.classpath"> + <pathelement location="${maven.repo.local}/org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar"/> + <pathelement location="${maven.repo.local}/org/mortbay/jetty/jetty-util/6.1.26/jetty-util-6.1.26.jar"/> + </path> + + <!-- ====================================================================== --> + <!-- Cleaning up target --> + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> + <delete dir="${maven.build.dir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" depends="get-deps" description="Compile the code"> + <mkdir dir="${maven.build.outputDir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Test-compilation target --> + <!-- ====================================================================== --> + + <target name="compile-tests" + depends="compile" + description="Compile the test code" + unless="maven.test.skip"> + <mkdir dir="${maven.build.testOutputDir}"/> + </target> + + <!-- ====================================================================== --> + <!-- Run all tests --> + <!-- ====================================================================== --> + + <target name="test" + depends="compile-tests, junit-missing" + unless="junit.skipped" + description="Run the test cases"/> + + <target name="test-junit-present"> + <available classname="junit.framework.Test" property="junit.present"/> + </target> + + <target name="test-junit-status" + depends="test-junit-present"> + <condition property="junit.missing"> + <and> + <isfalse value="${junit.present}"/> + <isfalse value="${maven.test.skip}"/> + </and> + </condition> + <condition property="junit.skipped"> + <or> + <isfalse value="${junit.present}"/> + <istrue value="${maven.test.skip}"/> + </or> + </condition> + </target> + + <target name="junit-missing" + depends="test-junit-status" + if="junit.missing"> + <echo>=================================== WARNING ===================================</echo> + <echo> JUnit is not present in your $ANT_HOME/lib directory. Tests not executed.</echo> + <echo>===============================================================================</echo> + </target> + + <!-- ====================================================================== --> + <!-- Javadoc target --> + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"/> + + <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="compile,test" description="Package the application"> + <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" + compress="true" + index="false" + manifest="/var/tmp/portage/dev-java/jetty-continuation-8.1.10/work/target/classes/META-INF/MANIFEST.MF" + basedir="${maven.build.outputDir}" + excludes="**/package.html"/> + </target> + + <!-- ====================================================================== --> + <!-- A dummy target for the package named after the type it creates --> + <!-- ====================================================================== --> + + <target name="jar" depends="package" description="Builds the jar for the application"/> + + <!-- ====================================================================== --> + <!-- Download dependencies target --> + <!-- ====================================================================== --> + + <target name="test-offline"> + <condition property="maven.mode.offline"> + <equals arg1="${maven.settings.offline}" arg2="true"/> + </condition> + </target> + + <target name="get-deps" + depends="test-offline" + description="Download all dependencies" + unless="maven.mode.offline"> + <mkdir dir="${maven.repo.local}"/> + <mkdir dir="${maven.repo.local}/org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016"/> + <get src="http://repo.maven.apache.org/maven2/org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar" + dest="${maven.repo.local}/org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar" + usetimestamp="false" + ignoreerrors="true"/> + <mkdir dir="${maven.repo.local}/org/mortbay/jetty/jetty-util/6.1.26"/> + <get src="http://repo.maven.apache.org/maven2/org/mortbay/jetty/jetty-util/6.1.26/jetty-util-6.1.26.jar" + dest="${maven.repo.local}/org/mortbay/jetty/jetty-util/6.1.26/jetty-util-6.1.26.jar" + usetimestamp="false" + ignoreerrors="true"/> + </target> + +</project> diff --git a/dev-java/jetty-continuation/files/jetty-continuation-8.1.10-j6c.patch b/dev-java/jetty-continuation/files/jetty-continuation-8.1.10-j6c.patch new file mode 100644 index 0000000..1b2d151 --- /dev/null +++ b/dev-java/jetty-continuation/files/jetty-continuation-8.1.10-j6c.patch @@ -0,0 +1,75 @@ +--- a/org/eclipse/jetty/continuation/Jetty6Continuation.java 2013-05-12 16:02:19.980222801 +0200 ++++ b/org/eclipse/jetty/continuation/Jetty6Continuation.java 2013-05-12 16:02:12.233556821 +0200 +@@ -44,7 +44,7 @@ + + private final ServletRequest _request; + private ServletResponse _response; +- private final org.mortbay.util.ajax.Continuation _j6Continuation; ++ private final Object _j6Continuation; + + private Throwable _retry; + private int _timeout; +@@ -55,7 +55,7 @@ + private boolean _responseWrapped=false; + private List<ContinuationListener> _listeners; + +- public Jetty6Continuation(ServletRequest request, org.mortbay.util.ajax.Continuation continuation) ++ public Jetty6Continuation(ServletRequest request, Object continuation) + { + if (!ContinuationFilter._initialized) + { +@@ -80,8 +80,8 @@ + if (_resumed) + throw new IllegalStateException(); + _completed=true; +- if (_j6Continuation.isPending()) +- _j6Continuation.resume(); ++// if (_j6Continuation.isPending()) ++// _j6Continuation.resume(); + } + } + +@@ -150,8 +150,8 @@ + if (_completed) + throw new IllegalStateException(); + _resumed=true; +- if (_j6Continuation.isPending()) +- _j6Continuation.resume(); ++// if (_j6Continuation.isPending()) ++// _j6Continuation.resume(); + } + } + +@@ -174,7 +174,7 @@ + _resumed=false; + _expired=false; + _completed=false; +- _j6Continuation.suspend(_timeout); ++// _j6Continuation.suspend(_timeout); + } + catch(Throwable retry) + { +@@ -192,7 +192,7 @@ + _resumed=false; + _expired=false; + _completed=false; +- _j6Continuation.suspend(_timeout); ++// _j6Continuation.suspend(_timeout); + } + catch(Throwable retry) + { +@@ -225,12 +225,12 @@ + public boolean enter(ServletResponse response) + { + _response=response; +- _expired=!_j6Continuation.isResumed(); ++// _expired=!_j6Continuation.isResumed(); + + if (_initial) + return true; + +- _j6Continuation.reset(); ++// _j6Continuation.reset(); + + if (_expired) + { diff --git a/dev-java/jetty-continuation/jetty-continuation-8.1.10.ebuild b/dev-java/jetty-continuation/jetty-continuation-8.1.10.ebuild new file mode 100644 index 0000000..82137ec --- /dev/null +++ b/dev-java/jetty-continuation/jetty-continuation-8.1.10.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="5" + +JAVA_PKG_IUSE="test" + +inherit java-pkg-2 java-ant-2 java-osgi + +DESCRIPTION="Eclipse Jetty Continuation" +HOMEPAGE="http://www.eclipse.org/jetty/" +LICENSE="Apache-2.0 EPL-1.0" + +BUILD_DATE="20130312" + +MY_PV="${PV}.v${BUILD_DATE}" +MY_P="${PN}-${MY_PV}" + +SRC_URI="http://repo1.maven.org/maven2/org/eclipse/jetty/${PN}/${MY_PV}/${MY_P}-sources.jar" +SLOT="8" +KEYWORDS="~amd64 ~x86" + +S="${WORKDIR}" + +COMMON_DEPEND="dev-java/jetty-util:8 + java-virtuals/servlet-api:3.0" + +DEPEND="${COMMON_DEPEND} + test? ( + dev-java/ant-junit:0 + dev-java/junit:0 + ) + >=virtual/jdk-1.7" + +RDEPEND="${COMMON_DEPEND} + >=virtual/jre-1.7" + +java_prepare() { + cd "${S}" || die + cp "${FILESDIR}"/${P}-build.xml build.xml || die + sed -i 's/manifest=".*"/manifest="META-INF\/MANIFEST.MF"/g' build.xml || die + sed -i 's/\(<mkdir dir="${maven.build.outputDir}"\/>\)/\1<javac srcdir="." destdir="${maven.build.outputDir}" \/>/g' build.xml || die + + epatch "${FILESDIR}"/${P}-j6c.patch + + for FILE in $(find . -name '*.java') ; do + echo "Processing ${FILE} ..." + sed -i 's/org.mortbay\(\|.util\)/org.eclipse.jetty.util/g' ${FILE} || die + done +} + +EANT_GENTOO_CLASSPATH="jetty-util-8,servlet-api-3.0" +EANT_TEST_GENTOO_CLASSPATH="junit" +JAVA_ANT_REWRITE_CLASSPATH="true" + +src_test() { + java-pkg-2_src_test +} + +src_install() { + java-osgi_newjar-fromfile target/${MY_P}.jar META-INF/MANIFEST.MF org.eclipse.jetty.continuation +}
\ No newline at end of file diff --git a/dev-java/jetty-continuation/metadata.xml b/dev-java/jetty-continuation/metadata.xml new file mode 100644 index 0000000..55fcf3b --- /dev/null +++ b/dev-java/jetty-continuation/metadata.xml @@ -0,0 +1,11 @@ +<?xml version='1.0' encoding='UTF-8'?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer> + <email>TomWij@gentoo.org</email> + <name>Tom Wijsman</name> + </maintainer> + <longdescription> + Eclipse Jetty Continuation + </longdescription> +</pkgmetadata> diff --git a/dev-java/jetty-servlet/Manifest b/dev-java/jetty-servlet/Manifest index d1e578d..cffc71d 100644 --- a/dev-java/jetty-servlet/Manifest +++ b/dev-java/jetty-servlet/Manifest @@ -3,16 +3,16 @@ Hash: SHA256 AUX jetty-servlet-8.1.10-build.xml 14418 SHA256 0f4caddeb87b817215bf389fd7721728704f5594db7bd00aafff42e308efa6f2 SHA512 7471597c44ee0f6b325e7ce4e0a7baa4aaa8d9cb4d84698f7e0f9229e87dc8f6e5dbf74a9122dffc6116322705410f321e25d554f6061037fcf827bfcaaeff95 WHIRLPOOL d1002f8aadd9b3b567ed9abd05bbee312232546f3df22c6f7574df1f31ce061517e2d9c90e8cc6ee25855441ba04433e4b7333029fe8a250a4fe500c91644466 DIST jetty-servlet-8.1.10.v20130312-sources.jar 58114 SHA256 00627c2a027abb260e88078dbb9b58947382d46e0787defa2bdc76f9fddd8a0f SHA512 a15e845a4ed2d7f0ca6ea32bb4b9f278e39faeb2b9c137bd32dd7370c4fe10972e32c1b7fb141fe0eb418b847adcf186afef2d1189a153b1468d410ca0e18e36 WHIRLPOOL 9d0cad2fc7a0981ad1c587442701ac70b55a1399c859250552806fa615bc395ee97c6cb29d0e56deb3902878c182bf8963f5eccd9a387a7f2990a52deaf757a8 -EBUILD jetty-servlet-8.1.10.ebuild 1690 SHA256 8c3bee823522f1493245a5d0743cb1fdb97c7e03615e54063301fd32015a87fa SHA512 569fa3f4d8592810b1234a80b3c3197fa4dd2b2677da5a0d066c85fb5a88ef15f74d0ae4765258374af51267ba064226102664cb9136f678bcde02bad498e793 WHIRLPOOL 40d0d6408f1cf94471897a578270f381a74e59c97492ae95b74bba2c110677b33ac9ecde58e96ef0d0be987ef2359bbd0f64df82798a85c6a7ef2ef5750c7776 +EBUILD jetty-servlet-8.1.10.ebuild 1650 SHA256 968d2aa6627e4f541de5515e34a611c71f2a2d233afa507444a1f2e14ec6b83a SHA512 616aa32179522b77e304d97bbda65d8fa49e409c6acb634bc4cc4e3fab0cfb0c2f17950e9e3c440733e3d443891348066ea58f9df5a579e8791594d36dce037c WHIRLPOOL 2f8fcd8c843942b0b4a6e7605aa30214435f3656af506023bd6d26c09e77ae250efef6f1d68b8a7b646e7ef9f9b6e35a8f0060b03e14d3f0558bb349b1afc64c MISC metadata.xml 303 SHA256 cdb0ac041d1a6c0b3b3d3f8903352813ba132aa7509e44b37b7ea468ebe5ba1b SHA512 292959d0cbd1d36a6e722ca1c351b74b3bd664c2180eea9cafc1b5e02efe3db10b8e3852cbebe7260a58c4687d46b3a5407cb6cc9f0dfe8783338ea9e59874c2 WHIRLPOOL 50e637a9d1e66889a86ee28100a5f233cb19ef377d25313c7d10bb0db61ece3119599427570526323af276bea301b6156205e8f749825003151a58a9f805c6ef -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJRkzKhAAoJEJWyH81tNOV9hngIALH/1Tyzfi0u1KoBNuzJWOGt -8LSkR8Mcx6dvNdBXAoGu1WAnaiJ8B/OnmCanl8niXzZbJO0WfcLydgzXZOjt1dvv -k3rNVz7l5iUTBr9NWHSf3WepHdxA3rcWX3+9xHG5WQLKz436e7/8HVn5MPNnXmRl -goUVMZCsNceqoOgZWK/wLk29XgHd5He2optQJNZW+i0ZmQJfyFQNp1ublu5Hcbw0 -n5SWP+0w8NRIzJb+15DFXU5NvjaSJ1CYifpCSysapoHYE/G6rHnirpwacSLJ9/63 -mqMS9nFI1IvQnv9uov1DrzACvxfdOtewV6erEr6xSgX5ON5icNmHW1iFmQumttQ= -=c7CE +iQEcBAEBCAAGBQJRkzyHAAoJEJWyH81tNOV9M7wH/0mpkJ2D6z2gTmCnlrbxFmNb +YjpBEdpnxCqT6St3fJ7x+00LLnX7ofQobqbl8QYLU2mqmkv0p2LSYy3zMTx09tW6 +FtarKVcie/+2WfuL/BQKWGwmynd8nCZN7zzKIpbPNADNPCcqxbfqzcYA8yerQG4Y ++IhcWvlZ28cXjQ+kB2quRwzZ24rjPuCUmufkg3z+GfuI4qSRG7kZUgl68Zm8gTcz +IvbuUjRI/ioAoe29ux53MwVWptfgPAU3eV14Xag1Y9dPjuNE/42YxWl4bXNhDKZW +ZJtxwKHHG/uiFLwFlpX5LwT4k/DgDGp8KnFKLs9gjfQ5JtIPKIPrauZozQ2K6wg= +=GZOz -----END PGP SIGNATURE----- diff --git a/dev-java/jetty-servlet/jetty-servlet-8.1.10.ebuild b/dev-java/jetty-servlet/jetty-servlet-8.1.10.ebuild index 87d1d8d..3539709 100644 --- a/dev-java/jetty-servlet/jetty-servlet-8.1.10.ebuild +++ b/dev-java/jetty-servlet/jetty-servlet-8.1.10.ebuild @@ -47,8 +47,6 @@ java_prepare() { sed -i 's/manifest=".*"/manifest="META-INF\/MANIFEST.MF"/g' build.xml || die sed -i 's/\(<mkdir dir="${maven.build.outputDir}"\/>\)/\1<javac srcdir="." destdir="${maven.build.outputDir}" \/>/g' build.xml || die - # epatch "${FILESDIR}"/${P}-j6c.patch - for FILE in $(find . -name '*.java') ; do echo "Processing ${FILE} ..." sed -i 's/org.mortbay\(\|.util\)/org.eclipse.jetty.util/g' ${FILE} || die |