Author: robbie
Date: Sat Jul 11 15:51:17 2009
New Revision: 793189
URL: http://svn.apache.org/viewvc?rev=793189&view=rev
Log:
QPID-1926: modify management-common module to output an osgi bundle, and have
the JMX MC use this jar
directly instead of wrapping the old module jar with an RCP plugin manifest
Added:
qpid/trunk/qpid/java/management/common/src/main/java/management-common.bnd
Removed:
qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/qpid-management-common-plugin/
Modified:
qpid/trunk/qpid/java/build.xml
qpid/trunk/qpid/java/management/common/build.xml
qpid/trunk/qpid/java/management/eclipse-plugin/build-release-macosx.xml
qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml
Modified: qpid/trunk/qpid/java/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.xml?rev=793189&r1=793188&r2=793189&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.xml (original)
+++ qpid/trunk/qpid/java/build.xml Sat Jul 11 15:51:17 2009
@@ -106,7 +106,7 @@
<iterate target="bundle"/>
</target>
- <target name="release-bin" description="build a binary release artifact"
depends="build">
+ <target name="release-bin" description="build a binary release artifact"
depends="build,bundle">
<iterate target="release-bin"/>
</target>
Modified: qpid/trunk/qpid/java/management/common/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/common/build.xml?rev=793189&r1=793188&r2=793189&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/common/build.xml (original)
+++ qpid/trunk/qpid/java/management/common/build.xml Sat Jul 11 15:51:17 2009
@@ -22,4 +22,5 @@
<import file="../../module.xml"/>
+ <target name="bundle" depends="bundle-tasks"/>
</project>
Added:
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=793189&view=auto
==============================================================================
--- qpid/trunk/qpid/java/management/common/src/main/java/management-common.bnd
(added)
+++ qpid/trunk/qpid/java/management/common/src/main/java/management-common.bnd
Sat Jul 11 15:51:17 2009
@@ -0,0 +1,8 @@
+ver: 0.5.0
+
+Bundle-SymbolicName: qpid-management-common
+Bundle-Version: ${ver}
+Export-Package: *;version=${ver}
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Require-Bundle: jmxremote.sasl;resolution:=optional
+
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=793189&r1=793188&r2=793189&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 Sat
Jul 11 15:51:17 2009
@@ -38,14 +38,10 @@
</copy>
</target>
- <target name="release-bin-qpidmanagementcommon-plugin">
- <!-- Copy the management common plugin's manifest, creating its plugin
directory -->
- <copy
todir="${release.app}/plugins/qpid-management-common_1.0.0/META-INF"
flatten="true" failonerror="true">
- <fileset file="${qpidmanagementcommon.manifest}"/>
- </copy>
- <!-- Copy the qpid management-common module jar -->
- <copy
tofile="${release.app}/plugins/qpid-management-common_1.0.0/qpid-management-common.jar"
flatten="true" failonerror="true">
- <fileset
file="${build.lib}/qpid-management-common-${project.version}.jar"/>
+ <target name="release-bin-qpid-management-common-plugin">
+ <!-- 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"/>
</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=793189&r1=793188&r2=793189&view=diff
==============================================================================
--- qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml (original)
+++ qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml Sat Jul 11
15:51:17 2009
@@ -72,14 +72,10 @@
</copy>
</target>
- <target name="release-bin-qpidmanagementcommon-plugin">
- <!-- Copy the management common plugin's manifest, creating its plugin
directory -->
- <copy
todir="${release.subdir}/plugins/qpid-management-common_1.0.0/META-INF"
flatten="true" failonerror="true">
- <fileset file="${qpidmanagementcommon.manifest}"/>
- </copy>
- <!-- Copy the qpid management-common module jar -->
- <copy
tofile="${release.subdir}/plugins/qpid-management-common_1.0.0/qpid-management-common.jar"
flatten="true" failonerror="true">
- <fileset
file="${build.lib}/qpid-management-common-${project.version}.jar"/>
+ <target name="release-bin-qpid-management-common-plugin">
+ <!-- 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"/>
</copy>
</target>
@@ -166,6 +162,6 @@
<!-- override imported module.xml release-bin target -->
<target name="release-bin"
depends="check,release-bin-prepare,release-bin-rcp-deps,release-bin-resources,
-
release-bin-qpid-mc-plugin,release-bin-qpidmanagementcommon-plugin,release-bin-jmxremote-plugin,release-bin-zip,release-bin-gzip"/>
+
release-bin-qpid-mc-plugin,release-bin-qpid-management-common-plugin,release-bin-jmxremote-plugin,release-bin-zip,release-bin-gzip"/>
</project>
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
