diff options
Diffstat (limited to 'dev-java/mx4j-tools')
| -rw-r--r-- | dev-java/mx4j-tools/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-java/mx4j-tools/files/mx4j-tools-3.0.2-new-hessian.patch | 37 | ||||
| -rw-r--r-- | dev-java/mx4j-tools/files/mx4j-tools-3.0.2-split-javadoc-build.patch | 45 | ||||
| -rw-r--r-- | dev-java/mx4j-tools/mx4j-tools-3.0.2.ebuild | 95 |
4 files changed, 186 insertions, 1 deletions
diff --git a/dev-java/mx4j-tools/ChangeLog b/dev-java/mx4j-tools/ChangeLog index 87473c0fba1e..e93bf2d00b3e 100644 --- a/dev-java/mx4j-tools/ChangeLog +++ b/dev-java/mx4j-tools/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-java/mx4j-tools # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j-tools/ChangeLog,v 1.9 2008/05/03 02:46:06 ken69267 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j-tools/ChangeLog,v 1.10 2008/06/17 14:03:09 nelchael Exp $ + +*mx4j-tools-3.0.2 (17 Jun 2008) + + 17 Jun 2008; Krzysiek Pawlik <nelchael@gentoo.org> + +files/mx4j-tools-3.0.2-new-hessian.patch, + +files/mx4j-tools-3.0.2-split-javadoc-build.patch, + +mx4j-tools-3.0.2.ebuild: + Version bump. 03 May 2008; Kenneth Prugh <ken69267@gentoo.org> mx4j-tools-3.0.1-r2.ebuild: diff --git a/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-new-hessian.patch b/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-new-hessian.patch new file mode 100644 index 000000000000..8bc827b29b22 --- /dev/null +++ b/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-new-hessian.patch @@ -0,0 +1,37 @@ +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.vanilla/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 +@@ -12,13 +12,13 @@ + import java.io.IOException; + import java.io.ObjectInputStream; + ++import com.caucho.hessian.io.AbstractDeserializer; + import com.caucho.hessian.io.AbstractHessianInput; +-import com.caucho.hessian.io.Deserializer; + + /** + * @version $ + */ +-class JMXDeserializer extends Deserializer ++class JMXDeserializer extends AbstractDeserializer + { + 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 +@@ -13,12 +13,12 @@ + import java.io.ObjectOutputStream; + + import com.caucho.hessian.io.AbstractHessianOutput; +-import com.caucho.hessian.io.Serializer; ++import com.caucho.hessian.io.AbstractSerializer; + + /** + * @version $Revision: 1.1 $ + */ +-class JMXSerializer extends Serializer ++class JMXSerializer extends AbstractSerializer + { + public void writeObject(Object obj, AbstractHessianOutput out) throws IOException + { diff --git a/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-split-javadoc-build.patch b/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-split-javadoc-build.patch new file mode 100644 index 000000000000..9fba649e1f45 --- /dev/null +++ b/dev-java/mx4j-tools/files/mx4j-tools-3.0.2-split-javadoc-build.patch @@ -0,0 +1,45 @@ +diff -Nru mx4j-3.0.2.vanilla/build/build.xml mx4j-3.0.2/build/build.xml +--- mx4j-3.0.2.vanilla/build/build.xml 2008-06-17 15:32:02.000000000 +0200 ++++ mx4j-3.0.2/build/build.xml 2008-06-17 15:34:06.000000000 +0200 +@@ -407,7 +407,7 @@ + </jar> + </target> + +- <target name="javadocs" description="Creates the MX4J javadoc documentation" depends="compile.tools"> ++ <target name="javadocs.core" description="Creates the MX4J javadoc documentation" depends="compile.rjmx"> + <mkdir dir="${dist.docs.api.dir}"/> + <javadoc destdir="${dist.docs.api.dir}" + author="true" +@@ -421,6 +421,23 @@ + <group title="MX4J classes" packages="mx4j:mx4j.*"/> + <sourcepath> + <pathelement path="${core.src.dir}"/> ++ </sourcepath>
++ </javadoc>
++ </target>
++
++ <target name="javadocs.tools" description="Creates the MX4J javadoc documentation" depends="compile.tools">
++ <mkdir dir="${dist.docs.api.dir}"/>
++ <javadoc destdir="${dist.docs.api.dir}"
++ author="true"
++ version="true"
++ use="true"
++ windowtitle="MX4J API"
++ classpathref="classpath">
++ <package name="mx4j.*"/>
++
++ <bottom><![CDATA[<center><small>Copyright © 2001-2005 The MX4J Contributors. All Rights Reserved.</small></center>]]></bottom>
++ <group title="MX4J classes" packages="mx4j:mx4j.*"/>
++ <sourcepath>
+ <pathelement path="${tools.src.dir}"/> + </sourcepath> + </javadoc> +@@ -468,7 +485,7 @@ + + <target name="main" depends="tests, compile.examples"/> + +- <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs"> ++ <target name="release" description="Builds a release of the MX4J project" depends="clean, manifest, releasing, main, docs, javadocs.core"> + <mkdir dir="${release.dist.dir}"/> + <mkdir dir="${binary.release.dist.dir}"/> + <mkdir dir="${source.release.dist.dir}"/> diff --git a/dev-java/mx4j-tools/mx4j-tools-3.0.2.ebuild b/dev-java/mx4j-tools/mx4j-tools-3.0.2.ebuild new file mode 100644 index 000000000000..f6fc64cc900c --- /dev/null +++ b/dev-java/mx4j-tools/mx4j-tools-3.0.2.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/mx4j-tools/mx4j-tools-3.0.2.ebuild,v 1.1 2008/06/17 14:03:09 nelchael Exp $ + +EAPI=1 + +inherit eutils java-pkg-2 java-ant-2 + +MY_P=${P/-tools/} +MY_PN=${PN/-tools/} + +DESCRIPTION="Optional tool classes and utilities for MX4J" +HOMEPAGE="http://mx4j.sourceforge.net/" +SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}-src.tar.gz" + +# The ${S}/BUILD-HOWTO is a good source for dependencies +# This package could also be built with jdk-1.3; see special +# handling instructions in ${S}/BUILD-HOWTO. + +# javamail and jython support is optional but because ant-core puts it in the classpath +# if it is installed we can't force disable it without modifying the build.xml +# and jikes refuses to compile mx4j with javamail support disabled + +# Optional jetty support can be enabled after jetty uses java-pkg_dojar to install jars + +RDEPEND=" + dev-java/bcel + dev-java/commons-logging + dev-java/log4j + =www-servers/axis-1* + dev-java/hessian:3.0 + dev-java/jython + java-virtuals/servlet-api:2.3 + java-virtuals/jaf + java-virtuals/javamail" +# >=www-servers/jetty-4.2 +DEPEND="${RDEPEND} + >=virtual/jdk-1.5 + >=dev-java/ant-core-1.6 + source? ( app-arch/zip )" +RDEPEND="${RDEPEND} + >=virtual/jre-1.5" + +LICENSE="mx4j" +SLOT="3.0" +KEYWORDS="~amd64 ~x86" +IUSE="doc source" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack ${A} + + cd "${S}" + epatch "${FILESDIR}/${P}-split-javadoc-build.patch" + epatch "${FILESDIR}/${P}-new-hessian.patch" + + cd "${S}/lib" + java-pkg_jar-from bcel bcel.jar + java-pkg_jar-from commons-logging commons-logging.jar + java-pkg_jar-from log4j + java-pkg_jar-from axis-1 + java-pkg_jar-from --virtual servlet-api-2.3 servlet.jar + + # optionals +# java-pkg_jar-from jetty org.mortbay.jetty.jar + java-pkg_jar-from hessian-3.0 + java-pkg_jar-from jython jython.jar + java-pkg_jar-from --virtual jaf + java-pkg_jar-from --virtual javamail +} + +src_compile() { + eant -f build/build.xml compile.tools $(use_doc javadocs.tools) +} + +src_install() { + java-pkg_dojar dist/lib/mx4j-tools.jar + java-pkg_dowar dist/lib/mx4j-soap.war + + dodoc README.txt + use doc && java-pkg_dojavadoc dist/docs/api + use source && java-pkg_dosrc "${S}/src/tools/*" +} + +pkg_postinst() { + elog + elog "This package is currently built without Jetty support. Jetty support will be" + elog "added when Jetty is brought up-to-date in Portage with the new Java system." + elog "To track Jetty progress, see the following:" + elog + elog " http://bugs.gentoo.org/show_bug.cgi?id=94452" + elog " http://bugs.gentoo.org/show_bug.cgi?id=147469" + elog +} |