From f8c1e6f0d48971376502649bbadee9b8a3fd9d07 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Tue, 28 May 2013 09:16:13 +0000
Subject: [PATCH] Attempt to avoid knocking over Jenkins's house of cards
---
opendj3/src/main/docbkx/shared/man-upgrade.xml | 12 +++---
opends/resource/man/man1/upgrade.1 | 70 ++---------------------------------
2 files changed, 10 insertions(+), 72 deletions(-)
diff --git a/opendj3/src/main/docbkx/shared/man-upgrade.xml b/opendj3/src/main/docbkx/shared/man-upgrade.xml
index fe8b1b2..b464c90 100644
--- a/opendj3/src/main/docbkx/shared/man-upgrade.xml
+++ b/opendj3/src/main/docbkx/shared/man-upgrade.xml
@@ -196,13 +196,13 @@
</listitem>
</varlistentry>
</variablelist>
- </refsect1>
- <refsect1>
- <title>Examples</title>
- <para>The following example shows the upgrade process for OpenDJ directory
- server installed from the cross-platform (.zip) delivery.</para>
- <para>Test for java.lang.reflect.InvocationTargetException, Caused by: java.lang.StackOverflowError</para>
+ <para>See the <citetitle>Installation Guide</citetitle> for an example
+ upgrade process for OpenDJ directory server installed from the cross-platform
+ (.zip) delivery, <link xlink:show="new"
+ xlink:href="install-guide#upgrade-zip-example"
+ xlink:role="http://docbook.org/xlink/role/olink"><citetitle>Upgrading From
+ OpenDJ 2.4.5</citetitle></link>.</para>
<para>Native packages (.deb, .rpm) perform more of the upgrade process,
stopping OpenDJ if it is running, overwriting older files with newer files,
diff --git a/opends/resource/man/man1/upgrade.1 b/opends/resource/man/man1/upgrade.1
index e0655ff..9b8212a 100644
--- a/opends/resource/man/man1/upgrade.1
+++ b/opends/resource/man/man1/upgrade.1
@@ -187,73 +187,11 @@
.RS 4
An error occurred\&.
.RE
-.SH "EXAMPLES"
.PP
-The following example shows the upgrade process for OpenDJ directory server installed from the cross\-platform (\&.zip) delivery\&.
-.sp
-.if n \{\
-.RS 4
-.\}
-.nf
-$ cd /path/to
-$ ls
-OpenDJ\-2\&.4\&.5
-$ \&./OpenDJ\-2\&.4\&.5/bin/stop\-ds \-\-quiet
-\&.\&.\&. msg=The backend userRoot is now taken offline
-\&.\&.\&. msg=The Directory Server is now stopped
-$ zip \-rq OpenDJ\-backup\&.zip OpenDJ\-2\&.4\&.5
-$ unzip \-q ~/Downloads/OpenDJ\-\fIversion\fR\&.zip
-$ cp \-r opendj/* OpenDJ\-2\&.4\&.5/
-$ rm \-rf opendj
-$ mv OpenDJ\-2\&.4\&.5 opendj
-$ \&./opendj/upgrade \-\-no\-prompt
-
->>>> OpenDJ Upgrade Utility
-
- * OpenDJ will be upgraded from version 2\&.4\&.5\&.7743 to \fIversion\fR\&.\fIrevision\fR
- * See \*(Aq/path/to/opendj/upgrade\&.log\*(Aq for a detailed log of this operation
-
->>>> Preparing to upgrade
-
- OpenDJ \fIversion\fR modified the default configuration of the \*(AqisMemberOf\*(Aq virtual
- attribute so that it is included with group entries\&. This was done in order
- to make it easier for users to determine which groups a \*(Aqnested\*(Aq group
- belongs to\&.
- Do you want to make this configuration change? (yes/no) yes
-
- The upgrade is ready to proceed\&. Do you wish to continue? (yes/no) yes
-
-
->>>> Performing upgrade
-
- Fixing de\-DE collation matching rule OID\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&. 100%
- Updating password policy configurations\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&. 100%
- Updating audit log publisher configuration\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&. 100%
- Adding \*(Aqetag\*(Aq virtual attribute schema\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&. 100%
- Configuring \*(Aqetag\*(Aq virtual attribute\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&. 100%
- Configuring \*(Aqds\-pwp\-password\-expiration\-time\*(Aq virtual attribute\&.\&.\&.\&.\&. 100%
- Updating certificate syntax configuration\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&. 100%
- Updating JPEG syntax configuration\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&. 100%
- Updating country string syntax configuration\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&. 100%
- Modifying filter in \*(AqisMemberOf\*(Aq virtual attribute configuration\&.\&.\&.\&. 100%
- Updating dictionary password validator configuration\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&. 100%
- Updating attribute value password validator configuration\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&. 100%
- Adding PBKDF2 password storage scheme configuration\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&. 100%
- Adding \*(Aqhttp\-config\&.json\*(Aq configuration file\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&. 100%
- Adding HTTP connection handler configuration\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&. 100%
- Adding file\-based HTTP access logger\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&. 100%
- Replacing schema file \*(Aq02\-config\&.ldif\*(Aq\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&. 100%
- Archiving concatenated schema\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&.\&. 100%
-
->>>> OpenDJ was successfully upgraded from version 2\&.4\&.5\&.7743 to \fIversion\fR\&.\fIrevision\fR
-
- * See \*(Aq/path/to/opendj/upgrade\&.log\*(Aq for a detailed log of this operation
-$ \&./opendj/bin/start\-ds \-\-quiet
-$
-.fi
-.if n \{\
-.RE
-.\}
+See the
+Installation Guide
+for an example upgrade process for OpenDJ directory server installed from the cross\-platform (\&.zip) delivery,
+\m[blue]\fBUpgrading From OpenDJ 2\&.4\&.5\fR\m[]\&.
.PP
Native packages (\&.deb, \&.rpm) perform more of the upgrade process, stopping OpenDJ if it is running, overwriting older files with newer files, running this utility, and starting OpenDJ if it was running when you upgraded the package(s)\&.
.SH "COPYRIGHT"
--
Gitblit v1.10.0