Author: robbie
Date: Thu Dec 10 14:08:45 2009
New Revision: 889271
URL: http://svn.apache.org/viewvc?rev=889271&view=rev
Log:
Update OSGI/Eclipse bundle versions and filenames for the 0.6 release
Modified:
qpid/trunk/qpid/java/client/src/main/java/client.bnd
qpid/trunk/qpid/java/common/src/main/java/common.bnd
qpid/trunk/qpid/java/management/common/src/main/java/management-common.bnd
qpid/trunk/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF
qpid/trunk/qpid/java/management/eclipse-plugin/build-release-common.properties
qpid/trunk/qpid/java/management/eclipse-plugin/build-release-macosx.xml
qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml
qpid/trunk/qpid/java/module.xml
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=889271&r1=889270&r2=889271&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/client.bnd (original)
+++ qpid/trunk/qpid/java/client/src/main/java/client.bnd Thu Dec 10 14:08:45
2009
@@ -1,4 +1,4 @@
-ver: 0.5.0
+ver: 0.6.0
Bundle-SymbolicName: qpid-client
Bundle-Version: ${ver}
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=889271&r1=889270&r2=889271&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/src/main/java/common.bnd (original)
+++ qpid/trunk/qpid/java/common/src/main/java/common.bnd Thu Dec 10 14:08:45
2009
@@ -1,4 +1,4 @@
-ver: 0.5.0
+ver: 0.6.0
Bundle-SymbolicName: qpid-common
Bundle-Version: ${ver}
Modified:
qpid/trunk/qpid/java/management/common/src/main/java/management-common.bnd
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/common/src/main/java/management-common.bnd?rev=889271&r1=889270&r2=889271&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/common/src/main/java/management-common.bnd
(original)
+++ qpid/trunk/qpid/java/management/common/src/main/java/management-common.bnd
Thu Dec 10 14:08:45 2009
@@ -1,4 +1,4 @@
-ver: 0.5.0
+ver: 0.6.0
Bundle-SymbolicName: qpid-management-common
Bundle-Version: ${ver}
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF?rev=889271&r1=889270&r2=889271&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF
(original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/META-INF/MANIFEST.MF Thu Dec
10 14:08:45 2009
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
Bundle-ManifestVersion: 2
-Bundle-Name: Qpid Management Console Plug-in
+Bundle-Name: Qpid JMX Management Console Plug-in
Bundle-SymbolicName: org.apache.qpid.management.ui; singleton:=true
-Bundle-Version: 0.1.0
+Bundle-Version: 0.6.0
Bundle-Activator: org.apache.qpid.management.ui.Activator
Bundle-Vendor: Apache Software Foundation
Bundle-Localization: plugin
Modified:
qpid/trunk/qpid/java/management/eclipse-plugin/build-release-common.properties
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-common.properties?rev=889271&r1=889270&r2=889271&view=diff
==============================================================================
---
qpid/trunk/qpid/java/management/eclipse-plugin/build-release-common.properties
(original)
+++
qpid/trunk/qpid/java/management/eclipse-plugin/build-release-common.properties
Thu Dec 10 14:08:45 2009
@@ -22,7 +22,7 @@
app.namever=jmx-management-console-${project.version}
artifact.id=org.apache.qpid.management.ui
-mcplugin.version=0.2.0-${project.version}
+mcplugin.version=${project.version}.0
mcplugin.filename=${artifact.id}_${mcplugin.version}
mcplugin.contents.dir=${module.classes}
@@ -31,4 +31,3 @@
jmxremote.sasl.manifest=src/main/resources/jmxremote.sasl-plugin/MANIFEST.MF
-qpidmanagementcommon.manifest=src/main/resources/qpid-management-common-plugin/MANIFEST.MF
Modified:
qpid/trunk/qpid/java/management/eclipse-plugin/build-release-macosx.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-macosx.xml?rev=889271&r1=889270&r2=889271&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/build-release-macosx.xml
(original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/build-release-macosx.xml Thu
Dec 10 14:08:45 2009
@@ -18,13 +18,16 @@
- under the License.
-
-->
-<project name="Eclipse Plugin MacOSX Binary Release" default="release-bin">
+<project name="JMX Management Console MacOSX Binary Release"
default="release-bin">
<import file="build-release.xml"/>
<property name="release.app" value="${release.subdir}/${application.dir}"/>
<target name="release-bin-qpid-mc-plugin">
+ <available
file="${build.lib}/qpid-management-eclipse-plugin-${project.version}.jar"
property="management-eclipse-plugin.jar.present"/>
+ <fail unless="management-eclipse-plugin.jar.present" message="Please
run ant build for the management-eclipse-plugin module"/>
+
<!-- Copy the qpid management-eclipse-plugin module jar -->
<copy tofile="${release.app}/plugins/${mcplugin.filename}.jar"
flatten="true" failonerror="true">
<fileset
file="${build.lib}/qpid-management-eclipse-plugin-${project.version}.jar"/>
@@ -39,9 +42,12 @@
</target>
<target name="release-bin-qpid-management-common-plugin">
+ <available
file="${build.lib}/qpid-management-common_${project.version}.0.osgi.jar"
property="management-common.jar.present"/>
+ <fail unless="management-common.jar.present" message="Please run ant
bundle for the management-common module"/>
+
<!-- Copy the qpid-management-common module osgi jar -->
<copy todir="${release.app}/plugins" flatten="true" failonerror="true">
- <fileset
file="${build.lib}/qpid-management-common_${project.version}.osgi.jar"/>
+ <fileset
file="${build.lib}/qpid-management-common_${project.version}.0.osgi.jar"/>
</copy>
</target>
Modified: qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml?rev=889271&r1=889270&r2=889271&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml Thu Dec 10
14:08:45 2009
@@ -18,7 +18,7 @@
- under the License.
-
-->
-<project name="Eclipse Plugin Binary Release" default="release-bin">
+<project name="JMX Management Console Binary Release" default="release-bin">
<!-- check properties that must be set by caller -->
<target name="check" description="ensure all required properties are set">
@@ -27,7 +27,6 @@
<!-- common properties -->
<isset property ="mcplugin.filename"/>
<isset property ="jmxremote.sasl.manifest"/>
- <isset property ="qpidmanagementcommon.manifest"/>
<!-- platform specific properties -->
<isset property ="qpidmc.ini"/>
<isset property ="qpidmc.executable"/>
@@ -59,6 +58,9 @@
</target>
<target name="release-bin-qpid-mc-plugin">
+ <available
file="${build.lib}/qpid-management-eclipse-plugin-${project.version}.jar"
property="management-eclipse-plugin.jar.present"/>
+ <fail unless="management-eclipse-plugin.jar.present" message="Please
run ant build for the management-eclipse-plugin module"/>
+
<!-- Copy the qpid management-eclipse-plugin module jar -->
<copy tofile="${release.subdir}/plugins/${mcplugin.filename}.jar"
flatten="true" failonerror="true">
<fileset
file="${build.lib}/qpid-management-eclipse-plugin-${project.version}.jar"/>
@@ -73,9 +75,12 @@
</target>
<target name="release-bin-qpid-management-common-plugin">
+ <available
file="${build.lib}/qpid-management-common_${project.version}.0.osgi.jar"
property="management-common.jar.present"/>
+ <fail unless="management-common.jar.present" message="Please run ant
bundle for the management-common module"/>
+
<!-- Copy the qpid-management-common module osgi jar -->
<copy todir="${release.subdir}/plugins" failonerror="true">
- <fileset
file="${build.lib}/qpid-management-common_${project.version}.osgi.jar"/>
+ <fileset
file="${build.lib}/qpid-management-common_${project.version}.0.osgi.jar"/>
</copy>
</target>
Modified: qpid/trunk/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=889271&r1=889270&r2=889271&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Thu Dec 10 14:08:45 2009
@@ -50,7 +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.namever.osgi"
value="${project.name}-${module.name}_${project.version}.0.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"/>
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
