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