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/branches/jmx_mc_gsoc09@787275 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 15 insertions, 9 deletions

diff --git a/qpid/java/client/build.xml b/qpid/java/client/build.xml
index e826df9c74..8e065eaeee 100644
--- a/qpid/java/client/build.xml
+++ b/qpid/java/client/build.xml
@@ -45,4 +45,5 @@
 
   <target name="release-bin" depends="release-bin-tasks"/>    
 
+  <target name="bundle" depends="bundle-tasks"/>
 </project>
diff --git a/qpid/java/client/src/main/java/client.bnd b/qpid/java/client/src/main/java/client.bnd
index dbda0aad3b..cbaf3882fb 100755
--- a/qpid/java/client/src/main/java/client.bnd
+++ b/qpid/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/qpid/java/common/build.xml b/qpid/java/common/build.xml
index dfe060cdef..9b3ef1de0b 100644
--- a/qpid/java/common/build.xml
+++ b/qpid/java/common/build.xml
@@ -101,4 +101,5 @@
 
   <target name="precompile" depends="gentools,jython,version"/>
 
+  <target name="bundle" depends="bundle-tasks"/>
 </project>
diff --git a/qpid/java/common/src/main/java/common.bnd b/qpid/java/common/src/main/java/common.bnd
index a534451390..11d26a8b4d 100755
--- a/qpid/java/common/src/main/java/common.bnd
+++ b/qpid/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/qpid/java/module.xml b/qpid/java/module.xml
index 6ff2e01e83..baca1d164d 100644
--- a/qpid/java/module.xml
+++ b/qpid/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"/>
@@ -423,16 +424,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">