From 356919733f94d1282f28c411529ce866c5d87d1e Mon Sep 17 00:00:00 2001
From: Ludovic Poitou <ludovic.poitou@forgerock.com>
Date: Tue, 05 Oct 2010 13:29:15 +0000
Subject: [PATCH] more Branding
---
opendj-sdk/opends/resource/README | 9 +++-
opendj-sdk/opends/resource/webstart/create-webstart-standalone.sh | 28 ++++----------
opendj-sdk/opends/resource/install.html | 22 +++++-----
opendj-sdk/opends/resource/install.txt | 16 ++++----
4 files changed, 33 insertions(+), 42 deletions(-)
diff --git a/opendj-sdk/opends/resource/README b/opendj-sdk/opends/resource/README
index 86bc2ef..77d9d7c 100644
--- a/opendj-sdk/opends/resource/README
+++ b/opendj-sdk/opends/resource/README
@@ -1,7 +1,10 @@
-OpenDS Directory Server
+OpenDJ
-This archive contains the OpenDS Directory Server. Complete documentation for
-this product may be found online at https://OpenDS.dev.java.net/.
+This archive contains OpenDJ an open source directory server in Java.
+OpenDJ is a downstream build of the OpenDS project, with a different name
+to avoid trademark issues.
+Complete documentation for this product may be found online
+at https://OpenDS.dev.java.net/.
To configure the server, run the setup script on UNIX-based platforms, or the
setup.bat batch file on Windows. To start the server, run bin/start-ds on
diff --git a/opendj-sdk/opends/resource/install.html b/opendj-sdk/opends/resource/install.html
index 9bb5d94..f112ea5 100644
--- a/opendj-sdk/opends/resource/install.html
+++ b/opendj-sdk/opends/resource/install.html
@@ -1,7 +1,7 @@
<!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>
+<title>How To Install OpenDJ</title>
<style type="text/css">
<!--
body { font-family: Arial, Helvetica, sans-serif;
@@ -25,18 +25,18 @@
<body>
-<img src="images/opends_logo.png" alt="OpenDS logo" border="0" align=right>
+<img src="images/opends_logo.png" alt="OpenDJ pictogram" border="0" align=right>
<br>
-<h2>How To Install OpenDS</h2>
+<h2>How To Install OpenDJ</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:
+an OpenDJ build.
+<p>You can install OpenDJ 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.
+OpenDJ 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.
@@ -46,18 +46,18 @@
<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
+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
<a href="https://www.opends.org/wiki/page/OpenDSSystemRequirements">OpenDS System Requirements</a>.
-<h3>To Install OpenDS in GUI mode</h3>
+<h3>To Install OpenDJ 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="">.
+<a class="external" href="http://www.forgerock.org/downloads/opendj/2.4.0beta1/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>
@@ -75,7 +75,7 @@
</li>
</ol>
-<h3>To Install OpenDS in Command-Line Mode</h3>
+<h3>To Install OpenDJ in Command-Line Mode</h3>
<ol>
<li>From the top level of your installation directory, type the following command:
<br>
diff --git a/opendj-sdk/opends/resource/install.txt b/opendj-sdk/opends/resource/install.txt
index 248a9a1..93c8c3d 100644
--- a/opendj-sdk/opends/resource/install.txt
+++ b/opendj-sdk/opends/resource/install.txt
@@ -1,12 +1,12 @@
-How To Install OpenDS
+How To Install OpenDJ
=====================
-If you are reading this page, you have already downloaded and unzipped an OpenDS build.
+If you are reading this page, you have already downloaded and unzipped an OpenDJ build.
-You can install OpenDS in two modes:
+You can install OpenDJ in two modes:
* Graphical User Interface (GUI) mode. 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
+ that enables you to install and configure an OpenDJ directory server, load it with data and get
it running in very little time.
* Interactive Command-line mode. The interactive command-line utility prompts you for required
information before the installation and configuration begin.
@@ -15,18 +15,18 @@
------------------
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
+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 OpenDS System Requirements
at https://www.opends.org/wiki/page/OpenDSSystemRequirements.
-To Install OpenDS in GUI mode
+To Install OpenDJ in GUI mode
-----------------------------
You can run QuickSetup remotely via Java Web Start, or locally from within the build that you
have downloaded and unzipped.
If you run QuickSetup remotely, it automatically downloads and unzips the latest weekly build,
and handles server configuration. To launch QuickSetup via Java Web Start, point your
-browser to http://opends.org/install/QuickSetup.jnlp.
+browser to http://www.forgerock.org/downloads/opendj/2.4.0beta1/install/QuickSetup.jnlp.
To run QuickSetup locally:
diff --git a/opendj-sdk/opends/resource/webstart/create-webstart-standalone.sh b/opendj-sdk/opends/resource/webstart/create-webstart-standalone.sh
index 4c3fd5c..39194b8 100755
--- a/opendj-sdk/opends/resource/webstart/create-webstart-standalone.sh
+++ b/opendj-sdk/opends/resource/webstart/create-webstart-standalone.sh
@@ -33,7 +33,7 @@
if test -z "${ADDRESS}"
then
- ADDRESS="www.forgerock.com"
+ ADDRESS="www.forgerock.org"
fi
echo "ADDRESS: ${ADDRESS}"
echo "PORT: ${PORT}"
@@ -57,6 +57,8 @@
INSTALLER_URI="${PROTOCOL}://${ADDRESS}:${PORT}${BASE_PATH}"
fi
+VENDOR="http://www.forgerock.com/"
+HOMEPAGE="http://www.forgerock.com/opendj.html"
# See if we can find the location of the dependencies in the Java environment.
# If not, then fail.
@@ -135,15 +137,12 @@
find "${INSTALL_DIR}/images" -type d -name '.svn' -exec rm -rf {} \;
-# Copy the appropriate OpenDJ library files and make sure they are signed.
+# Copy the appropriate OpenDS library files and make sure they are signed.
PKG_LIB_DIR="${BUILD_DIR}/package/${ZIP_FILENAME_BASE}/lib"
CERT_KEYSTORE="${ROOT_DIR}/tests/unit-tests-testng/resource/server.keystore"
CERT_KEYSTORE_PIN="password"
CERT_ALIAS="server-cert"
-for LIBFILE in ${PRODUCT_NAME}.jar je.jar quicksetup.jar \
- ${PRODUCT_NAME}_fr.jar ${PRODUCT_NAME}_zh_CN.jar ${PRODUCT_NAME}_ca_ES.jar \
- ${PRODUCT_NAME}_ja.jar ${PRODUCT_NAME}_zh_TW.jar ${PRODUCT_NAME}_de.jar \
- ${PRODUCT_NAME}_ko.jar ${PRODUCT_NAME}_es.jar ${PRODUCT_NAME}_pl.jar
+for LIBFILE in ${PRODUCT_NAME}.jar je.jar quicksetup.jar
do
echo "Signing ${LIBFILE} ..."
cp "${PKG_LIB_DIR}/${LIBFILE}" "${INSTALL_DIR}/lib"
@@ -173,8 +172,8 @@
codebase="${INSTALLER_URI}" href="${INSTALL_JNLP_FILENAME}">
<information>
<title>${PRODUCT_NAME} QuickSetup Application</title>
- <vendor>http://www.forgerock.com/</vendor>
- <homepage href="http://www.forgerock.com/opendj.html"/>
+ <vendor>${VENDOR}</vendor>
+ <homepage href="${HOMEPAGE}"/>
<description>${PRODUCT_NAME} QuickSetup Application</description>
<description kind="short">${PRODUCT_NAME} Web Start Installer</description>
<icon href="images/opendshref.png" height="128" width="128"/>
@@ -191,20 +190,9 @@
<jar href="lib/${PRODUCT_NAME}.jar" download="lazy"/>
<jar href="lib/je.jar" download="lazy"/>
<jar href="lib/zipped.jar" download="lazy"/>
- <jar href="lib/${PRODUCT_NAME}_ca_ES.jar" download="lazy"/>
- <jar href="lib/${PRODUCT_NAME}_de.jar" download="lazy"/>
- <jar href="lib/${PRODUCT_NAME}_fr.jar" download="lazy"/>
- <jar href="lib/${PRODUCT_NAME}_es.jar" download="lazy"/>
- <jar href="lib/${PRODUCT_NAME}_ja.jar" download="lazy"/>
- <jar href="lib/${PRODUCT_NAME}_ko.jar" download="lazy"/>
- <jar href="lib/${PRODUCT_NAME}_pl.jar" download="lazy"/>
- <jar href="lib/${PRODUCT_NAME}_zh_CN_.jar" download="lazy"/>
- <jar href="lib/${PRODUCT_NAME}_zh_TW.jar" download="lazy"/>
<property name="org.opends.quicksetup.iswebstart" value="true" />
<property name="org.opends.quicksetup.Application.class" value="org.opends.quicksetup.installandupgrader.InstallAndUpgrader"/>
- <property name="org.opends.quicksetup.lazyjarurls" value="${INSTALLER_URI}/lib/${PRODUCT_NAME}.jar ${INSTALLER_URI}/lib/zipped.jar ${INSTALLER_URI}/lib/je.jar
- ${INSTALLER_URI}/lib/${PRODUCT_NAME}_ca_ES.jar ${INSTALLER_URI}/lib/${PRODUCT_NAME}_de.jar ${INSTALLER_URI}/lib/${PRODUCT_NAME}_es.jar ${INSTALLER_URI}/lib/${PRODUCT_NAME}_fr.jar
- ${INSTALLER_URI}/lib/${PRODUCT_NAME}_ja.jar ${INSTALLER_URI}/lib/${PRODUCT_NAME}_ko.jar ${INSTALLER_URI}/lib/${PRODUCT_NAME}_pl.jar ${INSTALLER_URI}/lib/${PRODUCT_NAME}_zh_CN.jar ${INSTALLER_URI}/lib/${PRODUCT_NAME}_zh_TW.jar" />
+ <property name="org.opends.quicksetup.lazyjarurls" value="${INSTALLER_URI}/lib/${PRODUCT_NAME}.jar ${INSTALLER_URI}/lib/zipped.jar ${INSTALLER_URI}/lib/je.jar" />
<property name="org.opends.quicksetup.zipfilename" value="${ZIP_FILENAME_BASE}.zip"/>
</resources>
--
Gitblit v1.10.0