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

5 files changed, 69 insertions, 44 deletions

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