From ff9b49ad76234e3b60512fc479343030a6b367ad Mon Sep 17 00:00:00 2001 From: ludovicp <ludovicp@localhost> Date: Wed, 18 Aug 2010 09:47:15 +0000 Subject: [PATCH] Cleanup. Remove references to Java 5 since we no longer support it. Cleanup messages, removing unnecessary casts (due to bugs in early versions of Java 5), removing dead code. The minimal version has been set to Java 1.6.0_10. Also cleanup the Java Stubs for MacOS, removed the StatusPanel (replaced by ControlPanel since 1.2), and update Info.plist to require 1.6 or higher, show 2.3 as version. --- opends/resource/mac/ControlPanel.app/Contents/Info.plist | 65 +++++++++++++++++++------------- 1 files changed, 38 insertions(+), 27 deletions(-) diff --git a/opends/resource/mac/ControlPanel.app/Contents/Info.plist b/opends/resource/mac/ControlPanel.app/Contents/Info.plist index 859934d..8ce55ef 100644 --- a/opends/resource/mac/ControlPanel.app/Contents/Info.plist +++ b/opends/resource/mac/ControlPanel.app/Contents/Info.plist @@ -1,42 +1,53 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> -<plist version="1.0"> +<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd"> +<plist version="0.9"> <dict> - <key>CFBundleAllowMixedLocalizations</key> - <string>true</string> - <key>CFBundleDevelopmentRegion</key> - <string>English</string> - <key>CFBundleExecutable</key> - <string>JavaApplicationStub</string> - <key>CFBundleGetInfoString</key> - <string>OpenDS Control Panel</string> - <key>CFBundleIconFile</key> - <string>OpenDS.icns</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> <key>CFBundleName</key> <string>OpenDS Control Panel</string> + <key>CFBundleIdentifier</key> + <string>org.opends.guitools.controlpanel.ControlPanelLauncher</string> + <key>CFBundleVersion</key> + <string>2.3.0</string> + <key>CFBundleAllowMixedLocalizations</key> + <string>true</string> + <key>CFBundleExecutable</key> + <string>JavaApplicationStub</string> + <key>CFBundleDevelopmentRegion</key> + <string>English</string> <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleSignature</key> <string>????</string> - <key>CFBundleVersion</key> - <string>1.0</string> + <key>CFBundleInfoDictionaryVersion</key> + <string>6.0</string> + <key>CFBundleIconFile</key> + <string>OpenDS.icns</string> <key>Java</key> <dict> - <key>ClassPath</key> - <array> - <string>$JAVAROOT/../../../../../lib/quicksetup.jar</string> - <string>$JAVAROOT/../../../../../lib/activation.jar</string> - <string>$JAVAROOT/../../../../../lib/aspectjrt.jar</string> - <string>$JAVAROOT/../../../../../lib/OpenDS.jar</string> - <string>$JAVAROOT/../../../../../lib/mail.jar</string> - <string>$JAVAROOT/../../../../../lib/je.jar</string> - </array> - <key>JVMVersion</key> - <string>1.5+</string> + <key>VMOptions</key> + <string>-client</string> <key>MainClass</key> <string>org.opends.guitools.controlpanel.ControlPanelLauncher</string> + <key>JVMVersion</key> + <string>1.6+</string> + <key>ClassPath</key> + <array> + <string>$JAVAROOT/../../../../../lib/OpenDS.jar</string> + <string>$JAVAROOT/../../../../../lib/activation.jar</string> + <string>$JAVAROOT/../../../../../lib/je.jar</string> + <string>$JAVAROOT/../../../../../lib/mail.jar</string> + <string>$JAVAROOT/../../../../../lib/quicksetup.jar</string> + <string>$JAVAROOT/../../../../../lib/OpenDS_ca_ES.jar</string> + <string>$JAVAROOT/../../../../../lib/OpenDS_de.jar</string> + <string>$JAVAROOT/../../../../../lib/OpenDS_es.jar</string> + <string>$JAVAROOT/../../../../../lib/OpenDS_fr.jar</string> + <string>$JAVAROOT/../../../../../lib/OpenDS_ja.jar</string> + <string>$JAVAROOT/../../../../../lib/OpenDS_ko.jar</string> + <string>$JAVAROOT/../../../../../lib/OpenDS_pl.jar</string> + <string>$JAVAROOT/../../../../../lib/OpenDS_zh_CN.jar</string> + <string>$JAVAROOT/../../../../../lib/OpenDS_zh_TW.jar</string> + </array> </dict> </dict> </plist> + -- Gitblit v1.10.0