summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Sennhauser <sera@gentoo.org>2012-06-03 08:07:39 +0000
committerRalph Sennhauser <sera@gentoo.org>2012-06-03 08:07:39 +0000
commitcb2ae9e95b2c246e2615a93b2b32f259681ddbe1 (patch)
tree177240ef25b7d338f7e2f2fef949f4a7c5687c9b /dev-java/saaj
parentMaking wpa_supplicant depend on net-wireless/crda on linux, fixing bug 401277 (diff)
downloadhistorical-cb2ae9e95b2c246e2615a93b2b32f259681ddbe1.tar.gz
historical-cb2ae9e95b2c246e2615a93b2b32f259681ddbe1.tar.bz2
historical-cb2ae9e95b2c246e2615a93b2b32f259681ddbe1.zip
Fix for use with java 1.5 (add missing jaf and jsr67 and use servlet-api:2.5 instead of 3.0 for tests. Fix 1.6 bcp usage). #419403
Package-Manager: portage-2.1.10.62/cvs/Linux x86_64
Diffstat (limited to 'dev-java/saaj')
-rw-r--r--dev-java/saaj/ChangeLog9
-rw-r--r--dev-java/saaj/Manifest20
-rw-r--r--dev-java/saaj/files/saaj-1.3.19-java-5-bootclasspath.patch13
-rw-r--r--dev-java/saaj/saaj-1.3.19-r1.ebuild68
4 files changed, 100 insertions, 10 deletions
diff --git a/dev-java/saaj/ChangeLog b/dev-java/saaj/ChangeLog
index 6dfeaf499374..3808243ed689 100644
--- a/dev-java/saaj/ChangeLog
+++ b/dev-java/saaj/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-java/saaj
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/saaj/ChangeLog,v 1.13 2012/06/02 12:54:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saaj/ChangeLog,v 1.14 2012/06/03 08:07:39 sera Exp $
+
+*saaj-1.3.19-r1 (03 Jun 2012)
+
+ 03 Jun 2012; Ralph Sennhauser <sera@gentoo.org> +saaj-1.3.19-r1.ebuild,
+ +files/saaj-1.3.19-java-5-bootclasspath.patch:
+ Fix for use with java 1.5 (add missing jaf and jsr67 and use servlet-api:2.5
+ instead of 3.0 for tests. Fix 1.6 bcp usage). #419403
02 Jun 2012; Agostino Sarubbo <ago@gentoo.org> saaj-1.3.19.ebuild:
Stable for amd64, wrt bug #417997
diff --git a/dev-java/saaj/Manifest b/dev-java/saaj/Manifest
index a552ca932761..676fac8dbec6 100644
--- a/dev-java/saaj/Manifest
+++ b/dev-java/saaj/Manifest
@@ -1,22 +1,24 @@
-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
AUX build.xml-1.3 442 RMD160 ca6ad741c1cf33f529f135bae63647317745f568 SHA1 813c2abd9a11af89fd519c410f5f2919aa0cc4b2 SHA256 4c92b6eaf6cb2a8bf1cf4f579536569ab37c198032369bc0eb869e4d36da3b74
+AUX saaj-1.3.19-java-5-bootclasspath.patch 502 RMD160 1f4a70f900480d174535e5ff8ab7927a99e5c2f3 SHA1 814d8c682fd9a86331aae3ebb4121c75c2b0350b SHA256 20defaf2378634b1f0223d8b571a709e844e70d8ff4f245c179a265acd491b7e
DIST saaj-1.3.19.tar.bz2 2266558 RMD160 59f7d1176860b394ac2815da32d290a6cb132ff8 SHA1 ab46b33fa9b97987b1312ea8a232f71016591cd0 SHA256 d498d621a9798e503dae9728cf39d50a585e7704ffab2feb61ed769534f05f43
DIST saaj1.3.src.zip 262141 RMD160 87e3d28373e84b8fbd03f0467ad8a0b6e091139d SHA1 526b00954a373161eb39a6618446c56000c21b3d SHA256 51a746c08aac81c4fe39af6fcb3fd5f713159306f87f7ec84109b9d877e4fa6b
EBUILD saaj-1.3-r1.ebuild 1468 RMD160 c6218134b737ebe308dfaeba6662e05b1a888295 SHA1 c91b1e068cc74ba1bea52632531dce32ccafbd05 SHA256 9d7ed84934549eb825c2ae825c497290205f5c6a77d34b428d4f1519dc40ff2e
+EBUILD saaj-1.3.19-r1.ebuild 1827 RMD160 67c802bfab1e06d0efbd6c29e8821b3c7610cbbf SHA1 77f15d1819aea6220a10d4e3774594de17519c4d SHA256 6d41a288bca325e7598fabb6835eac1fb44dc678548369dcdc5e7b2875338697
EBUILD saaj-1.3.19.ebuild 1627 RMD160 e4092db85d6b4397d9c80bb194aeb9986ab1ac38 SHA1 2ba534dd212bc67a5828fb8ad78a8848bfea60f3 SHA256 ea0dc70a5948c091fd62944e2ba42c8fe0e1cd7397b7ba107a83f9766f1d5d99
EBUILD saaj-1.3.ebuild 1434 RMD160 e600098b4176096337f028001dccf6ccbd49348c SHA1 7b0fb6b3fbdb29c87707ef008a52389665020007 SHA256 458d8e060c19f3a776d33342e89ac26552b9bf842b29211ae324e4b0f462306b
-MISC ChangeLog 1922 RMD160 c221cee0f9a4f1ab7acf5068ac35dc10358f72e6 SHA1 63371f5024ea64a2fa106228de809865d42e60b1 SHA256 b08abbde3cd347787615ff4feb7ec26528ac6132e82af9befb27aeb80939b797
+MISC ChangeLog 2213 RMD160 5dac3945d0231570c5c2b009626245cd2af8b8ef SHA1 5c0de37f7a61be80aba27ced07856f8760a05291 SHA256 14e6dd8be1f4d925c508c47832bb819389c2151998e2a7a44fe38c3c23f624d0
MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iQEcBAEBCgAGBQJPyg0OAAoJEOTDgjZ80txdhpIH/2iWVAf6kN2AE4GDjQvNKl/T
-888qPucKU3mCNI2wmYho1Ha3zA7Ev/WPS7nLCjGAaHkH/oGWeyxdLTnc2l7j0IO4
-VF9gQHEsh2Vp8fhSXikeCJYM1HU/prHZQkwSm2NbHw01JmXvjE+jaFQ9VVCdWq2s
-R2x/hPJ51IKFdnAcifH+aVk09YuLlD7jl+Z69FSRlGU73PkX5XG4g5eRChCiZa7K
-gcsT9IvDbSZcXDuebfftiINufssxd0pJ8+pBltmMg2IuIKzRaNynu8ziSGNNEicH
-mbPknAPRdmxjanoOPRBOTUUcDKjkUkeHjVDJ+mycTrOjvAYGhRkWzg/3xga14y8=
-=p/F+
+iQEcBAEBAgAGBQJPyxtZAAoJEIUJ+svaV163w4sIALfBckTLDoFhvBnPqI7oYGhP
+zid5vw8OAYYUIBgr3pZVzpSxTU0H5ouq0JaU1m7jKqaWJzjqP65COD8tZhouwQ1k
+BpG0llvVrtqRzgfIsb5pHIa5t90LnX6AClTh+nCy++uvfewdyyOVPfyrw0QGRwsu
+OuhkRjTduZhA8OHmlaDz/hPOawtkMe9PHJgtgVcjQ3O3xZn64G2PywS6ma1qw8Q6
+NCLXwkM8vPpoB1nViRd6W16O7EqRlCZSGevPeCAJAKIJUnSNZCOr8kqmxveohLmV
+RRQfk6VH4V5hScMx6TtnmevRSHLfk88roN7Js8pLw40pQGflcxEJjEK7f3AWT2s=
+=4bsA
-----END PGP SIGNATURE-----
diff --git a/dev-java/saaj/files/saaj-1.3.19-java-5-bootclasspath.patch b/dev-java/saaj/files/saaj-1.3.19-java-5-bootclasspath.patch
new file mode 100644
index 000000000000..9b92b18944c9
--- /dev/null
+++ b/dev-java/saaj/files/saaj-1.3.19-java-5-bootclasspath.patch
@@ -0,0 +1,13 @@
+--- a/src/java/com/sun/xml/messaging/saaj/soap/ImageDataContentHandler.java
++++ b/src/java/com/sun/xml/messaging/saaj/soap/ImageDataContentHandler.java
+@@ -83,7 +83,9 @@
+ * @return The DataFlavors.
+ */
+ public DataFlavor[] getTransferDataFlavors() {
+- return (DataFlavor[]) Arrays.copyOf(flavor, flavor.length);
++ DataFlavor[] copyOf = new DataFlavor[flavor.length];
++ System.arraycopy(flavor, 0, copyOf, 0, flavor.length);
++ return copyOf;
+ }
+
+ /**
diff --git a/dev-java/saaj/saaj-1.3.19-r1.ebuild b/dev-java/saaj/saaj-1.3.19-r1.ebuild
new file mode 100644
index 000000000000..e13101458b73
--- /dev/null
+++ b/dev-java/saaj/saaj-1.3.19-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/saaj/saaj-1.3.19-r1.ebuild,v 1.1 2012/06/03 08:07:39 sera Exp $
+
+EAPI=4
+
+JAVA_PKG_IUSE="examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="SOAP with Attachments API for Java"
+HOMEPAGE="https://saaj.dev.java.net/"
+# svn export https://svn.java.net/svn/saaj~svn/tags/saaj-impl-1.3.19 saaj-1.3.19
+# tar cjf saaj-1.3.19.tar.bz2 saaj-1.3.19
+SRC_URI="https://dev.gentoo.org/~sera/distfiles/${P}.tar.bz2"
+
+LICENSE="CDDL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# jaf and saaj-api only for java 5
+COMMON_DEP="
+ dev-java/mimepull:0
+ dev-java/xerces:2
+ dev-java/xml-commons-external:1.4
+ java-virtuals/jaf:0
+ java-virtuals/saaj-api:0"
+RDEPEND="${COMMON_DEP}
+ >=virtual/jre-1.5"
+# servlet-api 2.5 for java 5. 3.0 is java 6.
+DEPEND="${COMMON_DEP}
+ >=virtual/jdk-1.5
+ test? (
+ dev-java/ant-junit:0
+ dev-java/xalan:0
+ java-virtuals/servlet-api:2.5
+ )"
+
+java_prepare() {
+ find -name '*.jar' -exec rm -v {} + || die
+
+ epatch "${FILESDIR}"/${P}-java-5-bootclasspath.patch
+
+ # YES! There's nothing like using com.sun...internal ! YAY!
+ find src -name '*.java' -exec sed -i \
+ -e 's,com.sun.org.apache.xerces.internal,org.apache.xerces,g' \
+ -e 's,com.sun.org.apache.xalan.internal.xsltc.trax,org.apache.xalan.xsltc.trax,g' \
+ {} + || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+EANT_GENTOO_CLASSPATH="mimepull,jaf,saaj-api,xerces-2,xml-commons-external-1.4"
+
+EANT_TEST_TARGET="test-all"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},servlet-api-2.5,xalan"
+src_test() {
+ java-pkg-2_src_test
+}
+
+src_install() {
+ java-pkg_newjar build/lib/saaj-impl.jar ${PN}.jar
+ dohtml -r docs/*
+
+ use examples && java-pkg_doexamples samples
+ use source && java-pkg_dosrc src/java/*
+}