diff options
| author | Robert Gemmell <robbie@apache.org> | 2009-07-11 15:51:17 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2009-07-11 15:51:17 +0000 |
| commit | e1575a2b704902b171360f0c7f7243a5b10600ef (patch) | |
| tree | 7a8c7088f3a9ffe47d955375db90ddf661789dcb /java/management/eclipse-plugin | |
| parent | fccf3ba859d6da2bf619f7e156edde1154f0ef95 (diff) | |
| download | qpid-python-e1575a2b704902b171360f0c7f7243a5b10600ef.tar.gz | |
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
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@793189 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/management/eclipse-plugin')
3 files changed, 9 insertions, 28 deletions
diff --git a/java/management/eclipse-plugin/build-release-macosx.xml b/java/management/eclipse-plugin/build-release-macosx.xml index 49be6e8c4b..3e3c47b6fb 100644 --- a/java/management/eclipse-plugin/build-release-macosx.xml +++ b/java/management/eclipse-plugin/build-release-macosx.xml @@ -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> diff --git a/java/management/eclipse-plugin/build-release.xml b/java/management/eclipse-plugin/build-release.xml index 86d71fc7fa..f94f99d333 100644 --- a/java/management/eclipse-plugin/build-release.xml +++ b/java/management/eclipse-plugin/build-release.xml @@ -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> diff --git a/java/management/eclipse-plugin/src/main/resources/qpid-management-common-plugin/MANIFEST.MF b/java/management/eclipse-plugin/src/main/resources/qpid-management-common-plugin/MANIFEST.MF deleted file mode 100644 index 818daef003..0000000000 --- a/java/management/eclipse-plugin/src/main/resources/qpid-management-common-plugin/MANIFEST.MF +++ /dev/null @@ -1,11 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 1 -Bundle-Name: Qpid management commonPlug-in -Bundle-SymbolicName: qpid-management-common -Bundle-Version: 1.0.0 -Bundle-ClassPath: qpid-management-common.jar -Export-Package: org.apache.qpid.management.common, - org.apache.qpid.management.common.sasl -Bundle-Vendor: -Bundle-Localization: plugin -Require-Bundle: jmxremote.sasl;resolution:=optional |