From fccf3ba859d6da2bf619f7e156edde1154f0ef95 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Sat, 11 Jul 2009 15:34:02 +0000
Subject: QPID-1797: update bundle version format and output filenames, modify
 ant bundle task only to run for required modules

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@793184 13f79535-47bb-0310-9956-ffa450edef68
---
 java/client/build.xml                |  1 +
 java/client/src/main/java/client.bnd |  7 ++++---
 java/common/build.xml                |  1 +
 java/common/src/main/java/common.bnd |  4 ++--
 java/module.xml                      | 11 +++++++----
 5 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'java')

diff --git a/java/client/build.xml b/java/client/build.xml
index c419d11b95..321e613d94 100644
--- a/java/client/build.xml
+++ b/java/client/build.xml
@@ -47,4 +47,5 @@
 
   <target name="release-bin" depends="release-bin-tasks"/>    
 
+  <target name="bundle" depends="bundle-tasks"/>
 </project>
diff --git a/java/client/src/main/java/client.bnd b/java/client/src/main/java/client.bnd
index dbda0aad3b..cbaf3882fb 100755
--- a/java/client/src/main/java/client.bnd
+++ b/java/client/src/main/java/client.bnd
@@ -1,6 +1,7 @@
-ver: M4
+ver: 0.5.0
 
-Bundle-SymbolicName: qpid_client
+Bundle-SymbolicName: qpid-client
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+
diff --git a/java/common/build.xml b/java/common/build.xml
index 26801a9bd1..52e4506c91 100644
--- a/java/common/build.xml
+++ b/java/common/build.xml
@@ -103,4 +103,5 @@
 
   <target name="precompile" depends="gentools,jython,version"/>
 
+  <target name="bundle" depends="bundle-tasks"/>
 </project>
diff --git a/java/common/src/main/java/common.bnd b/java/common/src/main/java/common.bnd
index a534451390..11d26a8b4d 100755
--- a/java/common/src/main/java/common.bnd
+++ b/java/common/src/main/java/common.bnd
@@ -1,6 +1,6 @@
-ver: M4
+ver: 0.5.0
 
-Bundle-SymbolicName: qpid_common
+Bundle-SymbolicName: qpid-common
 Bundle-Version: ${ver}
 Export-Package: *;version=${ver}
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/java/module.xml b/java/module.xml
index d57ec631b1..8dcae74b1d 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -50,6 +50,7 @@
   <property name="module.etc"          location="etc"/>
     
   <property name="module.namever"      value="${project.name}-${module.name}-${project.version}"/>
+  <property name="module.namever.osgi" value="${project.name}-${module.name}_${project.version}.osgi"/>
   <property name="module.release.base" value="${basedir}/release"/>
   <property name="module.release"      value="${module.release.base}/${module.namever}"/>
   <property name="module.release.lib"  value="${module.release}/lib"/>
@@ -443,16 +444,18 @@
     </zip>
   </target>
 
-  <target name="bundle" depends="jar">
+  <target name="bundle" description="Build module osgi artifact. Override and depend on bundle-tasks to use"/>
+
+  <target name="bundle-tasks" 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"/>
+   <echo message="Bundling ${build}/lib/${module.namever}.jar with ${module.src}/${module.name}.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"/>
+      output="${build}/lib/${module.namever.osgi}.jar"
+      files="${module.src}/${module.name}.bnd"/>
   </target>    
 
     <target name="tar-release" depends="zip-release" description="build release archive">
-- 
cgit v1.2.1