Author: xhaakon-guest Date: 2013-01-23 21:00:25 +0000 (Wed, 23 Jan 2013) New Revision: 16388
Removed: trunk/axis/debian/patches/add-osgi-metadata.patch Modified: trunk/axis/debian/changelog trunk/axis/debian/control trunk/axis/debian/patches/series trunk/axis/debian/rules Log: Use bnd to generate OSGi metadata Modified: trunk/axis/debian/changelog =================================================================== --- trunk/axis/debian/changelog 2013-01-21 19:14:47 UTC (rev 16387) +++ trunk/axis/debian/changelog 2013-01-23 21:00:25 UTC (rev 16388) @@ -1,3 +1,9 @@ +axis (1.4-17) UNRELEASED; urgency=low + + * Use bnd to generate OSGi metadata. + + -- Jakub Adam <[email protected]> Mon, 21 Jan 2013 21:15:10 +0100 + axis (1.4-16.2) unstable; urgency=low * Non-maintainer upload. Modified: trunk/axis/debian/control =================================================================== --- trunk/axis/debian/control 2013-01-21 19:14:47 UTC (rev 16387) +++ trunk/axis/debian/control 2013-01-23 21:00:25 UTC (rev 16388) @@ -7,7 +7,7 @@ Damien Raude-Morvan <[email protected]>, Jakub Adam <[email protected]> Build-Depends: debhelper (>= 7), cdbs, ant-optional, default-jdk, libwsdl4j-java, - libcommons-logging-java, libcommons-httpclient-java, + libcommons-logging-java, libcommons-httpclient-java, bnd, libcommons-discovery-java, libgnujaf-java, libgnumail-java, libservlet2.5-java, maven-repo-helper Standards-Version: 3.9.2 Deleted: trunk/axis/debian/patches/add-osgi-metadata.patch =================================================================== --- trunk/axis/debian/patches/add-osgi-metadata.patch 2013-01-21 19:14:47 UTC (rev 16387) +++ trunk/axis/debian/patches/add-osgi-metadata.patch 2013-01-23 21:00:25 UTC (rev 16388) @@ -1,55 +0,0 @@ -From: Jakub Adam <[email protected]> -Date: Sun, 9 Oct 2011 02:17:06 +0200 -Subject: add-osgi-metadata - ---- - build.xml | 21 +++++++++++++++++++++ - 1 files changed, 21 insertions(+), 0 deletions(-) - -diff --git a/build.xml b/build.xml -index 738d245..8b7b0fe 100644 ---- a/build.xml -+++ b/build.xml -@@ -195,6 +195,13 @@ Copyright: - <include name="log4j.properties" unless="exclude.log4j.configuration"/> - <include name="simplelog.properties"/> - <manifest> -+ <attribute name="Bundle-ManifestVersion" value="2"/> -+ <attribute name="Bundle-Name" value="Apache Axis"/> -+ <attribute name="Bundle-Vendor" value="Apache Software Foundation"/> -+ <attribute name="Bundle-SymbolicName" value="org.apache.axis"/> -+ <attribute name="Bundle-Version" value="${axis.version}"/> -+ <attribute name="Export-Package" value="org.apache.axis,org.apache.axis.attachments,org.apache.axis.client,org.apache.axis.client.async,org.apache.axis.collections,org.apache.axis.components,org.apache.axis.components.compiler,org.apache.axis.components.encoding,org.apache.axis.components.image,org.apache.axis.components.jms,org.apache.axis.components.logger,org.apache.axis.components.net,org.apache.axis.components.script,org.apache.axis.components.threadpool,org.apache.axis.components.uuid,org.apache.axis.configuration,org.apache.axis.constants,org.apache.axis.deployment.wsdd,org.apache.axis.deployment.wsdd.providers,org.apache.axis.description,org.apache.axis.encoding,org.apache.axis.encoding.ser,org.apache.axis.enum,org.apache.axis.handlers,org.apache.axis.handlers.http,org.apache.axis.handlers.soap,org.apache.axis.holders,org.apache.axis.i18n,org.apache.axis.management,org.apache.axis.management.jmx,org.apache.axis.message,org.apache.axis.monitor,org.apache.axis.providers,org.apache.axis.providers.java,org.apache.axis.schema,org.apache.axis.security,org.apache.axis.security.servlet,org.apache.axis.security.simple,org.apache.axis.server,org.apache.axis.session,org.apache.axis.soap,org.apache.axis.strategies,org.apache.axis.transport.http,org.apache.axis.transport.java,org.apache.axis.transport.local,org.apache.axis.types,org.apache.axis.utils,org.apache.axis.utils.bytecode,org.apache.axis.utils.cache,org.apache.axis.wsdl,org.apache.axis.wsdl.fromJava,org.apache.axis.wsdl.gen,org.apache.axis.wsdl.symbolTable,org.apache.axis.wsdl.toJava"/> -+ <attribute name="Require-Bundle" value="javax.wsdl,javax.activation,javax.mail,javax.xml,javax.xml.rpc,javax.xml.soap,javax.servlet,org.apache.commons.discovery,org.apache.commons.httpclient,org.apache.commons.logging"/> - <section name="org/apache/axis"> - <attribute name="Implementation-Title" value="Apache Axis"/> - <attribute name="Implementation-Version" value="${axis.version} ${TSTAMP} ${TODAY}"/> -@@ -206,6 +213,13 @@ Copyright: - <include name="javax/**"/> - <exclude name="javax/xml/soap/**"/> - <manifest> -+ <attribute name="Bundle-ManifestVersion" value="2"/> -+ <attribute name="Bundle-Name" value="JAX-RPC"/> -+ <attribute name="Bundle-Vendor" value="Apache Software Foundation"/> -+ <attribute name="Bundle-SymbolicName" value="javax.xml.rpc"/> -+ <attribute name="Bundle-Version" value="${axis.version}"/> -+ <attribute name="Export-Package" value="javax.xml.rpc,javax.xml.rpc.encoding,javax.xml.rpc.handler,javax.xml.rpc.handler.soap,javax.xml.rpc.holders,javax.xml.rpc.server,javax.xml.rpc.soap"/> -+ <attribute name="Require-Bundle" value="javax.servlet,javax.xml,javax.xml.soap"/> - <section name="javax/xml/rpc"> - <attribute name="Specification-Title" value="JAX-RPC"/> - <attribute name="Specification-Version" value="1.1"/> -@@ -216,6 +230,13 @@ Copyright: - <jar jarfile="${build.lib}/${saaj}.jar" basedir="${build.dest}" > - <include name="javax/xml/soap/**"/> - <manifest> -+ <attribute name="Bundle-ManifestVersion" value="2"/> -+ <attribute name="Bundle-Name" value="SAAJ"/> -+ <attribute name="Bundle-Vendor" value="Apache Software Foundation"/> -+ <attribute name="Bundle-SymbolicName" value="javax.xml.soap"/> -+ <attribute name="Bundle-Version" value="${axis.version}"/> -+ <attribute name="Export-Package" value="javax.xml.soap"/> -+ <attribute name="Require-Bundle" value="javax.activation,javax.xml"/> - <section name="javax/xml/soap"> - <attribute name="Specification-Title" value="SAAJ"/> - <attribute name="Specification-Version" value="1.2"/> --- Modified: trunk/axis/debian/patches/series =================================================================== --- trunk/axis/debian/patches/series 2013-01-21 19:14:47 UTC (rev 16387) +++ trunk/axis/debian/patches/series 2013-01-23 21:00:25 UTC (rev 16388) @@ -2,5 +2,4 @@ 02-gcj-4.4.patch axis-bz152255.patch javadoc.diff -add-osgi-metadata.patch 06-fix-CVE-2012-5784.patch Modified: trunk/axis/debian/rules =================================================================== --- trunk/axis/debian/rules 2013-01-21 19:14:47 UTC (rev 16387) +++ trunk/axis/debian/rules 2013-01-23 21:00:25 UTC (rev 16388) @@ -8,6 +8,12 @@ DEB_ANT_BUILD_TARGET := compile javadocs +common-post-build-indep:: + for BNDFILE in debian/*.bnd; do \ + JARPATH=build/lib/`basename $$BNDFILE .bnd`.jar; \ + bnd wrap -properties $$BNDFILE -output $$JARPATH $$JARPATH; \ + done + install/libaxis-java:: mh_installpoms -plibaxis-java -e$(DEB_UPSTREAM_VERSION) mh_installjar -plibaxis-java -l debian/poms/axis.xml build/lib/axis.jar _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
