[pkg-java] r15346 - trunk/libxmlrpc3-java/debian

[Jakub Adam]

Author: xhaakon-guest
Date: 2011-11-05 10:03:55 +0000 (Sat, 05 Nov 2011)
New Revision: 15346

Added:
   trunk/libxmlrpc3-java/debian/xmlrpc-client.mf
   trunk/libxmlrpc3-java/debian/xmlrpc-common.mf
   trunk/libxmlrpc3-java/debian/xmlrpc-server.mf
Modified:
   trunk/libxmlrpc3-java/debian/build.xml
   trunk/libxmlrpc3-java/debian/changelog
Log:
Add OSGi metadata to JAR manifests

Modified: trunk/libxmlrpc3-java/debian/build.xml
===================================================================
--- trunk/libxmlrpc3-java/debian/build.xml	2011-11-04 23:16:08 UTC (rev 15345)
+++ trunk/libxmlrpc3-java/debian/build.xml	2011-11-05 10:03:55 UTC (rev 15346)
@@ -12,6 +12,10 @@
    <property name="server.bin.dir" location="server/target/classes"/>
    <property name="tests.bin.dir" location="server/target/test-classes"/>
 
+   <property name="common.manifest.file" location="debian/xmlrpc-common.mf"/>
+   <property name="client.manifest.file" location="debian/xmlrpc-client.mf"/>
+   <property name="server.manifest.file" location="debian/xmlrpc-server.mf"/>
+
    <property name="common.jar.file"
              location="common/target/${ant.project.name}-common-${version}.jar"/>
    <property name="client.jar.file"
@@ -31,26 +35,29 @@
    <target name="jar-all" depends="jar-common,jar-client,jar-server,jar-tests"/>
 
    <target name="jar-common">
-     <antcall target="jar">
+     <antcall target="jar-with-manifest">
        <param name="bin" value="${common.bin.dir}"/>
        <param name="src" value="${common.src.dir}"/>
        <param name="jar" value="${common.jar.file}"/>
+       <param name="manifest" value="${common.manifest.file}"/>
      </antcall>
    </target>
 
    <target name="jar-client">
-     <antcall target="jar">
+     <antcall target="jar-with-manifest">
        <param name="bin" value="${client.bin.dir}"/>
        <param name="src" value="${client.src.dir}"/>
        <param name="jar" value="${client.jar.file}"/>
+       <param name="manifest" value="${client.manifest.file}"/>
      </antcall>
    </target>
 
    <target name="jar-server">
-     <antcall target="jar">
+     <antcall target="jar-with-manifest">
        <param name="bin" value="${server.bin.dir}"/>
        <param name="src" value="${server.src.dir}"/>
        <param name="jar" value="${server.jar.file}"/>
+       <param name="manifest" value="${server.manifest.file}"/>
      </antcall>
    </target>
 
@@ -73,6 +80,17 @@
      </jar>
    </target>
 
+   <target name="jar-with-manifest">
+     <antcall target="compile">
+       <param name="bin" value="${bin}"/>
+       <param name="src" value="${src}"/>
+     </antcall>
+
+     <jar destfile="${jar}" manifest="${manifest}">
+       <fileset dir="${bin}"/>
+     </jar>
+   </target>
+
    <target name="tests" depends="jar-all">
      <junit printsummary="on" haltonfailure="true">
        <classpath>

Modified: trunk/libxmlrpc3-java/debian/changelog
===================================================================
--- trunk/libxmlrpc3-java/debian/changelog	2011-11-04 23:16:08 UTC (rev 15345)
+++ trunk/libxmlrpc3-java/debian/changelog	2011-11-05 10:03:55 UTC (rev 15346)
@@ -1,3 +1,9 @@
+libxmlrpc3-java (3.1.3-4) UNRELEASED; urgency=low
+
+  * Add OSGi metadata to JAR manifests
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Sun, 09 Oct 2011 14:45:30 +0200
+
 libxmlrpc3-java (3.1.3-3) unstable; urgency=low
 
   [ Damien Raude-Morvan ]

Added: trunk/libxmlrpc3-java/debian/xmlrpc-client.mf
===================================================================
--- trunk/libxmlrpc3-java/debian/xmlrpc-client.mf	                        (rev 0)
+++ trunk/libxmlrpc3-java/debian/xmlrpc-client.mf	2011-11-05 10:03:55 UTC (rev 15346)
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.apache.xmlrpc.client
+Bundle-Version: 3.1.3
+Export-Package: org.apache.xmlrpc.client,
+ org.apache.xmlrpc.client.util
+Import-Package: org.apache.commons.httpclient,
+ org.apache.xmlrpc.common,
+ org.apache.xmlrpc.parser,
+ org.apache.xmlrpc.serializer,
+ org.apache.xmlrpc.util,
+ org.apache.xmlrpc,
+ org.xml.sax

Added: trunk/libxmlrpc3-java/debian/xmlrpc-common.mf
===================================================================
--- trunk/libxmlrpc3-java/debian/xmlrpc-common.mf	                        (rev 0)
+++ trunk/libxmlrpc3-java/debian/xmlrpc-common.mf	2011-11-05 10:03:55 UTC (rev 15346)
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.apache.xmlrpc
+Bundle-Version: 3.1.3
+Export-Package: org.apache.xmlrpc,
+ org.apache.xmlrpc.common,
+ org.apache.xmlrpc.jaxb,
+ org.apache.xmlrpc.parser,
+ org.apache.xmlrpc.serializer,
+ org.apache.xmlrpc.util
+Import-Package: javax.xml.bind,
+ javax.xml.namespace,
+ javax.xml.parsers,
+ org.apache.ws.commons.serialize,
+ org.apache.ws.commons.util,
+ org.w3c.dom,
+ org.xml.sax

Added: trunk/libxmlrpc3-java/debian/xmlrpc-server.mf
===================================================================
--- trunk/libxmlrpc3-java/debian/xmlrpc-server.mf	                        (rev 0)
+++ trunk/libxmlrpc3-java/debian/xmlrpc-server.mf	2011-11-05 10:03:55 UTC (rev 15346)
@@ -0,0 +1,19 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-SymbolicName: org.apache.xmlrpc.server
+Bundle-Version: 3.1.3
+Export-Package: org.apache.xmlrpc.metadata,
+ org.apache.xmlrpc.server,
+ org.apache.xmlrpc.webserver
+Import-Package: javax.servlet.http,
+ javax.servlet,
+ org.apache.commons.logging,
+ org.apache.xmlrpc.common,
+ org.apache.xmlrpc.metadata,
+ org.apache.xmlrpc.parser,
+ org.apache.xmlrpc.serializer,
+ org.apache.xmlrpc.util,
+ org.apache.xmlrpc,
+ org.w3c.dom,
+ org.xml.sax
+