You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2008/11/26 19:23:33 UTC
svn commit: r720931 - in /incubator/qpid/trunk/qpid/java: ./ lib/
lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/
lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/
management/eclipse-plugin/ manageme...
Author: ritchiem
Date: Wed Nov 26 10:23:31 2008
New Revision: 720931
URL: http://svn.apache.org/viewvc?rev=720931&view=rev
Log:
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
Added:
incubator/qpid/trunk/qpid/java/lib/com.ibm.icu_3.4.4.jar (props changed)
- copied unchanged from r720925, incubator/qpid/trunk/qpid/java/lib/com.ibm.icu-3.4.4.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.commands_3.2.0.jar (props changed)
- copied unchanged from r720925, incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.commands-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.contenttype_3.2.0.jar (props changed)
- copied unchanged from r720925, incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.contenttype-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.expressions_3.2.0.jar (props changed)
- copied unchanged from r720925, incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.expressions-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.jobs_3.2.0.jar (props changed)
- copied unchanged from r720925, incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.jobs-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.runtime.compatibility.auth_3.2.0.jar (props changed)
- copied unchanged from r720925, incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.runtime.compatibility.auth-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.0.jar (props changed)
- copied unchanged from r720925, incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.runtime_3.2.0.jar (props changed)
- copied unchanged from r720925, incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.runtime-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.common_3.2.0.jar (props changed)
- copied unchanged from r720925, incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.common-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/
incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/
incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.SF
incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/MANIFEST.MF
incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/eclipse.inf
incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/about.html
incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/launcher.gtk.linux.x86.properties
incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar (with props)
incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.preferences_3.2.0.jar (props changed)
- copied unchanged from r720925, incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.preferences-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.registry_3.2.0.jar (props changed)
- copied unchanged from r720925, incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.registry-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.help_3.2.0.jar (props changed)
- copied unchanged from r720925, incubator/qpid/trunk/qpid/java/lib/org.eclipse.help-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.jface_3.2.0.jar (props changed)
- copied unchanged from r720925, incubator/qpid/trunk/qpid/java/lib/org.eclipse.jface-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar (with props)
incubator/qpid/trunk/qpid/java/lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3449c.jar (with props)
incubator/qpid/trunk/qpid/java/lib/org.eclipse.swt.win32.win32.x86_3.2.0.jar (props changed)
- copied unchanged from r720925, incubator/qpid/trunk/qpid/java/lib/org.eclipse.swt.win32.win32.x86-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.swt_3.4.1.v3449c.jar (with props)
incubator/qpid/trunk/qpid/java/lib/org.eclipse.ui.forms_3.2.0.jar (props changed)
- copied unchanged from r720925, incubator/qpid/trunk/qpid/java/lib/org.eclipse.ui.forms-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.ui.workbench_3.2.1.jar (props changed)
- copied unchanged from r720925, incubator/qpid/trunk/qpid/java/lib/org.eclipse.ui.workbench-3.2.1.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.ui_3.2.0.jar (props changed)
- copied unchanged from r720925, incubator/qpid/trunk/qpid/java/lib/org.eclipse.ui-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.osgi.core_1.0.0.jar (props changed)
- copied unchanged from r720925, incubator/qpid/trunk/qpid/java/lib/org.osgi.core-1.0.0.jar
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-common.properties
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/eclipse.ini
Removed:
incubator/qpid/trunk/qpid/java/lib/com.ibm.icu-3.4.4.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.commands-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.contenttype-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.expressions-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.jobs-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.runtime-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.runtime.compatibility.auth-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.common-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.preferences-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.registry-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.help-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.jface-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.osgi-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.swt-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.swt.win32.win32.x86-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.ui-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.ui.forms-3.2.0.jar
incubator/qpid/trunk/qpid/java/lib/org.eclipse.ui.workbench-3.2.1.jar
incubator/qpid/trunk/qpid/java/lib/org.osgi.core-1.0.0.jar
Modified:
incubator/qpid/trunk/qpid/java/build.deps
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.sh
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc_gtk.sh
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc_motif.sh
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build.xml
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java
incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/configuration/config.ini
incubator/qpid/trunk/qpid/java/module.xml
Modified: incubator/qpid/trunk/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/build.deps?rev=720931&r1=720930&r2=720931&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/build.deps (original)
+++ incubator/qpid/trunk/qpid/java/build.deps Wed Nov 26 10:23:31 2008
@@ -51,32 +51,42 @@
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
+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
-management-eclipse-plugin.libs=${commons-codec} ${ibm-icu} ${ecl-core-jface} \
+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}
Propchange: incubator/qpid/trunk/qpid/java/lib/com.ibm.icu_3.4.4.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/qpid/trunk/qpid/java/lib/com.ibm.icu_3.4.4.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.commands_3.2.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.commands_3.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.contenttype_3.2.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.contenttype_3.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.expressions_3.2.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.expressions_3.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.jobs_3.2.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.jobs_3.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.runtime.compatibility.auth_3.2.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.runtime.compatibility.auth_3.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.runtime_3.2.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.core.runtime_3.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.common_3.2.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.common_3.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.SF
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.SF?rev=720931&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.SF (added)
+++ incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.SF Wed Nov 26 10:23:31 2008
@@ -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=
+
Added: incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/MANIFEST.MF?rev=720931&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/MANIFEST.MF (added)
+++ incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/MANIFEST.MF Wed Nov 26 10:23:31 2008
@@ -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=
+
Added: incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/eclipse.inf
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/eclipse.inf?rev=720931&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/eclipse.inf (added)
+++ incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/eclipse.inf Wed Nov 26 10:23:31 2008
@@ -0,0 +1,3 @@
+#Processed using Jarprocessor
+pack200.args = -E4
+pack200.conditioned = true
Added: incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/about.html
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/about.html?rev=720931&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/about.html (added)
+++ incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/about.html Wed Nov 26 10:23:31 2008
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 5, 2006</p>
+<h3>License</h3>
+
+<p>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 <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>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 <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
Added: incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/launcher.gtk.linux.x86.properties
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/launcher.gtk.linux.x86.properties?rev=720931&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/launcher.gtk.linux.x86.properties (added)
+++ incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/launcher.gtk.linux.x86.properties Wed Nov 26 10:23:31 2008
@@ -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
Added: incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar?rev=720931&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.preferences_3.2.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.preferences_3.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.registry_3.2.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.equinox.registry_3.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.help_3.2.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.help_3.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.jface_3.2.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.jface_3.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/qpid/trunk/qpid/java/lib/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/lib/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar?rev=720931&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.osgi_3.4.2.R34x_v20080826-1230.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/qpid/trunk/qpid/java/lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3449c.jar
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3449c.jar?rev=720931&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3449c.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.swt.win32.win32.x86_3.2.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.swt.win32.win32.x86_3.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/qpid/trunk/qpid/java/lib/org.eclipse.swt_3.4.1.v3449c.jar
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/lib/org.eclipse.swt_3.4.1.v3449c.jar?rev=720931&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.swt_3.4.1.v3449c.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.ui.forms_3.2.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.ui.forms_3.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.ui.workbench_3.2.1.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.ui.workbench_3.2.1.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.ui_3.2.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/qpid/trunk/qpid/java/lib/org.eclipse.ui_3.2.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Propchange: incubator/qpid/trunk/qpid/java/lib/org.osgi.core_1.0.0.jar
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/qpid/trunk/qpid/java/lib/org.osgi.core_1.0.0.jar
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: incubator/qpid/trunk/qpid/java/lib/org.osgi.core_1.0.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.sh?rev=720931&r1=720930&r2=720931&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.sh (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc.sh Wed Nov 26 10:23:31 2008
@@ -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 @@
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 <operating system> <windowing system> <platform achitecture>
-## eg. qpidmc.sh linux motif x86
-if [ $# -eq 3 ]; then
- os=$1
- ws=$2
- arch=$3
+## qpidmc.sh <windowing system>
+## 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 <windowing system>
+ 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
Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc_gtk.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc_gtk.sh?rev=720931&r1=720930&r2=720931&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc_gtk.sh (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc_gtk.sh Wed Nov 26 10:23:31 2008
@@ -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
Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc_motif.sh
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc_motif.sh?rev=720931&r1=720930&r2=720931&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc_motif.sh (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/bin/qpidmc_motif.sh Wed Nov 26 10:23:31 2008
@@ -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
Added: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-common.properties
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-common.properties?rev=720931&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-common.properties (added)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-common.properties Wed Nov 26 10:23:31 2008
@@ -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
Added: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties?rev=720931&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties (added)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties Wed Nov 26 10:23:31 2008
@@ -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
Added: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties?rev=720931&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties (added)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties Wed Nov 26 10:23:31 2008
@@ -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
Added: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml?rev=720931&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml (added)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build-release.xml Wed Nov 26 10:23:31 2008
@@ -0,0 +1,152 @@
+<!--
+ -
+ - Licensed to the Apache Software Foundation (ASF) under one
+ - or more contributor license agreements. See the NOTICE file
+ - distributed with this work for additional information
+ - regarding copyright ownership. The ASF licenses this file
+ - to you under the Apache License, Version 2.0 (the
+ - "License"); you may not use this file except in compliance
+ - with the License. You may obtain a copy of the License at
+ -
+ - http://www.apache.org/licenses/LICENSE-2.0
+ -
+ - Unless required by applicable law or agreed to in writing,
+ - software distributed under the License is distributed on an
+ - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ - KIND, either express or implied. See the License for the
+ - specific language governing permissions and limitations
+ - under the License.
+ -
+ -->
+<project name="Eclipse Plugin Binary Release" default="release-bin">
+
+ <!-- check properties that must be set by caller -->
+ <target name="check" description="ensure all required properties are set">
+ <condition property="properties.set">
+ <and>
+ <!-- common properties -->
+ <isset property ="mcplugin.contents.dir"/>
+ <isset property ="mcplugin.manifest"/>
+ <isset property ="mcplugin.filename"/>
+ <isset property ="bin.dir"/>
+ <isset property ="startup.jar"/>
+ <isset property ="eclipse.ini"/>
+ <isset property ="license.eclipse.txt"/>
+ <isset property ="jmxremote.sasl.manifest"/>
+ <!-- platform specific properties -->
+ <isset property ="bin.includes"/>
+ <isset property ="release.name"/>
+ <isset property ="release.subdir"/>
+ <isset property ="rcp.libs"/>
+ <isset property ="rcp.configuration.dir"/>
+ <or>
+ <isset property ="release.zip"/>
+ <isset property ="release.tar.gz"/>
+ </or>
+ </and>
+ <!-- Optional Properties -->
+ <!-- eclipse.executable.companion.library -->
+ </condition>
+
+ <fail unless="properties.set" message="required properties not set"/>
+ </target>
+
+ <target name="release-bin-prepare">
+ <mkdir dir="${release.subdir}"/>
+ </target>
+
+ <target name="release-bin-mcplugin-jar">
+ <jar destfile="${release.subdir}/eclipse/plugins/${mcplugin.filename}.jar" basedir="${mcplugin.contents.dir}" manifest="${mcplugin.manifest}"/>
+ </target>
+
+ <target name="release-bin-jmxremote-plugin">
+ <!-- Copy the jmxremote.sasl plugin's manifest, creating its plugin directory -->
+ <copy todir="${release.subdir}/eclipse/plugins/jmxremote.sasl_1.0.1/META-INF" flatten="true" failonerror="true">
+ <fileset file="${jmxremote.sasl.manifest}"/>
+ </copy>
+ </target>
+
+ <target name="copy-executable" description="Copy eclipse-rcp execuitable" if="eclipse.executable">
+
+ <!-- Copy the eclipse rcp executable files -->
+ <copy todir="${release.subdir}/eclipse" flatten="true" failonerror="true">
+ <fileset file="${eclipse.executable}"/>
+ </copy>
+ <chmod dir="${release.subdir}/eclipse" perm="u+rx" includes="**/*"/>
+
+
+ </target>
+
+ <target name="release-bin-rcp-deps" description="copy eclipse-rcp dependencies into module release"
+ depends="copy-executable">
+
+ <!-- Copy remaining startup & license files -->
+ <copy todir="${release.subdir}/eclipse" flatten="true" failonerror="true">
+ <fileset file="${startup.jar}"/>
+ <fileset file="${eclipse.ini}"/>
+ <fileset file="${license.eclipse.txt}"/>
+ </copy>
+
+ <echo message="${ecl-swt-linux-gtk-x86}"/>
+ <echo message="${management-eclipse-plugin-linux-gtk-x86.libs}"/>
+ <echo message="${rcp.libs}"/>
+ <!-- Copy the eclipse rcp module libs -->
+ <copy todir="${release.subdir}/eclipse/plugins" failonerror="true">
+
+ <fileset dir="${project.root}" includes="${rcp.libs}"/>
+ <globmapper from="lib/*" to="*"/>
+ </copy>
+
+ <!-- Copy the relevant bin dir files-->
+ <copy todir="${release.subdir}/bin" failonerror="true">
+ <fileset dir="${bin.dir}" includes="${bin.includes}"/>
+ </copy>
+ <chmod dir="${release.subdir}/bin" perm="u+rx" includes="**/*"/>
+
+ <!-- Copy the relevant configuration dir -->
+ <copy todir="${release.subdir}/configuration" failonerror="true">
+ <fileset dir="${rcp.configuration.dir}"/>
+ </copy>
+ <chmod dir="${release.subdir}/configuration" perm="ugo+r" includes="**/*"/>
+ </target>
+
+ <target name="release-bin-zip" if="release.zip" description="build mc zip archive">
+ <zip destfile="${release.zip}">
+ <zipfileset dir="${release.subdir}" prefix="${release.name}" filemode="755">
+ <include name="bin/*"/>
+ </zipfileset>
+
+ <zipfileset dir="${release.subdir}" prefix="${release.name}" filemode="755">
+ <include name="eclipse/eclipse*"/>
+ </zipfileset>
+
+ <zipfileset dir="${release.subdir}" prefix="${release.name}" filemode="644" dirmode="755">
+ <exclude name="bin/**"/>
+ <exclude name="eclipse/eclipse*"/>
+ </zipfileset>
+ </zip>
+ </target>
+
+ <target name="release-bin-gzip" if="release.tar.gz" description="build mc tar.gz archive">
+ <tar destfile="${release.tar.gz}" longfile="gnu">
+ <tarfileset dir="${release.subdir}" prefix="${release.name}" filemode="755">
+ <include name="bin/*"/>
+ </tarfileset>
+
+ <tarfileset dir="${release.subdir}" prefix="${release.name}" filemode="755">
+ <include name="eclipse/eclipse*"/>
+ </tarfileset>
+
+ <tarfileset dir="${release.subdir}" prefix="${release.name}" filemode="644" dirmode="755">
+ <exclude name="bin/**"/>
+ <exclude name="eclipse/eclipse*"/>
+ </tarfileset>
+ </tar>
+ </target>
+
+
+
+ <target name="release-bin" depends="check,release-bin-prepare,release-bin-rcp-deps,
+ release-bin-mcplugin-jar,release-bin-jmxremote-plugin,release-bin-zip,release-bin-gzip"/>
+
+</project>
Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build.xml?rev=720931&r1=720930&r2=720931&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/build.xml Wed Nov 26 10:23:31 2008
@@ -24,4 +24,59 @@
<import file="../../module.xml"/>
+ <!-- module.manifest property to invoke use of 'jar.manifest' jar target when building -->
+ <property name="module.manifest" value="${module.classes}/META-INF/MANIFEST.MF"/>
+
+ <target name="copy-plugin-files" description="copy eclipse management plugin files into build tree">
+ <copy todir="${module.classes}/icons" failonerror="true">
+ <fileset dir="icons/"/>
+ </copy>
+ <copy todir="${module.classes}/META-INF/" failonerror="true">
+ <fileset dir="META-INF/"/>
+ </copy>
+ <copy todir="${module.classes}" failonerror="true">
+ <fileset file="icons/splash.bmp"/>
+ </copy>
+ <copy todir="${module.classes}" failonerror="true">
+ <fileset file="plugin.properties"/>
+ </copy>
+ <copy todir="${module.classes}" failonerror="true">
+ <fileset file="plugin.xml"/>
+ </copy>
+ </target>
+
+ <target name="create-version" description="Create the version file">
+
+ <exec executable="svnversion" spawn="false" failifexecutionfails="false"
+ dir="." outputproperty="svnversion">
+ <arg line="."/>
+ </exec>
+
+ <!-- Write the version.properties out. -->
+ <propertyfile file="${module.classes}/qpidversion.properties">
+ <entry key="qpid.version" value="${project.version}"/>
+ <entry key="qpid.svnversion" value="${svnversion}"/>
+ <entry key="qpid.name" value="${project.name}"/>
+ </propertyfile>
+
+ </target>
+
+
+ <!-- Override imported module.xml build target, create module jar containing plugin files -->
+ <target name="build" depends="prepare, compile, copy-plugin-files, create-version, jar, jar-tests"/>
+
+ <!-- Override imported module.xml release-bin target -->
+ <target name="release-bin" depends="build">
+ <!-- linux gtk x86 -->
+ <ant antfile="build-release.xml">
+ <property file="build-release-linux-gtk-x86.properties"/>
+ <property file="build-release-common.properties"/>
+ </ant>
+ <!-- win32 win32 x86 -->
+ <ant antfile="build-release.xml">
+ <property file="build-release-win32-win32-x86.properties"/>
+ <property file="build-release-common.properties"/>
+ </ant>
+ </target>
+
</project>
Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java?rev=720931&r1=720930&r2=720931&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/actions/VersionAction.java Wed Nov 26 10:23:31 2008
@@ -57,6 +57,11 @@
_text = "Build Version : " + _buildVersion + "\n" +
"Release Version : " + _releaseVersion;
}
+ else
+ {
+ _text = "Build Version : \n" +
+ "Release Version : ";
+ }
}
catch (Exception ex)
{
Modified: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/configuration/config.ini
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/configuration/config.ini?rev=720931&r1=720930&r2=720931&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/configuration/config.ini (original)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/configuration/config.ini Wed Nov 26 10:23:31 2008
@@ -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
Added: incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/eclipse.ini
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/eclipse.ini?rev=720931&view=auto
==============================================================================
--- incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/eclipse.ini (added)
+++ incubator/qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/unix/eclipse.ini Wed Nov 26 10:23:31 2008
@@ -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
Modified: incubator/qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/module.xml?rev=720931&r1=720930&r2=720931&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/module.xml (original)
+++ incubator/qpid/trunk/qpid/java/module.xml Wed Nov 26 10:23:31 2008
@@ -26,6 +26,12 @@
<globmapper from="${project.root}${file.separator}*" to="*"/>
</map>
+ <map property="module.name" value="${module}">
+ <filtermapper>
+ <replacestring from="${file.separator}" to="-"/>
+ </filtermapper>
+ </map>
+
<echo message="Running ant for module : ${module}" level="info"/>
<property file="${project.root}/build.deps"/>
@@ -43,7 +49,7 @@
<property name="module.bin" location="bin"/>
<property name="module.etc" location="etc"/>
- <property name="module.namever" value="${project.name}-${module}-${project.version}"/>
+ <property name="module.namever" value="${project.name}-${module.name}-${project.version}"/>
<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"/>
@@ -62,12 +68,6 @@
<available property="module.etc.exists" file="${module.etc}"/>
<available property="module.bin.exists" file="${module.bin}"/>
- <map property="module.name" value="${module}">
- <filtermapper>
- <replacestring from="${file.separator}" to="-"/>
- </filtermapper>
- </map>
-
<indirect name="module.libs" variable="${module.name}.libs"/>
<indirect name="module.test.libs" variable="${module.name}.test.libs"/>