From 382cb45063f25b0e8ae5324b955b6deb4f0b01aa Mon Sep 17 00:00:00 2001 From: Ludovic Poitou <ludovic.poitou@forgerock.com> Date: Mon, 27 May 2013 15:33:03 +0000 Subject: [PATCH] Fix for OpenDJ-909 : ControlPanel.app exits during startup. There are a number of issues with the Mac Apps, and this commit fixes most of them, but we should also change the icon name and picture once we have a logo for OpenDJ. The version and revision numbers are now automatically set when packaging. The -client JVM option is deprecated and thus removed. And we properly set the ServerRoot to allow ControlPanel to work when double clicking the icon. Note that Mac App are dependant on the JavaApplicationStub that only supports Java6. We fine for now, since OpenDJ is built with target 1.6, but we will need to redo the Apps when/if we switch to 1.7 by default. --- opends/resource/mac/ControlPanel.app/Contents/Info.plist | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/opends/resource/mac/ControlPanel.app/Contents/Info.plist b/opends/resource/mac/ControlPanel.app/Contents/Info.plist index f7e18f3..ed7ce1d 100644 --- a/opends/resource/mac/ControlPanel.app/Contents/Info.plist +++ b/opends/resource/mac/ControlPanel.app/Contents/Info.plist @@ -6,8 +6,10 @@ <string>OpenDJ Control Panel</string> <key>CFBundleIdentifier</key> <string>org.opends.guitools.controlpanel.ControlPanelLauncher</string> + <key>CFBundleShortVersionString</key> + <string>@version@</string> <key>CFBundleVersion</key> - <string>2.3.0</string> + <string>@revision@</string> <key>CFBundleAllowMixedLocalizations</key> <string>true</string> <key>CFBundleExecutable</key> @@ -25,7 +27,7 @@ <key>Java</key> <dict> <key>VMOptions</key> - <string>-client</string> + <string>-Dorg.opends.server.ServerRoot=$APP_PACKAGE/../..</string> <key>MainClass</key> <string>org.opends.guitools.controlpanel.ControlPanelLauncher</string> <key>JVMVersion</key> -- Gitblit v1.10.0