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

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

29 files changed, 253 insertions, 476 deletions

diff --git a/java/management/eclipse-plugin/bin/qpidmc.bat b/java/management/eclipse-plugin/bin/qpidmc.bat
deleted file mode 100644
index 22a8a4d78c..0000000000
--- a/java/management/eclipse-plugin/bin/qpidmc.bat
+++ /dev/null
@@ -1,55 +0,0 @@
-@REM

-@REM Licensed to the Apache Software Foundation (ASF) under one

-@REM or more contributor license agreements.  See the NOTICE file

-@REM distributed with this work for additional information

-@REM regarding copyright ownership.  The ASF licenses this file

-@REM to you under the Apache License, Version 2.0 (the

-@REM "License"); you may not use this file except in compliance

-@REM with the License.  You may obtain a copy of the License at

-@REM 

-@REM   http://www.apache.org/licenses/LICENSE-2.0

-@REM 

-@REM Unless required by applicable law or agreed to in writing,

-@REM software distributed under the License is distributed on an

-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

-@REM KIND, either express or implied.  See the License for the

-@REM specific language governing permissions and limitations

-@REM under the License.

-@REM

-

-@echo off

-REM Script to run the Qpid Management Console

-

-rem Guess QPIDMC_HOME if not defined

-set CURRENT_DIR=%cd%

-if not "%QPIDMC_HOME%" == "" goto gotHome

-set QPIDMC_HOME=%CURRENT_DIR%

-echo %QPIDMC_HOME%

-if exist "%QPIDMC_HOME%\bin\qpidmc.bat" goto okHome

-cd ..

-set QPIDMC_HOME=%cd%

-cd %CURRENT_DIR%

-:gotHome

-if exist "%QPIDMC_HOME%\bin\qpidmc.bat" goto okHome

-echo The QPIDMC_HOME environment variable is not defined correctly

-echo This environment variable is needed to run this program

-goto end

-:okHome

-

-if not "%JAVA_HOME%" == "" goto gotJavaHome

-echo The JAVA_HOME environment variable is not defined

-echo This environment variable is needed to run this program

-goto exit

-:gotJavaHome

-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome

-goto okJavaHome

-:noJavaHome

-echo The JAVA_HOME environment variable is not defined correctly

-echo This environment variable is needed to run this program.

-goto exit

-:okJavaHome

-

-rem Slurp the command line arguments. This loop allows for an unlimited number

-rem of agruments (up to the command line limit, anyway).

-

-"%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 win32 -ws win32 -arch x86

diff --git a/java/management/eclipse-plugin/bin/qpidmc.sh b/java/management/eclipse-plugin/bin/qpidmc.sh
deleted file mode 100755
index 599d9bf7e0..0000000000
--- a/java/management/eclipse-plugin/bin/qpidmc.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-
-if [ -z "$JAVA" ]; then
-    JAVA=java
-fi
-
-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.
-cygwin=false
-if [[ "$(uname -a | fgrep Cygwin)" != "" ]]; then
-  cygwin=true
-fi
-
-if $cygwin; then
-  QPIDMC_HOME=$(cygpath -w $QPIDMC_HOME)
-fi
-
-
-## If this is to be run on different platform other than windows then following parameters should be passed
-## 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 the ARCH is not set via QPIDMC_ARCH then query uname for the arch,
-if [ -z "$QPIDMC_ARCH" ] ; then
-    QPIDMC_ARCH=`uname -i`
-fi
-
-# 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
deleted file mode 100755
index 1d55743d84..0000000000
--- a/java/management/eclipse-plugin/bin/qpidmc_gtk.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-
-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 gtk
diff --git a/java/management/eclipse-plugin/bin/qpidmc_motif.sh b/java/management/eclipse-plugin/bin/qpidmc_motif.sh
deleted file mode 100755
index f49759cc91..0000000000
--- a/java/management/eclipse-plugin/bin/qpidmc_motif.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# 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.
-#
-
-$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
index fa47cdf280..4c5ebecc41 100644
--- a/java/management/eclipse-plugin/build-release-common.properties
+++ b/java/management/eclipse-plugin/build-release-common.properties
@@ -19,20 +19,14 @@
 # 
 #
 
-artifactId=org.apache.qpid.management.ui
-mcplugin.version=0.1.0-${project.version}
-mcplugin.filename=${artifactId}_${mcplugin.version}
+artifact.id=org.apache.qpid.management.ui
+mcplugin.version=0.2.0-${project.version}
+mcplugin.filename=${artifact.id}_${mcplugin.version}
 
 mcplugin.contents.dir=${module.classes}
 
 mcplugin.manifest=${module.manifest}
 
-bin.dir=bin
-
-startup.jar=src/main/resources/startup.jar
-
-license.eclipse.txt=src/main/resources/license.eclipse.txt
-
 jmxremote.sasl.manifest=src/main/resources/jmxremote.sasl-plugin/MANIFEST.MF
 
 qpidmanagementcommon.manifest=src/main/resources/qpid-management-common-plugin/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
index 14fd3d2c4e..3c5eb8f3cb 100644
--- a/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties
+++ b/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties
@@ -25,10 +25,12 @@ release.subdir=${module.release.base}/${release.name}
 
 release.tar.gz=${module.release.base}/${release.name}.tar.gz
 
-eclipse.ini=src/main/resources/linux-gtk-x86/eclipse.ini
+qpidmc.ini=src/main/resources/linux-gtk-x86/qpidmc.ini
 
-rcp.libs=${management-eclipse-plugin-linux-gtk-x86.libs}
+qpidmc.executable=src/main/resources/linux-gtk-x86/qpidmc
 
+qpidmc.companion.library=src/main/resources/linux-gtk-x86/libcairo-swt.so
+ 
+rcp.libs=${management-eclipse-plugin-linux-gtk-x86.libs}
+ 
 rcp.configuration.dir=src/main/resources/linux-gtk-x86/Configuration
-
-bin.includes=qpidmc.sh qpidmc_gtk.sh
diff --git a/java/management/eclipse-plugin/build-release-macosx.properties b/java/management/eclipse-plugin/build-release-macosx.properties
index c83b7823d5..4dd0b4e569 100644
--- a/java/management/eclipse-plugin/build-release-macosx.properties
+++ b/java/management/eclipse-plugin/build-release-macosx.properties
@@ -33,8 +33,8 @@ rcp.libs=${management-eclipse-plugin-macosx.libs}
 
 rcp.configuration.dir=src/main/resources/macosx/Configuration
 
-eclipse.ini=src/main/resources/macosx/Contents/MacOS/eclipse.ini
-bin.includes=src/main/resources/macosx/Contents/MacOS/eclipse
-
+qpidmc.ini=src/main/resources/macosx/Contents/MacOS/qpidmc.ini
+qpidmc.executable=src/main/resources/macosx/Contents/MacOS/qpidmc
+ 
 eclipse.icns=src/main/resources/macosx/Contents/Resources/Console.icns
 macosx.plist=src/main/resources/macosx/Contents/Info.plist
diff --git a/java/management/eclipse-plugin/build-release-macosx.xml b/java/management/eclipse-plugin/build-release-macosx.xml
index 4a51ab5727..e9e4f000ba 100644
--- a/java/management/eclipse-plugin/build-release-macosx.xml
+++ b/java/management/eclipse-plugin/build-release-macosx.xml
@@ -18,14 +18,17 @@
  - under the License.
  -
  -->
-<project name="Eclipse Plugin Binary Release" default="release-bin">
+<project name="Eclipse Plugin MacOSX Binary Release" default="release-bin">
 
    <import file="build-release.xml"/>
 
    <property name="release.app" value="${release.subdir}/${application.dir}"/>
 
-   <target name="release-bin-mcplugin-jar">
-   	<jar destfile="${release.app}/plugins/${mcplugin.filename}.jar" basedir="${mcplugin.contents.dir}" manifest="${mcplugin.manifest}"/>
+   <target name="release-bin-qpid-mc-plugin">
+        <!-- Copy the qpid management-eclipse-plugin module jar -->
+        <copy tofile="${release.app}/plugins/${mcplugin.filename}.jar" flatten="true" failonerror="true">
+            <fileset file="${build.lib}/qpid-management-eclipse-plugin-${project.version}.jar"/>
+        </copy>
    </target>
 
    <target name="release-bin-jmxremote-plugin">
@@ -35,14 +38,24 @@
        </copy>
    </target>
 
+   <target name="release-bin-qpidmanagementcommon-plugin">
+       <!-- Copy the management common plugin's manifest, creating its plugin directory -->
+       <copy todir="${release.app}/plugins/qpid-management-common_1.0.0/META-INF" flatten="true" failonerror="true">
+           <fileset file="${qpidmanagementcommon.manifest}"/>
+       </copy>
+        <!-- Copy the qpid management-common module jar -->
+       <copy tofile="${release.app}/plugins/qpid-management-common_1.0.0/qpid-management-common.jar" flatten="true" failonerror="true">
+           <fileset file="${build.lib}/qpid-management-common-${project.version}.jar"/>
+       </copy>
+   </target>
 
-   <target name="release-bin-rcp-deps" description="copy eclipse-rcp dependencies into module release" 
-       depends="copy-executable">    	
+
+   <target name="release-bin-rcp-deps" description="copy eclipse-rcp dependencies into module release">    	
        
-       <!-- Copy remaining Eclipse binary and start-up files -->
+       <!-- Copy Eclipse binary and start-up files -->
        <copy todir="${release.app}/Contents/MacOS" flatten="true" failonerror="true">
-           <fileset file="${eclipse.ini}"/>
-           <fileset file="${bin.includes}"/>
+           <fileset file="${qpidmc.ini}"/>
+           <fileset file="${qpidmc.executable}"/>
        </copy>
 
        <chmod dir="${release.app}/Contents/MacOS" perm="u+rx" includes="**/*"/>
@@ -52,16 +65,11 @@
            <fileset file="${macosx.plist}"/>
        </copy>
 
-       <!-- Copy remaining Eclipse binary and start-up files -->
+       <!-- Copy Icns icon file -->
        <copy todir="${release.app}/Contents/Resources" flatten="true" failonerror="true">
            <fileset file="${eclipse.icns}"/>
        </copy>
 
-       <!-- Copy License file -->
-       <copy todir="${release.app}" flatten="true" failonerror="true">
-           <fileset file="${license.eclipse.txt}"/>
-       </copy>
-
        <!-- Copy the eclipse rcp module libs -->
        <copy todir="${release.app}/plugins" failonerror="true">
            <fileset dir="${project.root}" includes="${rcp.libs}"/>
diff --git a/java/management/eclipse-plugin/build-release-win32-win32-x86.properties b/java/management/eclipse-plugin/build-release-win32-win32-x86.properties
index 0545a1d909..f4d3c48420 100644
--- a/java/management/eclipse-plugin/build-release-win32-win32-x86.properties
+++ b/java/management/eclipse-plugin/build-release-win32-win32-x86.properties
@@ -25,12 +25,10 @@ release.subdir=${module.release.base}/${release.name}
 
 release.zip=${module.release.base}/${release.name}.zip
 
-eclipse.executable=src/main/resources/win32-win32-x86/eclipse.exe
-
-eclipse.ini=src/main/resources/win32-win32-x86/eclipse.ini
+qpidmc.executable=src/main/resources/win32-win32-x86/qpidmc.exe
+ 
+qpidmc.ini=src/main/resources/win32-win32-x86/qpidmc.ini
 
 rcp.libs=${management-eclipse-plugin-win32-win32-x86.libs}
-
+ 
 rcp.configuration.dir=src/main/resources/win32-win32-x86/Configuration
-
-bin.includes=qpidmc.bat
diff --git a/java/management/eclipse-plugin/build-release.xml b/java/management/eclipse-plugin/build-release.xml
index 74a47c5e38..b396974c9a 100644
--- a/java/management/eclipse-plugin/build-release.xml
+++ b/java/management/eclipse-plugin/build-release.xml
@@ -25,17 +25,12 @@
     	<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 ="license.eclipse.txt"/>
                 <isset property ="jmxremote.sasl.manifest"/>
                 <isset property ="qpidmanagementcommon.manifest"/>
                 <!-- platform specific properties -->
-                <isset property ="eclipse.ini"/>
-                <isset property ="bin.includes"/>
+                <isset property ="qpidmc.ini"/>
+                <isset property ="qpidmc.executable"/>
                 <isset property ="release.name"/>
                 <isset property ="release.subdir"/>
                 <isset property ="rcp.libs"/>
@@ -45,75 +40,73 @@
     		        <isset property ="release.tar.gz"/>
     		    </or>
         	</and>
-            <!-- Optional Properties -->
-            <!-- eclipse.executable.companion.library -->
+            <!-- Optional Properties:
+
+    	    For linux libcairo-swt.so file:
+            qpidmc.companion.library
+            
+            -->
         </condition>
 
-        <fail unless="properties.set" message="required properties not set"/>
+        <fail unless="properties.set" message="some required properties were 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 name="release-bin-qpid-mc-plugin">
+        <!-- Copy the qpid management-eclipse-plugin module jar -->
+        <copy tofile="${release.subdir}/plugins/${mcplugin.filename}.jar" flatten="true" failonerror="true">
+            <fileset file="${build.lib}/qpid-management-eclipse-plugin-${project.version}.jar"/>
+        </copy>
     </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">
+        <copy todir="${release.subdir}/plugins/jmxremote.sasl_1.0.1/META-INF" flatten="true" failonerror="true">
             <fileset file="${jmxremote.sasl.manifest}"/>
         </copy>
     </target>
 
     <target name="release-bin-qpidmanagementcommon-plugin">
         <!-- Copy the management common plugin's manifest, creating its plugin directory -->
-        <copy todir="${release.subdir}/eclipse/plugins/qpid-management-common_1.0.0/META-INF" flatten="true" failonerror="true">
+        <copy todir="${release.subdir}/plugins/qpid-management-common_1.0.0/META-INF" flatten="true" failonerror="true">
             <fileset file="${qpidmanagementcommon.manifest}"/>
         </copy>
-        <copy todir="${release.subdir}/eclipse/plugins/qpid-management-common_1.0.0/" flatten="true" failonerror="true">
+        <!-- Copy the qpid management-common module jar -->
+        <copy tofile="${release.subdir}/plugins/qpid-management-common_1.0.0/qpid-management-common.jar" flatten="true" failonerror="true">
             <fileset file="${build.lib}/qpid-management-common-${project.version}.jar"/>
         </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}"/>
+    
+    <target name="release-bin-executable-companion-library" if="qpidmc.companion.library">
+        <!-- Copy the rcp executable companion library file -->
+        <copy todir="${release.subdir}" flatten="true" failonerror="true">
+            <fileset file="${qpidmc.companion.library}"/>
         </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">    	
+    
+    <target name="release-bin-rcp-deps" description="copy eclipse-rcp dependencies into module release"
+        depends="release-bin-executable-companion-library">
+        
+        <!-- Copy the rcp executable file -->
+        <copy todir="${release.subdir}" flatten="true" failonerror="true">
+            <fileset file="${qpidmc.executable}"/>
+        </copy>
+        <chmod dir="${release.subdir}" perm="u+rx" includes="**/*"/>
         
         <!-- 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 todir="${release.subdir}" flatten="true" failonerror="true">
+            <fileset file="${qpidmc.ini}"/>
         </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">
-
+        <!-- Copy the rcp module libs -->
+        <copy todir="${release.subdir}/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}"/>
@@ -124,16 +117,16 @@
     <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/*"/>
+                <include name="qpidmc*"/>
+                <exclude name="qpidmc.ini"/>
             </zipfileset>
-
-            <zipfileset dir="${release.subdir}" prefix="${release.name}" filemode="755">
-                <include name="eclipse/eclipse*"/>
+            
+            <zipfileset dir="${release.subdir}" prefix="${release.name}" filemode="644">
+                <include name="qpidmc.ini"/>
             </zipfileset>
 
             <zipfileset dir="${release.subdir}" prefix="${release.name}" filemode="644" dirmode="755">
-                <exclude name="bin/**"/>
-                <exclude name="eclipse/eclipse*"/>
+                <exclude name="qpidmc*"/>
             </zipfileset>
         </zip>
     </target>    		
@@ -141,23 +134,22 @@
     <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/*"/>
+                <include name="qpidmc*"/>
+                <exclude name="qpidmc.ini"/>
             </tarfileset>
 
-            <tarfileset dir="${release.subdir}" prefix="${release.name}" filemode="755">
-                <include name="eclipse/eclipse*"/>
+            <tarfileset dir="${release.subdir}" prefix="${release.name}" filemode="644">
+                <include name="qpidmc.ini"/>
             </tarfileset>
 
             <tarfileset dir="${release.subdir}" prefix="${release.name}" filemode="644" dirmode="755">
-                <exclude name="bin/**"/>
-                <exclude name="eclipse/eclipse*"/>
+                <exclude name="qpidmc*"/>
             </tarfileset>
         </tar>
     </target>
 
     
-    
     <target name="release-bin" depends="check,release-bin-prepare,release-bin-rcp-deps,
-        release-bin-mcplugin-jar,release-bin-qpidmanagementcommon-plugin,release-bin-jmxremote-plugin,release-bin-zip,release-bin-gzip"/>
+        release-bin-qpid-mc-plugin,release-bin-qpidmanagementcommon-plugin,release-bin-jmxremote-plugin,release-bin-zip,release-bin-gzip"/>
     
 </project>
diff --git a/java/management/eclipse-plugin/build.xml b/java/management/eclipse-plugin/build.xml
index 1d6144116d..4dd279f721 100644
--- a/java/management/eclipse-plugin/build.xml
+++ b/java/management/eclipse-plugin/build.xml
@@ -61,9 +61,7 @@
 
     </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"/>
+    <target name="precompile" depends="copy-plugin-files, create-version" />
 
     <!-- Override imported module.xml release-bin target -->
     <target name="release-bin" depends="build">
diff --git a/java/management/eclipse-plugin/src/main/resources/license.eclipse.txt b/java/management/eclipse-plugin/src/main/resources/license.eclipse.txt
deleted file mode 100644
index da433e89f9..0000000000
--- a/java/management/eclipse-plugin/src/main/resources/license.eclipse.txt
+++ /dev/null
@@ -1,88 +0,0 @@
-Eclipse Public License - v 1.0 
-
-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 
-
-1. DEFINITIONS 
-
-"Contribution" means: 
-
-a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
-b) in the case of each subsequent Contributor:
-
-i) changes to the Program, and
-
-ii) additions to the Program;
-
-where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. 
-
-"Contributor" means any person or entity that distributes the Program. 
-
-"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. 
-
-"Program" means the Contributions distributed in accordance with this Agreement. 
-
-"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. 
-
-2. GRANT OF RIGHTS 
-
-a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
-
-b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. 
-
-c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
-
-d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. 
-
-3. REQUIREMENTS 
-
-A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: 
-
-a) it complies with the terms and conditions of this Agreement; and
-
-b) its license agreement:
-
-i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; 
-
-ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; 
-
-iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
-
-iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. 
-
-When the Program is made available in source code form: 
-
-a) it must be made available under this Agreement; and 
-
-b) a copy of this Agreement must be included with each copy of the Program. 
-
-Contributors may not remove or alter any copyright notices contained within the Program. 
-
-Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. 
-
-4. COMMERCIAL DISTRIBUTION 
-
-Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. 
-
-For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. 
-
-5. NO WARRANTY 
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. 
-
-6. DISCLAIMER OF LIABILITY 
-
-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
-
-7. GENERAL 
-
-If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. 
-
-If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. 
-
-All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. 
-
-Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. 
-
-This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. 
-
- 
diff --git a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/config.ini b/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/config.ini
index 3c70d9aa0d..be058e2ae5 100644
--- a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/config.ini
+++ b/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/config.ini
@@ -17,11 +17,32 @@
 #  under the License.

 ###############################################################################

 

-#Product Runtime Configuration File

-

-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.gtk.linux.x86,org.eclipse.ui,org.eclipse.ui.forms,org.eclipse.ui.workbench,jmxremote.sasl,qpid-management-common

-osgi.bundles.defaultStartLevel=4

-eof=eof

+#Product Runtime Configuration File
+
+osgi.splashPath=platform:/base/plugins/org.apache.qpid.management.ui
+eclipse.product=org.apache.qpid.management.ui.product
+osgi.bundles.defaultStartLevel=4
+osgi.bundles=jmxremote.sasl, \
+qpid-management-common, \
+org.apache.qpid.management.ui, \
+com.ibm.icu, \
+org.eclipse.core.commands, \
+org.eclipse.core.contenttype, \
+org.eclipse.core.databinding, \
+org.eclipse.core.expressions, \
+org.eclipse.core.jobs, \
+org.eclipse.core.runtime@start, \
+org.eclipse.core.runtime.compatibility.registry, \
+org.eclipse.equinox.app,org.eclipse.equinox.common, \
+org.eclipse.equinox.preferences, \
+org.eclipse.equinox.registry, \
+org.eclipse.help, \
+org.eclipse.jface, \
+org.eclipse.jface.databinding, \
+org.eclipse.swt, \
+org.eclipse.swt.gtk.linux.x86, \
+org.eclipse.ui, \
+org.eclipse.ui.forms, \
+org.eclipse.ui.workbench, \
+org.eclipse.equinox.launcher, \
+org.eclipse.equinox.launcher.gtk.linux.x86
diff --git a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/eclipse.ini b/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/eclipse.ini
deleted file mode 100644
index 33884bd8f1..0000000000
--- a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/eclipse.ini
+++ /dev/null
@@ -1,11 +0,0 @@
--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/management/eclipse-plugin/src/main/resources/linux-gtk-x86/libcairo-swt.so b/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/libcairo-swt.so
new file mode 100644
index 0000000000..b66f95814e
--- /dev/null
+++ b/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/libcairo-swt.so
diff --git a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc b/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc
new file mode 100644
index 0000000000..0cc5c65455
--- /dev/null
+++ b/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc
diff --git a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini b/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini
index 33884bd8f1..8fd70ba19f 100644
--- a/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini
+++ b/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini
@@ -1,11 +1,25 @@
--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
+###############################################################################
+#  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.
+###############################################################################
+
 -vmargs
 -Xms40m
 -Xmx256m
+-XX:MaxPermSize=256m
+-Dosgi.requiredJavaVersion=1.5
+-Declipse.consoleLog=true
diff --git a/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/config.ini b/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/config.ini
index de55f949a4..a7c671ce2d 100644
--- a/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/config.ini
+++ b/java/management/eclipse-plugin/src/main/resources/macosx/Configuration/config.ini
@@ -1,30 +1,48 @@
-###############################################################################
-#  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.
-###############################################################################
-
+###############################################################################

+#  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.

+###############################################################################

+

 #Product Runtime Configuration File
 
-org.eclipse.update.reconcile=false
-osgi.splashPath=platform\:/base/plugins/org.eclipse.platform
+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.carbon.macosx,org.eclipse.ui,org.eclipse.ui.forms,org.eclipse.ui.workbench,org.eclipse.equinox.app,org.eclipse.core.databinding,org.eclipse.jface.databinding,jmxremote.sasl,qpid-management-common
-
 osgi.bundles.defaultStartLevel=4
-eof=eof
+osgi.bundles=jmxremote.sasl, \
+qpid-management-common, \
+org.apache.qpid.management.ui, \
+com.ibm.icu, \
+org.eclipse.core.commands, \
+org.eclipse.core.contenttype, \
+org.eclipse.core.databinding, \
+org.eclipse.core.expressions, \
+org.eclipse.core.jobs, \
+org.eclipse.core.runtime@start, \
+org.eclipse.core.runtime.compatibility.registry, \
+org.eclipse.equinox.app,org.eclipse.equinox.common, \
+org.eclipse.equinox.preferences, \
+org.eclipse.equinox.registry, \
+org.eclipse.help, \
+org.eclipse.jface, \
+org.eclipse.jface.databinding, \
+org.eclipse.swt, \
+org.eclipse.swt.carbon.macosx, \
+org.eclipse.ui, \
+org.eclipse.ui.forms, \
+org.eclipse.ui.workbench, \
+org.eclipse.equinox.launcher, \
+org.eclipse.equinox.launcher.carbon.macosx
diff --git a/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist b/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist
index 77f79a2944..e06c8a6e60 100644
--- a/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist
+++ b/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleExecutable</key>
-	<string>eclipse</string>
+	<string>qpidmc</string>
 	<key>CFBundleGetInfoString</key>
 	<string>Apache Qpid Management Console for Mac OS X</string>
 	<key>CFBundleIconFile</key>
@@ -26,6 +26,10 @@
 	<array>
 		<string>-consoleLog</string>
 		<string>-showlocation</string>
+		<!-- WARNING:
+		If you try to add a single VM argument (-vmargs) here,
+		*all* vmargs specified in qpidmc.ini will be ignored.
+		We recommend to add all arguments in MacOS/qpidmc.ini  -->
 	</array>
 </dict>
 </plist>
diff --git a/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/eclipse.ini b/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/eclipse.ini
deleted file mode 100644
index d3c2505730..0000000000
--- a/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/eclipse.ini
+++ /dev/null
@@ -1,14 +0,0 @@
--showsplash
-org.eclipse.platform
--startup
-../../plugins/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar
---launcher.library
-../../plugins/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731
--vmargs
-#-Xdock:icon=../Resources/Eclipse.icns
--XstartOnFirstThread
--Xms40m
--Xmx512m
--XX:MaxPermSize=256m
--Dosgi.requiredJavaVersion=1.5
--Dorg.eclipse.swt.internal.carbon.smallFonts
diff --git a/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/eclipse b/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
index 36247a08e4..36247a08e4 100755
--- a/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/eclipse
+++ b/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
diff --git a/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini b/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini
index d3c2505730..231adf2d8b 100644
--- a/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini
+++ b/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini
@@ -1,14 +1,31 @@
--showsplash
-org.eclipse.platform
+###############################################################################
+#  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.
+###############################################################################
+
 -startup
 ../../plugins/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar
 --launcher.library
 ../../plugins/org.eclipse.equinox.launcher.carbon.macosx_1.0.101.R34x_v20080731
 -vmargs
-#-Xdock:icon=../Resources/Eclipse.icns
 -XstartOnFirstThread
 -Xms40m
 -Xmx512m
 -XX:MaxPermSize=256m
 -Dosgi.requiredJavaVersion=1.5
+-Declipse.consoleLog=true
 -Dorg.eclipse.swt.internal.carbon.smallFonts
diff --git a/java/management/eclipse-plugin/src/main/resources/qpid-management-common-plugin/MANIFEST.MF b/java/management/eclipse-plugin/src/main/resources/qpid-management-common-plugin/MANIFEST.MF
index 496dec6129..5ef0c78606 100644
--- a/java/management/eclipse-plugin/src/main/resources/qpid-management-common-plugin/MANIFEST.MF
+++ b/java/management/eclipse-plugin/src/main/resources/qpid-management-common-plugin/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 1
 Bundle-Name: Qpid management commonPlug-in
 Bundle-SymbolicName: qpid-management-common
 Bundle-Version: 1.0.0
-Bundle-ClassPath: qpid-management-common-M4.jar
+Bundle-ClassPath: qpid-management-common.jar
 Export-Package: org.apache.qpid.management.common,
  org.apache.qpid.management.common.sasl
 Bundle-Vendor:
diff --git a/java/management/eclipse-plugin/src/main/resources/startup.jar b/java/management/eclipse-plugin/src/main/resources/startup.jar
deleted file mode 100644
index 2f26eceece..0000000000
--- a/java/management/eclipse-plugin/src/main/resources/startup.jar
+++ /dev/null
diff --git a/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/config.ini b/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/config.ini
index aa68db3e4e..d00d756706 100644
--- a/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/config.ini
+++ b/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/config.ini
@@ -21,6 +21,28 @@
 

 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.win32.win32.x86,org.eclipse.ui,org.eclipse.ui.forms,jmxremote.sasl,org.eclipse.ui.workbench,qpid-management-common

 osgi.bundles.defaultStartLevel=4

+osgi.bundles=jmxremote.sasl, \

+qpid-management-common, \

+org.apache.qpid.management.ui, \

+com.ibm.icu, \

+org.eclipse.core.commands, \

+org.eclipse.core.contenttype, \

+org.eclipse.core.databinding, \

+org.eclipse.core.expressions, \

+org.eclipse.core.jobs, \

+org.eclipse.core.runtime@start, \

+org.eclipse.core.runtime.compatibility.registry, \

+org.eclipse.equinox.app,org.eclipse.equinox.common, \

+org.eclipse.equinox.preferences, \

+org.eclipse.equinox.registry, \

+org.eclipse.help, \

+org.eclipse.jface, \

+org.eclipse.jface.databinding, \

+org.eclipse.swt, \

+org.eclipse.swt.win32.win32.x86, \

+org.eclipse.ui, \

+org.eclipse.ui.forms, \

+org.eclipse.ui.workbench, \

+org.eclipse.equinox.launcher, \

+org.eclipse.equinox.launcher.win32.win32.x86

diff --git a/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/eclipse.exe b/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/eclipse.exe
deleted file mode 100644
index 7826d1ed80..0000000000
--- a/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/eclipse.exe
+++ /dev/null
diff --git a/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/eclipse.ini b/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/eclipse.ini
deleted file mode 100644
index f56524580d..0000000000
--- a/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/eclipse.ini
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-#  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.
-###############################################################################
-
--vmargs

--Xms40m

--Xmx256m

--Declipse.consoleLog=true

diff --git a/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.exe b/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.exe
new file mode 100644
index 0000000000..3999884bfb
--- /dev/null
+++ b/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.exe
diff --git a/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini b/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini
index f56524580d..9f3ad202ad 100644
--- a/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini
+++ b/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini
@@ -1,23 +1,25 @@
-###############################################################################
-#  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.
-###############################################################################
-
+###############################################################################

+#  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.

+###############################################################################

+

 -vmargs

 -Xms40m

 -Xmx256m

+-XX:MaxPermSize=256m

+-Dosgi.requiredJavaVersion=1.5

 -Declipse.consoleLog=true