From b38bb4d933f7123f1cdeef4308880dde3a3e90ed Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Mon, 15 Jun 2015 16:20:39 +0000
Subject: [PATCH] CR-7263 OPENDJ-2077 Fix screenshots
---
opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/images/OpenDJ-Control-Panel.png | 0
/dev/null | 0
opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/OpenDJ-Control-Panel.png | 0
opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/chap-replication.xml | 114 ++++++++----------
opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/chap-uninstall.xml | 31 ++---
opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/chap-install-gui.xml | 185 +++++++++++++++---------------
6 files changed, 158 insertions(+), 172 deletions(-)
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/chap-replication.xml b/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/chap-replication.xml
index af4df0c..3724009 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/chap-replication.xml
+++ b/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/chap-replication.xml
@@ -48,76 +48,68 @@
<see>Replication</see>
</indexterm>
- <para>You can set up replication during installation by choosing to
- configure replication through the setup wizard.</para>
+ <itemizedlist>
+ <para>
+ You can set up replication during installation by using the setup wizard,
+ starting with the Topology Options screen.
+ </para>
- <para>In the Topology Options screen for the first server you set up, select
- This server will be part of a replication topology. If you also choose
- Configure as Secure, then replication traffic is protected by SSL.</para>
+ <listitem>
+ <para>
+ In the Topology Options screen for the first server you set up,
+ select This server will be part of a replication topology.
+ </para>
- <mediaobject xml:id="figure-repla-setup">
- <imageobject>
- <imagedata fileref="images/replA-setup.png" format="PNG" />
- </imageobject>
- <textobject>
- <para>QuickSetup makes it easy to configure replication.</para>
- </textobject>
- </mediaobject>
+ <para>
+ If you also choose Configure as Secure,
+ then replication traffic is protected by Transport Layer Security.
+ </para>
+ </listitem>
- <para>In the Topology Options screen for subsequent servers, also select
- There is already a server in the topology, providing the Host Name,
- Administration Connector Port number, Admin User, and Admin Password for
- the first replica you set up.</para>
+ <listitem>
+ <para>
+ In the Topology Options screen for subsequent servers,
+ select There is already a server in the topology.
+ </para>
- <mediaobject xml:id="figure-replb-setup">
- <imageobject>
- <imagedata fileref="images/replB-setup.png" format="PNG" />
- </imageobject>
- <textobject>
- <para>Subsequent servers can point to the first server at setup time.</para>
- </textobject>
- </mediaobject>
+ <para>
+ Provide the Host Name, Administration Connector Port number,
+ global Admin User identifier, and Admin Password for the first server.
+ </para>
+ </listitem>
- <para>You also set up a global administrator account, stored under
- <literal>cn=admin data</literal> across replicas, used to manage replication
- in the topology.</para>
+ <listitem>
+ <para>
+ When presented with the Create Global Administrator screen,
+ provide a Global Administrator ID and Global Administrator Password.
+ </para>
- <mediaobject xml:id="figure-replb-global-admin">
- <imageobject>
- <imagedata fileref="images/replB-global-admin.png" format="PNG" />
- </imageobject>
- <textobject>
- <para>The global administrator account exists on all servers in the
- replication topology.</para>
- </textobject>
- </mediaobject>
+ <para>
+ The Global Administrator account exists on all servers
+ in the replication topology.
+ The account is stored under <literal>cn=admin data</literal>.
+ It provides an account to administer replication
+ with the same credentials on every server in the topology.
+ </para>
+ </listitem>
- <para>You further set up what to replicate.</para>
+ <listitem>
+ <para>
+ In the Data Replication screen,
+ select the user and application data base DN(s) to replicate.
+ </para>
- <mediaobject xml:id="figure-replb-data-repl">
- <imageobject>
- <imagedata fileref="images/replB-data-repl.png" format="PNG" />
- </imageobject>
- <textobject>
- <para>You choose the user data to replicate. OpenDJ automatically replicates
- administrative data and directory schema.</para>
- </textobject>
- </mediaobject>
+ <para>
+ OpenDJ directory server automatically replicates
+ configuration data and directory schema.
+ </para>
+ </listitem>
+ </itemizedlist>
- <para>Once replication is set up, it works for all the replicas. You can
- monitor the replication connection and status through the OpenDJ Control
- Panel.</para>
-
- <mediaobject xml:id="figure-repla-monitor-repl">
- <imageobject>
- <imagedata fileref="images/replA-monitor-repl.png" format="PNG" />
- </imageobject>
- <textobject>
- <para>OpenDJ Control Panel indicates the status of data being
- replicated.</para>
- </textobject>
- </mediaobject>
-
+ <para>
+ Once replication is set up, it works for all the replicas.
+ You can monitor replication status through OpenDJ Control Panel.
+ </para>
</section>
<section xml:id="about-repl">
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/images/OpenDJ-Control-Panel.png b/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/images/OpenDJ-Control-Panel.png
index a227df7..853e34c 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/images/OpenDJ-Control-Panel.png
+++ b/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/images/OpenDJ-Control-Panel.png
Binary files differ
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/images/replA-monitor-repl.png b/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/images/replA-monitor-repl.png
deleted file mode 100644
index 99292d8..0000000
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/images/replA-monitor-repl.png
+++ /dev/null
Binary files differ
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/images/replA-setup.png b/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/images/replA-setup.png
deleted file mode 100644
index 3577c2b..0000000
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/images/replA-setup.png
+++ /dev/null
Binary files differ
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/images/replB-data-repl.png b/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/images/replB-data-repl.png
deleted file mode 100644
index dee2e81..0000000
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/images/replB-data-repl.png
+++ /dev/null
Binary files differ
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/images/replB-global-admin.png b/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/images/replB-global-admin.png
deleted file mode 100644
index 94a7ce1..0000000
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/images/replB-global-admin.png
+++ /dev/null
Binary files differ
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/images/replB-setup.png b/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/images/replB-setup.png
deleted file mode 100644
index c29ffdc..0000000
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/admin-guide/images/replB-setup.png
+++ /dev/null
Binary files differ
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/chap-install-gui.xml b/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/chap-install-gui.xml
index 3ad427e..9b8bde5 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/chap-install-gui.xml
+++ b/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/chap-install-gui.xml
@@ -48,19 +48,11 @@
quick test installation.</para>
<note>
- <para>OpenDJ directory server relies on Java 6 or later, so if your browser
- picks up an old installation of Java 5 for example, installation can
- fail. You might see an application error message such as this:</para>
-
- <mediaobject xml:id="figure-missing-java6">
- <alt>Application error due to old Java version</alt>
- <imageobject>
- <imagedata fileref="images/missing-java6.png" format="PNG" />
- </imageobject>
- <textobject>
- <para>Message showing the browser is unable to launch the application</para>
- </textobject>
- </mediaobject>
+ <para>
+ If your environment picks up an old installation of Java,
+ installation can fail.
+ You might see an application error due to an old Java version.
+ </para>
</note>
<para>If the WebStart installation does not work in your browser, copy
@@ -89,95 +81,102 @@
or <command>opendj/QuickSetup.app</command> (Mac OS X).
</para>
- <para>Java WebStart launches the the QuickSetup wizard, and soon the
- Welcome screen appears.</para>
+ <para>
+ Java WebStart launches the the QuickSetup wizard,
+ and soon the Welcome screen appears.
+ </para>
- <mediaobject xml:id="figure-quicksetup-welcome">
- <imageobject>
- <imagedata fileref="images/QuickSetup-welcome.png" format="PNG" />
- </imageobject>
- <textobject>
- <para>The Welcome screen summarizes the setup process.</para>
- </textobject>
- </mediaobject>
+ <itemizedlist>
+ <para>
+ The QuickSetup wizard presents the following screens:
+ </para>
- <mediaobject xml:id="figure-quicksetup-license">
- <imageobject>
- <imagedata fileref="images/QuickSetup-license.png" format="PNG" />
- </imageobject>
- <textobject>
- <para>Accept the license to install OpenDJ directory server if QuickSetup
- presents a license text.</para>
- </textobject>
- </mediaobject>
+ <listitem>
+ <para>
+ <emphasis>Welcome</emphasis>: summarizes the setup process
+ and indicates the minimum required Java version
+ </para>
+ </listitem>
- <mediaobject xml:id="figure-quicksetup-svrconf">
- <imageobject>
- <imagedata fileref="images/QuickSetup-svrconf.png" format="PNG" />
- </imageobject>
- <textobject>
- <para>In the Server Settings screen that the default ports
- are 389 or 1389 for LDAP, 4444 for administrative access.</para>
- </textobject>
- </mediaobject>
+ <listitem>
+ <para>
+ <emphasis>License</emphasis>: presents the license agreement to accept
+ before installing OpenDJ software
+ </para>
+ </listitem>
- <mediaobject xml:id="figure-quicksetup-replopts">
- <imageobject>
- <imagedata fileref="images/QuickSetup-replopts.png" format="PNG" />
- </imageobject>
- <textobject>
- <para>You can replicate data for high availability through the
- Topology Options screen.</para>
- </textobject>
- </mediaobject>
+ <listitem>
+ <para>
+ <emphasis>Server Settings</emphasis>: prompts for basic server settings
+ including installation path, host name, port numbers, secure connections,
+ and credentials for the directory superuser
+ (default bind DN: <literal>cn=Directory Manager</literal>)
+ </para>
+ </listitem>
- <mediaobject xml:id="figure-quicksetup-gendata">
- <imageobject>
- <imagedata fileref="images/QuickSetup-gendata.png" format="PNG" />
- </imageobject>
- <textobject>
- <para>You can generate test data as part of server setup in the Directory
- Data screen.</para>
- </textobject>
- </mediaobject>
+ <listitem>
+ <para>
+ <emphasis>Topology Options</emphasis>: prompts for data replication options
+ including whether this server is part of a replication topology,
+ and if so the port number and security settings for this server,
+ as well as the connection settings for a remote replica if available
+ </para>
+ </listitem>
- <mediaobject xml:id="figure-quicksetup-jvmopts">
- <imageobject>
- <imagedata fileref="images/QuickSetup-jvmopts.png" format="PNG" />
- </imageobject>
- <textobject>
- <para>For a real installation, you can adjust JVM parameters for
- your server, for example to allow OpenDJ to use more memory.</para>
- </textobject>
- </mediaobject>
+ <listitem>
+ <para>
+ <emphasis>Directory Data</emphasis>: allows you to import or to generate
+ LDAP directory data as part of the setup process
+ </para>
- <mediaobject xml:id="figure-quicksetup-review">
- <imageobject>
- <imagedata fileref="images/QuickSetup-review.png" format="PNG" />
- </imageobject>
- <textobject>
- <para>You can opt to start your server when setup completes.</para>
- </textobject>
- </mediaobject>
+ <para>
+ This screen also allows you to select the backend type for data storage.
+ </para>
+ </listitem>
- <mediaobject xml:id="figure-quicksetup-finished">
- <imageobject>
- <imagedata fileref="images/QuickSetup-finished.png" format="PNG" />
- </imageobject>
- <textobject>
- <para>Click the Launch Control Panel button to check your newly
- installed server.</para>
- </textobject>
- </mediaobject>
+ <listitem>
+ <para>
+ <emphasis>Runtime Options</emphasis>: allows you to adjust
+ JVM settings as part of the setup process,
+ for example to allow OpenDJ to use more memory if necessary
+ </para>
+ </listitem>
- <mediaobject xml:id="figure-quicksetup-control-panel">
- <imageobject>
- <imagedata fileref="images/OpenDJ-Control-Panel.png" format="PNG" />
- </imageobject>
- <textobject>
- <para>OpenDJ Control Panel offers basic administration capabilities.</para>
- </textobject>
- </mediaobject>
+ <listitem>
+ <para>
+ <emphasis>Review</emphasis>: presents current selections
+ so that you can check everything is correct before running setup,
+ with the option to start OpenDJ directory server after setup completes
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <emphasis>Finished</emphasis>: summarizes how setup completed,
+ with the option to launch the OpenDJ Control Panel
+ </para>
+ </listitem>
+ </itemizedlist>
+
+ <para>
+ <xref linkend="figure-quicksetup-control-panel" />
+ shows the top-level window with status information.
+ OpenDJ Control Panel helps to manage directory data, LDAP schema, indexes,
+ monitoring, and JVM runtime options through a graphical user interface.
+ </para>
+
+ <figure xml:id="figure-quicksetup-control-panel">
+ <title>OpenDJ Control Panel</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="images/OpenDJ-Control-Panel.png" format="PNG" />
+ </imageobject>
+ <textobject>
+ <para>OpenDJ Control Panel offers basic administration capabilities.</para>
+ </textobject>
+ </mediaobject>
+ </figure>
</section>
<section xml:id="install-gui-windows-msi">
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/chap-uninstall.xml b/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/chap-uninstall.xml
index fd960d7..b5b067b 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/chap-uninstall.xml
+++ b/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/chap-uninstall.xml
@@ -57,28 +57,23 @@
<para>(Windows) Double-click <filename>/path/to/opendj\uninstall.bat</filename>.</para>
<para>(Mac OS X) Double-click <filename>/path/to/opendj/Uninstall.app</filename>.</para>
- <mediaobject xml:id="figure-uninstall-start">
- <imageobject>
- <imagedata fileref="images/uninstall-start.png" format="PNG" />
- </imageobject>
- <textobject>
- <para>Select what to remove in the initial screen.</para>
- </textobject>
- </mediaobject>
+ <para>
+ The Uninstall Options screen appears.
+ </para>
</step>
<step>
- <para>When the process is finished, you might still have some files
- to remove manually.</para>
+ <para>
+ Select the components to remove in the Uninstall Options screen,
+ and then click Uninstall to proceed.
+ </para>
+ </step>
- <mediaobject xml:id="figure-uninstall-finished">
- <imageobject>
- <imagedata fileref="images/uninstall-finished.png" format="PNG" />
- </imageobject>
- <textobject>
- <para>The final screen indicates what must be removed manually.</para>
- </textobject>
- </mediaobject>
+ <step>
+ <para>
+ To complete the process,
+ manually remove any remaining components indicated in the Finished screen.
+ </para>
</step>
</procedure>
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/OpenDJ-Control-Panel.png b/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/OpenDJ-Control-Panel.png
index a227df7..853e34c 100644
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/OpenDJ-Control-Panel.png
+++ b/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/OpenDJ-Control-Panel.png
Binary files differ
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-finished.png b/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-finished.png
deleted file mode 100644
index fbedbe6..0000000
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-finished.png
+++ /dev/null
Binary files differ
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-gendata.png b/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-gendata.png
deleted file mode 100644
index 2d8ae38..0000000
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-gendata.png
+++ /dev/null
Binary files differ
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-jvmopts.png b/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-jvmopts.png
deleted file mode 100644
index ed5aeb2..0000000
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-jvmopts.png
+++ /dev/null
Binary files differ
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-license.png b/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-license.png
deleted file mode 100644
index 9304569..0000000
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-license.png
+++ /dev/null
Binary files differ
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-replopts.png b/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-replopts.png
deleted file mode 100644
index 51dab98..0000000
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-replopts.png
+++ /dev/null
Binary files differ
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-review.png b/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-review.png
deleted file mode 100644
index 0925ad9..0000000
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-review.png
+++ /dev/null
Binary files differ
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-svrconf.png b/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-svrconf.png
deleted file mode 100644
index cec86af..0000000
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-svrconf.png
+++ /dev/null
Binary files differ
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-welcome.png b/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-welcome.png
deleted file mode 100644
index ceef256..0000000
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/QuickSetup-welcome.png
+++ /dev/null
Binary files differ
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/missing-java6.png b/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/missing-java6.png
deleted file mode 100644
index fb03bb0..0000000
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/missing-java6.png
+++ /dev/null
Binary files differ
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/uninstall-finished.png b/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/uninstall-finished.png
deleted file mode 100644
index a176a4a..0000000
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/uninstall-finished.png
+++ /dev/null
Binary files differ
diff --git a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/uninstall-start.png b/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/uninstall-start.png
deleted file mode 100644
index cb21761..0000000
--- a/opendj-sdk/opendj-server-legacy/src/main/docbkx/install-guide/images/uninstall-start.png
+++ /dev/null
Binary files differ
--
Gitblit v1.10.0