diff options
Diffstat (limited to 'dev-java/mx4j')
| -rw-r--r-- | dev-java/mx4j/ChangeLog | 8 | ||||
| -rw-r--r-- | dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch | 10 | ||||
| -rw-r--r-- | dev-java/mx4j/mx4j-3.0.2.ebuild | 20 |
3 files changed, 20 insertions, 18 deletions
diff --git a/dev-java/mx4j/ChangeLog b/dev-java/mx4j/ChangeLog index f1fb84ace11c..b443e966766c 100644 --- a/dev-java/mx4j/ChangeLog +++ b/dev-java/mx4j/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/mx4j -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.29 2009/10/04 15:08:07 caster Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/ChangeLog,v 1.30 2010/04/03 12:13:31 nelchael Exp $ + + 03 Apr 2010; Krzysztof Pawlik <nelchael@gentoo.org> mx4j-3.0.2.ebuild, + files/mx4j-3.0.2-new-hessian.patch: + Update for new Hessian, update patch. 04 Oct 2009; Vlastimil Babka <caster@gentoo.org> -mx4j-3.0.1-r2.ebuild: Remove old. diff --git a/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch b/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch index 7665825cccee..25de4b50b8f5 100644 --- a/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch +++ b/dev-java/mx4j/files/mx4j-3.0.2-new-hessian.patch @@ -1,6 +1,6 @@ diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java ---- mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java 2008-06-17 15:32:02.000000000 +0200 -+++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java 2008-06-17 15:51:14.000000000 +0200 +--- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java 2010-04-03 13:09:19.815790652 +0100 ++++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXDeserializer.java 2010-04-03 13:09:29.096398617 +0100 @@ -12,13 +12,13 @@ import java.io.IOException; import java.io.ObjectInputStream; @@ -18,8 +18,8 @@ diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JM private Class type; diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java ---- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java 2008-06-17 15:32:02.000000000 +0200 -+++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java 2008-06-17 15:51:14.000000000 +0200 +--- mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java 2010-04-03 13:09:19.815790652 +0100 ++++ mx4j-3.0.2/src/tools/mx4j/tools/remote/caucho/serialization/JMXSerializer.java 2010-04-03 13:11:41.543862447 +0100 @@ -13,12 +13,12 @@ import java.io.ObjectOutputStream; @@ -28,7 +28,7 @@ diff -Nru mx4j-3.0.2.vanilla/src/tools/mx4j/tools/remote/caucho/serialization/JM +import com.caucho.hessian.io.AbstractSerializer; /** - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ */ -class JMXSerializer extends Serializer +class JMXSerializer extends AbstractSerializer diff --git a/dev-java/mx4j/mx4j-3.0.2.ebuild b/dev-java/mx4j/mx4j-3.0.2.ebuild index 5939242b46a2..7e1683a4232b 100644 --- a/dev-java/mx4j/mx4j-3.0.2.ebuild +++ b/dev-java/mx4j/mx4j-3.0.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/mx4j-3.0.2.ebuild,v 1.2 2009/07/23 13:20:03 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j/mx4j-3.0.2.ebuild,v 1.3 2010/04/03 12:13:31 nelchael Exp $ -EAPI=1 +EAPI=2 JAVA_PKG_IUSE="examples source doc" inherit java-pkg-2 java-ant-2 @@ -27,8 +27,8 @@ COMMON_DEP=" dev-java/commons-logging www-servers/axis:1 java-virtuals/servlet-api:2.3 - dev-java/hessian:3.0 - dev-java/jython:0 + dev-java/hessian:4.0 + dev-java/jython:2.5 dev-java/gnu-jaf:1 java-virtuals/javamail ) @@ -45,10 +45,8 @@ RDEPEND=" DEPEND=">=virtual/jdk-1.5 ${COMMON_DEP}" -src_unpack() { - unpack "${P}-src.tar.gz" - - #epatch "${FILESDIR}/${P}-new-hessian.patch" +src_prepare() { + epatch "${FILESDIR}/${P}-new-hessian.patch" if use doc; then mkdir binary && cd binary @@ -62,8 +60,8 @@ src_unpack() { java-pkg_jar-from commons-logging commons-logging.jar java-pkg_jar-from axis-1 java-pkg_jar-from --virtual servlet-api-2.3 servlet.jar - java-pkg_jar-from hessian-3.0 - java-pkg_jar-from jython jython.jar + java-pkg_jar-from hessian-4.0 + java-pkg_jar-from jython-2.5 jython.jar java-pkg_jar-from gnu-jaf-1 activation.jar java-pkg_jar-from --virtual javamail mail.jar fi |