From 38bfdfa2f1cceb454bace86f48d843f19894dd5e Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Wed, 06 May 2015 07:44:04 +0000
Subject: [PATCH] OPENDJ-1993 Replace outdated Java 6 references
---
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java | 2
opendj-sdk/opendj-server-legacy/resource/bin/_script-util.bat | 12 +-
opendj-sdk/opendj-server-legacy/resource/README | 2
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java | 21 ++---
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java | 8 +-
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java | 6
opendj-sdk/opendj-server-legacy/build.bat | 4
opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_zh_CN.properties | 4
opendj-sdk/opendj-server-legacy/src/svr4/OpenDJ/install.html | 4
opendj-sdk/opendj-ldap-sync/README | 2
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java | 3
opendj-sdk/opendj-server-legacy/resource/webstart/create-webstart-standalone.sh | 6
opendj-sdk/opendj-virtual/README | 2
opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_es.properties | 4
opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/CliConstants.java | 5 +
opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_zh_TW.properties | 4
opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_ja.properties | 4
opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup.properties | 7 -
opendj-sdk/opendj-ldap-toolkit/README | 2
opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_ko.properties | 4
opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_fr.properties | 4
opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_de.properties | 4
/dev/null | 68 -----------------
opendj-sdk/opendj-rest2ldap/README | 2
opendj-sdk/opendj-server-legacy/resource/bin/_script-util.sh | 12 +-
opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java | 3
opendj-sdk/opendj-server-legacy/src/svr4/OpenDJ/install.txt | 4
opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/UtilsTestCase.java | 4
28 files changed, 69 insertions(+), 138 deletions(-)
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/CliConstants.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/CliConstants.java
index e5cc678..f188ada 100755
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/CliConstants.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/CliConstants.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2012-2014 ForgeRock AS.
+ * Portions copyright 2012-2015 ForgeRock AS.
*/
package com.forgerock.opendj.cli;
@@ -31,6 +31,9 @@
*/
public final class CliConstants {
+ /** The minimum java specification supported string version. */
+ public static final float MINIMUM_JAVA_VERSION = 1.7F;
+
/** Default value for LDAP connection timeout. */
public static final int DEFAULT_LDAP_CONNECT_TIMEOUT = 30000;
diff --git a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
index ce56e60..3edc833 100644
--- a/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
+++ b/opendj-sdk/opendj-cli/src/main/java/com/forgerock/opendj/cli/Utils.java
@@ -22,7 +22,7 @@
*
*
* Copyright 2006-2010 Sun Microsystems, Inc.
- * Portions copyright 2014 ForgeRock AS
+ * Portions copyright 2014-2015 ForgeRock AS
*/
package com.forgerock.opendj.cli;
@@ -408,10 +408,10 @@
*/
public static void checkJavaVersion() throws ClientException {
final String version = System.getProperty("java.specification.version");
- if (Float.valueOf(version) < 1.6) {
+ if (Float.valueOf(version) < CliConstants.MINIMUM_JAVA_VERSION) {
final String javaBin = System.getProperty("java.home") + File.separator + "bin" + File.separator + "java";
- throw new ClientException(ReturnCode.JAVA_VERSION_INCOMPATIBLE, ERR_INCOMPATIBLE_JAVA_VERSION.get("1.6",
- version, javaBin), null);
+ throw new ClientException(ReturnCode.JAVA_VERSION_INCOMPATIBLE,
+ ERR_INCOMPATIBLE_JAVA_VERSION.get(CliConstants.MINIMUM_JAVA_VERSION, version, javaBin), null);
}
}
diff --git a/opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/UtilsTestCase.java b/opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/UtilsTestCase.java
index f7eb772..e0671bd 100644
--- a/opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/UtilsTestCase.java
+++ b/opendj-sdk/opendj-cli/src/test/java/com/forgerock/opendj/cli/UtilsTestCase.java
@@ -21,7 +21,7 @@
* CDDL HEADER END
*
*
- * Copyright 2014 ForgeRock AS.
+ * Copyright 2014-2015 ForgeRock AS.
*/
package com.forgerock.opendj.cli;
@@ -39,7 +39,7 @@
@Test(expectedExceptions = ClientException.class)
public void testInvalidJavaVersion() throws ClientException {
final String original = System.getProperty("java.specification.version");
- System.setProperty("java.specification.version", "1.5");
+ System.setProperty("java.specification.version", "1.6");
try {
Utils.checkJavaVersion();
} finally {
diff --git a/opendj-sdk/opendj-ldap-sync/README b/opendj-sdk/opendj-ldap-sync/README
index c1aa799..db40db2 100644
--- a/opendj-sdk/opendj-ldap-sync/README
+++ b/opendj-sdk/opendj-ldap-sync/README
@@ -1,7 +1,7 @@
OpenDJ LDAP synchronization tool.
This Maven project contains the OpenDJ LDAP synchronization daemon. It is 100%
-Java based and requires Java 1.6.
+Java based and requires Java 1.7.
Complete documentation for this product may be found online
at http://www.forgerock.com/opendj.html.
diff --git a/opendj-sdk/opendj-ldap-toolkit/README b/opendj-sdk/opendj-ldap-toolkit/README
index 82bc83d..97dd3ce 100644
--- a/opendj-sdk/opendj-ldap-toolkit/README
+++ b/opendj-sdk/opendj-ldap-toolkit/README
@@ -1,7 +1,7 @@
OpenDJ LDAP client tools and SDK.
This Maven project contains the OpenDJ client tools, and LDAP SDK. It is 100%
-Java based and requires Java 1.6.
+Java based and requires Java 1.7.
Complete documentation for this product is available online
from http://www.forgerock.com/
diff --git a/opendj-sdk/opendj-rest2ldap/README b/opendj-sdk/opendj-rest2ldap/README
index 7b98b9e..f74610a 100644
--- a/opendj-sdk/opendj-rest2ldap/README
+++ b/opendj-sdk/opendj-rest2ldap/README
@@ -1,7 +1,7 @@
OpenDJ REST to LDAP Gateway.
This Maven project contains the OpenDJ REST to LDAP gateway support library. It
-is 100% Java based and requires Java 1.6.
+is 100% Java based and requires Java 1.7.
Complete documentation for this product may be found online
at http://www.forgerock.com/opendj.html.
diff --git a/opendj-sdk/opendj-server-legacy/build.bat b/opendj-sdk/opendj-server-legacy/build.bat
index 88c4a3e..78c852a 100644
--- a/opendj-sdk/opendj-server-legacy/build.bat
+++ b/opendj-sdk/opendj-server-legacy/build.bat
@@ -23,7 +23,7 @@
rem
rem
rem Copyright 2008-2010 Sun Microsystems, Inc.
-rem Portions Copyright 2013 ForgeRock AS.
+rem Portions Copyright 2013-2015 ForgeRock AS.
setlocal
@@ -34,7 +34,7 @@
:noJavaHome
echo Error: JAVA_HOME environment variable is not set.
-echo Please set it to a valid Java 6 installation.
+echo Please set it to a valid Java 7 installation.
goto end
diff --git a/opendj-sdk/opendj-server-legacy/resource/README b/opendj-sdk/opendj-server-legacy/resource/README
index 10f216e..8bc212b 100644
--- a/opendj-sdk/opendj-server-legacy/resource/README
+++ b/opendj-sdk/opendj-server-legacy/resource/README
@@ -21,7 +21,7 @@
Before You Install
------------------
- * A Java SE 6 or later runtime environment must be installed.
+ * A Java SE 7 or later runtime environment must be installed.
* The system must have at least 100MB of disk space and 256MB of free memory
to run OpenDJ directory server for evaluation purposes.
diff --git a/opendj-sdk/opendj-server-legacy/resource/bin/_script-util.bat b/opendj-sdk/opendj-server-legacy/resource/bin/_script-util.bat
index cc3c2c7..619573b 100644
--- a/opendj-sdk/opendj-server-legacy/resource/bin/_script-util.bat
+++ b/opendj-sdk/opendj-server-legacy/resource/bin/_script-util.bat
@@ -158,11 +158,11 @@
:noJavaFound
echo ERROR: Could not find a valid Java binary to be used.
-echo You must specify the path to a valid Java 6.0 update 10 or higher version.
+echo You must specify the path to a valid Java 7.0 update 10 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 OPENDJ_JAVA_HOME to the root of a valid
-echo Java 6.0 installation.
+echo Java 7.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
@@ -198,11 +198,11 @@
echo ERROR: The detected Java version could not be used. The detected
echo Java binary is:
echo %OPENDJ_JAVA_BIN%
-echo You must specify the path to a valid Java 6.0 update 10 or higher version.
+echo You must specify the path to a valid Java 7.0 update 10 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 OPENDJ_JAVA_HOME to the root of a valid
-echo Java 6.0 installation.
+echo Java 7.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
@@ -224,11 +224,11 @@
echo arguments %OPENDJ_JAVA_ARGS%.
echo The detected Java binary is:
echo %OPENDJ_JAVA_BIN%
-echo You must specify the path to a valid Java 6.0 update 10 or higher version.
+echo You must specify the path to a valid Java 7.0 update 10 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 OPENDJ_JAVA_HOME to the root of a valid
-echo Java 6.0 installation.
+echo Java 7.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/opendj-sdk/opendj-server-legacy/resource/bin/_script-util.sh b/opendj-sdk/opendj-server-legacy/resource/bin/_script-util.sh
index 1d1024e..b8df17e 100644
--- a/opendj-sdk/opendj-server-legacy/resource/bin/_script-util.sh
+++ b/opendj-sdk/opendj-server-legacy/resource/bin/_script-util.sh
@@ -29,7 +29,7 @@
# Display an error message
#
display_java_not_found_error() {
- echo "Please set OPENDJ_JAVA_HOME to the root of a Java 6 update 10 (or higher) installation"
+ echo "Please set OPENDJ_JAVA_HOME to the root of a Java 7 (or higher) installation"
echo "or edit the java.properties file and then run the dsjavaproperties script to"
echo "specify the Java version to be used"
}
@@ -190,11 +190,11 @@
echo "ERROR: The detected Java version could not be used. The detected"
echo "Java binary is:"
echo "${OPENDJ_JAVA_BIN}"
- echo "You must specify the path to a valid Java 6.0 update 10 or higher version."
+ echo "You must specify the path to a valid Java 7.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 OPENDJ_JAVA_HOME to the root of a valid "
- echo "Java 6.0 installation."
+ echo "Java 7.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"
@@ -208,7 +208,7 @@
RESULT_CODE=${?}
if test ${RESULT_CODE} -eq 13
then
- # This is a particular error code that means that the Java version is 6
+ # This is a particular error code that means that the Java version is 7
# but not supported. Let InstallDS to display the localized error message
"${OPENDJ_JAVA_BIN}" org.opends.server.tools.InstallDS --testonly
exit 1
@@ -218,11 +218,11 @@
echo "arguments ${OPENDJ_JAVA_ARGS}."
echo "The detected Java binary is:"
echo "${OPENDJ_JAVA_BIN}"
- echo "You must specify the path to a valid Java 6.0 update 10 or higher version."
+ echo "You must specify the path to a valid Java 7.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 OPENDJ_JAVA_HOME to the root of a valid "
- echo "Java 6.0 installation."
+ echo "Java 7.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/opendj-sdk/opendj-server-legacy/resource/webstart/create-webstart-standalone.sh b/opendj-sdk/opendj-server-legacy/resource/webstart/create-webstart-standalone.sh
index f394288..af56876 100755
--- a/opendj-sdk/opendj-server-legacy/resource/webstart/create-webstart-standalone.sh
+++ b/opendj-sdk/opendj-server-legacy/resource/webstart/create-webstart-standalone.sh
@@ -22,7 +22,7 @@
# CDDL HEADER END
#
# Portions Copyright 2006-2010 Sun Microsystems Inc.
-# Copyright 2010-2013 ForgeRock AS
+# Copyright 2010-2015 ForgeRock AS
# Determine the location to this script so that we know where we are in the
# OpenDJ source tree.
@@ -90,7 +90,7 @@
JAVA_HOME=`java -cp "${ROOT_DIR}/resource" FindJavaHome 2> /dev/null`
if test -z "${JAVA_HOME}"
then
- echo "Please set JAVA_HOME to the root of a Java 6.0 installation."
+ echo "Please set JAVA_HOME to the root of a Java 7.0 installation."
exit 1
else
export JAVA_HOME
@@ -186,7 +186,7 @@
"${JARSIGNER}" -keystore "${CERT_KEYSTORE}" -keypass "${CERT_KEYSTORE_PIN}" \
-storepass "${CERT_KEYSTORE_PIN}" license.jar "${CERT_ALIAS}"
# Create the resource line to add to the jnlp script.
-LICENSEJAR="<jar href=\"lib/license.jar\" download=\"eager\"/>"
+LICENSEJAR="<jar href=\"lib/license.jar\" download=\"eager\"/>"
fi
# Create and sign the zipped.jar file.
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java
index f24346f..ceeca94 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/InstallWelcomePanel.java
@@ -27,9 +27,11 @@
package org.opends.quicksetup.installer.ui;
import org.forgerock.i18n.LocalizableMessage;
+
import static org.opends.messages.QuickSetupMessages.*;
import org.opends.server.util.DynamicConstants;
+import org.opends.server.util.Platform;
import java.awt.Component;
@@ -71,6 +73,7 @@
INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS.get(
DynamicConstants.SHORT_NAME,
DynamicConstants.SHORT_NAME,
+ Platform.JAVA_MINIMUM_VERSION_NUMBER,
DynamicConstants.DOC_REFERENCE_WIKI,
DynamicConstants.SHORT_NAME),
LocalizableMessage.class);
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/CompatibleJava.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/CompatibleJava.java
deleted file mode 100644
index bf665ed..0000000
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/CompatibleJava.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- * Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- * Copyright 2008-2010 Sun Microsystems, Inc.
- */
-
-package org.opends.quicksetup.util;
-
-/**
- * This enumeration contains the different minimal java versions required
- * to run properly OpenDS. The versions specify a vendor and a java version.
- *
- */
-enum CompatibleJava
-{
- JDK_SUN("Sun Microsystems Inc.", "1.6.0_10");
- private String vendor;
- private String version;
-
- /**
- * Private constructor.
- * @param vendor the JVM vendor.
- * @param version the JVM version.
- */
- private CompatibleJava(String vendor, String version)
- {
- this.vendor = vendor;
- this.version = version;
- }
-
- /**
- * Returns the version of this compatible java version.
- * @return the version of this compatible java version.
- */
- String getVersion()
- {
- return version;
- }
-
- /**
- * Returns the vendor of this compatible java version.
- * @return the vendor of this compatible java version.
- */
- String getVendor()
- {
- return vendor;
- }
-}
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
index b3b66a8..faecc45 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/quicksetup/util/Utils.java
@@ -62,6 +62,7 @@
import org.opends.server.util.StaticUtils;
import com.forgerock.opendj.cli.ArgumentConstants;
+import com.forgerock.opendj.cli.ClientException;
import static com.forgerock.opendj.cli.Utils.*;
import static com.forgerock.opendj.util.OperatingSystem.*;
@@ -1256,21 +1257,15 @@
*/
public static void checkJavaVersion() throws IncompatibleVersionException
{
- String vendor = System.getProperty("java.vendor");
- String version = System.getProperty("java.version");
- for (CompatibleJava i : CompatibleJava.values())
+ try
{
- if (i.getVendor().equalsIgnoreCase(vendor))
- {
- // Compare versions.
- boolean versionCompatible = i.getVersion().compareToIgnoreCase(version) <= 0;
- if (!versionCompatible)
- {
- String javaBin = System.getProperty("java.home") + File.separator + "bin" + File.separator + "java";
- throw new IncompatibleVersionException(ERR_INCOMPATIBLE_VERSION.get(i.getVersion(), version, javaBin), null);
- }
- }
+ com.forgerock.opendj.cli.Utils.checkJavaVersion();
}
+ catch (ClientException e)
+ {
+ throw new IncompatibleVersionException(e.getMessageObject(), e);
+ }
+
if (Utils.isWebStart())
{
// Check that the JNLP service exists.
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
index d9a9d0e..3640558 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDS.java
@@ -489,7 +489,7 @@
logger.warn(LocalizableMessage.raw("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.6 version.
+ // Test that we are running a compatible java 1.7 version.
try
{
Utils.checkJavaVersion();
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java
index eefd20b..03b4d67 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/tools/JavaPropertiesTool.java
@@ -651,19 +651,19 @@
.append(" then").append(EOL)
.append(" export OPENDJ_JAVA_BIN").append(EOL)
.append(" else").append(EOL)
- .append(" echo \"You must specify the path to a valid Java 6.0 ")
+ .append(" echo \"You must specify the path to a valid Java 7.0 ")
.append("or higher version in the\"").append(EOL)
.append(" echo \"properties file and then run the ")
.append("dsjavaproperties tool. \"").append(EOL)
.append(" echo \"The procedure to follow is:\"").append(EOL)
- .append(" echo \"You must specify the path to a valid Java 6.0 ")
+ .append(" echo \"You must specify the path to a valid Java 7.0 ")
.append("or higher version. The \"").append(EOL)
.append(" echo \"procedure to follow is:\"").append(EOL)
.append(" echo \"1. Delete the file ")
.append("${INSTANCE_ROOT}/lib/set-java-home\"").append(EOL)
.append(" echo \"2. Set the environment variable ")
.append("OPENDJ_JAVA_HOME to the root of a valid \"").append(EOL)
- .append(" echo \"Java 6.0 installation.\"").append(EOL)
+ .append(" echo \"Java 7.0 installation.\"").append(EOL)
.append(" echo \"If you want to have specificjava settings for")
.append(" each command line you must\"").append(EOL)
.append(" echo \"follow the steps 3 and 4\"").append(EOL)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java
index b86e637..e9bf101 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java
+++ b/opendj-sdk/opendj-server-legacy/src/main/java/org/opends/server/util/Platform.java
@@ -67,6 +67,9 @@
private static final PlatformIMPL IMPL;
+ /** The minimum java supported version. */
+ public static final String JAVA_MINIMUM_VERSION_NUMBER = "7.0";
+
static
{
String vendor = System.getProperty("java.vendor");
diff --git a/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup.properties b/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup.properties
index 07084a7..51bb664 100644
--- a/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup.properties
+++ b/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup.properties
@@ -858,7 +858,7 @@
INFO_WARNING_LARGE_ICON=images/warning_large.gif
INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS=The %s QuickSetup tool will ask \
you for some basic server and data configuration settings and will get your \
- server up and running quickly.<br><br> %s requires a Java SE 6.0 or \
+ server up and running quickly.<br><br> %s requires a Java SE %s or \
higher runtime.<br><br> Additional information on QuickSetup is available on \
the <a href="%s"> %s documentation site</a>.
INFO_WELCOME_PANEL_TITLE=Welcome
@@ -882,11 +882,6 @@
initialize the contents of local base DN: %s.
ERR_ERROR_CREATING_JAVA_HOME_SCRIPTS=Error updating scripts with java \
properties. Error code: %d
-ERR_INCOMPATIBLE_VERSION=The minimum Java version required is %s.%n%n\
- The detected version is %s.%nThe binary detected is %s%n%nPlease set \
- OPENDJ_JAVA_HOME to the root of a compatible Java installation or edit the \
- java.properties file and then run the dsjavaproperties script to specify the \
- java version to be used.
INFO_ADS_CONTEXT_EXCEPTION_MSG=Registration information error. Error type: '%s'.
INFO_ADS_CONTEXT_EXCEPTION_WITH_DETAILS_MSG=Registration information error. \
Error type: '%s'. Details: %s
diff --git a/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_de.properties b/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_de.properties
index 4b3c493..e2fb540 100644
--- a/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_de.properties
+++ b/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_de.properties
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
-# Portions Copyright 2010-2014 ForgeRock AS
+# Portions Copyright 2010-2015 ForgeRock AS
@@ -597,7 +597,7 @@
INFO_WARNING_ICON_TOOLTIP=Warnung
# Only translate if the image is specific to the local
INFO_WARNING_LARGE_ICON=images/warning_large.gif
-INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS=Das %s QuickSetup-Tool fordert Sie zur Eingabe einiger grundlegender Server- und Datenkonfigurationseinstellungen auf und macht Ihren Server schnell einsatzbereit.<br><br> %s erfordert eine Java SE 6.0- oder eine h\u00f6here Laufzeit.<br><br> Weitere Information zu QuickSetup finden Sie auf der Site mit der <a href="%s"> %s Dokumentation</a>.
+INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS=Das %s QuickSetup-Tool fordert Sie zur Eingabe einiger grundlegender Server- und Datenkonfigurationseinstellungen auf und macht Ihren Server schnell einsatzbereit.<br><br> %s erfordert eine Java SE 7.0- oder eine h\u00f6here Laufzeit.<br><br> Weitere Information zu QuickSetup finden Sie auf der Site mit der <a href="%s"> %s Dokumentation</a>.
INFO_WELCOME_PANEL_TITLE=Willkommen
INFO_WELCOME_STEP=Willkommen
INFO_LICENSE_PANEL_TITLE=Lizenz
diff --git a/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_es.properties b/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_es.properties
index ac877d8..76bfe61 100644
--- a/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_es.properties
+++ b/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_es.properties
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
-# Portions Copyright 2010-2014 ForgeRock AS
+# Portions Copyright 2010-2015 ForgeRock AS
@@ -597,7 +597,7 @@
INFO_WARNING_ICON_TOOLTIP=Advertencia
# Only translate if the image is specific to the local
INFO_WARNING_LARGE_ICON=images/warning_large.gif
-INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS=La herramienta de configuraci\u00f3n r\u00e1pida %s QuickSetup le pedir\u00e1 algunos ajustes b\u00e1sicos de configuraci\u00f3n del servidor y de datos y har\u00e1 que su servidor funcione r\u00e1pidamente.<br><br> %s requiere un tiempo de ejecuci\u00f3n Java SE 6.0 o superior.<br><br> Dispone de informaci\u00f3n adicional sobre la Configuraci\u00f3n r\u00e1pida en el <a href="%s"> sitio de documentaci\u00f3n de %s</a>.
+INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS=La herramienta de configuraci\u00f3n r\u00e1pida %s QuickSetup le pedir\u00e1 algunos ajustes b\u00e1sicos de configuraci\u00f3n del servidor y de datos y har\u00e1 que su servidor funcione r\u00e1pidamente.<br><br> %s requiere un tiempo de ejecuci\u00f3n Java SE 7.0 o superior.<br><br> Dispone de informaci\u00f3n adicional sobre la Configuraci\u00f3n r\u00e1pida en el <a href="%s"> sitio de documentaci\u00f3n de %s</a>.
INFO_WELCOME_PANEL_TITLE=Bienvenido
INFO_WELCOME_STEP=Bienvenido
INFO_LICENSE_PANEL_TITLE=Licencia
diff --git a/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_fr.properties b/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_fr.properties
index f274656..d5e8e78 100644
--- a/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_fr.properties
+++ b/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_fr.properties
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
-# Portions Copyright 2010-2014 ForgeRock AS
+# Portions Copyright 2010-2015 ForgeRock AS
@@ -598,7 +598,7 @@
INFO_WARNING_ICON_TOOLTIP=Avertissement
# Only translate if the image is specific to the local
INFO_WARNING_LARGE_ICON=images/warning_large.gif
-INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS=L\u2019outil %s QuickSetup vous invite \u00e0 d\u00e9finir quelques param\u00e8tres de configuration de base pour le serveur, puis rendre rapidement votre serveur op\u00e9rationnel.<br><br> %s requiert Java\u00a0SE\u00a06.0 ou version sup\u00e9rieure.<br><br> Pour plus d\u2019informations sur QuickSetup, consultez le <a href="%s">site de documentation de %s</a>.
+INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS=L\u2019outil %s QuickSetup vous invite \u00e0 d\u00e9finir quelques param\u00e8tres de configuration de base pour le serveur, puis rendre rapidement votre serveur op\u00e9rationnel.<br><br> %s requiert Java\u00a0SE\u00a07.0 ou version sup\u00e9rieure.<br><br> Pour plus d\u2019informations sur QuickSetup, consultez le <a href="%s">site de documentation de %s</a>.
INFO_WELCOME_PANEL_TITLE=Bienvenue
INFO_WELCOME_STEP=Bienvenue
INFO_LICENSE_PANEL_TITLE=Licence
diff --git a/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_ja.properties b/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_ja.properties
index 8b154cc..11431fb 100644
--- a/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_ja.properties
+++ b/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_ja.properties
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
-# Portions Copyright 2010-2014 ForgeRock AS
+# Portions Copyright 2010-2015 ForgeRock AS
@@ -597,7 +597,7 @@
INFO_WARNING_ICON_TOOLTIP=\u8b66\u544a
# Only translate if the image is specific to the local
INFO_WARNING_LARGE_ICON=images/warning_large.gif
-INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS=%s QuickSetup \u30c4\u30fc\u30eb\u306b\u3088\u308a\u3001\u57fa\u672c\u30b5\u30fc\u30d0\u30fc\u304a\u3088\u3073\u30c7\u30fc\u30bf\u69cb\u6210\u306e\u8a2d\u5b9a\u304c\u6c42\u3081\u3089\u308c\u307e\u3059\u3002\u305d\u306e\u5f8c\u3001\u30b5\u30fc\u30d0\u30fc\u306e\u8d77\u52d5\u3068\u7a3c\u50cd\u304c\u3059\u307f\u3084\u304b\u306b\u5b9f\u884c\u3055\u308c\u307e\u3059\u3002<br><br> %s \u306b\u306f Java SE 6.0 \u4ee5\u964d\u306e\u30e9\u30f3\u30bf\u30a4\u30e0\u304c\u5fc5\u8981\u3067\u3059\u3002<br><br> QuickSetup \u306b\u3064\u3044\u3066\u306f\u3001<a href="%s"> %s \u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30b5\u30a4\u30c8</a>\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
+INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS=%s QuickSetup \u30c4\u30fc\u30eb\u306b\u3088\u308a\u3001\u57fa\u672c\u30b5\u30fc\u30d0\u30fc\u304a\u3088\u3073\u30c7\u30fc\u30bf\u69cb\u6210\u306e\u8a2d\u5b9a\u304c\u6c42\u3081\u3089\u308c\u307e\u3059\u3002\u305d\u306e\u5f8c\u3001\u30b5\u30fc\u30d0\u30fc\u306e\u8d77\u52d5\u3068\u7a3c\u50cd\u304c\u3059\u307f\u3084\u304b\u306b\u5b9f\u884c\u3055\u308c\u307e\u3059\u3002<br><br> %s \u306b\u306f Java SE 7.0 \u4ee5\u964d\u306e\u30e9\u30f3\u30bf\u30a4\u30e0\u304c\u5fc5\u8981\u3067\u3059\u3002<br><br> QuickSetup \u306b\u3064\u3044\u3066\u306f\u3001<a href="%s"> %s \u306e\u30c9\u30ad\u30e5\u30e1\u30f3\u30c8\u30b5\u30a4\u30c8</a>\u3092\u53c2\u7167\u3057\u3066\u304f\u3060\u3055\u3044\u3002
INFO_WELCOME_PANEL_TITLE=\u3088\u3046\u3053\u305d
INFO_WELCOME_STEP=\u3088\u3046\u3053\u305d
INFO_LICENSE_PANEL_TITLE=\u30e9\u30a4\u30bb\u30f3\u30b9
diff --git a/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_ko.properties b/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_ko.properties
index 9549222..b21ee81 100644
--- a/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_ko.properties
+++ b/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_ko.properties
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
# Copyright 2006-2009 Sun Microsystems, Inc.
-# Portions Copyright 2010-2014 ForgeRock AS
+# Portions Copyright 2010-2015 ForgeRock AS
@@ -574,7 +574,7 @@
INFO_WARNING_ICON_TOOLTIP=\uacbd\uace0
# Only translate if the image is specific to the local
INFO_WARNING_LARGE_ICON=images/warning_large.gif
-INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS=%s \ube60\ub978 \uc124\uce58 \ub3c4\uad6c\ub294 \uc0ac\uc6a9\uc790\uc5d0\uac8c \uae30\ubcf8 \uc11c\ubc84 \ubc0f \ub370\uc774\ud130 \uad6c\uc131 \uc124\uc815\uc5d0 \ub300\ud55c \uba87 \uac00\uc9c0 \uc9c8\ubb38\uc744 \ud55c \ud6c4 \uc11c\ubc84\ub97c \uc2e0\uc18d\ud558\uac8c \uc2dc\uc791 \ubc0f \uc2e4\ud589\ud558\ub3c4\ub85d \ud569\ub2c8\ub2e4.<br><br> %s \uc5d0\ub294 Java SE 6.0 \uc774\uc0c1\uc758 \ub7f0\ud0c0\uc784\uc774 \ud544\uc694\ud569\ub2c8\ub2e4.<br><br> \ube60\ub978 \uc124\uce58\uc5d0 \ub300\ud55c \ucd94\uac00 \uc815\ubcf4\ub294 <a href="%s"> OpenDJ \uc124\uba85\uc11c </a>\uc5d0\uc11c \uc0ac\uc6a9\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
+INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS=%s \ube60\ub978 \uc124\uce58 \ub3c4\uad6c\ub294 \uc0ac\uc6a9\uc790\uc5d0\uac8c \uae30\ubcf8 \uc11c\ubc84 \ubc0f \ub370\uc774\ud130 \uad6c\uc131 \uc124\uc815\uc5d0 \ub300\ud55c \uba87 \uac00\uc9c0 \uc9c8\ubb38\uc744 \ud55c \ud6c4 \uc11c\ubc84\ub97c \uc2e0\uc18d\ud558\uac8c \uc2dc\uc791 \ubc0f \uc2e4\ud589\ud558\ub3c4\ub85d \ud569\ub2c8\ub2e4.<br><br> %s \uc5d0\ub294 Java SE 7.0 \uc774\uc0c1\uc758 \ub7f0\ud0c0\uc784\uc774 \ud544\uc694\ud569\ub2c8\ub2e4.<br><br> \ube60\ub978 \uc124\uce58\uc5d0 \ub300\ud55c \ucd94\uac00 \uc815\ubcf4\ub294 <a href="%s"> OpenDJ \uc124\uba85\uc11c </a>\uc5d0\uc11c \uc0ac\uc6a9\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
INFO_WELCOME_PANEL_TITLE=\uc2dc\uc791
INFO_WELCOME_STEP=\uc2dc\uc791
INFO_LICENSE_CLI_ACCEPT_NO=\uc544\ub2c8\uc694
diff --git a/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_zh_CN.properties b/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_zh_CN.properties
index a33cf27..e72408d 100644
--- a/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_zh_CN.properties
+++ b/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_zh_CN.properties
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
# Copyright 2006-2010 Sun Microsystems, Inc.
-# Portions Copyright 2010-2014 ForgeRock AS
+# Portions Copyright 2010-2015 ForgeRock AS
@@ -597,7 +597,7 @@
INFO_WARNING_ICON_TOOLTIP=\u8b66\u544a
# Only translate if the image is specific to the local
INFO_WARNING_LARGE_ICON=images/warning_large.gif
-INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS=%s \u5feb\u901f\u5b89\u88c5\u5de5\u5177\u5c06\u8981\u6c42\u60a8\u8fdb\u884c\u4e00\u4e9b\u57fa\u672c\u7684\u670d\u52a1\u5668\u548c\u6570\u636e\u914d\u7f6e\u8bbe\u7f6e\uff0c\u800c\u4e14\u4f1a\u5feb\u901f\u542f\u52a8\u5e76\u8fd0\u884c\u670d\u52a1\u5668\u3002<br><br>%s \u9700\u8981 Java SE 6.0 \u6216\u66f4\u9ad8\u7248\u672c\u7684\u8fd0\u884c\u65f6\u73af\u5883\u3002<br><br>\u5173\u4e8e\u5feb\u901f\u5b89\u88c5\u7684\u9644\u52a0\u4fe1\u606f\u4f4d\u4e8e<a href="%s"> %s \u6587\u6863\u7ad9\u70b9</a>\u4e0a\u3002
+INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS=%s \u5feb\u901f\u5b89\u88c5\u5de5\u5177\u5c06\u8981\u6c42\u60a8\u8fdb\u884c\u4e00\u4e9b\u57fa\u672c\u7684\u670d\u52a1\u5668\u548c\u6570\u636e\u914d\u7f6e\u8bbe\u7f6e\uff0c\u800c\u4e14\u4f1a\u5feb\u901f\u542f\u52a8\u5e76\u8fd0\u884c\u670d\u52a1\u5668\u3002<br><br>%s \u9700\u8981 Java SE 7.0 \u6216\u66f4\u9ad8\u7248\u672c\u7684\u8fd0\u884c\u65f6\u73af\u5883\u3002<br><br>\u5173\u4e8e\u5feb\u901f\u5b89\u88c5\u7684\u9644\u52a0\u4fe1\u606f\u4f4d\u4e8e<a href="%s"> %s \u6587\u6863\u7ad9\u70b9</a>\u4e0a\u3002
INFO_WELCOME_PANEL_TITLE=\u6b22\u8fce\u4f7f\u7528
INFO_WELCOME_STEP=\u6b22\u8fce\u4f7f\u7528
INFO_LICENSE_PANEL_TITLE=\u8bb8\u53ef\u8bc1
diff --git a/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_zh_TW.properties b/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_zh_TW.properties
index 2e7112a..ec01b9b 100644
--- a/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_zh_TW.properties
+++ b/opendj-sdk/opendj-server-legacy/src/messages/org/opends/messages/quickSetup_zh_TW.properties
@@ -20,7 +20,7 @@
# CDDL HEADER END
#
# Copyright 2006-2009 Sun Microsystems, Inc.
-# Portions Copyright 2010-2014 ForgeRock AS
+# Portions Copyright 2010-2015 ForgeRock AS
@@ -575,7 +575,7 @@
INFO_WARNING_ICON_TOOLTIP=\u8b66\u544a
# Only translate if the image is specific to the local
INFO_WARNING_LARGE_ICON=images/warning_large.gif
-INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS=%s QuickSetup \u5de5\u5177\u6703\u8981\u6c42\u60a8\u63d0\u4f9b\u67d0\u4e9b\u57fa\u672c\u4f3a\u670d\u5668\u8207\u8cc7\u6599\u914d\u7f6e\u8a2d\u5b9a\uff0c\u4e26\u6703\u5feb\u901f\u555f\u52d5\u4e26\u57f7\u884c\u60a8\u7684\u4f3a\u670d\u5668\u3002<br><br>%s \u9700\u8981 Java SE 6.0 \u6216\u66f4\u9ad8\u7684\u57f7\u884c\u968e\u6bb5\u3002<br><br>\u95dc\u65bc\u5feb\u901f\u5b89\u88dd\u7684\u9644\u52a0\u4fe1\u606f\u4f4d\u65bc<a href="%s">%s \u6587\u6863\u7ad9\u70b9</a>\u3002
+INFO_WELCOME_PANEL_OFFLINE_INSTRUCTIONS=%s QuickSetup \u5de5\u5177\u6703\u8981\u6c42\u60a8\u63d0\u4f9b\u67d0\u4e9b\u57fa\u672c\u4f3a\u670d\u5668\u8207\u8cc7\u6599\u914d\u7f6e\u8a2d\u5b9a\uff0c\u4e26\u6703\u5feb\u901f\u555f\u52d5\u4e26\u57f7\u884c\u60a8\u7684\u4f3a\u670d\u5668\u3002<br><br>%s \u9700\u8981 Java SE 7.0 \u6216\u66f4\u9ad8\u7684\u57f7\u884c\u968e\u6bb5\u3002<br><br>\u95dc\u65bc\u5feb\u901f\u5b89\u88dd\u7684\u9644\u52a0\u4fe1\u606f\u4f4d\u65bc<a href="%s">%s \u6587\u6863\u7ad9\u70b9</a>\u3002
INFO_WELCOME_PANEL_TITLE=\u6b61\u8fce\u4f7f\u7528
INFO_WELCOME_STEP=\u6b61\u8fce\u4f7f\u7528
INFO_LICENSE_CLI_ACCEPT_NO=\u5426
diff --git a/opendj-sdk/opendj-server-legacy/src/svr4/OpenDJ/install.html b/opendj-sdk/opendj-server-legacy/src/svr4/OpenDJ/install.html
index 9c6d536..d53cd30 100644
--- a/opendj-sdk/opendj-server-legacy/src/svr4/OpenDJ/install.html
+++ b/opendj-sdk/opendj-server-legacy/src/svr4/OpenDJ/install.html
@@ -33,11 +33,11 @@
<p>If you are reading this page, you have already installed the OpenDJ package.
<h3>Before You Configure</h3>
-A Java SE 6.0 (version 1.6.0_10) or higher runtime environment must be installed.
+A Java SE 7.0 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 OpenDJ for evaluation purposes. Note that
you can configure OpenDJ in such a way that it requires substantially
-less, or more, disk space. For more information, see the
+less, or more, disk space. For more information, see the
<a href="https://wikis.forgerock.org/confluence/display/OPENDJ/OpenDJ+Documentation">
System Requirements section of the OpenDJ Installation Guide</a>.
diff --git a/opendj-sdk/opendj-server-legacy/src/svr4/OpenDJ/install.txt b/opendj-sdk/opendj-server-legacy/src/svr4/OpenDJ/install.txt
index e0e33ad..386a0dc 100644
--- a/opendj-sdk/opendj-server-legacy/src/svr4/OpenDJ/install.txt
+++ b/opendj-sdk/opendj-server-legacy/src/svr4/OpenDJ/install.txt
@@ -5,8 +5,8 @@
Before You Configure
------------------
-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
+A Java SE 7 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
OpenDJ for evaluation purposes. Note that you can configure OpenDJ in such a way that it requires
substantially less, or more, disk space. For more information, see the OpenDJ System Requirements
at https://
diff --git a/opendj-sdk/opendj-virtual/README b/opendj-sdk/opendj-virtual/README
index e9c2818..3dcc50d 100644
--- a/opendj-sdk/opendj-virtual/README
+++ b/opendj-sdk/opendj-virtual/README
@@ -1,7 +1,7 @@
OpenDJ Virtual Directory.
This Maven project contains the Virtual Directory. It is 100%
-Java based and requires Java 1.6.
+Java based and requires Java 1.7.
Complete documentation for this product may be found online
at http://www.forgerock.com/opendj.html.
--
Gitblit v1.10.0