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/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java | 6
opends/resource/admin/example-plugin/build.xml | 6
opends/resource/mac/ControlPanel.app/Contents/Info.plist | 65 +++--
opends/resource/install.txt | 2
opends/resource/mac/QuickSetup.app/Contents/Info.plist | 65 +++--
opends/resource/mac/ControlPanel.app/Contents/MacOS/JavaApplicationStub | 0
opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java | 16 -
opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java | 16 -
opends/resource/bin/_script-util.bat | 14
opends/src/server/org/opends/server/tools/InstallDS.java | 9
opends/resource/bin/_script-util.sh | 14
opends/src/server/org/opends/server/util/Platform.java | 87 -------
opends/tests/staf-tests/shared/functions/utils.xml | 2
opends/src/admin/messages/RegularExpressionIdentityMapperCfgDefn.properties | 2
opends/resource/install.html | 204 +++++++++---------
opends/resource/config/java.properties | 4
opends/src/admin/defn/org/opends/server/admin/std/RegularExpressionIdentityMapperConfiguration.xml | 6
/dev/null | 0
opends/src/quicksetup/org/opends/quicksetup/util/IncompatibleVersionException.java | 6
opends/resource/mac/QuickSetup.app/Contents/MacOS/JavaApplicationStub | 0
opends/resource/mac/Uninstall.app/Contents/Info.plist | 65 +++--
opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java | 4
opends/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java | 15
opends/resource/webstart/create-webstart-standalone.sh | 4
opends/src/quicksetup/org/opends/quicksetup/util/CompatibleJava.java | 4
opends/src/messages/src/org/opends/messages/Message.java | 28 -
opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java | 6
opends/resource/mac/Uninstall.app/Contents/MacOS/JavaApplicationStub | 0
28 files changed, 282 insertions(+), 368 deletions(-)
diff --git a/opends/resource/admin/example-plugin/build.xml b/opends/resource/admin/example-plugin/build.xml
index 3622061..0639a4b 100644
--- a/opends/resource/admin/example-plugin/build.xml
+++ b/opends/resource/admin/example-plugin/build.xml
@@ -22,7 +22,7 @@
! CDDL HEADER END
!
!
- ! Copyright 2008 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<project name="Directory Server Extension" basedir="." default="package">
@@ -100,7 +100,7 @@
<!-- Compile the Directory Server extension source files. -->
<target name="compile" depends="init,compileadmin,generate-messages" description="Compile the Directory Server extension source files.">
<mkdir dir="${classes.dir}" />
- <javac srcdir="${src.dir}:${src.gen.dir}" destdir="${classes.dir}" optimize="true" excludes="**/package-info.java" debug="on" debuglevel="lines,source" source="1.5" target="1.5" deprecation="true" fork="true" memoryInitialSize="${MEM}" memoryMaximumSize="${MEM}">
+ <javac srcdir="${src.dir}:${src.gen.dir}" destdir="${classes.dir}" optimize="true" excludes="**/package-info.java" debug="on" debuglevel="lines,source" source="1.6" target="1.6" deprecation="true" fork="true" memoryInitialSize="${MEM}" memoryMaximumSize="${MEM}">
<compilerarg value="-Xlint:all" />
<classpath>
<fileset dir="${lib.dir}">
@@ -116,7 +116,7 @@
<!-- Generate JavaDoc documentation from the source files. -->
<target name="javadoc" depends="init,compile" description="Generate JavaDoc documentation.">
<mkdir dir="${javadoc.dir}" />
- <javadoc destdir="${javadoc.dir}" source="1.5" additionalparam="-quiet" linksource="yes" windowtitle="${pkg.description} API Documentation" maxmemory="${MEM}">
+ <javadoc destdir="${javadoc.dir}" source="1.6" additionalparam="-quiet" linksource="yes" windowtitle="${pkg.description} API Documentation" maxmemory="${MEM}">
<classpath>
<fileset dir="${lib.dir}">
<include name="*.jar" />
diff --git a/opends/resource/bin/_script-util.bat b/opends/resource/bin/_script-util.bat
index 3af240a..e26613e 100644
--- a/opends/resource/bin/_script-util.bat
+++ b/opends/resource/bin/_script-util.bat
@@ -119,11 +119,11 @@
:noJavaFound
echo ERROR: Could not find a valid Java binary to be used.
-echo You must specify the path to a valid Java 5.0 or higher version.
+echo You must specify the path to a valid Java 6.0 or higher version.
echo The procedure to follow is:
echo 1. Delete the file %INSTANCE_ROOT%\lib\set-java-home.bat if it exists.
echo 2. Set the environment variable OPENDS_JAVA_HOME to the root of a valid
-echo Java 5.0 installation.
+echo Java 6.0 installation.
echo If you want to have specific Java settings for each command line you must
echo follow the steps 3 and 4.
echo 3. Edit the properties file specifying the Java binary and the Java arguments
@@ -152,11 +152,11 @@
echo ERROR: The detected Java version could not be used. The detected
echo Java binary is:
echo %OPENDS_JAVA_BIN%
-echo You must specify the path to a valid Java 5.0 or higher version.
+echo You must specify the path to a valid Java 6.0 or higher version.
echo The procedure to follow is:
echo 1. Delete the file %INSTANCE_ROOT%\lib\set-java-home.bat if it exists.
echo 2. Set the environment variable OPENDS_JAVA_HOME to the root of a valid
-echo Java 5.0 installation.
+echo Java 6.0 installation.
echo If you want to have specific Java settings for each command line you must
echo follow the steps 3 and 4.
echo 3. Edit the properties file specifying the Java binary and the Java arguments
@@ -167,7 +167,7 @@
exit /B 1
:notSupportedJavaHome
-rem We get here when the java version is 5 (or up) but not supported. We run
+rem We get here when the java version is 6 (or up) but not supported. We run
rem InstallDS again to see a localized message.
"%OPENDS_JAVA_BIN%" %OPENDS_JAVA_ARGS% org.opends.server.tools.InstallDS -t
pause
@@ -178,11 +178,11 @@
echo arguments %OPENDS_JAVA_ARGS%.
echo The detected Java binary is:
echo %OPENDS_JAVA_BIN%
-echo You must specify the path to a valid Java 5.0 or higher version.
+echo You must specify the path to a valid Java 6.0 or higher version.
echo The procedure to follow is:
echo 1. Delete the file %INSTANCE_ROOT%\lib\set-java-home.bat if it exists.
echo 2. Set the environment variable OPENDS_JAVA_HOME to the root of a valid
-echo Java 5.0 installation.
+echo Java 6.0 installation.
echo If you want to have specific Java settings for each command line you must
echo follow the steps 3 and 4.
echo 3. Edit the properties file specifying the Java binary and the Java arguments
diff --git a/opends/resource/bin/_script-util.sh b/opends/resource/bin/_script-util.sh
index 3eff9cd..1dc84b9 100644
--- a/opends/resource/bin/_script-util.sh
+++ b/opends/resource/bin/_script-util.sh
@@ -29,7 +29,7 @@
# Display an error message
#
display_java_not_found_error() {
- echo "Please set OPENDS_JAVA_HOME to the root of a Java 5 (or later) installation"
+ echo "Please set OPENDS_JAVA_HOME to the root of a Java 6 (or later) installation"
echo "or edit the java.properties file and then run the dsjavaproperties script to"
echo "specify the Java version to be used"
}
@@ -140,7 +140,7 @@
RESULT_CODE=${?}
if test ${RESULT_CODE} -eq 13
then
- # This is a particular error code that means that the Java version is 5
+ # This is a particular error code that means that the Java version is 6
# but not supported. Let InstallDS to display the localized error message
"${OPENDS_JAVA_BIN}" org.opends.server.tools.InstallDS -t
exit 1
@@ -149,11 +149,11 @@
echo "ERROR: The detected Java version could not be used. The detected"
echo "Java binary is:"
echo "${OPENDS_JAVA_BIN}"
- echo "You must specify the path to a valid Java 5.0 or higher version."
+ echo "You must specify the path to a valid Java 6.0 or higher version."
echo "The procedure to follow is:"
echo "1. Delete the file ${INSTANCE_ROOT}/lib/set-java-home" if it exists.
echo "2. Set the environment variable OPENDS_JAVA_HOME to the root of a valid "
- echo "Java 5.0 installation."
+ echo "Java 6.0 installation."
echo "If you want to have specific Java settings for each command line you must"
echo "follow the steps 3 and 4."
echo "3. Edit the properties file specifying the Java binary and the Java arguments"
@@ -167,7 +167,7 @@
RESULT_CODE=${?}
if test ${RESULT_CODE} -eq 13
then
- # This is a particular error code that means that the Java version is 5
+ # This is a particular error code that means that the Java version is 6
# but not supported. Let InstallDS to display the localized error message
"${OPENDS_JAVA_BIN}" org.opends.server.tools.InstallDS -t
exit 1
@@ -177,11 +177,11 @@
echo "arguments ${OPENDS_JAVA_ARGS}."
echo "The detected Java binary is:"
echo "${OPENDS_JAVA_BIN}"
- echo "You must specify the path to a valid Java 5.0 or higher version."
+ echo "You must specify the path to a valid Java 6.0 or higher version."
echo "The procedure to follow is:"
echo "1. Delete the file ${INSTANCE_ROOT}/lib/set-java-home" if it exists.
echo "2. Set the environment variable OPENDS_JAVA_HOME to the root of a valid "
- echo "Java 5.0 installation."
+ echo "Java 6.0 installation."
echo "If you want to have specific Java settings for each command line you must"
echo "follow the steps 3 and 4."
echo "3. Edit the properties file specifying the Java binary and the Java arguments"
diff --git a/opends/resource/config/java.properties b/opends/resource/config/java.properties
index 4871d08..54f1e8e 100644
--- a/opends/resource/config/java.properties
+++ b/opends/resource/config/java.properties
@@ -20,7 +20,7 @@
#
# CDDL HEADER END
#
-# Copyright 2008 Sun Microsystems, Inc.
+# Copyright 2008-2010 Sun Microsystems, Inc.
#
#
@@ -77,7 +77,7 @@
#
# Specify to use the java home for all the command-lines that have not
# an associated property defined:
-# default.java-home=/usr/jdk1.5
+# default.java-home=/usr/jdk1.6
#
# Specify to use the -client argument for all the command-lines that have not
# an associated property defined:
diff --git a/opends/resource/install.html b/opends/resource/install.html
index 76a8829..9bb5d94 100644
--- a/opends/resource/install.html
+++ b/opends/resource/install.html
@@ -1,102 +1,102 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<title>How To Install Open DS</title>
-<style type="text/css">
-<!--
-body { font-family: Arial, Helvetica, sans-serif;
- font-size: 12px;
- color: #333; background-color: #fff; }
-h1 { font-size: 2.0em; font-weight: normal;
- margin-top: 0em; margin-bottom: 0em; }
-h2 { font-size: 1.7em; font-weight: normal;
- margin: 1.2em 0em .8em 0em;
- border-bottom: 1px #D9D9D9 solid; }
-h3 { font-size: 1.4em; font-weight: bold;
- margin: 1.2em 0em .8em 0em; }
-
-a:link {color:#069;text-decoration:none;}
-a:visited {color:#069;text-decoration:none;}
-a:active, a:hover {color:#069;text-decoration:underline;}
-
--->
-</style>
-</head>
-
-<body>
-
-<img src="images/opends_logo.png" alt="OpenDS logo" border="0" align=right>
-
-<br>
-
-<h2>How To Install OpenDS</h2>
-<p>If you are reading this page, you have already downloaded and unzipped
-an OpenDS build.
-<p>You can install OpenDS in two modes:
-<ul>
- <li><b>Graphical User Interface (GUI) mode</b>. The GUI mode uses
-QuickSetup, a Java-based graphical tool that enables you to install and configure an
-OpenDS directory server, load it with data and get it running in very little time.
- </li>
- <li><b>Interactive Command-line mode</b>. The interactive command-line utility
- prompts you for required information before the installation and configuration begin.
- </li>
-</ul>
-
-<h3>Before You Install</h3>
-A Java SE 5.0 (version 1.5.0_08) or higher runtime environment must be installed.
-It is recommended that your system have at least 100MB of disk space and
-256MB of free memory to run OpenDS for evaluation purposes. Note that
-you can configure OpenDS in such a way that it requires substantially
-less, or more, disk space. For more information, see the
-<a href="https://www.opends.org/wiki/page/OpenDSSystemRequirements">OpenDS System Requirements</a>.
-
-<h3>To Install OpenDS in GUI mode</h3>
-You can run QuickSetup remotely via Java Web Start, or locally from within the
-build that you have downloaded and unzipped.
-<p>If you run QuickSetup remotely, it automatically downloads and
-unzips the latest weekly build, and handles server configuration.
-
-<a class="external" href="http://opends.org/install/QuickSetup.jnlp">Launch QuickSetup via Java Web Start</a><img class="outlink" src="Install_files/out.png" alt="">.
-</p>
-<p>To run QuickSetup locally:
-</p>
-<ol>
- <li>From the top level of your installation directory, type the following command:
- <span style="font-family: monospace; white-space: pre;">
-(Unix, Linux) setup
-(Windows) setup.bat
- </span>
- </li>
- <li>On Mac systems, double-click on the QuickSetup.app application to launch
- QuickSetup directly from the Finder.<br><br>
- </li>
- <li>Answer the questions in the installation wizard.
- </li>
-</ol>
-
-<h3>To Install OpenDS in Command-Line Mode</h3>
-<ol>
- <li>From the top level of your installation directory, type the following command:
- <br>
- <span style="font-family: monospace; white-space: pre;">
-(Unix, Linux) setup --cli
-(Windows) setup.bat --cli
- </span>
- </li>
- <li>Follow the prompts to provide the required installation information.
- </li>
-</ol>
-
-<h3>See Also</h3>
-<ul>
- <li><a href="https://www.opends.org/wiki/page/InstallingTheOpenDSDirectoryServer">Installing the OpenDS Directory Server</a>
- <br>
- <li> <a href="https://www.opends.org/wiki/page/OverviewOfTheQuickSetupTool">Overview of the QuickSetup Tool</a>
- <br>
- </li>
- <li> <a href="https://www.opends.org/wiki/page/Setup">setup</a>
- </li>
-</ul>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+<title>How To Install Open DS</title>
+<style type="text/css">
+<!--
+body { font-family: Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ color: #333; background-color: #fff; }
+h1 { font-size: 2.0em; font-weight: normal;
+ margin-top: 0em; margin-bottom: 0em; }
+h2 { font-size: 1.7em; font-weight: normal;
+ margin: 1.2em 0em .8em 0em;
+ border-bottom: 1px #D9D9D9 solid; }
+h3 { font-size: 1.4em; font-weight: bold;
+ margin: 1.2em 0em .8em 0em; }
+
+a:link {color:#069;text-decoration:none;}
+a:visited {color:#069;text-decoration:none;}
+a:active, a:hover {color:#069;text-decoration:underline;}
+
+-->
+</style>
+</head>
+
+<body>
+
+<img src="images/opends_logo.png" alt="OpenDS logo" border="0" align=right>
+
+<br>
+
+<h2>How To Install OpenDS</h2>
+<p>If you are reading this page, you have already downloaded and unzipped
+an OpenDS build.
+<p>You can install OpenDS in two modes:
+<ul>
+ <li><b>Graphical User Interface (GUI) mode</b>. The GUI mode uses
+QuickSetup, a Java-based graphical tool that enables you to install and configure an
+OpenDS directory server, load it with data and get it running in very little time.
+ </li>
+ <li><b>Interactive Command-line mode</b>. The interactive command-line utility
+ prompts you for required information before the installation and configuration begin.
+ </li>
+</ul>
+
+<h3>Before You Install</h3>
+A Java SE 6.0 (version 1.6.0_10) or higher runtime environment must be installed.
+It is recommended that your system have at least 100MB of disk space and
+256MB of free memory to run OpenDS for evaluation purposes. Note that
+you can configure OpenDS in such a way that it requires substantially
+less, or more, disk space. For more information, see the
+<a href="https://www.opends.org/wiki/page/OpenDSSystemRequirements">OpenDS System Requirements</a>.
+
+<h3>To Install OpenDS in GUI mode</h3>
+You can run QuickSetup remotely via Java Web Start, or locally from within the
+build that you have downloaded and unzipped.
+<p>If you run QuickSetup remotely, it automatically downloads and
+unzips the latest weekly build, and handles server configuration.
+
+<a class="external" href="http://opends.org/install/QuickSetup.jnlp">Launch QuickSetup via Java Web Start</a><img class="outlink" src="Install_files/out.png" alt="">.
+</p>
+<p>To run QuickSetup locally:
+</p>
+<ol>
+ <li>From the top level of your installation directory, type the following command:
+ <span style="font-family: monospace; white-space: pre;">
+(Unix, Linux) setup
+(Windows) setup.bat
+ </span>
+ </li>
+ <li>On Mac systems, double-click on the QuickSetup.app application to launch
+ QuickSetup directly from the Finder.<br><br>
+ </li>
+ <li>Answer the questions in the installation wizard.
+ </li>
+</ol>
+
+<h3>To Install OpenDS in Command-Line Mode</h3>
+<ol>
+ <li>From the top level of your installation directory, type the following command:
+ <br>
+ <span style="font-family: monospace; white-space: pre;">
+(Unix, Linux) setup --cli
+(Windows) setup.bat --cli
+ </span>
+ </li>
+ <li>Follow the prompts to provide the required installation information.
+ </li>
+</ol>
+
+<h3>See Also</h3>
+<ul>
+ <li><a href="https://www.opends.org/wiki/page/InstallingTheOpenDSDirectoryServer">Installing the OpenDS Directory Server</a>
+ <br>
+ <li> <a href="https://www.opends.org/wiki/page/OverviewOfTheQuickSetupTool">Overview of the QuickSetup Tool</a>
+ <br>
+ </li>
+ <li> <a href="https://www.opends.org/wiki/page/Setup">setup</a>
+ </li>
+</ul>
+</body>
+</html>
diff --git a/opends/resource/install.txt b/opends/resource/install.txt
index fa57807..248a9a1 100644
--- a/opends/resource/install.txt
+++ b/opends/resource/install.txt
@@ -13,7 +13,7 @@
Before You Install
------------------
-A Java SE 5.0 (version 1.5.0_08) or higher runtime environment must be installed. It is
+A Java SE 6.0 (version 1.6.0_10) or higher runtime environment must be installed. It is
recommended that your system have at least 100MB of disk space and 256MB of free memory to run
OpenDS for evaluation purposes. Note that you can configure OpenDS in such a way that it requires
substantially less, or more, disk space. For more information, see the OpenDS System Requirements
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>
+
diff --git a/opends/resource/mac/ControlPanel.app/Contents/MacOS/JavaApplicationStub b/opends/resource/mac/ControlPanel.app/Contents/MacOS/JavaApplicationStub
index 4190041..0bb0345 100755
--- a/opends/resource/mac/ControlPanel.app/Contents/MacOS/JavaApplicationStub
+++ b/opends/resource/mac/ControlPanel.app/Contents/MacOS/JavaApplicationStub
Binary files differ
diff --git a/opends/resource/mac/QuickSetup.app/Contents/Info.plist b/opends/resource/mac/QuickSetup.app/Contents/Info.plist
index f6ce8c6..4e26d4e 100644
--- a/opends/resource/mac/QuickSetup.app/Contents/Info.plist
+++ b/opends/resource/mac/QuickSetup.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 QuickSetup</string>
- <key>CFBundleIconFile</key>
- <string>OpenDS.icns</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
<key>CFBundleName</key>
<string>OpenDS QuickSetup</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.opends.quicksetup.installer.SetupLauncher</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.quicksetup.installer.SetupLauncher</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>
+
diff --git a/opends/resource/mac/QuickSetup.app/Contents/MacOS/JavaApplicationStub b/opends/resource/mac/QuickSetup.app/Contents/MacOS/JavaApplicationStub
index 4190041..0bb0345 100755
--- a/opends/resource/mac/QuickSetup.app/Contents/MacOS/JavaApplicationStub
+++ b/opends/resource/mac/QuickSetup.app/Contents/MacOS/JavaApplicationStub
Binary files differ
diff --git a/opends/resource/mac/StatusPanel.app/Contents/Info.plist b/opends/resource/mac/StatusPanel.app/Contents/Info.plist
deleted file mode 100644
index 7796f4c..0000000
--- a/opends/resource/mac/StatusPanel.app/Contents/Info.plist
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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">
-<dict>
- <key>CFBundleAllowMixedLocalizations</key>
- <string>true</string>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>JavaApplicationStub</string>
- <key>CFBundleGetInfoString</key>
- <string>OpenDS Status Panel</string>
- <key>CFBundleIconFile</key>
- <string>OpenDS.icns</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>OpenDS Status Panel</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>1.0</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>MainClass</key>
- <string>org.opends.guitools.statuspanel.StatusPanelLauncher</string>
- </dict>
-</dict>
-</plist>
diff --git a/opends/resource/mac/StatusPanel.app/Contents/MacOS/JavaApplicationStub b/opends/resource/mac/StatusPanel.app/Contents/MacOS/JavaApplicationStub
deleted file mode 100755
index 4190041..0000000
--- a/opends/resource/mac/StatusPanel.app/Contents/MacOS/JavaApplicationStub
+++ /dev/null
Binary files differ
diff --git a/opends/resource/mac/StatusPanel.app/Contents/PkgInfo b/opends/resource/mac/StatusPanel.app/Contents/PkgInfo
deleted file mode 100644
index bd04210..0000000
--- a/opends/resource/mac/StatusPanel.app/Contents/PkgInfo
+++ /dev/null
@@ -1 +0,0 @@
-APPL????
\ No newline at end of file
diff --git a/opends/resource/mac/StatusPanel.app/Contents/Resources/OpenDS.icns b/opends/resource/mac/StatusPanel.app/Contents/Resources/OpenDS.icns
deleted file mode 100644
index dad9cbb..0000000
--- a/opends/resource/mac/StatusPanel.app/Contents/Resources/OpenDS.icns
+++ /dev/null
Binary files differ
diff --git a/opends/resource/mac/Uninstall.app/Contents/Info.plist b/opends/resource/mac/Uninstall.app/Contents/Info.plist
index c8f0454..b23dba3 100644
--- a/opends/resource/mac/Uninstall.app/Contents/Info.plist
+++ b/opends/resource/mac/Uninstall.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 Uninstall</string>
- <key>CFBundleIconFile</key>
- <string>OpenDS.icns</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
<key>CFBundleName</key>
<string>OpenDS Uninstall</string>
+ <key>CFBundleIdentifier</key>
+ <string>org.opends.guitools.uninstaller.UninstallLauncher</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.uninstaller.UninstallLauncher</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>
+
diff --git a/opends/resource/mac/Uninstall.app/Contents/MacOS/JavaApplicationStub b/opends/resource/mac/Uninstall.app/Contents/MacOS/JavaApplicationStub
index 4190041..0bb0345 100755
--- a/opends/resource/mac/Uninstall.app/Contents/MacOS/JavaApplicationStub
+++ b/opends/resource/mac/Uninstall.app/Contents/MacOS/JavaApplicationStub
Binary files differ
diff --git a/opends/resource/webstart/create-webstart-standalone.sh b/opends/resource/webstart/create-webstart-standalone.sh
index 0cb2574..b25ae1f 100755
--- a/opends/resource/webstart/create-webstart-standalone.sh
+++ b/opends/resource/webstart/create-webstart-standalone.sh
@@ -169,7 +169,7 @@
</security>
<resources>
- <j2se version="1.5+" java-vm-args="-client"/>
+ <j2se version="1.6+" java-vm-args="-client"/>
<jar href="lib/quicksetup.jar" download="eager" main="true"/>
<jar href="lib/OpenDS.jar" download="lazy"/>
<jar href="lib/je.jar" download="lazy"/>
@@ -181,7 +181,7 @@
</resources>
<resources os="AIX">
- <j2se version="1.5+"/>
+ <j2se version="1.6+"/>
</resources>
<application-desc main-class="org.opends.quicksetup.SplashScreen"/>
diff --git a/opends/src/admin/defn/org/opends/server/admin/std/RegularExpressionIdentityMapperConfiguration.xml b/opends/src/admin/defn/org/opends/server/admin/std/RegularExpressionIdentityMapperConfiguration.xml
index e859a2d..e1a5e02 100644
--- a/opends/src/admin/defn/org/opends/server/admin/std/RegularExpressionIdentityMapperConfiguration.xml
+++ b/opends/src/admin/defn/org/opends/server/admin/std/RegularExpressionIdentityMapperConfiguration.xml
@@ -23,7 +23,7 @@
! CDDL HEADER END
!
!
- ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Copyright 2007-2010 Sun Microsystems, Inc.
! -->
<adm:managed-object name="regular-expression-identity-mapper"
plural-name="regular-expression-identity-mappers"
@@ -136,8 +136,8 @@
<adm:synopsis>
Any valid regular expression pattern which is supported by the
javax.util.regex.Pattern class
- (see http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/Pattern.html
- for documentation about this class for Java SE 5).
+ (see http://download.oracle.com/docs/cd/E17409_01/javase/6/docs/api/java/util/regex/Pattern.html
+ for documentation about this class for Java SE 6).
</adm:synopsis>
</adm:pattern>
</adm:string>
diff --git a/opends/src/admin/messages/RegularExpressionIdentityMapperCfgDefn.properties b/opends/src/admin/messages/RegularExpressionIdentityMapperCfgDefn.properties
index ce478d9..1fa6be6 100644
--- a/opends/src/admin/messages/RegularExpressionIdentityMapperCfgDefn.properties
+++ b/opends/src/admin/messages/RegularExpressionIdentityMapperCfgDefn.properties
@@ -10,7 +10,7 @@
property.match-base-dn.default-behavior.alias.synopsis=The server searches below all public naming contexts.
property.match-pattern.synopsis=Specifies the regular expression pattern that is used to identify portions of the ID string that will be replaced.
property.match-pattern.description=Any portion of the ID string that matches this pattern is replaced in accordance with the provided replace pattern (or is removed if no replace pattern is specified). If multiple substrings within the given ID string match this pattern, all occurrences are replaced. If no part of the given ID string matches this pattern, the ID string is not altered. Exactly one match pattern value must be provided, and it must be a valid regular expression as described in the API documentation for the java.util.regex.Pattern class, including support for capturing groups.
-property.match-pattern.syntax.string.pattern.synopsis=Any valid regular expression pattern which is supported by the javax.util.regex.Pattern class (see http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/Pattern.html for documentation about this class for Java SE 5).
+property.match-pattern.syntax.string.pattern.synopsis=Any valid regular expression pattern which is supported by the javax.util.regex.Pattern class (see http://download.oracle.com/docs/cd/E17409_01/javase/6/docs/api/java/util/regex/Pattern.html for documentation about this class for Java SE 6).
property.replace-pattern.synopsis=Specifies the replacement pattern that should be used for substrings in the ID string that match the provided regular expression pattern.
property.replace-pattern.description=If no replacement pattern is provided, then any matching portions of the ID string will be removed (i.e., replaced with an empty string). The replacement pattern may include a string from a capturing group by using a dollar sign ($) followed by an integer value that indicates which capturing group should be used.
property.replace-pattern.default-behavior.alias.synopsis=The replace pattern will be the empty string.
diff --git a/opends/src/messages/src/org/opends/messages/Message.java b/opends/src/messages/src/org/opends/messages/Message.java
index 4dcfda3..20dfa73 100644
--- a/opends/src/messages/src/org/opends/messages/Message.java
+++ b/opends/src/messages/src/org/opends/messages/Message.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.messages;
@@ -58,7 +58,7 @@
// Variable used to workaround a bug in AIX Java 1.6
// TODO: remove this code once the JDK issue referenced in 3077 is closed.
- private final boolean isAIXPost5 = isAIXPost5();
+ private final boolean isAIX = isAIX();
/**
* Creates an uninternationalized message that will render itself
@@ -168,6 +168,7 @@
* Gets the string representation of this message.
* @return String representation of this message
*/
+ @Override
public String toString() {
return toString(Locale.getDefault());
}
@@ -186,7 +187,7 @@
try {
// TODO: remove this code once the JDK issue referenced in 3077 is
// closed.
- if (isAIXPost5)
+ if (isAIX)
{
// Java 6 in AIX Formatter does not handle properly Formattable
// arguments; this code is a workaround for the problem.
@@ -452,6 +453,7 @@
* @see #hashCode()
* @see java.util.Hashtable
*/
+ @Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
@@ -468,6 +470,7 @@
* @see java.lang.Object#equals(java.lang.Object)
* @see java.util.Hashtable
*/
+ @Override
public int hashCode() {
int result;
result = 31 * toString().hashCode();
@@ -477,24 +480,13 @@
// TODO: remove this code once the JDK issue referenced in 3077 is closed.
/**
- * Returns whether we are running post 1.5 on AIX or not.
- * @return <CODE>true</CODE> if we are running post 1.5 on AIX and
+ * Returns whether we are running on AIX or not.
+ * @return <CODE>true</CODE> if we are running on AIX and
* <CODE>false</CODE> otherwise.
*/
- private boolean isAIXPost5()
+ private boolean isAIX()
{
- boolean isJDK15 = false;
- try
- {
- String javaRelease = System.getProperty ("java.version");
- isJDK15 = javaRelease.startsWith("1.5");
- }
- catch (Throwable t)
- {
- System.err.println("Cannot get the java version: " + t);
- }
- boolean isAIX = "aix".equalsIgnoreCase(System.getProperty("os.name"));
- return !isJDK15 && isAIX;
+ return "aix".equalsIgnoreCase(System.getProperty("os.name"));
}
}
diff --git a/opends/src/quicksetup/org/opends/quicksetup/util/CompatibleJava.java b/opends/src/quicksetup/org/opends/quicksetup/util/CompatibleJava.java
index 67edfd6..baf2cf6 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/util/CompatibleJava.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/util/CompatibleJava.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.util;
@@ -34,7 +34,7 @@
*/
enum CompatibleJava
{
- JDK_SUN("Sun Microsystems Inc.", "1.5.0_08");
+ JDK_SUN("Sun Microsystems Inc.", "1.6.0_10");
private String vendor;
private String version;
diff --git a/opends/src/quicksetup/org/opends/quicksetup/util/IncompatibleVersionException.java b/opends/src/quicksetup/org/opends/quicksetup/util/IncompatibleVersionException.java
index 249971d..f98d989 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/util/IncompatibleVersionException.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/util/IncompatibleVersionException.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.util;
@@ -31,8 +31,8 @@
/**
* The exception representing an incompatible java version being used. Even
- * if the code can be run under 1.5, some bugs have been found in some versions
- * of the JVM that prevent OpenDS to work properly (see
+ * if the code can be run under 1.6, some bugs might be found that prevent from
+ * using some of the 1.6 releases.
*/
public class IncompatibleVersionException extends OpenDsException
{
diff --git a/opends/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java b/opends/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java
index 14d5b1a..246f532 100644
--- a/opends/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java
+++ b/opends/src/server/org/opends/server/admin/AbstractManagedObjectDefinition.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2007-2009 Sun Microsystems, Inc.
+ * Copyright 2007-2010 Sun Microsystems, Inc.
*/
package org.opends.server.admin;
@@ -867,8 +867,6 @@
* definition is the {@link TopCfgDefn}.
*/
public final boolean isTop() {
- // Casting to Object and instanceof check are required
- // to workaround a bug in JDK versions prior to 1.5.0_08.
return (this instanceof TopCfgDefn);
}
@@ -998,7 +996,7 @@
propertyDefinitions.put(propName, d);
allPropertyDefinitions.put(propName, d);
- if (d instanceof AggregationPropertyDefinition) {
+ if (d instanceof AggregationPropertyDefinition<?,?>) {
AggregationPropertyDefinition<?, ?> apd =
(AggregationPropertyDefinition<?, ?>) d;
aggregationPropertyDefinitions.put(propName, apd);
diff --git a/opends/src/server/org/opends/server/tools/InstallDS.java b/opends/src/server/org/opends/server/tools/InstallDS.java
index 454b892..20414f0 100644
--- a/opends/src/server/org/opends/server/tools/InstallDS.java
+++ b/opends/src/server/org/opends/server/tools/InstallDS.java
@@ -95,7 +95,7 @@
*/
public class InstallDS extends ConsoleApplication
{
- private PlainTextProgressMessageFormatter formatter =
+ private final PlainTextProgressMessageFormatter formatter =
new PlainTextProgressMessageFormatter();
/** Prefix for log files. */
static public final String LOG_FILE_PREFIX = "opends-setup-";
@@ -388,7 +388,7 @@
LOG.log(Level.WARNING, "Error while trying to update the contents of "+
"the set-java-home file in test only mode: "+t, t);
}
- // Test that we are running a compatible java 1.5 version.
+ // Test that we are running a compatible java 1.6 version.
try
{
Utils.checkJavaVersion();
@@ -703,6 +703,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isQuiet()
{
return argParser.quietArg.isPresent();
@@ -711,6 +712,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isInteractive()
{
return !argParser.noPromptArg.isPresent();
@@ -727,6 +729,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isScriptFriendly() {
return false;
}
@@ -734,6 +737,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isAdvancedMode() {
return false;
}
@@ -742,6 +746,7 @@
/**
* {@inheritDoc}
*/
+ @Override
public boolean isVerbose() {
return argParser.verboseArg.isPresent();
}
diff --git a/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java b/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
index f4f320b..8cee440 100644
--- a/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
+++ b/opends/src/server/org/opends/server/tools/dsconfig/CreateSubCommandHandler.java
@@ -572,11 +572,9 @@
try {
for (PropertyDefinition<?> pd : d.getAllPropertyDefinitions()) {
- if (pd instanceof AggregationPropertyDefinition) {
- // Runtime cast is required to workaround a
- // bug in JDK versions prior to 1.5.0_08.
+ if (pd instanceof AggregationPropertyDefinition<?,?>) {
AggregationPropertyDefinition<?, ?> apd =
- AggregationPropertyDefinition.class.cast(pd);
+ (AggregationPropertyDefinition<?, ?>)pd;
// Skip this aggregation if the referenced managed objects
// do not need to be enabled.
diff --git a/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java b/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java
index 888b219..d29039b 100644
--- a/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java
+++ b/opends/src/server/org/opends/server/tools/dsconfig/SetPropSubCommandHandler.java
@@ -389,10 +389,8 @@
try {
for (PropertyDefinition<?> pd : d.getAllPropertyDefinitions()) {
if (pd instanceof AggregationPropertyDefinition<?,?>) {
- // Runtime cast is required to workaround a
- // bug in JDK versions prior to 1.5.0_08.
AggregationPropertyDefinition<?, ?> apd =
- AggregationPropertyDefinition.class.cast(pd);
+ (AggregationPropertyDefinition<?, ?>)pd;
// Skip this aggregation if the referenced managed objects
// do not need to be enabled.
diff --git a/opends/src/server/org/opends/server/util/Platform.java b/opends/src/server/org/opends/server/util/Platform.java
index 5956b6e..fdec803 100644
--- a/opends/src/server/org/opends/server/util/Platform.java
+++ b/opends/src/server/org/opends/server/util/Platform.java
@@ -68,32 +68,16 @@
static
{
String vendor = System.getProperty("java.vendor");
- String ver = System.getProperty("java.version");
if (vendor.startsWith("IBM"))
{
pkgPrefix = IBM_SEC;
- if (ver.startsWith("1.5"))
- {
- IMPL = new IBM5PlatformIMPL();
- }
- else
- {
- IMPL = new DefaultPlatformIMPL();
- }
}
else
{
pkgPrefix = SUN_SEC;
- if (ver.startsWith("1.5"))
- {
- IMPL = new Sun5PlatformIMPL();
- }
- else
- {
- IMPL = new DefaultPlatformIMPL();
- }
}
+ IMPL = new DefaultPlatformIMPL();
}
@@ -553,58 +537,6 @@
validity);
}
-
-
- /**
- * Sun 5 JDK platform class.
- */
- private static class Sun5PlatformIMPL extends PlatformIMPL
- {
- // normalize method.
- private static final Method NORMALIZE;
- // Normalized form method.
- private static final Object FORM_NFKC;
-
- static
- {
- Method normalize = null;
- Object formNFKC = null;
- try
- {
- Class<?> normalizer = Class.forName("sun.text.Normalizer");
- formNFKC = normalizer.getField("DECOMP_COMPAT").get(null);
- Class<?> normalizerForm = Class.forName("sun.text.Normalizer$Mode");
- normalize = normalizer.getMethod("normalize", String.class,
- normalizerForm, Integer.TYPE);
- }
- catch (Exception ex)
- {
- // Do not use Normalizer. The values are already set to null.
- }
- NORMALIZE = normalize;
- FORM_NFKC = formNFKC;
- }
-
-
-
- @Override
- public void normalize(StringBuilder buffer)
- {
- try
- {
- String normal = (String) NORMALIZE.invoke(null, buffer.toString(),
- FORM_NFKC, 0);
- buffer.replace(0, buffer.length(), normal);
- }
- catch (Exception ex)
- {
- // Don't do anything. buffer should be used.
- }
- }
- }
-
-
-
/**
* Default platform class.
*/
@@ -653,23 +585,6 @@
}
}
-
-
- /**
- * IBM JDK 5 platform class.
- */
- private static class IBM5PlatformIMPL extends PlatformIMPL
- {
-
- @Override
- public void normalize(StringBuilder buffer)
- {
- // No implementation.
- }
- }
-
-
-
/**
* Normalize the specified buffer.
*
diff --git a/opends/tests/staf-tests/shared/functions/utils.xml b/opends/tests/staf-tests/shared/functions/utils.xml
index c5681aa..f3307c2 100755
--- a/opends/tests/staf-tests/shared/functions/utils.xml
+++ b/opends/tests/staf-tests/shared/functions/utils.xml
@@ -2587,7 +2587,7 @@
{
'name' : 'Compile Java files' ,
'command' : cmd ,
- 'arguments' : '-target 1.5 %s %s' % (cmdOptions,list) ,
+ 'arguments' : '-target 1.6 %s %s' % (cmdOptions,list) ,
'location' : location ,
'path' : foldername ,
'envCmd' : env ,
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java
index b7939d1..3d41520 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/admin/MockLDAPProfile.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.server.admin;
@@ -30,9 +30,6 @@
/**
* A mock LDAP profile wrapper for testing purposes.
- *
- * NOTE: The seemingly unnecessary casts throughout this class are
- * required to work around a bug in JDK versions prior to 1.5.0_08.
*/
public final class MockLDAPProfile extends LDAPProfile.Wrapper {
@@ -50,8 +47,7 @@
public String getAttributeName(AbstractManagedObjectDefinition<?, ?> d,
PropertyDefinition<?> pd) {
- // These casts throughout are required to work around a bug in JDK versions prior to 1.5.0_08.
- if (d == (AbstractManagedObjectDefinition<?, ?>)TestParentCfgDefn.getInstance()) {
+ if (d == TestParentCfgDefn.getInstance()) {
TestParentCfgDefn td = TestParentCfgDefn.getInstance();
if (pd == (PropertyDefinition<?>)td.getMandatoryBooleanPropertyPropertyDefinition()) {
@@ -67,7 +63,7 @@
throw new RuntimeException("Unexpected test-parent property"
+ pd.getName());
}
- } else if (d == (AbstractManagedObjectDefinition<?, ?>)TestChildCfgDefn.getInstance()) {
+ } else if (d == TestChildCfgDefn.getInstance()) {
TestChildCfgDefn td = TestChildCfgDefn.getInstance();
if (pd == (PropertyDefinition<?>)td.getMandatoryBooleanPropertyPropertyDefinition()) {
@@ -117,10 +113,9 @@
*/
@Override
public String getObjectClass(AbstractManagedObjectDefinition<?, ?> d) {
- // These casts throughout are required to work around a bug in JDK versions prior to 1.5.0_08.
- if (d == (AbstractManagedObjectDefinition<?, ?>)TestParentCfgDefn.getInstance()) {
+ if (d == TestParentCfgDefn.getInstance()) {
return "ds-cfg-test-parent-dummy";
- } else if (d == (AbstractManagedObjectDefinition<?, ?>)TestChildCfgDefn.getInstance()) {
+ } else if (d == TestChildCfgDefn.getInstance()) {
return "ds-cfg-test-child-dummy";
} else {
// Not known.
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
index eac1ef9..872ea68 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/UserDefinedVirtualAttributeProviderTestCase.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.server.extensions;
@@ -130,13 +130,8 @@
{
if (rule.getAttributeType().equals(descriptionType))
{
- // Due to a bug in JDK versions prior to 1.5.0_08, we have to
- // rewrite the following code.
- // UserDefinedVirtualAttributeProvider provider =
- // (UserDefinedVirtualAttributeProvider)
- Object providerAsObject = rule.getProvider();
UserDefinedVirtualAttributeProvider provider =
- (UserDefinedVirtualAttributeProvider) providerAsObject;
+ (UserDefinedVirtualAttributeProvider) rule.getProvider();
assertFalse(provider.isMultiValued());
assertFalse(provider.isSearchable(rule, searchOperation));
@@ -202,13 +197,8 @@
{
if (rule.getAttributeType().equals(descriptionType))
{
- // Due to a bug in JDK versions prior to 1.5.0_08, we have to
- // rewrite the following code.
- // UserDefinedVirtualAttributeProvider provider =
- // (UserDefinedVirtualAttributeProvider)
- Object providerAsObject = rule.getProvider();
UserDefinedVirtualAttributeProvider provider =
- (UserDefinedVirtualAttributeProvider) providerAsObject;
+ (UserDefinedVirtualAttributeProvider) rule.getProvider();
assertTrue(provider.isMultiValued());
assertFalse(provider.isSearchable(rule, searchOperation));
diff --git a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java
index b0824e0..333b6c3 100644
--- a/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java
+++ b/opends/tests/unit-tests-testng/src/server/org/opends/server/extensions/VirtualStaticGroupTestCase.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.server.extensions;
@@ -629,13 +629,8 @@
}
assertNotNull(rule);
- // Due to a bug in JDK versions prior to 1.5.0_08, we have to
- // rewrite the following code.
- // MemberVirtualAttributeProvider provider =
- // (MemberVirtualAttributeProvider) rule.getProvider();
- Object providerAsObject = rule.getProvider();
MemberVirtualAttributeProvider provider =
- (MemberVirtualAttributeProvider) providerAsObject;
+ (MemberVirtualAttributeProvider) rule.getProvider();
assertNotNull(provider);
@@ -708,13 +703,8 @@
}
assertNotNull(rule);
- // Due to a bug in JDK versions prior to 1.5.0_08, we have to
- // rewrite the following code.
- // MemberVirtualAttributeProvider provider =
- // (MemberVirtualAttributeProvider) rule.getProvider();
- Object providerAsObject = rule.getProvider();
MemberVirtualAttributeProvider provider =
- (MemberVirtualAttributeProvider) providerAsObject;
+ (MemberVirtualAttributeProvider) rule.getProvider();
assertNotNull(provider);
--
Gitblit v1.10.0