diff options
| author | Aidan Skinner <aidan@apache.org> | 2008-10-24 15:20:00 +0000 |
|---|---|---|
| committer | Aidan Skinner <aidan@apache.org> | 2008-10-24 15:20:00 +0000 |
| commit | e03e63e42011aa6e73664997f1af9c2c9c0bee9d (patch) | |
| tree | 67fbc4b98a6f325d1a65e45f8d49e851fc170c68 /java | |
| parent | 8adca7262ae82e2bfe5331d4264e3e7865a0181a (diff) | |
| download | qpid-python-e03e63e42011aa6e73664997f1af9c2c9c0bee9d.tar.gz | |
QPID-1398: use bnd tool to produce osgi bundles with 'ant bundle'
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@707654 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
| -rw-r--r-- | java/build.xml | 4 | ||||
| -rwxr-xr-x | java/client/src/main/java/client.bnd | 6 | ||||
| -rwxr-xr-x | java/common/src/main/java/common.bnd | 6 | ||||
| -rw-r--r-- | java/lib/bnd-0.0.249.jar | bin | 0 -> 255605 bytes | |||
| -rw-r--r-- | java/module.xml | 12 |
5 files changed, 28 insertions, 0 deletions
diff --git a/java/build.xml b/java/build.xml index 5117ceba0c..851a853c66 100644 --- a/java/build.xml +++ b/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/java/client/src/main/java/client.bnd b/java/client/src/main/java/client.bnd new file mode 100755 index 0000000000..7ea88959f1 --- /dev/null +++ b/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/java/common/src/main/java/common.bnd b/java/common/src/main/java/common.bnd new file mode 100755 index 0000000000..88890d14a6 --- /dev/null +++ b/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/java/lib/bnd-0.0.249.jar b/java/lib/bnd-0.0.249.jar Binary files differnew file mode 100644 index 0000000000..7d216ea9e0 --- /dev/null +++ b/java/lib/bnd-0.0.249.jar diff --git a/java/module.xml b/java/module.xml index 63fc4bbb8d..2ed8e014ff 100644 --- a/java/module.xml +++ b/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}"/> |