QPID-1398: use bnd tool to produce osgi bundles with 'ant bundle'

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@707654 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 28 insertions, 0 deletions

diff --git a/qpid/java/build.xml b/qpid/java/build.xml
index 5117ceba0c..851a853c66 100644
--- a/qpid/java/build.xml
+++ b/qpid/java/build.xml
@@ -98,6 +98,10 @@
     <iterate target="doc"/>
   </target>
 
+  <target name="bundle" description="create OSGi bundles">
+    <iterate target="bundle"/>
+  </target>
+  
   <target name="release-bin" description="build a binary release artifact" depends="build">
       <iterate  target="release-bin"/>
   </target>
diff --git a/qpid/java/client/src/main/java/client.bnd b/qpid/java/client/src/main/java/client.bnd
new file mode 100755
index 0000000000..7ea88959f1
--- /dev/null
+++ b/qpid/java/client/src/main/java/client.bnd
@@ -0,0 +1,6 @@
+ver: M3

+

+Bundle-SymbolicName: qpid_client

+Bundle-Version: ${ver}

+Export-Package: *;version=${ver}

+Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/qpid/java/common/src/main/java/common.bnd b/qpid/java/common/src/main/java/common.bnd
new file mode 100755
index 0000000000..88890d14a6
--- /dev/null
+++ b/qpid/java/common/src/main/java/common.bnd
@@ -0,0 +1,6 @@
+ver: M3

+

+Bundle-SymbolicName: qpid_common

+Bundle-Version: ${ver}

+Export-Package: *;version=${ver}

+Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/qpid/java/lib/bnd-0.0.249.jar b/qpid/java/lib/bnd-0.0.249.jar
new file mode 100644
index 0000000000..7d216ea9e0
--- /dev/null
+++ b/qpid/java/lib/bnd-0.0.249.jar
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 63fc4bbb8d..2ed8e014ff 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -415,6 +415,18 @@
     </zip>
   </target>
 
+  <target name="bundle" depends="jar">
+   <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${project.root}/lib/bnd-0.0.249.jar"/>
+   <echo message="Bundling ${build}/lib/${module.namever}.jar with ${module.src}/${module}.bnd"/>
+   <bnd 
+      classpath="${build}/lib/${module.namever}.jar"
+      eclipse="false" 
+      failok="false" 
+      exceptions="true"
+      output="${build}/lib/${module.namever}-osgi.jar"
+      files="${module.src}/${module}.bnd"/>
+  </target>    
+
     <target name="tar-release" depends="zip-release" description="build release archive">
       <tar destfile="${module.release.tar}" longfile="gnu" >
         <zipfileset src="${module.release.zip}"/>