Author: aidan
Date: Fri Oct 24 08:20:00 2008
New Revision: 707654
URL: http://svn.apache.org/viewvc?rev=707654&view=rev
Log:
QPID-1398: use bnd tool to produce osgi bundles with 'ant bundle'
Added:
incubator/qpid/trunk/qpid/java/client/src/main/java/client.bnd (with
props)
incubator/qpid/trunk/qpid/java/common/src/main/java/common.bnd (with
props)
incubator/qpid/trunk/qpid/java/lib/bnd-0.0.249.jar
Modified:
incubator/qpid/trunk/qpid/java/build.xml
incubator/qpid/trunk/qpid/java/module.xml
Modified: incubator/qpid/trunk/qpid/java/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/build.xml?rev=707654&r1=707653&r2=707654&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/build.xml Fri Oct 24 08:20:00 2008
@@ -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>
Added: incubator/qpid/trunk/qpid/java/client/src/main/java/client.bnd
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/client.bnd?rev=707654&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/client.bnd (added)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/client.bnd Fri Oct 24
08:20:00 2008
@@ -0,0 +1,6 @@
+ver: M3
+
+Bundle-SymbolicName: qpid_client
+Bundle-Version: ${ver}
+Export-Package: *;version=${ver}
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Propchange: incubator/qpid/trunk/qpid/java/client/src/main/java/client.bnd
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/qpid/trunk/qpid/java/common/src/main/java/common.bnd
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/common.bnd?rev=707654&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/common.bnd (added)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/common.bnd Fri Oct 24
08:20:00 2008
@@ -0,0 +1,6 @@
+ver: M3
+
+Bundle-SymbolicName: qpid_common
+Bundle-Version: ${ver}
+Export-Package: *;version=${ver}
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
Propchange: incubator/qpid/trunk/qpid/java/common/src/main/java/common.bnd
------------------------------------------------------------------------------
svn:executable = *
Added: incubator/qpid/trunk/qpid/java/lib/bnd-0.0.249.jar
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/lib/bnd-0.0.249.jar?rev=707654&view=auto
==============================================================================
Files incubator/qpid/trunk/qpid/java/lib/bnd-0.0.249.jar (added) and
incubator/qpid/trunk/qpid/java/lib/bnd-0.0.249.jar Fri Oct 24 08:20:00 2008
differ
Modified: incubator/qpid/trunk/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/module.xml?rev=707654&r1=707653&r2=707654&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/module.xml (original)
+++ incubator/qpid/trunk/qpid/java/module.xml Fri Oct 24 08:20:00 2008
@@ -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}"/>
