QPID-1592 : Patch provided by Robert Gemmell to standardise launchers for management console.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@736591 13f79535-47bb-0310-9956-ffa450edef68

52 files changed, 215 insertions, 34 deletions

diff --git a/qpid/java/build.deps b/qpid/java/build.deps
index 8a52dbe7e8..262bb25543 100644
--- a/qpid/java/build.deps
+++ b/qpid/java/build.deps
@@ -84,45 +84,56 @@ 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
+
+ibm-icu=lib/com.ibm.icu_3.8.1.v20080530.jar
+ecl-core-jface=lib/org.eclipse.jface_3.4.1.M20080827-2000.jar
+ecl-core-jface-databinding=lib/org.eclipse.jface.databinding_1.2.1.M20080827-0800a.jar
+ecl-core-commands=lib/org.eclipse.core.commands_3.4.0.I20080509-2000.jar
+ecl-core-contenttype=lib/org.eclipse.core.contenttype_3.3.0.v20080604-1400.jar
+ecl-core-databinding=lib/org.eclipse.core.databinding_1.1.1.M20080827-0800b.jar
+ecl-core-expressions=lib/org.eclipse.core.expressions_3.4.0.v20080603-2000.jar
+ecl-core-jobs=lib/org.eclipse.core.jobs_3.4.0.v20080512.jar
+ecl-core-runtime=lib/org.eclipse.core.runtime_3.4.0.v20080512.jar
+ecl-core-runtime-compat-registry=lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/**
+ecl-equinox-app=lib/org.eclipse.equinox.app_1.1.0.v20080421-2006.jar
+ecl-equinox-common=lib/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar
+ecl-equinox-launcher=lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar
+ecl-equinox-prefs=lib/org.eclipse.equinox.preferences_3.2.201.R34x_v20080709.jar
+ecl-equinox-registry=lib/org.eclipse.equinox.registry_3.4.0.v20080516-0950.jar
+ecl-help=lib/org.eclipse.help_3.3.101.v20080702_34x.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-unix-shared=lib/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.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/*
-ecl-swt-macosx=lib/org.eclipse.swt.carbon.macosx_3.4.1.v3449c.jar \
-  lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/*
-  
-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-ui} ${ecl-ui-forms} ${ecl-ui-workbench}
+ecl-ui=lib/org.eclipse.ui_3.4.1.M20080910-0800.jar
+ecl-ui-forms=lib/org.eclipse.ui.forms_3.3.101.v20080708_34x.jar
+ecl-ui-workbench=lib/org.eclipse.ui.workbench_3.4.1.M20080827-0800a.jar
+
+ecl-swt-win32-win32-x86=lib/org.eclipse.swt.win32.win32.x86_3.4.1.v3449c.jar
+ecl-equinox-launcher-win32-win32-x86=lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/**
+ecl-swt-linux-gtk-x86=lib/org.eclipse.swt.gtk.linux.x86_3.4.1.v3449c.jar
+ecl-equinox-launcher-linux-gtk-x86=lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/**
+ecl-swt-macosx-carbon=lib/org.eclipse.swt.carbon.macosx_3.4.1.v3449c.jar
+ecl-equinox-launcher-macosx-carbon=lib/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731/**
+
+management-eclipse-plugin-win32-win32-x86.libs=${management-eclipse-plugin.core-libs} \
+    ${ecl-swt-win32-win32-x86} ${ecl-equinox-launcher-win32-win32-x86}
+management-eclipse-plugin-linux-gtk-x86.libs=${management-eclipse-plugin.core-libs} \
+    ${ecl-swt-linux-gtk-x86} ${ecl-equinox-launcher-linux-gtk-x86}
+management-eclipse-plugin-macosx.libs=${management-eclipse-plugin.core-libs} \
+    ${ecl-swt-macosx-carbon} ${ecl-equinox-launcher-macosx-carbon}
+
+management-eclipse-plugin.core-libs=${ibm-icu} ${ecl-core-jface} ${ecl-core-jface-databinding} \
+    ${ecl-core-commands} ${ecl-core-contenttype} ${ecl-core-databinding} ${ecl-core-expressions} \
+    ${ecl-core-jobs} ${ecl-core-runtime} ${ecl-core-runtime-compat-registry} ${ecl-equinox-app} \
+    ${ecl-equinox-common} ${ecl-equinox-launcher} ${ecl-equinox-prefs} ${ecl-equinox-registry} \
+    ${ecl-help} ${ecl-osgi} ${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-unix-shared} ${ecl-swt-linux-gtk-x86}
-management-eclipse-plugin-macosx.libs=${management-eclipse-plugin.core-libs} ${ecl-unix-shared} ${ecl-swt-macosx} 
+management-eclipse-plugin.platform-libs=${ecl-equinox-launcher-win32-win32-x86} \
+    ${ecl-equinox-launcher-linux-gtk-x86} ${ecl-equinox-launcher-macosx-carbon} \
+    ${ecl-swt-win32-win32-x86} ${ecl-swt-linux-gtk-x86} ${ecl-swt-macosx-carbon}
 
-management-eclipse-plugin.libs=${management-eclipse-plugin.core-libs} ${ecl-swt-win32-win32-x86} ${ecl-swt-linux-gtk-x86} ${ecl-swt-macosx}
+management-eclipse-plugin.libs=${management-eclipse-plugin.core-libs} ${management-eclipse-plugin.platform-libs}
     
+
 management-tools-qpid-cli.libs=${common.libs} ${jline}
 
 common.test.libs=${test.libs}
diff --git a/qpid/java/lib/com.ibm.icu_3.4.4.jar b/qpid/java/lib/com.ibm.icu_3.4.4.jar
deleted file mode 100644
index 9df503a2a3..0000000000
--- a/qpid/java/lib/com.ibm.icu_3.4.4.jar
+++ /dev/null
diff --git a/qpid/java/lib/com.ibm.icu_3.8.1.v20080530.jar b/qpid/java/lib/com.ibm.icu_3.8.1.v20080530.jar
new file mode 100644
index 0000000000..1d8a0a0997
--- /dev/null
+++ b/qpid/java/lib/com.ibm.icu_3.8.1.v20080530.jar
diff --git a/qpid/java/lib/org.eclipse.core.commands_3.2.0.jar b/qpid/java/lib/org.eclipse.core.commands_3.2.0.jar
deleted file mode 100644
index c864864689..0000000000
--- a/qpid/java/lib/org.eclipse.core.commands_3.2.0.jar
+++ /dev/null
diff --git a/qpid/java/lib/org.eclipse.core.commands_3.4.0.I20080509-2000.jar b/qpid/java/lib/org.eclipse.core.commands_3.4.0.I20080509-2000.jar
new file mode 100644
index 0000000000..6467d78d66
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.core.commands_3.4.0.I20080509-2000.jar
diff --git a/qpid/java/lib/org.eclipse.core.contenttype_3.2.0.jar b/qpid/java/lib/org.eclipse.core.contenttype_3.2.0.jar
deleted file mode 100644
index 816e3fc938..0000000000
--- a/qpid/java/lib/org.eclipse.core.contenttype_3.2.0.jar
+++ /dev/null
diff --git a/qpid/java/lib/org.eclipse.core.contenttype_3.3.0.v20080604-1400.jar b/qpid/java/lib/org.eclipse.core.contenttype_3.3.0.v20080604-1400.jar
new file mode 100644
index 0000000000..0b6163cf1b
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.core.contenttype_3.3.0.v20080604-1400.jar
diff --git a/qpid/java/lib/org.eclipse.core.databinding_1.1.1.M20080827-0800b.jar b/qpid/java/lib/org.eclipse.core.databinding_1.1.1.M20080827-0800b.jar
new file mode 100644
index 0000000000..7f9d1b637e
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.core.databinding_1.1.1.M20080827-0800b.jar
diff --git a/qpid/java/lib/org.eclipse.core.expressions_3.2.0.jar b/qpid/java/lib/org.eclipse.core.expressions_3.2.0.jar
deleted file mode 100644
index 51d2a0204c..0000000000
--- a/qpid/java/lib/org.eclipse.core.expressions_3.2.0.jar
+++ /dev/null
diff --git a/qpid/java/lib/org.eclipse.core.expressions_3.4.0.v20080603-2000.jar b/qpid/java/lib/org.eclipse.core.expressions_3.4.0.v20080603-2000.jar
new file mode 100644
index 0000000000..671e92aa4b
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.core.expressions_3.4.0.v20080603-2000.jar
diff --git a/qpid/java/lib/org.eclipse.core.jobs_3.2.0.jar b/qpid/java/lib/org.eclipse.core.jobs_3.2.0.jar
deleted file mode 100644
index 995bcd2e27..0000000000
--- a/qpid/java/lib/org.eclipse.core.jobs_3.2.0.jar
+++ /dev/null
diff --git a/qpid/java/lib/org.eclipse.core.jobs_3.4.0.v20080512.jar b/qpid/java/lib/org.eclipse.core.jobs_3.4.0.v20080512.jar
new file mode 100644
index 0000000000..7bdbc00313
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.core.jobs_3.4.0.v20080512.jar
diff --git a/qpid/java/lib/org.eclipse.core.runtime.compatibility.auth_3.2.0.jar b/qpid/java/lib/org.eclipse.core.runtime.compatibility.auth_3.2.0.jar
deleted file mode 100644
index 26bb49fe12..0000000000
--- a/qpid/java/lib/org.eclipse.core.runtime.compatibility.auth_3.2.0.jar
+++ /dev/null
diff --git a/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.0.jar b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.0.jar
deleted file mode 100644
index 4ffbb0db56..0000000000
--- a/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.0.jar
+++ /dev/null
diff --git a/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.RSA b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.RSA
new file mode 100644
index 0000000000..d694a14d7f
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.RSA
diff --git a/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.SF b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.SF
new file mode 100644
index 0000000000..6bf4f8d81a
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/ECLIPSE.SF
@@ -0,0 +1,17 @@
+Signature-Version: 1.0

+SHA1-Digest-Manifest: lM34M2cYUookZFTsw+CIRRJzG/o=

+Created-By: 1.5.0 (IBM Corporation)

+SHA1-Digest-Manifest-Main-Attributes: XjH6FbEjs0cznPMbHs9K2V7KmP4=

+

+Name: runtime_registry_compatibility.jar

+SHA1-Digest: 3ZA+TQU6TxgVia+krDcqMAAYdpU=

+

+Name: about.html

+SHA1-Digest: M+fykt9heyWoEv1LNiIEeBhi/2Q=

+

+Name: META-INF/eclipse.inf

+SHA1-Digest: SAqY+5ITAL0mkdYeijlSRhyIaZk=

+

+Name: fragment.properties

+SHA1-Digest: Gi/SEQV8Vl9A/8928AtuhnVkrKQ=

+

diff --git a/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/MANIFEST.MF b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..d9a497e8f4
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0

+Bundle-RequiredExecutionEnvironment: CDC-1.0/Foundation-1.0,J2SE-1.3

+Bundle-SymbolicName: org.eclipse.core.runtime.compatibility.registry

+Bundle-ManifestVersion: 2

+Bundle-Localization: fragment

+Bundle-Name: %fragmentName

+Bundle-Version: 3.2.200.v20080610

+Bundle-ClassPath: runtime_registry_compatibility.jar

+Fragment-Host: org.eclipse.equinox.registry;bundle-version="[3.3.0,3.5

+ .0)"

+Eclipse-PatchFragment: true

+Bundle-Vendor: %providerName

+

+Name: runtime_registry_compatibility.jar

+SHA1-Digest: Oxij1RUWY4Q3SjHVBqQuVSFgLxs=

+

+Name: about.html

+SHA1-Digest: ejOZra0kypGLQQ2bJtGTX+LI8tU=

+

+Name: META-INF/eclipse.inf

+SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=

+

+Name: fragment.properties

+SHA1-Digest: 4yjHkU5Z/6ej6ZFYT+PE9sMOJPY=

+

diff --git a/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/eclipse.inf b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/eclipse.inf
new file mode 100644
index 0000000000..7864d3c4c3
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/META-INF/eclipse.inf
@@ -0,0 +1,3 @@
+#Processed using Jarprocessor
+pack200.args = -E4
+pack200.conditioned = true
diff --git a/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/about.html b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/about.html
new file mode 100644
index 0000000000..460233046e
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/about.html
@@ -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 2, 2006</p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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
diff --git a/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/fragment.properties b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/fragment.properties
new file mode 100644
index 0000000000..e60dbf5c67
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/fragment.properties
@@ -0,0 +1,12 @@
+###############################################################################
+# Copyright (c) 2006 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
+###############################################################################
+providerName=Eclipse.org
+fragmentName=Eclipse Registry Compatibility Fragment
diff --git a/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/runtime_registry_compatibility.jar b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/runtime_registry_compatibility.jar
new file mode 100644
index 0000000000..3103fb0ce7
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.core.runtime.compatibility.registry_3.2.200.v20080610/runtime_registry_compatibility.jar
diff --git a/qpid/java/lib/org.eclipse.core.runtime_3.2.0.jar b/qpid/java/lib/org.eclipse.core.runtime_3.2.0.jar
deleted file mode 100644
index 85e61cca58..0000000000
--- a/qpid/java/lib/org.eclipse.core.runtime_3.2.0.jar
+++ /dev/null
diff --git a/qpid/java/lib/org.eclipse.core.runtime_3.4.0.v20080512.jar b/qpid/java/lib/org.eclipse.core.runtime_3.4.0.v20080512.jar
new file mode 100644
index 0000000000..366be26fe3
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.core.runtime_3.4.0.v20080512.jar
diff --git a/qpid/java/lib/org.eclipse.equinox.app_1.1.0.v20080421-2006.jar b/qpid/java/lib/org.eclipse.equinox.app_1.1.0.v20080421-2006.jar
new file mode 100644
index 0000000000..e46c099fe4
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.equinox.app_1.1.0.v20080421-2006.jar
diff --git a/qpid/java/lib/org.eclipse.equinox.common_3.2.0.jar b/qpid/java/lib/org.eclipse.equinox.common_3.2.0.jar
deleted file mode 100644
index e28a631ebb..0000000000
--- a/qpid/java/lib/org.eclipse.equinox.common_3.2.0.jar
+++ /dev/null
diff --git a/qpid/java/lib/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar b/qpid/java/lib/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar
new file mode 100644
index 0000000000..c73223995b
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.equinox.common_3.4.0.v20080421-2006.jar
diff --git a/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.RSA b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.RSA
new file mode 100644
index 0000000000..566c0abd11
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/META-INF/ECLIPSE.RSA
diff --git a/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/eclipse_1115.so b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/eclipse_1115.so
new file mode 100644
index 0000000000..3ec14a5e88
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805/eclipse_1115.so
diff --git a/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
new file mode 100644
index 0000000000..e2350f7b3d
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.RSA
diff --git a/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
new file mode 100644
index 0000000000..a4cc0ac995
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/ECLIPSE.SF
@@ -0,0 +1,17 @@
+Signature-Version: 1.0

+SHA1-Digest-Manifest: oXE8Y8m0B4hXXkniJ3e42s+zWZA=

+Created-By: 1.5.0 (IBM Corporation)

+SHA1-Digest-Manifest-Main-Attributes: D+OZA9EIs+7l5qfZkdxKrzNalvU=

+

+Name: about.html

+SHA1-Digest: xGcp/Hbq/ywyvVWkPzD/2vkIzdY=

+

+Name: launcher.win32.win32.x86.properties

+SHA1-Digest: TMYbn4sXlC4uxONCDt2S0kP1hTY=

+

+Name: META-INF/eclipse.inf

+SHA1-Digest: SAqY+5ITAL0mkdYeijlSRhyIaZk=

+

+Name: eclipse_1115.dll

+SHA1-Digest: ishZ405IXeNkJcKK6X6ZCmhtZOk=

+

diff --git a/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..6acfe13c74
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0

+Bundle-SymbolicName: org.eclipse.equinox.launcher.win32.win32.x86; sin

+ gleton:=true

+Bundle-ManifestVersion: 2

+Bundle-Localization: launcher.win32.win32.x86

+Bundle-Name: %pluginName

+Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=

+ x86))

+Bundle-Version: 1.0.101.R34x_v20080731

+Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.1

+ .0)"

+Bundle-Vendor: %providerName

+

+Name: about.html

+SHA1-Digest: a9lDHrGuLPkvHBUhsqWU+V2mhPw=

+

+Name: META-INF/eclipse.inf

+SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=

+

+Name: launcher.win32.win32.x86.properties

+SHA1-Digest: rhstucCaFV5tj2GARC/9A5zdmB4=

+

+Name: eclipse_1115.dll

+SHA1-Digest: 6f1Zg9WvwnS5OsA5EB8tWKy1480=

+

diff --git a/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/eclipse.inf b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/eclipse.inf
new file mode 100644
index 0000000000..7864d3c4c3
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/META-INF/eclipse.inf
@@ -0,0 +1,3 @@
+#Processed using Jarprocessor
+pack200.args = -E4
+pack200.conditioned = true
diff --git a/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/about.html b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/about.html
new file mode 100644
index 0000000000..395df3ba90
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/about.html
@@ -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 (&quot;Content&quot;).  
+Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor&rsquo;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
diff --git a/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/eclipse_1115.dll b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/eclipse_1115.dll
new file mode 100644
index 0000000000..5e438cf505
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/eclipse_1115.dll
diff --git a/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/launcher.win32.win32.x86.properties b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/launcher.win32.win32.x86.properties
new file mode 100644
index 0000000000..e8f40bca50
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.equinox.launcher.win32.win32.x86_1.0.101.R34x_v20080731/launcher.win32.win32.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 Win32 X86 Fragment
+providerName = Eclipse.org
diff --git a/qpid/java/lib/org.eclipse.equinox.preferences_3.2.0.jar b/qpid/java/lib/org.eclipse.equinox.preferences_3.2.0.jar
deleted file mode 100644
index 0ca4767ced..0000000000
--- a/qpid/java/lib/org.eclipse.equinox.preferences_3.2.0.jar
+++ /dev/null
diff --git a/qpid/java/lib/org.eclipse.equinox.preferences_3.2.201.R34x_v20080709.jar b/qpid/java/lib/org.eclipse.equinox.preferences_3.2.201.R34x_v20080709.jar
new file mode 100644
index 0000000000..0efcea4022
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.equinox.preferences_3.2.201.R34x_v20080709.jar
diff --git a/qpid/java/lib/org.eclipse.equinox.registry_3.2.0.jar b/qpid/java/lib/org.eclipse.equinox.registry_3.2.0.jar
deleted file mode 100644
index 750fab0e76..0000000000
--- a/qpid/java/lib/org.eclipse.equinox.registry_3.2.0.jar
+++ /dev/null
diff --git a/qpid/java/lib/org.eclipse.equinox.registry_3.4.0.v20080516-0950.jar b/qpid/java/lib/org.eclipse.equinox.registry_3.4.0.v20080516-0950.jar
new file mode 100644
index 0000000000..ddc97ffe7c
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.equinox.registry_3.4.0.v20080516-0950.jar
diff --git a/qpid/java/lib/org.eclipse.help_3.2.0.jar b/qpid/java/lib/org.eclipse.help_3.2.0.jar
deleted file mode 100644
index 12ac13f918..0000000000
--- a/qpid/java/lib/org.eclipse.help_3.2.0.jar
+++ /dev/null
diff --git a/qpid/java/lib/org.eclipse.help_3.3.101.v20080702_34x.jar b/qpid/java/lib/org.eclipse.help_3.3.101.v20080702_34x.jar
new file mode 100644
index 0000000000..8bb2b74a73
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.help_3.3.101.v20080702_34x.jar
diff --git a/qpid/java/lib/org.eclipse.jdt.launching.macosx_3.1.100.v20080422.jar b/qpid/java/lib/org.eclipse.jdt.launching.macosx_3.1.100.v20080422.jar
deleted file mode 100644
index 26764dcfe7..0000000000
--- a/qpid/java/lib/org.eclipse.jdt.launching.macosx_3.1.100.v20080422.jar
+++ /dev/null
diff --git a/qpid/java/lib/org.eclipse.jface.databinding_1.2.1.M20080827-0800a.jar b/qpid/java/lib/org.eclipse.jface.databinding_1.2.1.M20080827-0800a.jar
new file mode 100644
index 0000000000..b61037ef9f
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.jface.databinding_1.2.1.M20080827-0800a.jar
diff --git a/qpid/java/lib/org.eclipse.jface_3.2.0.jar b/qpid/java/lib/org.eclipse.jface_3.2.0.jar
deleted file mode 100644
index 1d5035a859..0000000000
--- a/qpid/java/lib/org.eclipse.jface_3.2.0.jar
+++ /dev/null
diff --git a/qpid/java/lib/org.eclipse.jface_3.4.1.M20080827-2000.jar b/qpid/java/lib/org.eclipse.jface_3.4.1.M20080827-2000.jar
new file mode 100644
index 0000000000..ad1c58f0d0
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.jface_3.4.1.M20080827-2000.jar
diff --git a/qpid/java/lib/org.eclipse.swt.win32.win32.x86_3.2.0.jar b/qpid/java/lib/org.eclipse.swt.win32.win32.x86_3.2.0.jar
deleted file mode 100644
index 8fbebc2401..0000000000
--- a/qpid/java/lib/org.eclipse.swt.win32.win32.x86_3.2.0.jar
+++ /dev/null
diff --git a/qpid/java/lib/org.eclipse.swt.win32.win32.x86_3.4.1.v3449c.jar b/qpid/java/lib/org.eclipse.swt.win32.win32.x86_3.4.1.v3449c.jar
new file mode 100644
index 0000000000..5c261c8411
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.swt.win32.win32.x86_3.4.1.v3449c.jar
diff --git a/qpid/java/lib/org.eclipse.ui.forms_3.2.0.jar b/qpid/java/lib/org.eclipse.ui.forms_3.2.0.jar
deleted file mode 100644
index 460585e68b..0000000000
--- a/qpid/java/lib/org.eclipse.ui.forms_3.2.0.jar
+++ /dev/null
diff --git a/qpid/java/lib/org.eclipse.ui.forms_3.3.101.v20080708_34x.jar b/qpid/java/lib/org.eclipse.ui.forms_3.3.101.v20080708_34x.jar
new file mode 100644
index 0000000000..a458fcb058
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.ui.forms_3.3.101.v20080708_34x.jar
diff --git a/qpid/java/lib/org.eclipse.ui.workbench_3.2.1.jar b/qpid/java/lib/org.eclipse.ui.workbench_3.2.1.jar
deleted file mode 100644
index 4a10e210df..0000000000
--- a/qpid/java/lib/org.eclipse.ui.workbench_3.2.1.jar
+++ /dev/null
diff --git a/qpid/java/lib/org.eclipse.ui.workbench_3.4.1.M20080827-0800a.jar b/qpid/java/lib/org.eclipse.ui.workbench_3.4.1.M20080827-0800a.jar
new file mode 100644
index 0000000000..3e151c8122
--- /dev/null
+++ b/qpid/java/lib/org.eclipse.ui.workbench_3.4.1.M20080827-0800a.jar
diff --git a/qpid/java/lib/org.eclipse.ui_3.2.0.jar b/qpid/java/lib/org.eclipse.ui_3.4.1.M20080910-0800.jar
index b96dac530d..c7a8cf4256 100644
--- a/qpid/java/lib/org.eclipse.ui_3.2.0.jar
+++ b/qpid/java/lib/org.eclipse.ui_3.4.1.M20080910-0800.jar