diff options
Diffstat (limited to 'qpid/java')
19 files changed, 61 insertions, 13 deletions
diff --git a/qpid/java/management/eclipse-plugin/build-release-common.properties b/qpid/java/management/eclipse-plugin/build-release-common.properties index 29f582bec5..fa47cdf280 100644 --- a/qpid/java/management/eclipse-plugin/build-release-common.properties +++ b/qpid/java/management/eclipse-plugin/build-release-common.properties @@ -31,10 +31,8 @@ bin.dir=bin startup.jar=src/main/resources/startup.jar -eclipse.ini=src/main/resources/eclipse.ini - license.eclipse.txt=src/main/resources/license.eclipse.txt -jmxremote.sasl.manifest=src/main/resources/sasl/MANIFEST.MF +jmxremote.sasl.manifest=src/main/resources/jmxremote.sasl-plugin/MANIFEST.MF -qpidmanagementcommon.manifest=src/main/resources/qpidmanagementcommon/MANIFEST.MF +qpidmanagementcommon.manifest=src/main/resources/qpid-management-common-plugin/MANIFEST.MF diff --git a/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties b/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties index 5aef021763..14fd3d2c4e 100644 --- a/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties +++ b/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties @@ -25,10 +25,10 @@ release.subdir=${module.release.base}/${release.name} release.tar.gz=${module.release.base}/${release.name}.tar.gz -eclipse.ini=src/main/resources/unix/eclipse.ini +eclipse.ini=src/main/resources/linux-gtk-x86/eclipse.ini rcp.libs=${management-eclipse-plugin-linux-gtk-x86.libs} -rcp.configuration.dir=src/main/resources/unix/configuration +rcp.configuration.dir=src/main/resources/linux-gtk-x86/Configuration bin.includes=qpidmc.sh qpidmc_gtk.sh diff --git a/qpid/java/management/eclipse-plugin/build-release-macosx.properties b/qpid/java/management/eclipse-plugin/build-release-macosx.properties index cdeef836ed..c83b7823d5 100644 --- a/qpid/java/management/eclipse-plugin/build-release-macosx.properties +++ b/qpid/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/eclipse.ini -bin.includes=src/main/resources/macosx/eclipse +eclipse.ini=src/main/resources/macosx/Contents/MacOS/eclipse.ini +bin.includes=src/main/resources/macosx/Contents/MacOS/eclipse -eclipse.icns=src/main/resources/icons/Console.icns -macosx.plist=src/main/resources/macosx/Info.plist +eclipse.icns=src/main/resources/macosx/Contents/Resources/Console.icns +macosx.plist=src/main/resources/macosx/Contents/Info.plist diff --git a/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties b/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties index 1f28ccb99f..0545a1d909 100644 --- a/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties +++ b/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties @@ -25,10 +25,12 @@ release.subdir=${module.release.base}/${release.name} release.zip=${module.release.base}/${release.name}.zip -eclipse.executable=src/main/resources/eclipse.exe +eclipse.executable=src/main/resources/win32-win32-x86/eclipse.exe + +eclipse.ini=src/main/resources/win32-win32-x86/eclipse.ini rcp.libs=${management-eclipse-plugin-win32-win32-x86.libs} -rcp.configuration.dir=src/main/resources/win32/configuration +rcp.configuration.dir=src/main/resources/win32-win32-x86/Configuration bin.includes=qpidmc.bat diff --git a/qpid/java/management/eclipse-plugin/build-release.xml b/qpid/java/management/eclipse-plugin/build-release.xml index 46eca58424..74a47c5e38 100644 --- a/qpid/java/management/eclipse-plugin/build-release.xml +++ b/qpid/java/management/eclipse-plugin/build-release.xml @@ -30,11 +30,11 @@ <isset property ="mcplugin.filename"/> <isset property ="bin.dir"/> <isset property ="startup.jar"/> - <isset property ="eclipse.ini"/> <isset property ="license.eclipse.txt"/> <isset property ="jmxremote.sasl.manifest"/> <isset property ="qpidmanagementcommon.manifest"/> <!-- platform specific properties --> + <isset property ="eclipse.ini"/> <isset property ="bin.includes"/> <isset property ="release.name"/> <isset property ="release.subdir"/> diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/sasl/MANIFEST.MF b/qpid/java/management/eclipse-plugin/src/main/resources/jmxremote.sasl-plugin/MANIFEST.MF index fa11bac2ea..fa11bac2ea 100644 --- a/qpid/java/management/eclipse-plugin/src/main/resources/sasl/MANIFEST.MF +++ b/qpid/java/management/eclipse-plugin/src/main/resources/jmxremote.sasl-plugin/MANIFEST.MF diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/unix/configuration/config.ini b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/config.ini index 3c70d9aa0d..3c70d9aa0d 100644 --- a/qpid/java/management/eclipse-plugin/src/main/resources/unix/configuration/config.ini +++ b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/Configuration/config.ini diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/unix/eclipse.ini b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/eclipse.ini index 33884bd8f1..33884bd8f1 100644 --- a/qpid/java/management/eclipse-plugin/src/main/resources/unix/eclipse.ini +++ b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/eclipse.ini diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini new file mode 100644 index 0000000000..33884bd8f1 --- /dev/null +++ b/qpid/java/management/eclipse-plugin/src/main/resources/linux-gtk-x86/qpidmc.ini @@ -0,0 +1,11 @@ +-startup +plugins/org.eclipse.equinox.launcher_1.0.101.R34x_v20080819.jar +--launcher.library +plugins/org.eclipse.equinox.launcher.gtk.linux.x86_1.0.101.R34x_v20080805 +#-showsplash +#org.eclipse.platform +--launcher.XXMaxPermSize +256m +-vmargs +-Xms40m +-Xmx256m diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Info.plist b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist index 77f79a2944..77f79a2944 100644 --- a/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Info.plist +++ b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Info.plist diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/macosx/eclipse b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/eclipse Binary files differindex 36247a08e4..36247a08e4 100755 --- a/qpid/java/management/eclipse-plugin/src/main/resources/macosx/eclipse +++ b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/eclipse diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/macosx/eclipse.ini b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/eclipse.ini index d3c2505730..d3c2505730 100644 --- a/qpid/java/management/eclipse-plugin/src/main/resources/macosx/eclipse.ini +++ b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/eclipse.ini diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini new file mode 100644 index 0000000000..d3c2505730 --- /dev/null +++ b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc.ini @@ -0,0 +1,14 @@ +-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/qpid/java/management/eclipse-plugin/src/main/resources/icons/Console.icns b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Resources/Console.icns Binary files differindex 610976efab..610976efab 100644 --- a/qpid/java/management/eclipse-plugin/src/main/resources/icons/Console.icns +++ b/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/Resources/Console.icns diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/qpidmanagementcommon/MANIFEST.MF b/qpid/java/management/eclipse-plugin/src/main/resources/qpid-management-common-plugin/MANIFEST.MF index 496dec6129..496dec6129 100644 --- a/qpid/java/management/eclipse-plugin/src/main/resources/qpidmanagementcommon/MANIFEST.MF +++ b/qpid/java/management/eclipse-plugin/src/main/resources/qpid-management-common-plugin/MANIFEST.MF diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/win32/configuration/config.ini b/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/config.ini index aa68db3e4e..aa68db3e4e 100644 --- a/qpid/java/management/eclipse-plugin/src/main/resources/win32/configuration/config.ini +++ b/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/Configuration/config.ini diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/eclipse.exe b/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/eclipse.exe Binary files differindex 7826d1ed80..7826d1ed80 100644 --- a/qpid/java/management/eclipse-plugin/src/main/resources/eclipse.exe +++ b/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/eclipse.exe diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/eclipse.ini b/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/eclipse.ini index f56524580d..f56524580d 100644 --- a/qpid/java/management/eclipse-plugin/src/main/resources/eclipse.ini +++ b/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/eclipse.ini diff --git a/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini b/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini new file mode 100644 index 0000000000..f56524580d --- /dev/null +++ b/qpid/java/management/eclipse-plugin/src/main/resources/win32-win32-x86/qpidmc.ini @@ -0,0 +1,23 @@ +############################################################################### +# 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
|