Author: robbie Date: Mon Jun 22 15:37:45 2009 New Revision: 787275 URL: http://svn.apache.org/viewvc?rev=787275&view=rev Log: QPID-1797: update bundle version format and output filenames, modify ant bundle task only to run for required modules
Modified: qpid/branches/jmx_mc_gsoc09/qpid/java/client/build.xml qpid/branches/jmx_mc_gsoc09/qpid/java/client/src/main/java/client.bnd qpid/branches/jmx_mc_gsoc09/qpid/java/common/build.xml qpid/branches/jmx_mc_gsoc09/qpid/java/common/src/main/java/common.bnd qpid/branches/jmx_mc_gsoc09/qpid/java/module.xml Modified: qpid/branches/jmx_mc_gsoc09/qpid/java/client/build.xml URL: http://svn.apache.org/viewvc/qpid/branches/jmx_mc_gsoc09/qpid/java/client/build.xml?rev=787275&r1=787274&r2=787275&view=diff ============================================================================== --- qpid/branches/jmx_mc_gsoc09/qpid/java/client/build.xml (original) +++ qpid/branches/jmx_mc_gsoc09/qpid/java/client/build.xml Mon Jun 22 15:37:45 2009 @@ -45,4 +45,5 @@ <target name="release-bin" depends="release-bin-tasks"/> + <target name="bundle" depends="bundle-tasks"/> </project> Modified: qpid/branches/jmx_mc_gsoc09/qpid/java/client/src/main/java/client.bnd URL: http://svn.apache.org/viewvc/qpid/branches/jmx_mc_gsoc09/qpid/java/client/src/main/java/client.bnd?rev=787275&r1=787274&r2=787275&view=diff ============================================================================== --- qpid/branches/jmx_mc_gsoc09/qpid/java/client/src/main/java/client.bnd (original) +++ qpid/branches/jmx_mc_gsoc09/qpid/java/client/src/main/java/client.bnd Mon Jun 22 15:37:45 2009 @@ -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 + Modified: qpid/branches/jmx_mc_gsoc09/qpid/java/common/build.xml URL: http://svn.apache.org/viewvc/qpid/branches/jmx_mc_gsoc09/qpid/java/common/build.xml?rev=787275&r1=787274&r2=787275&view=diff ============================================================================== --- qpid/branches/jmx_mc_gsoc09/qpid/java/common/build.xml (original) +++ qpid/branches/jmx_mc_gsoc09/qpid/java/common/build.xml Mon Jun 22 15:37:45 2009 @@ -101,4 +101,5 @@ <target name="precompile" depends="gentools,jython,version"/> + <target name="bundle" depends="bundle-tasks"/> </project> Modified: qpid/branches/jmx_mc_gsoc09/qpid/java/common/src/main/java/common.bnd URL: http://svn.apache.org/viewvc/qpid/branches/jmx_mc_gsoc09/qpid/java/common/src/main/java/common.bnd?rev=787275&r1=787274&r2=787275&view=diff ============================================================================== --- qpid/branches/jmx_mc_gsoc09/qpid/java/common/src/main/java/common.bnd (original) +++ qpid/branches/jmx_mc_gsoc09/qpid/java/common/src/main/java/common.bnd Mon Jun 22 15:37:45 2009 @@ -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 Modified: qpid/branches/jmx_mc_gsoc09/qpid/java/module.xml URL: http://svn.apache.org/viewvc/qpid/branches/jmx_mc_gsoc09/qpid/java/module.xml?rev=787275&r1=787274&r2=787275&view=diff ============================================================================== --- qpid/branches/jmx_mc_gsoc09/qpid/java/module.xml (original) +++ qpid/branches/jmx_mc_gsoc09/qpid/java/module.xml Mon Jun 22 15:37:45 2009 @@ -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"> --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org