From cc1c75562925be828b024f2da14ac6152c6c5f51 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Wed, 26 Nov 2008 18:23:31 +0000 Subject: QPID-1243 : Applied patch from Robert Gemmell. Took a different approach for the linux binaries as the provided binaries requried a newer libc than I have. Also restored the qpidversion.properties file generation for this module that git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@720931 13f79535-47bb-0310-9956-ffa450edef68 --- java/build.deps | 54 +++++--- java/lib/com.ibm.icu-3.4.4.jar | Bin 3255246 -> 0 bytes java/lib/com.ibm.icu_3.4.4.jar | Bin 0 -> 3255246 bytes java/lib/org.eclipse.core.commands-3.2.0.jar | Bin 89522 -> 0 bytes java/lib/org.eclipse.core.commands_3.2.0.jar | Bin 0 -> 89522 bytes java/lib/org.eclipse.core.contenttype-3.2.0.jar | Bin 76141 -> 0 bytes java/lib/org.eclipse.core.contenttype_3.2.0.jar | Bin 0 -> 76141 bytes java/lib/org.eclipse.core.expressions-3.2.0.jar | Bin 66023 -> 0 bytes java/lib/org.eclipse.core.expressions_3.2.0.jar | Bin 0 -> 66023 bytes java/lib/org.eclipse.core.jobs-3.2.0.jar | Bin 74797 -> 0 bytes java/lib/org.eclipse.core.jobs_3.2.0.jar | Bin 0 -> 74797 bytes java/lib/org.eclipse.core.runtime-3.2.0.jar | Bin 76627 -> 0 bytes ...lipse.core.runtime.compatibility.auth-3.2.0.jar | Bin 18733 -> 0 bytes ...lipse.core.runtime.compatibility.auth_3.2.0.jar | Bin 0 -> 18733 bytes ...e.core.runtime.compatibility.registry-3.2.0.jar | Bin 7887 -> 0 bytes ...e.core.runtime.compatibility.registry_3.2.0.jar | Bin 0 -> 7887 bytes java/lib/org.eclipse.core.runtime_3.2.0.jar | Bin 0 -> 76627 bytes java/lib/org.eclipse.equinox.common-3.2.0.jar | Bin 79780 -> 0 bytes java/lib/org.eclipse.equinox.common_3.2.0.jar | Bin 0 -> 79780 bytes .../META-INF/ECLIPSE.SF | 17 +++ .../META-INF/MANIFEST.MF | 25 ++++ .../META-INF/eclipse.inf | 3 + .../about.html | 28 ++++ .../launcher.gtk.linux.x86.properties | 12 ++ ...pse.equinox.launcher_1.0.101.R34x_v20080819.jar | Bin 0 -> 43682 bytes java/lib/org.eclipse.equinox.preferences-3.2.0.jar | Bin 91662 -> 0 bytes java/lib/org.eclipse.equinox.preferences_3.2.0.jar | Bin 0 -> 91662 bytes java/lib/org.eclipse.equinox.registry-3.2.0.jar | Bin 143841 -> 0 bytes java/lib/org.eclipse.equinox.registry_3.2.0.jar | Bin 0 -> 143841 bytes java/lib/org.eclipse.help-3.2.0.jar | Bin 115440 -> 0 bytes java/lib/org.eclipse.help_3.2.0.jar | Bin 0 -> 115440 bytes java/lib/org.eclipse.jface-3.2.0.jar | Bin 813664 -> 0 bytes java/lib/org.eclipse.jface_3.2.0.jar | Bin 0 -> 813664 bytes java/lib/org.eclipse.osgi-3.2.0.jar | Bin 846717 -> 0 bytes .../org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar | Bin 0 -> 997883 bytes java/lib/org.eclipse.swt-3.2.0.jar | Bin 10867 -> 0 bytes .../org.eclipse.swt.gtk.linux.x86_3.4.1.v3449c.jar | Bin 0 -> 2006608 bytes java/lib/org.eclipse.swt.win32.win32.x86-3.2.0.jar | Bin 1553273 -> 0 bytes java/lib/org.eclipse.swt.win32.win32.x86_3.2.0.jar | Bin 0 -> 1553273 bytes java/lib/org.eclipse.swt_3.4.1.v3449c.jar | Bin 0 -> 15807 bytes java/lib/org.eclipse.ui-3.2.0.jar | Bin 124376 -> 0 bytes java/lib/org.eclipse.ui.forms-3.2.0.jar | Bin 235372 -> 0 bytes java/lib/org.eclipse.ui.forms_3.2.0.jar | Bin 0 -> 235372 bytes java/lib/org.eclipse.ui.workbench-3.2.1.jar | Bin 3076013 -> 0 bytes java/lib/org.eclipse.ui.workbench_3.2.1.jar | Bin 0 -> 3076013 bytes java/lib/org.eclipse.ui_3.2.0.jar | Bin 0 -> 124376 bytes java/lib/org.osgi.core-1.0.0.jar | Bin 60929 -> 0 bytes java/lib/org.osgi.core_1.0.0.jar | Bin 0 -> 60929 bytes java/management/eclipse-plugin/bin/qpidmc.sh | 59 ++++---- java/management/eclipse-plugin/bin/qpidmc_gtk.sh | 8 +- java/management/eclipse-plugin/bin/qpidmc_motif.sh | 5 +- .../eclipse-plugin/build-release-common.properties | 17 +++ .../build-release-linux-gtk-x86.properties | 13 ++ .../build-release-win32-win32-x86.properties | 13 ++ java/management/eclipse-plugin/build-release.xml | 152 +++++++++++++++++++++ java/management/eclipse-plugin/build.xml | 55 ++++++++ .../qpid/management/ui/actions/VersionAction.java | 5 + .../main/resources/unix/configuration/config.ini | 4 +- .../src/main/resources/unix/eclipse.ini | 11 ++ java/module.xml | 14 +- 60 files changed, 433 insertions(+), 62 deletions(-) delete mode 100644 java/lib/com.ibm.icu-3.4.4.jar create mode 100644 java/lib/com.ibm.icu_3.4.4.jar delete mode 100644 java/lib/org.eclipse.core.commands-3.2.0.jar create mode 100644 java/lib/org.eclipse.core.commands_3.2.0.jar delete mode 100644 java/lib/org.eclipse.core.contenttype-3.2.0.jar create mode 100644 java/lib/org.eclipse.core.contenttype_3.2.0.jar delete mode 100644 java/lib/org.eclipse.core.expressions-3.2.0.jar create mode 100644 java/lib/org.eclipse.core.expressions_3.2.0.jar delete mode 100644 java/lib/org.eclipse.core.jobs-3.2.0.jar create mode 100644 java/lib/org.eclipse.core.jobs_3.2.0.jar delete mode 100644 java/lib/org.eclipse.core.runtime-3.2.0.jar delete mode 100644 java/lib/org.eclipse.core.runtime.compatibility.auth-3.2.0.jar create mode 100644 java/lib/org.eclipse.core.runtime.compatibility.auth_3.2.0.jar delete mode 100644 java/lib/org.eclipse.core.runtime.compatibility.registry-3.2.0.jar create mode 100644 java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.0.jar create mode 100644 java/lib/org.eclipse.core.runtime_3.2.0.jar delete mode 100644 java/lib/org.eclipse.equinox.common-3.2.0.jar create mode 100644 java/lib/org.eclipse.equinox.common_3.2.0.jar create mode 100644 java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.SF create mode 100644 java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/MANIFEST.MF create mode 100644 java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/eclipse.inf create mode 100644 java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/about.html create mode 100644 java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/launcher.gtk.linux.x86.properties create mode 100644 java/lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar delete mode 100644 java/lib/org.eclipse.equinox.preferences-3.2.0.jar create mode 100644 java/lib/org.eclipse.equinox.preferences_3.2.0.jar delete mode 100644 java/lib/org.eclipse.equinox.registry-3.2.0.jar create mode 100644 java/lib/org.eclipse.equinox.registry_3.2.0.jar delete mode 100644 java/lib/org.eclipse.help-3.2.0.jar create mode 100644 java/lib/org.eclipse.help_3.2.0.jar delete mode 100644 java/lib/org.eclipse.jface-3.2.0.jar create mode 100644 java/lib/org.eclipse.jface_3.2.0.jar delete mode 100644 java/lib/org.eclipse.osgi-3.2.0.jar create mode 100644 java/lib/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar delete mode 100644 java/lib/org.eclipse.swt-3.2.0.jar create mode 100644 java/lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3449c.jar delete mode 100644 java/lib/org.eclipse.swt.win32.win32.x86-3.2.0.jar create mode 100644 java/lib/org.eclipse.swt.win32.win32.x86_3.2.0.jar create mode 100644 java/lib/org.eclipse.swt_3.4.1.v3449c.jar delete mode 100644 java/lib/org.eclipse.ui-3.2.0.jar delete mode 100644 java/lib/org.eclipse.ui.forms-3.2.0.jar create mode 100644 java/lib/org.eclipse.ui.forms_3.2.0.jar delete mode 100644 java/lib/org.eclipse.ui.workbench-3.2.1.jar create mode 100644 java/lib/org.eclipse.ui.workbench_3.2.1.jar create mode 100644 java/lib/org.eclipse.ui_3.2.0.jar delete mode 100755 java/lib/org.osgi.core-1.0.0.jar create mode 100755 java/lib/org.osgi.core_1.0.0.jar create mode 100644 java/management/eclipse-plugin/build-release-common.properties create mode 100644 java/management/eclipse-plugin/build-release-linux-gtk-x86.properties create mode 100644 java/management/eclipse-plugin/build-release-win32-win32-x86.properties create mode 100644 java/management/eclipse-plugin/build-release.xml create mode 100644 java/management/eclipse-plugin/src/main/resources/unix/eclipse.ini (limited to 'java') diff --git a/java/build.deps b/java/build.deps index bd68e6fda5..9c1f09ee5e 100644 --- a/java/build.deps +++ b/java/build.deps @@ -51,32 +51,42 @@ integrationtests.libs=${systests.libs} client-example.libs=${client.libs} testkit.libs=${client.libs} -ibm-icu=lib/com.ibm.icu-3.4.4.jar -ecl-core-jface=lib/org.eclipse.jface-3.2.0.jar -ecl-core-commands=lib/org.eclipse.core.commands-3.2.0.jar -ecl-core-contenttype=lib/org.eclipse.core.contenttype-3.2.0.jar -ecl-core-expressions=lib/org.eclipse.core.expressions-3.2.0.jar -ecl-core-jobs=lib/org.eclipse.core.jobs-3.2.0.jar -ecl-core-runtime=lib/org.eclipse.core.runtime-3.2.0.jar -ecl-core-runtime-compat-auth=lib/org.eclipse.core.runtime.compatibility.auth-3.2.0.jar -ecl-core-runtime-compat-registry=lib/org.eclipse.core.runtime.compatibility.registry-3.2.0.jar -ecl-equinox-common=lib/org.eclipse.equinox.common-3.2.0.jar -ecl-equinox-prefs=lib/org.eclipse.equinox.preferences-3.2.0.jar -ecl-equinox-registry=lib/org.eclipse.equinox.registry-3.2.0.jar -ecl-help=lib/org.eclipse.help-3.2.0.jar -ecl-osgi=lib/org.eclipse.osgi-3.2.0.jar -ecl-swt=lib/org.eclipse.swt-3.2.0.jar -ecl-swt-win32=lib/org.eclipse.swt.win32.win32.x86-3.2.0.jar -ecl-ui=lib/org.eclipse.ui-3.2.0.jar -ecl-ui-forms=lib/org.eclipse.ui.forms-3.2.0.jar -ecl-ui-workbench=lib/org.eclipse.ui.workbench-3.2.1.jar - -management-eclipse-plugin.libs=${commons-codec} ${ibm-icu} ${ecl-core-jface} \ +ibm-icu=lib/com.ibm.icu_3.4.4.jar +ecl-core-jface=lib/org.eclipse.jface_3.2.0.jar +ecl-core-commands=lib/org.eclipse.core.commands_3.2.0.jar +ecl-core-contenttype=lib/org.eclipse.core.contenttype_3.2.0.jar +ecl-core-expressions=lib/org.eclipse.core.expressions_3.2.0.jar +ecl-core-jobs=lib/org.eclipse.core.jobs_3.2.0.jar +ecl-core-runtime=lib/org.eclipse.core.runtime_3.2.0.jar +ecl-core-runtime-compat-auth=lib/org.eclipse.core.runtime.compatibility.auth_3.2.0.jar +ecl-core-runtime-compat-registry=lib/org.eclipse.core.runtime.compatibility.registry_3.2.0.jar +ecl-equinox-common=lib/org.eclipse.equinox.common_3.2.0.jar +ecl-equinox-prefs=lib/org.eclipse.equinox.preferences_3.2.0.jar +ecl-equinox-registry=lib/org.eclipse.equinox.registry_3.2.0.jar +ecl-help=lib/org.eclipse.help_3.2.0.jar +ecl-osgi=lib/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar +ecl-swt=lib/org.eclipse.swt_3.4.1.v3449c.jar +ecl-swt-win32-win32-x86=lib/org.eclipse.swt.win32.win32.x86_3.2.0.jar +ecl-swt-linux-gtk-x86=lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3449c.jar \ + lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/ \ + lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar + +ecl-ui=lib/org.eclipse.ui_3.2.0.jar +ecl-ui-forms=lib/org.eclipse.ui.forms_3.2.0.jar +ecl-ui-workbench=lib/org.eclipse.ui.workbench_3.2.1.jar + +management-eclipse-plugin.core-libs=${ibm-icu} ${ecl-core-jface} \ ${ecl-core-commands} ${ecl-core-contenttype} ${ecl-core-expressions} \ ${ecl-core-jobs} ${ecl-core-runtime} ${ecl-core-runtime-compat-auth} \ ${ecl-core-runtime-compat-registry} ${ecl-equinox-common} \ ${ecl-equinox-prefs} ${ecl-equinox-registry} ${ecl-help} ${ecl-osgi} \ - ${ecl-swt} ${ecl-swt-win32} ${ecl-ui} ${ecl-ui-forms} ${ecl-ui-workbench} + ${ecl-swt} ${ecl-ui} ${ecl-ui-forms} ${ecl-ui-workbench} + +management-eclipse-plugin-win32-win32-x86.libs=${management-eclipse-plugin.core-libs} ${ecl-swt-win32-win32-x86} +management-eclipse-plugin-linux-gtk-x86.libs=${management-eclipse-plugin.core-libs} ${ecl-swt-linux-gtk-x86} + +management-eclipse-plugin.libs=${management-eclipse-plugin.core-libs} ${ecl-swt-win32-win32-x86} ${ecl-swt-linux-gtk-x86} + management-tools-qpid-cli.libs=${common.libs} ${jline} common.test.libs=${test.libs} diff --git a/java/lib/com.ibm.icu-3.4.4.jar b/java/lib/com.ibm.icu-3.4.4.jar deleted file mode 100644 index 9df503a2a3..0000000000 Binary files a/java/lib/com.ibm.icu-3.4.4.jar and /dev/null differ diff --git a/java/lib/com.ibm.icu_3.4.4.jar b/java/lib/com.ibm.icu_3.4.4.jar new file mode 100644 index 0000000000..9df503a2a3 Binary files /dev/null and b/java/lib/com.ibm.icu_3.4.4.jar differ diff --git a/java/lib/org.eclipse.core.commands-3.2.0.jar b/java/lib/org.eclipse.core.commands-3.2.0.jar deleted file mode 100644 index c864864689..0000000000 Binary files a/java/lib/org.eclipse.core.commands-3.2.0.jar and /dev/null differ diff --git a/java/lib/org.eclipse.core.commands_3.2.0.jar b/java/lib/org.eclipse.core.commands_3.2.0.jar new file mode 100644 index 0000000000..c864864689 Binary files /dev/null and b/java/lib/org.eclipse.core.commands_3.2.0.jar differ diff --git a/java/lib/org.eclipse.core.contenttype-3.2.0.jar b/java/lib/org.eclipse.core.contenttype-3.2.0.jar deleted file mode 100644 index 816e3fc938..0000000000 Binary files a/java/lib/org.eclipse.core.contenttype-3.2.0.jar and /dev/null differ diff --git a/java/lib/org.eclipse.core.contenttype_3.2.0.jar b/java/lib/org.eclipse.core.contenttype_3.2.0.jar new file mode 100644 index 0000000000..816e3fc938 Binary files /dev/null and b/java/lib/org.eclipse.core.contenttype_3.2.0.jar differ diff --git a/java/lib/org.eclipse.core.expressions-3.2.0.jar b/java/lib/org.eclipse.core.expressions-3.2.0.jar deleted file mode 100644 index 51d2a0204c..0000000000 Binary files a/java/lib/org.eclipse.core.expressions-3.2.0.jar and /dev/null differ diff --git a/java/lib/org.eclipse.core.expressions_3.2.0.jar b/java/lib/org.eclipse.core.expressions_3.2.0.jar new file mode 100644 index 0000000000..51d2a0204c Binary files /dev/null and b/java/lib/org.eclipse.core.expressions_3.2.0.jar differ diff --git a/java/lib/org.eclipse.core.jobs-3.2.0.jar b/java/lib/org.eclipse.core.jobs-3.2.0.jar deleted file mode 100644 index 995bcd2e27..0000000000 Binary files a/java/lib/org.eclipse.core.jobs-3.2.0.jar and /dev/null differ diff --git a/java/lib/org.eclipse.core.jobs_3.2.0.jar b/java/lib/org.eclipse.core.jobs_3.2.0.jar new file mode 100644 index 0000000000..995bcd2e27 Binary files /dev/null and b/java/lib/org.eclipse.core.jobs_3.2.0.jar differ diff --git a/java/lib/org.eclipse.core.runtime-3.2.0.jar b/java/lib/org.eclipse.core.runtime-3.2.0.jar deleted file mode 100644 index 85e61cca58..0000000000 Binary files a/java/lib/org.eclipse.core.runtime-3.2.0.jar and /dev/null differ diff --git a/java/lib/org.eclipse.core.runtime.compatibility.auth-3.2.0.jar b/java/lib/org.eclipse.core.runtime.compatibility.auth-3.2.0.jar deleted file mode 100644 index 26bb49fe12..0000000000 Binary files a/java/lib/org.eclipse.core.runtime.compatibility.auth-3.2.0.jar and /dev/null differ diff --git a/java/lib/org.eclipse.core.runtime.compatibility.auth_3.2.0.jar b/java/lib/org.eclipse.core.runtime.compatibility.auth_3.2.0.jar new file mode 100644 index 0000000000..26bb49fe12 Binary files /dev/null and b/java/lib/org.eclipse.core.runtime.compatibility.auth_3.2.0.jar differ diff --git a/java/lib/org.eclipse.core.runtime.compatibility.registry-3.2.0.jar b/java/lib/org.eclipse.core.runtime.compatibility.registry-3.2.0.jar deleted file mode 100644 index 4ffbb0db56..0000000000 Binary files a/java/lib/org.eclipse.core.runtime.compatibility.registry-3.2.0.jar and /dev/null differ diff --git a/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.0.jar b/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.0.jar new file mode 100644 index 0000000000..4ffbb0db56 Binary files /dev/null and b/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.0.jar differ diff --git a/java/lib/org.eclipse.core.runtime_3.2.0.jar b/java/lib/org.eclipse.core.runtime_3.2.0.jar new file mode 100644 index 0000000000..85e61cca58 Binary files /dev/null and b/java/lib/org.eclipse.core.runtime_3.2.0.jar differ diff --git a/java/lib/org.eclipse.equinox.common-3.2.0.jar b/java/lib/org.eclipse.equinox.common-3.2.0.jar deleted file mode 100644 index e28a631ebb..0000000000 Binary files a/java/lib/org.eclipse.equinox.common-3.2.0.jar and /dev/null differ diff --git a/java/lib/org.eclipse.equinox.common_3.2.0.jar b/java/lib/org.eclipse.equinox.common_3.2.0.jar new file mode 100644 index 0000000000..e28a631ebb Binary files /dev/null and b/java/lib/org.eclipse.equinox.common_3.2.0.jar differ diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.SF b/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.SF new file mode 100644 index 0000000000..4122b4ea8f --- /dev/null +++ b/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.SF @@ -0,0 +1,17 @@ +Signature-Version: 1.0 +SHA1-Digest-Manifest: tswsDz0e+s2SPhfY7LybTLEXoI4= +Created-By: 1.5.0 (IBM Corporation) +SHA1-Digest-Manifest-Main-Attributes: Ymnpf9HjgpR8t0MrPx1wLH4tJFQ= + +Name: launcher.gtk.linux.x86.properties +SHA1-Digest: +CJXeQUkWFS+xYpRY6jNNT065mI= + +Name: about.html +SHA1-Digest: xGcp/Hbq/ywyvVWkPzD/2vkIzdY= + +Name: eclipse_1115.so +SHA1-Digest: gvha3rnYpdA1SDXsMMxPKyEB/Xg= + +Name: META-INF/eclipse.inf +SHA1-Digest: SAqY+5ITAL0mkdYeijlSRhyIaZk= + diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/MANIFEST.MF b/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..d699938858 --- /dev/null +++ b/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/MANIFEST.MF @@ -0,0 +1,25 @@ +Manifest-Version: 1.0 +Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.linux.x86;single + ton:=true +Bundle-ManifestVersion: 2 +Bundle-Localization: launcher.gtk.linux.x86 +Bundle-Name: %pluginName +Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=linux) (osgi.arch=x8 + 6)) +Bundle-Version: 1.0.101.R34x_v20080805 +Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.1 + .0)" +Bundle-Vendor: %providerName + +Name: launcher.gtk.linux.x86.properties +SHA1-Digest: BSbhScorws9R/DVRUdKNmymMSIU= + +Name: eclipse_1115.so +SHA1-Digest: n3UyHV1KgJ0YuFIDUxPBXj2dxw0= + +Name: about.html +SHA1-Digest: a9lDHrGuLPkvHBUhsqWU+V2mhPw= + +Name: META-INF/eclipse.inf +SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw= + diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/eclipse.inf b/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/eclipse.inf new file mode 100644 index 0000000000..7864d3c4c3 --- /dev/null +++ b/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/eclipse.inf @@ -0,0 +1,3 @@ +#Processed using Jarprocessor +pack200.args = -E4 +pack200.conditioned = true diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/about.html b/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/about.html new file mode 100644 index 0000000000..395df3ba90 --- /dev/null +++ b/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/about.html @@ -0,0 +1,28 @@ + + + + +About + + +

About This Content

+ +

June 5, 2006

+

License

+ +

The Eclipse Foundation makes available all content in this plug-in ("Content"). +Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the +Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available +at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

+ +

If you did not receive this Content directly from the Eclipse Foundation, the Content is +being redistributed by another party ("Redistributor") and different terms and conditions may +apply to your use of any object code in the Content. Check the Redistributor’s license +that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise +indicated below, the terms and conditions of the EPL still apply to any source code in the Content +and such source code may be obtained at http://www.eclipse.org.

+ + + \ No newline at end of file diff --git a/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/launcher.gtk.linux.x86.properties b/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/launcher.gtk.linux.x86.properties new file mode 100644 index 0000000000..792485112e --- /dev/null +++ b/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/launcher.gtk.linux.x86.properties @@ -0,0 +1,12 @@ +############################################################################### +# Copyright (c) 2007 IBM Corporation and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +# +# Contributors: +# IBM Corporation - initial API and implementation +############################################################################### +pluginName = Equinox Launcher Linux X86 Fragment +providerName = Eclipse.org diff --git a/java/lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar b/java/lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar new file mode 100644 index 0000000000..21cc2a6a07 Binary files /dev/null and b/java/lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar differ diff --git a/java/lib/org.eclipse.equinox.preferences-3.2.0.jar b/java/lib/org.eclipse.equinox.preferences-3.2.0.jar deleted file mode 100644 index 0ca4767ced..0000000000 Binary files a/java/lib/org.eclipse.equinox.preferences-3.2.0.jar and /dev/null differ diff --git a/java/lib/org.eclipse.equinox.preferences_3.2.0.jar b/java/lib/org.eclipse.equinox.preferences_3.2.0.jar new file mode 100644 index 0000000000..0ca4767ced Binary files /dev/null and b/java/lib/org.eclipse.equinox.preferences_3.2.0.jar differ diff --git a/java/lib/org.eclipse.equinox.registry-3.2.0.jar b/java/lib/org.eclipse.equinox.registry-3.2.0.jar deleted file mode 100644 index 750fab0e76..0000000000 Binary files a/java/lib/org.eclipse.equinox.registry-3.2.0.jar and /dev/null differ diff --git a/java/lib/org.eclipse.equinox.registry_3.2.0.jar b/java/lib/org.eclipse.equinox.registry_3.2.0.jar new file mode 100644 index 0000000000..750fab0e76 Binary files /dev/null and b/java/lib/org.eclipse.equinox.registry_3.2.0.jar differ diff --git a/java/lib/org.eclipse.help-3.2.0.jar b/java/lib/org.eclipse.help-3.2.0.jar deleted file mode 100644 index 12ac13f918..0000000000 Binary files a/java/lib/org.eclipse.help-3.2.0.jar and /dev/null differ diff --git a/java/lib/org.eclipse.help_3.2.0.jar b/java/lib/org.eclipse.help_3.2.0.jar new file mode 100644 index 0000000000..12ac13f918 Binary files /dev/null and b/java/lib/org.eclipse.help_3.2.0.jar differ diff --git a/java/lib/org.eclipse.jface-3.2.0.jar b/java/lib/org.eclipse.jface-3.2.0.jar deleted file mode 100644 index 1d5035a859..0000000000 Binary files a/java/lib/org.eclipse.jface-3.2.0.jar and /dev/null differ diff --git a/java/lib/org.eclipse.jface_3.2.0.jar b/java/lib/org.eclipse.jface_3.2.0.jar new file mode 100644 index 0000000000..1d5035a859 Binary files /dev/null and b/java/lib/org.eclipse.jface_3.2.0.jar differ diff --git a/java/lib/org.eclipse.osgi-3.2.0.jar b/java/lib/org.eclipse.osgi-3.2.0.jar deleted file mode 100644 index 7ad4b9eff3..0000000000 Binary files a/java/lib/org.eclipse.osgi-3.2.0.jar and /dev/null differ diff --git a/java/lib/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar b/java/lib/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar new file mode 100644 index 0000000000..673f3f5932 Binary files /dev/null and b/java/lib/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar differ diff --git a/java/lib/org.eclipse.swt-3.2.0.jar b/java/lib/org.eclipse.swt-3.2.0.jar deleted file mode 100644 index 0b2be574ed..0000000000 Binary files a/java/lib/org.eclipse.swt-3.2.0.jar and /dev/null differ diff --git a/java/lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3449c.jar b/java/lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3449c.jar new file mode 100644 index 0000000000..cda22da341 Binary files /dev/null and b/java/lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3449c.jar differ diff --git a/java/lib/org.eclipse.swt.win32.win32.x86-3.2.0.jar b/java/lib/org.eclipse.swt.win32.win32.x86-3.2.0.jar deleted file mode 100644 index 8fbebc2401..0000000000 Binary files a/java/lib/org.eclipse.swt.win32.win32.x86-3.2.0.jar and /dev/null differ diff --git a/java/lib/org.eclipse.swt.win32.win32.x86_3.2.0.jar b/java/lib/org.eclipse.swt.win32.win32.x86_3.2.0.jar new file mode 100644 index 0000000000..8fbebc2401 Binary files /dev/null and b/java/lib/org.eclipse.swt.win32.win32.x86_3.2.0.jar differ diff --git a/java/lib/org.eclipse.swt_3.4.1.v3449c.jar b/java/lib/org.eclipse.swt_3.4.1.v3449c.jar new file mode 100644 index 0000000000..606abc5a3b Binary files /dev/null and b/java/lib/org.eclipse.swt_3.4.1.v3449c.jar differ diff --git a/java/lib/org.eclipse.ui-3.2.0.jar b/java/lib/org.eclipse.ui-3.2.0.jar deleted file mode 100644 index b96dac530d..0000000000 Binary files a/java/lib/org.eclipse.ui-3.2.0.jar and /dev/null differ diff --git a/java/lib/org.eclipse.ui.forms-3.2.0.jar b/java/lib/org.eclipse.ui.forms-3.2.0.jar deleted file mode 100644 index 460585e68b..0000000000 Binary files a/java/lib/org.eclipse.ui.forms-3.2.0.jar and /dev/null differ diff --git a/java/lib/org.eclipse.ui.forms_3.2.0.jar b/java/lib/org.eclipse.ui.forms_3.2.0.jar new file mode 100644 index 0000000000..460585e68b Binary files /dev/null and b/java/lib/org.eclipse.ui.forms_3.2.0.jar differ diff --git a/java/lib/org.eclipse.ui.workbench-3.2.1.jar b/java/lib/org.eclipse.ui.workbench-3.2.1.jar deleted file mode 100644 index 4a10e210df..0000000000 Binary files a/java/lib/org.eclipse.ui.workbench-3.2.1.jar and /dev/null differ diff --git a/java/lib/org.eclipse.ui.workbench_3.2.1.jar b/java/lib/org.eclipse.ui.workbench_3.2.1.jar new file mode 100644 index 0000000000..4a10e210df Binary files /dev/null and b/java/lib/org.eclipse.ui.workbench_3.2.1.jar differ diff --git a/java/lib/org.eclipse.ui_3.2.0.jar b/java/lib/org.eclipse.ui_3.2.0.jar new file mode 100644 index 0000000000..b96dac530d Binary files /dev/null and b/java/lib/org.eclipse.ui_3.2.0.jar differ diff --git a/java/lib/org.osgi.core-1.0.0.jar b/java/lib/org.osgi.core-1.0.0.jar deleted file mode 100755 index dcddc09bc0..0000000000 Binary files a/java/lib/org.osgi.core-1.0.0.jar and /dev/null differ diff --git a/java/lib/org.osgi.core_1.0.0.jar b/java/lib/org.osgi.core_1.0.0.jar new file mode 100755 index 0000000000..dcddc09bc0 Binary files /dev/null and b/java/lib/org.osgi.core_1.0.0.jar differ diff --git a/java/management/eclipse-plugin/bin/qpidmc.sh b/java/management/eclipse-plugin/bin/qpidmc.sh index 2472545a14..599d9bf7e0 100755 --- a/java/management/eclipse-plugin/bin/qpidmc.sh +++ b/java/management/eclipse-plugin/bin/qpidmc.sh @@ -18,14 +18,13 @@ # under the License. # -if [ "$JAVA_HOME" == "" ]; then - echo "The JAVA_HOME environment variable is not defined"; - exit 0; +if [ -z "$JAVA" ]; then + JAVA=java fi -if [ "$QPIDMC_HOME" == "" ]; then - echo "The QPIDMC_HOME environment variable is not defined correctly"; - exit 0; +if [ -z "$QPIDMC_HOME" ]; then + export QPIDMC_HOME=$(dirname $(dirname $(readlink -f $0))) + export PATH=${PATH}:${QPIDMC_HOME}/bin fi # Test if we're running on cygwin. @@ -38,27 +37,39 @@ if $cygwin; then QPIDMC_HOME=$(cygpath -w $QPIDMC_HOME) fi -os=win32 -ws=win32 -arch=x86 - -##echo $os -##echo $ws -##echo $arch ## If this is to be run on different platform other than windows then following parameters should be passed -## qpidmc.sh -## eg. qpidmc.sh linux motif x86 -if [ $# -eq 3 ]; then - os=$1 - ws=$2 - arch=$3 +## qpidmc.sh +## eg. qpidmc.sh motif + +if [ $# -eq 1 ] ; then + QPIDMC_WS=$1 +else + # If the WS is not set via QPIDMC_WS then query uname for the WS + if [ -z "$QPIDMC_WS" ] ; then + echo "Usage qpidmc.sh + echo "Alternatively set QPIDMC_WS to the windowing system you wish to use + exit 1 + fi +fi + +# If the OS is not set via QPIDMC_OS then query uname for the OS +if [ -z "$QPIDMC_OS" ] ; then + QPIDMC_OS=`uname | tr A-Z a-z` +else + # Force OS to be lower case + QPIDMC_OS=`echo $QPIDMC_OS | tr A-Z a-z` fi -if [ $os = "SunOS" ]; then - os="solaris" -elif [ $os = "Linux" ]; then - os="linux" +# If the ARCH is not set via QPIDMC_ARCH then query uname for the arch, +if [ -z "$QPIDMC_ARCH" ] ; then + QPIDMC_ARCH=`uname -i` fi -"$JAVA_HOME/bin/java" -Xms40m -Xmx256m -Declipse.consoleLog=false -jar $QPIDMC_HOME/eclipse/startup.jar org.eclipse.core.launcher.Main -launcher $QPIDMC_HOME/eclipse/eclipse -name "Qpid Management Console" -showsplash 600 -configuration "file:$QPIDMC_HOME/configuration" -os $os -ws $ws -arch $arch +# Note that it sometimes returns i386 which needs to be changed to x86 +if [ "$QPIDMC_ARCH" == "i386" ] ; then + QPIDMC_ARCH="x86" +fi + + +"$JAVA" -Xms40m -Xmx256m -Declipse.consoleLog=true -jar $QPIDMC_HOME/eclipse/startup.jar org.eclipse.core.launcher.Main -name "Qpid Management Console" -showsplash 600 -configuration "file:$QPIDMC_HOME/configuration" -os $QPIDMC_OS -ws $QPIDMC_WS -arch $QPIDMC_ARCH diff --git a/java/management/eclipse-plugin/bin/qpidmc_gtk.sh b/java/management/eclipse-plugin/bin/qpidmc_gtk.sh index 10b463d63b..1d55743d84 100755 --- a/java/management/eclipse-plugin/bin/qpidmc_gtk.sh +++ b/java/management/eclipse-plugin/bin/qpidmc_gtk.sh @@ -18,7 +18,9 @@ # under the License. # -os=`uname | tr A-Z a-z` -arch=`uname -p` +if [ -z "$QPIDMC_HOME" ]; then + export QPIDMC_HOME=$(dirname $(dirname $(readlink -f $0))) + export PATH=${PATH}:${QPIDMC_HOME}/bin +fi -$QPIDMC_HOME/bin/qpidmc.sh $os gtk $arch +$QPIDMC_HOME/bin/qpidmc.sh gtk diff --git a/java/management/eclipse-plugin/bin/qpidmc_motif.sh b/java/management/eclipse-plugin/bin/qpidmc_motif.sh index f53be75d87..f49759cc91 100755 --- a/java/management/eclipse-plugin/bin/qpidmc_motif.sh +++ b/java/management/eclipse-plugin/bin/qpidmc_motif.sh @@ -18,7 +18,4 @@ # under the License. # -os=`uname | tr A-Z a-z` -arch=`uname -p` - -$QPIDMC_HOME/bin/qpidmc.sh $os motif $arch +$QPIDMC_HOME/bin/qpidmc.sh motif diff --git a/java/management/eclipse-plugin/build-release-common.properties b/java/management/eclipse-plugin/build-release-common.properties new file mode 100644 index 0000000000..244448e322 --- /dev/null +++ b/java/management/eclipse-plugin/build-release-common.properties @@ -0,0 +1,17 @@ +artifactId=org.apache.qpid.management.ui +mcplugin.version=0.1.0-${project.version} +mcplugin.filename=${artifactId}_${mcplugin.version} + +mcplugin.contents.dir=${module.classes} + +mcplugin.manifest=${module.manifest} + +bin.dir=bin + +startup.jar=src/main/resources/startup.jar + +eclipse.ini=src/main/resources/eclipse.ini + +license.eclipse.txt=src/main/resources/license.eclipse.txt + +jmxremote.sasl.manifest=src/main/resources/sasl/MANIFEST.MF diff --git a/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties b/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties new file mode 100644 index 0000000000..5eeb771bb2 --- /dev/null +++ b/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties @@ -0,0 +1,13 @@ +release.name=${module.namever}-linux-gtk-x86 + +release.subdir=${module.release.base}/${release.name} + +release.tar.gz=${module.release.base}/${release.name}.tar.gz + +eclipse.ini=src/main/resources/unix/eclipse.ini + +rcp.libs=${management-eclipse-plugin-linux-gtk-x86.libs} + +rcp.configuration.dir=src/main/resources/unix/configuration + +bin.includes=qpidmc.sh qpidmc_gtk.sh diff --git a/java/management/eclipse-plugin/build-release-win32-win32-x86.properties b/java/management/eclipse-plugin/build-release-win32-win32-x86.properties new file mode 100644 index 0000000000..a41bd5a54a --- /dev/null +++ b/java/management/eclipse-plugin/build-release-win32-win32-x86.properties @@ -0,0 +1,13 @@ +release.name=${module.namever}-win32-win32-x86 + +release.subdir=${module.release.base}/${release.name} + +release.zip=${module.release.base}/${release.name}.zip + +eclipse.executable=src/main/resources/eclipse.exe + +rcp.libs=${management-eclipse-plugin-win32-win32-x86.libs} + +rcp.configuration.dir=src/main/resources/win32/configuration + +bin.includes=qpidmc.bat \ No newline at end of file diff --git a/java/management/eclipse-plugin/build-release.xml b/java/management/eclipse-plugin/build-release.xml new file mode 100644 index 0000000000..b116fcb55c --- /dev/null +++ b/java/management/eclipse-plugin/build-release.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/management/eclipse-plugin/build.xml b/java/management/eclipse-plugin/build.xml index 492783e574..5cfd13f2a5 100644 --- a/java/management/eclipse-plugin/build.xml +++ b/java/management/eclipse-plugin/build.xml @@ -24,4 +24,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java index 11db02f5a2..be69fadbe8 100644 --- a/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java +++ b/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java @@ -57,6 +57,11 @@ public class VersionAction extends Action _text = "Build Version : " + _buildVersion + "\n" + "Release Version : " + _releaseVersion; } + else + { + _text = "Build Version : \n" + + "Release Version : "; + } } catch (Exception ex) { diff --git a/java/management/eclipse-plugin/src/main/resources/unix/configuration/config.ini b/java/management/eclipse-plugin/src/main/resources/unix/configuration/config.ini index aa2d21fd48..5bbf344c17 100644 --- a/java/management/eclipse-plugin/src/main/resources/unix/configuration/config.ini +++ b/java/management/eclipse-plugin/src/main/resources/unix/configuration/config.ini @@ -22,6 +22,6 @@ osgi.splashPath=platform:/base/plugins/org.apache.qpid.management.ui eclipse.product=org.apache.qpid.management.ui.product eclipse.application=org.apache.qpid.management.ui.application -osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.core.runtime@start,com.ibm.icu,org.apache.qpid.management.ui,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.jobs,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.jface,org.eclipse.swt,org.eclipse.swt.motif.linux.x86,org.eclipse.swt.gtk.linux.x86_64,org.eclipse.swt.gtk.linux.x86,org.eclipse.swt.gtk.linux.ppc,org.eclipse.swt.motif.hpux.PA_RISC,org.eclipse.swt.gtk.solaris.sparc,org.eclipse.swt.motif.solaris.sparc,org.eclipse.swt.carbon.macocx,org.eclipse.ui,org.eclipse.ui.forms,org.eclipse.ui.workbench +osgi.bundles=org.eclipse.equinox.common@2:start,org.eclipse.core.runtime@start,com.ibm.icu,org.apache.qpid.management.ui,org.eclipse.core.commands,org.eclipse.core.contenttype,org.eclipse.core.expressions,org.eclipse.core.jobs,org.eclipse.core.runtime.compatibility.auth,org.eclipse.core.runtime.compatibility.registry,org.eclipse.equinox.preferences,org.eclipse.equinox.registry,org.eclipse.help,org.eclipse.jface,org.eclipse.swt,org.eclipse.swt.gtk.linux.x86,org.eclipse.ui,org.eclipse.ui.forms,org.eclipse.ui.workbench,jmxremote.sasl osgi.bundles.defaultStartLevel=4 -eof=eof \ No newline at end of file +eof=eof diff --git a/java/management/eclipse-plugin/src/main/resources/unix/eclipse.ini b/java/management/eclipse-plugin/src/main/resources/unix/eclipse.ini new file mode 100644 index 0000000000..33884bd8f1 --- /dev/null +++ b/java/management/eclipse-plugin/src/main/resources/unix/eclipse.ini @@ -0,0 +1,11 @@ +-startup +plugins/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar +--launcher.library +plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805 +#-showsplash +#org.eclipse.platform +--launcher.XXMaxPermSize +256m +-vmargs +-Xms40m +-Xmx256m diff --git a/java/module.xml b/java/module.xml index c487ffb134..2bcfa09f0c 100644 --- a/java/module.xml +++ b/java/module.xml @@ -26,6 +26,12 @@ + + + + + + @@ -43,7 +49,7 @@ - + @@ -62,12 +68,6 @@ - - - - - - -- cgit v1.2.1