From fc2580237b696e3bb775d493d401f3a47c4a22cb Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Wed, 28 Mar 2012 09:53:38 +0000
Subject: [PATCH] Fix for OPENDJ-461: Recommend JDK6u27 or later in our release notes and install guide due to potential SSL bugs
---
opendj-sdk/opendj3/src/main/docbkx/release-notes/chap-testing.xml | 10 ++++------
opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-install-cli.xml | 12 +++++-------
opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-get-sdk.xml | 9 ++++-----
opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-before-you-install.xml | 8 ++++----
4 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-get-sdk.xml b/opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-get-sdk.xml
index 7000aa6..6ec7d72 100644
--- a/opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-get-sdk.xml
+++ b/opendj-sdk/opendj3/src/main/docbkx/dev-guide/chap-get-sdk.xml
@@ -69,12 +69,11 @@
<para>Before you either download a build of OpenDJ LDAP SDK, or get the
source code to build your own SDK, make sure you have a Java Development Kit
- installed. OpenDJ LDAP SDK relies on Java 6 or later. You can check for
- Java 6 by running the following command.</para>
+ installed. See the <citetitle>Installation Guide</citetitle> section on
+ <link xlink:href="install-guide#prerequisites-java"
+ xlink:role="http://docbook.org/xlink/role/olink"><citetitle>Java
+ Environment</citetitle></link> requirements.</para>
- <screen>$ java -version
-java version "1.6.0_24"</screen>
-
<procedure xml:id="install-stable-sdk">
<title>To Install the Latest Stable SDK</title>
<step>
diff --git a/opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-before-you-install.xml b/opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-before-you-install.xml
index fa3fa2e..d80db01 100644
--- a/opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-before-you-install.xml
+++ b/opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-before-you-install.xml
@@ -20,7 +20,7 @@
!
! CCPL HEADER END
!
- ! Copyright 2011 ForgeRock AS
+ ! Copyright 2011-2012 ForgeRock AS
!
-->
<chapter xml:id='chap-before-you-install'
@@ -45,9 +45,9 @@
and Apple Mac OS X.</para>
<para>OpenDJ software requires Java 6, specifically at least the Java
- Standard Edition 6.0 (Sun version 1.6.0_10) runtime environment. For
- best server performance, use at least version 1.6.0_22, which includes a
- major security fix for TLS as well.</para>
+ Standard Edition 6.0 (Sun version 1.6.0_10) runtime environment. ForgeRock
+ recommends that you use at least version 1.6.0_27 due to security
+ fixes.</para>
</section>
<section xml:id="prerequisites-fqdn">
diff --git a/opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-install-cli.xml b/opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-install-cli.xml
index f745d9b..233a3ac 100644
--- a/opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-install-cli.xml
+++ b/opendj-sdk/opendj3/src/main/docbkx/install-guide/chap-install-cli.xml
@@ -38,13 +38,11 @@
<title>To Prepare For Installation</title>
<step xml:id="check-for-java">
- <para>Make sure you have the correct Java environment installed.</para>
- <indexterm><primary>Java</primary><secondary>Requirements</secondary></indexterm>
-
- <screen>$ java -version
-java version "1.6.0_24"
-Java(TM) SE Runtime Environment (build 1.6.0_24-b07-334-9M3326)
-Java HotSpot(TM) 64-Bit Server VM (build 19.1-b02-334, mixed mode)</screen>
+ <para>Make sure you have the correct Java environment installed, as
+ described in the section on <link
+ xlink:href="install-guide#prerequisites-java"
+ xlink:role="http://docbook.org/xlink/role/olink"><citetitle>Java
+ Environment</citetitle></link> requirements.</para>
<para>If your default Java environment is not appropriate, set
<literal>OPENDJ_JAVA_HOME</literal> to the path to the correct Java
diff --git a/opendj-sdk/opendj3/src/main/docbkx/release-notes/chap-testing.xml b/opendj-sdk/opendj3/src/main/docbkx/release-notes/chap-testing.xml
index 9da91df..9eafe91 100644
--- a/opendj-sdk/opendj3/src/main/docbkx/release-notes/chap-testing.xml
+++ b/opendj-sdk/opendj3/src/main/docbkx/release-notes/chap-testing.xml
@@ -34,10 +34,10 @@
<para>OpenDJ software depends on the Java environment more than it depends
on the underlying operating systems. OpenDJ directory server relies on Java 6,
specifically at least the Java Standard Edition 6.0 (Sun version 1.6.0_10)
- runtime environment. For best server performance, use at least version
- 1.6.0_22, which includes a major security fix for TLS as well. To build
- applications with the OpenDJ LDAP SDK, you need the Java SDK as the runtime
- environment has no compiler.</para>
+ runtime environment. ForgeRock recommends that you use at least version
+ 1.6.0_27 due to security fixes. To build applications with the OpenDJ LDAP
+ SDK, you need the Java SDK as the runtime environment has no
+ compiler.</para>
<para>That said, OpenDJ <?eval ${docTargetVersion}?> has been validated on
the following operating systems.</para>
@@ -59,6 +59,4 @@
<para>OpenDJ <?eval ${docTargetVersion}?> DSML gateway has been validated
on Apache Tomcat 6.</para>
-
</chapter>
-
--
Gitblit v1.10.0