From d928438fd1d461915babc0464c95fd98d531c4b2 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Thu, 30 Jul 2015 06:46:43 +0000
Subject: [PATCH] CR-7770 OPENDJ-2195 Move hand-written server docs
---
opendj-cli/src/main/resources/templates/dscfgReference.ftl | 2
/dev/null | 94 ---------------
opendj-server-legacy/src/site/xdoc/index.xml | 18 +-
opendj-server-legacy/pom.xml | 50 --------
opendj-server-legacy/src/site/site.xml | 14 +-
src/site/resources/.htaccess | 81 ++++++-------
src/site/site.xml | 16 +-
pom.xml | 44 ------
src/site/xdoc/docs.xml | 20 +-
9 files changed, 76 insertions(+), 263 deletions(-)
diff --git a/opendj-cli/src/main/resources/templates/dscfgReference.ftl b/opendj-cli/src/main/resources/templates/dscfgReference.ftl
index 1e3bcad..236ca4e 100644
--- a/opendj-cli/src/main/resources/templates/dscfgReference.ftl
+++ b/opendj-cli/src/main/resources/templates/dscfgReference.ftl
@@ -41,6 +41,6 @@
</partintro>
<#list subcommands as subcommand>
- <xinclude:include href="../man-pages/man-${subcommand.id}.xml" />
+ <xinclude:include href="man-${subcommand.id}.xml" />
</#list>
</reference>
diff --git a/opendj-server-legacy/pom.xml b/opendj-server-legacy/pom.xml
index b578193..24b0800 100644
--- a/opendj-server-legacy/pom.xml
+++ b/opendj-server-legacy/pom.xml
@@ -1927,24 +1927,6 @@
</artifactItems>
</configuration>
</execution>
- <execution>
- <id>unpack-doc-dependencies</id>
- <phase>pre-site</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.forgerock.opendj</groupId>
- <artifactId>opendj-server-legacy</artifactId>
- <version>${project.version}</version>
- <classifier>server-man-page-sources</classifier>
- <outputDirectory>${project.build.directory}/docbkx-sources/man-pages</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
</executions>
</plugin>
@@ -2068,38 +2050,6 @@
</execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.forgerock.commons</groupId>
- <artifactId>forgerock-doc-maven-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <copyResourceFiles>true</copyResourceFiles>
- <!-- Use conditional text to exclude local-db related elements in hand-written docs.
- <exclusions>
- <condition>local-db</condition>
- </exclusions>
- -->
- </configuration>
- <executions>
- <execution>
- <id>build-doc</id>
- <phase>pre-site</phase>
- <goals>
- <goal>process</goal>
- <goal>build</goal>
- </goals>
- </execution>
- <execution>
- <id>layout-doc</id>
- <phase>site</phase>
- <goals>
- <goal>site</goal>
- <goal>release</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
</profile>
diff --git a/opendj-server-legacy/src/site/site.xml b/opendj-server-legacy/src/site/site.xml
index 981e76c..2eac1ab 100644
--- a/opendj-server-legacy/src/site/site.xml
+++ b/opendj-server-legacy/src/site/site.xml
@@ -70,13 +70,13 @@
href="http://commons.forgerock.org/mobile/contact-manager/" />
</menu>
- <menu name="OpenDJ Documentation">
- <item name="All Formats" href="./docs.html" />
- <item name="Release Notes" href="./doc/bootstrap/release-notes/index.html" />
- <item name="Installation Guide" href="./doc/bootstrap/install-guide/index.html" />
- <item name="Administration Guide" href="./doc/bootstrap/admin-guide/index.html" />
- <item name="Server Dev Guide" href="./doc/bootstrap/server-dev-guide/index.html" />
- <item name="Reference" href="./doc/bootstrap/reference/index.html" />
+ <menu name="OpenDJ Server Docs">
+ <item name="All Formats" href="../docs.html" />
+ <item name="Release Notes" href="../doc/bootstrap/release-notes/index.html" />
+ <item name="Installation Guide" href="../doc/bootstrap/install-guide/index.html" />
+ <item name="Administration Guide" href="../doc/bootstrap/admin-guide/index.html" />
+ <item name="Server Dev Guide" href="../doc/bootstrap/server-dev-guide/index.html" />
+ <item name="Reference" href="../doc/bootstrap/reference/index.html" />
<item name="Config Reference" href="./configref/index.html" />
<item name="Plugin Javadoc" href="./apidocs/index.html" />
</menu>
diff --git a/opendj-server-legacy/src/site/xdoc/docs.xml b/opendj-server-legacy/src/site/xdoc/docs.xml
deleted file mode 100644
index 855bf5c..0000000
--- a/opendj-server-legacy/src/site/xdoc/docs.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ! CCPL HEADER START
- !
- ! This work is licensed under the Creative Commons
- ! Attribution-NonCommercial-NoDerivs 3.0 Unported License.
- ! To view a copy of this license, visit
- ! http://creativecommons.org/licenses/by-nc-nd/3.0/
- ! or send a letter to Creative Commons, 444 Castro Street,
- ! Suite 900, Mountain View, California, 94041, USA.
- !
- ! You can also obtain a copy of the license at legal-notices/CC-BY-NC-ND.txt.
- ! See the License for the specific language governing permissions
- ! and limitations under the License.
- !
- ! If applicable, add the following below this CCPL HEADER, with the fields
- ! enclosed by brackets "[]" replaced with your own identifying information:
- ! Portions Copyright [yyyy] [name of copyright owner]
- !
- ! CCPL HEADER END
- !
- ! Copyright 2011-2015 ForgeRock AS.
- !
--->
-<document
- xmlns="http://maven.apache.org/XDOC/2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
- <properties>
- <title>OpenDJ Core User Documentation</title>
- <author email="opendj-dev@forgerock.org">ForgeRock AS</author>
- </properties>
- <body>
- <section name="Core Documentation">
- <p>
- This core documentation is <strong>in progress</strong>
- and not finished.
- </p>
-
- <p>
- For completed, released documentation, see <a
- href="http://docs.forgerock.org/en/opendj/"
- >docs.forgerock.org</a>.
- </p>
-
- <dl>
- <dt>Release Notes</dt>
- <dd>
- <a href="./doc/bootstrap/release-notes/index.html">HTML</a>,
- <a href="./doc/OpenDJ-Release-Notes.pdf">PDF</a>
- </dd>
-
- <dt>Installation Guide</dt>
- <dd>
- <a href="./doc/bootstrap/install-guide/index.html">HTML</a>,
- <a href="./doc/OpenDJ-Install-Guide.pdf">PDF</a>
- </dd>
-
- <dt>Administration Guide</dt>
- <dd>
- <a href="./doc/bootstrap/admin-guide/index.html">HTML</a>
- <a href="./doc/OpenDJ-Admin-Guide.pdf">PDF</a>
- </dd>
-
- <dt>Server Dev Guide</dt>
- <dd>
- <a href="./doc/bootstrap/server-dev-guide/index.html">HTML</a>
- <a href="./doc/OpenDJ-Server-Dev-Guide.pdf">PDF</a>
- </dd>
-
- <dt>Reference</dt>
- <dd>
- <a href="./doc/bootstrap/reference/index.html">HTML</a>
- <a href="./doc/OpenDJ-Reference.pdf">PDF</a>
- </dd>
-
- <dt>Developer Guide</dt>
- <dd>
- <a href="../doc/bootstrap/dev-guide/index.html">HTML</a>
- <a href="../doc/OpenDJ-Dev-Guide.pdf">PDF</a>
- </dd>
-
- <dt>Configuration Reference</dt>
- <dd><a href="./configref/index.html">HTML</a></dd>
-
- <dt>Server Plugin API Specification</dt>
- <dd><a href="./apidocs/index.html">HTML</a></dd>
-
- <dt>LDAP Client API Specification</dt>
- <dd><a href="../opendj-core/apidocs/index.html">HTML</a></dd>
- </dl>
- </section>
- </body>
-</document>
diff --git a/opendj-server-legacy/src/site/xdoc/index.xml b/opendj-server-legacy/src/site/xdoc/index.xml
index 3e048a6..f66dec9 100644
--- a/opendj-server-legacy/src/site/xdoc/index.xml
+++ b/opendj-server-legacy/src/site/xdoc/index.xml
@@ -45,28 +45,24 @@
</p>
<subsection name="Download">
<p>
- By far the simplest method is to download a snapshot directly from the
- ForgeRock Maven
- <a
- href="http://maven.forgerock.org/repo/snapshots/org/forgerock/opendj/opendj-server/">repository</a>
- or a supported build from the ForgeRock
- <a href="https://download.forgerock.com/#/opendj">download</a>
- page.
+ By far the simplest method is to download a build from ForgeRock
+ <a href="https://backstage.forgerock.com/#!/">BackStage</a>,
+ or a nightly build from the ForgeRock
+ <a href="https://forgerock.org">community resource center</a>
</p>
</subsection>
<subsection name="Build">
<p>
For the DIY enthusiasts you can build it yourself by checking out the
- latest code using
- <a href="source-repository.html">Subversion</a>
- and building it with Ant or Maven 3.
+ <a href="source-repository.html">latest code</a>
+ and building it with Maven 3.
</p>
</subsection>
</section>
<section name="Getting started">
<p>
Once you have obtained a copy of the OpenDJ Directory Server, read the
- <a href="./doc/bootstrap/install-guide/index.html">Installation Guide</a>
+ <a href="../doc/bootstrap/install-guide/index.html">Installation Guide</a>
for further instructions.
</p>
</section>
diff --git a/pom.xml b/pom.xml
index 90af41f..ea5c7be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,6 +116,7 @@
<grizzlyFrameworkVersion>2.3.14</grizzlyFrameworkVersion>
<slf4jVersion>1.7.5</slf4jVersion>
<forgerockRestVersion>2.1.0-SNAPSHOT</forgerockRestVersion>
+ <frDocPluginVersion>3.0.0</frDocPluginVersion>
<!-- OSGi bundles properties -->
<opendj.osgi.import.additional />
@@ -132,34 +133,7 @@
<checkstyleHeaderLocation>org/forgerock/checkstyle/opendj-java-header</checkstyleHeaderLocation>
- <!-- START Documentation properties -->
- <shortProductName>OpenDJ</shortProductName>
- <docTargetVersion>${project.version}</docTargetVersion><!-- Reset before final publication -->
- <docPreviousVersion>2.6.0</docPreviousVersion>
- <sdkDocTargetVersion>${docTargetVersion}</sdkDocTargetVersion>
-
- <frDocPluginVersion>3.0.0</frDocPluginVersion>
- <gaId>UA-23412190-8</gaId>
-
<siteDistributionURL>scp://community.internal.forgerock.com/var/www/vhosts/opendj.forgerock.org/httpdocs</siteDistributionURL>
-
- <!--
- Release date and publication date are set at release build time.
- -D"releaseDate=Software release date: January 1, 1970"
- -D"pubDate=Publication date: December 31, 1969"
- At all other times, the dates should be empty.
- -->
- <releaseDate />
- <softwareReleaseDate>${releaseDate}</softwareReleaseDate>
- <pubDate />
- <publicationDate>${pubDate}</publicationDate>
-
- <!-- Permit doc build to override relative locations of non DocBook content -->
- <coreDocBase>http://opendj.forgerock.org/doc/bootstrap/</coreDocBase>
- <serverDocBase>http://opendj.forgerock.org/opendj-server/doc/bootstrap/</serverDocBase>
- <serverJavadocBase>http://opendj.forgerock.org/opendj-server/javadoc/</serverJavadocBase>
- <sdkJavadocBase>http://opendj.forgerock.org/opendj-core/apidocs/</sdkJavadocBase>
- <!-- END Documentation properties -->
</properties>
<build>
<plugins>
@@ -324,10 +298,10 @@
<artifactId>forgerock-doc-maven-plugin</artifactId>
<version>${frDocPluginVersion}</version>
<configuration>
- <projectName>${shortProductName}</projectName>
- <projectVersion>${docTargetVersion}</projectVersion>
- <releaseVersion>${docTargetVersion}</releaseVersion>
- <googleAnalyticsId>${gaId}</googleAnalyticsId>
+ <projectName>OpenDJ</projectName>
+ <projectVersion>${project.version}</projectVersion>
+ <releaseVersion>${project.version}</releaseVersion>
+ <googleAnalyticsId>UA-23412190-8</googleAnalyticsId>
</configuration>
</plugin>
</plugins>
@@ -448,14 +422,6 @@
source files.</comments>
<distribution>repo</distribution>
</license>
- <license>
- <name>CC BY-NC-ND 3.0</name>
- <url>http://creativecommons.org/licenses/by-nc-nd/3.0/</url>
- <comments>Creative Commons Attribution-NonCommercial-NoDerivs 3.0
- Unported. This license applies to the site content, and to the
- documentation as indicated in the documentation source code.</comments>
- <distribution>repo</distribution>
- </license>
</licenses>
<profiles>
<profile>
diff --git a/src/site/resources/.htaccess b/src/site/resources/.htaccess
index ecce7ac..bf59c6c 100644
--- a/src/site/resources/.htaccess
+++ b/src/site/resources/.htaccess
@@ -1,75 +1,66 @@
-# Redirect in the aftermath of OPENDJ-1005...
-
-RedirectMatch 301 ^/doc/OpenDJ-Admin-Guide(.*)$ http://opendj.forgerock.org/opendj-server/doc/OpenDJ-Admin-Guide$1
-RedirectMatch 301 ^/doc/admin-guide/(.*)$ http://opendj.forgerock.org/opendj-server/doc/admin-guide/$1
-
-RedirectMatch 301 ^/doc/OpenDJ-Install-Guide(.*)$ http://opendj.forgerock.org/opendj-server/doc/OpenDJ-Install-Guide$1
-RedirectMatch 301 ^/doc/install-guide/(.*)$ http://opendj.forgerock.org/opendj-server/doc/install-guide/$1
-
-RedirectMatch 301 ^/doc/OpenDJ-Release-Notes(.*)$ http://opendj.forgerock.org/opendj-server/doc/OpenDJ-Release-Notes$1
-RedirectMatch 301 ^/doc/release-notes/(.*)$ http://opendj.forgerock.org/opendj-server/doc/release-notes/$1
-
-
# OPENDJ-1789 Redirect away from obsolete in-progress documentation
# sending obsolete formats to the Bootstrap-styled HTML.
### OpenDJ trunk server docs ###
# EPUB, trunk server docs
-RedirectMatch 301 ^/opendj-server/doc/OpenDJ-Admin-Guide.epub http://opendj.forgerock.org/opendj-server/doc/bootstrap/admin-guide/
-RedirectMatch 301 ^/opendj-server/doc/OpenDJ-Install-Guide.epub http://opendj.forgerock.org/opendj-server/doc/bootstrap/install-guide/
-RedirectMatch 301 ^/opendj-server/doc/OpenDJ-Release-Notes.epub http://opendj.forgerock.org/opendj-server/doc/bootstrap/release-notes/
+RedirectMatch 301 ^/opendj-server/doc/OpenDJ-Admin-Guide.epub http://opendj.forgerock.org/doc/bootstrap/admin-guide/
+RedirectMatch 301 ^/opendj-server/doc/OpenDJ-Install-Guide.epub http://opendj.forgerock.org/doc/bootstrap/install-guide/
+RedirectMatch 301 ^/opendj-server/doc/OpenDJ-Release-Notes.epub http://opendj.forgerock.org/doc/bootstrap/release-notes/
# Single page HTML, trunk server docs
-RedirectMatch 301 ^/opendj-server/doc/admin-guide/(.*) http://opendj.forgerock.org/opendj-server/doc/bootstrap/admin-guide/$1
-RedirectMatch 301 ^/opendj-server/doc/install-guide/(.*) http://opendj.forgerock.org/opendj-server/doc/bootstrap/install-guide/$1
-RedirectMatch 301 ^/opendj-server/doc/release-notes/(.*) http://opendj.forgerock.org/opendj-server/doc/bootstrap/release-notes/$1
+RedirectMatch 301 ^/opendj-server/doc/admin-guide/(.*) http://opendj.forgerock.org/doc/bootstrap/admin-guide/$1
+RedirectMatch 301 ^/opendj-server/doc/install-guide/(.*) http://opendj.forgerock.org/doc/bootstrap/install-guide/$1
+RedirectMatch 301 ^/opendj-server/doc/release-notes/(.*) http://opendj.forgerock.org/doc/bootstrap/release-notes/$1
# Chunked HTML, trunk server docs
-RedirectMatch 301 ^/opendj-server/doc/admin-guide/index/(.*) http://opendj.forgerock.org/opendj-server/doc/bootstrap/admin-guide/
-RedirectMatch 301 ^/opendj-server/doc/install-guide/index/(.*) http://opendj.forgerock.org/opendj-server/doc/bootstrap/install-guide/
-RedirectMatch 301 ^/opendj-server/doc/release-notes/index/(.*) http://opendj.forgerock.org/opendj-server/doc/bootstrap/release-notes/
+RedirectMatch 301 ^/opendj-server/doc/admin-guide/index/(.*) http://opendj.forgerock.org/doc/bootstrap/admin-guide/
+RedirectMatch 301 ^/opendj-server/doc/install-guide/index/(.*) http://opendj.forgerock.org/doc/bootstrap/install-guide/
+RedirectMatch 301 ^/opendj-server/doc/release-notes/index/(.*) http://opendj.forgerock.org/doc/bootstrap/release-notes/
# RTF, trunk server docs
-RedirectMatch 301 ^/opendj-server/doc/OpenDJ-Admin-Guide.rtf http://opendj.forgerock.org/opendj-server/doc/bootstrap/admin-guide/
-RedirectMatch 301 ^/opendj-server/doc/OpenDJ-Install-Guide.rtf http://opendj.forgerock.org/opendj-server/doc/bootstrap/install-guide/
-RedirectMatch 301 ^/opendj-server/doc/OpenDJ-Release-Notes.rtf http://opendj.forgerock.org/opendj-server/doc/bootstrap/release-notes/
+RedirectMatch 301 ^/opendj-server/doc/OpenDJ-Admin-Guide.rtf http://opendj.forgerock.org/doc/bootstrap/admin-guide/
+RedirectMatch 301 ^/opendj-server/doc/OpenDJ-Install-Guide.rtf http://opendj.forgerock.org/doc/bootstrap/install-guide/
+RedirectMatch 301 ^/opendj-server/doc/OpenDJ-Release-Notes.rtf http://opendj.forgerock.org/doc/bootstrap/release-notes/
# Webhelp, trunk server docs
-RedirectMatch 301 ^/opendj-server/doc/webhelp/admin-guide/(.*) http://opendj.forgerock.org/opendj-server/doc/bootstrap/admin-guide/
-RedirectMatch 301 ^/opendj-server/doc/webhelp/install-guide/(.*) http://opendj.forgerock.org/opendj-server/doc/bootstrap/install-guide/
-RedirectMatch 301 ^/opendj-server/doc/webhelp/release-notes/(.*) http://opendj.forgerock.org/opendj-server/doc/bootstrap/release-notes/
+RedirectMatch 301 ^/opendj-server/doc/webhelp/admin-guide/(.*) http://opendj.forgerock.org/doc/bootstrap/admin-guide/
+RedirectMatch 301 ^/opendj-server/doc/webhelp/install-guide/(.*) http://opendj.forgerock.org/doc/bootstrap/install-guide/
+RedirectMatch 301 ^/opendj-server/doc/webhelp/release-notes/(.*) http://opendj.forgerock.org/doc/bootstrap/release-notes/
### OpenDJ dev branch server docs ###
-# Handle the move from opendj3-server-dev to opendj/opendj-server-legacy
-RedirectMatch 301 ^/opendj3-server-dev/doc/bootstrap/(.*) http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/$1
-RedirectMatch 301 ^/opendj3-server-dev/doc/([^\.]+).pdf http://opendj.forgerock.org/opendj-server-legacy/doc/$1.pdf
+# Handle the move from opendj3-server-dev
+RedirectMatch 301 ^/opendj3-server-dev/doc/bootstrap/(.*) http://opendj.forgerock.org/doc/bootstrap/$1
+RedirectMatch 301 ^/opendj3-server-dev/doc/([^\.]+).pdf http://opendj.forgerock.org/doc/$1.pdf
# EPUB, dev branch server docs
-RedirectMatch 301 ^/opendj3-server-dev/doc/OpenDJ-Admin-Guide.epub http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/admin-guide/
-RedirectMatch 301 ^/opendj3-server-dev/doc/OpenDJ-Install-Guide.epub http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/install-guide/
-RedirectMatch 301 ^/opendj3-server-dev/doc/OpenDJ-Release-Notes.epub http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/release-notes/
+RedirectMatch 301 ^/opendj3-server-dev/doc/OpenDJ-Admin-Guide.epub http://opendj.forgerock.org/doc/bootstrap/admin-guide/
+RedirectMatch 301 ^/opendj3-server-dev/doc/OpenDJ-Install-Guide.epub http://opendj.forgerock.org/doc/bootstrap/install-guide/
+RedirectMatch 301 ^/opendj3-server-dev/doc/OpenDJ-Release-Notes.epub http://opendj.forgerock.org/doc/bootstrap/release-notes/
# Single page HTML, dev branch server docs
-RedirectMatch 301 ^/opendj3-server-dev/doc/admin-guide/(.*) http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/admin-guide/$1
-RedirectMatch 301 ^/opendj3-server-dev/doc/install-guide/(.*) http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/install-guide/$1
-RedirectMatch 301 ^/opendj3-server-dev/doc/release-notes/(.*) http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/release-notes/$1
+RedirectMatch 301 ^/opendj3-server-dev/doc/admin-guide/(.*) http://opendj.forgerock.org/doc/bootstrap/admin-guide/$1
+RedirectMatch 301 ^/opendj3-server-dev/doc/install-guide/(.*) http://opendj.forgerock.org/doc/bootstrap/install-guide/$1
+RedirectMatch 301 ^/opendj3-server-dev/doc/release-notes/(.*) http://opendj.forgerock.org/doc/bootstrap/release-notes/$1
# Chunked HTML, dev branch server docs
-RedirectMatch 301 ^/opendj3-server-dev/doc/admin-guide/index/(.*) http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/admin-guide/
-RedirectMatch 301 ^/opendj3-server-dev/doc/install-guide/index/(.*) http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/install-guide/
-RedirectMatch 301 ^/opendj3-server-dev/doc/release-notes/index/(.*) http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/release-notes/
+RedirectMatch 301 ^/opendj3-server-dev/doc/admin-guide/index/(.*) http://opendj.forgerock.org/doc/bootstrap/admin-guide/
+RedirectMatch 301 ^/opendj3-server-dev/doc/install-guide/index/(.*) http://opendj.forgerock.org/doc/bootstrap/install-guide/
+RedirectMatch 301 ^/opendj3-server-dev/doc/release-notes/index/(.*) http://opendj.forgerock.org/doc/bootstrap/release-notes/
# RTF, dev branch server docs
-RedirectMatch 301 ^/opendj3-server-dev/doc/OpenDJ-Admin-Guide.rtf http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/admin-guide/
-RedirectMatch 301 ^/opendj3-server-dev/doc/OpenDJ-Install-Guide.rtf http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/install-guide/
-RedirectMatch 301 ^/opendj3-server-dev/doc/OpenDJ-Release-Notes.rtf http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/release-notes/
+RedirectMatch 301 ^/opendj3-server-dev/doc/OpenDJ-Admin-Guide.rtf http://opendj.forgerock.org/doc/bootstrap/admin-guide/
+RedirectMatch 301 ^/opendj3-server-dev/doc/OpenDJ-Install-Guide.rtf http://opendj.forgerock.org/doc/bootstrap/install-guide/
+RedirectMatch 301 ^/opendj3-server-dev/doc/OpenDJ-Release-Notes.rtf http://opendj.forgerock.org/doc/bootstrap/release-notes/
# Webhelp, dev branch server docs
-RedirectMatch 301 ^/opendj3-server-dev/doc/webhelp/admin-guide/(.*) http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/admin-guide/
-RedirectMatch 301 ^/opendj3-server-dev/doc/webhelp/install-guide/(.*) http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/install-guide/
-RedirectMatch 301 ^/opendj3-server-dev/doc/webhelp/release-notes/(.*) http://opendj.forgerock.org/opendj-server-legacy/doc/bootstrap/release-notes/
+RedirectMatch 301 ^/opendj3-server-dev/doc/webhelp/admin-guide/(.*) http://opendj.forgerock.org/doc/bootstrap/admin-guide/
+RedirectMatch 301 ^/opendj3-server-dev/doc/webhelp/install-guide/(.*) http://opendj.forgerock.org/doc/bootstrap/install-guide/
+RedirectMatch 301 ^/opendj3-server-dev/doc/webhelp/release-notes/(.*) http://opendj.forgerock.org/doc/bootstrap/release-notes/
+
+# Handle the move from opendj-server-legacy
+RedirectMatch 301 ^/opendj-server-legacy/doc/(.*) http://opendj.forgerock.org/doc/$1
### OpenDJ LDAP SDK docs ###
diff --git a/src/site/site.xml b/src/site/site.xml
index ec553ba..b98230a 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -81,15 +81,19 @@
<item name="OpenDJ 2.5.0-Xpress1" href="http://docs.forgerock.org/en/opendj/2.5.0-Xpress1/" />
</menu>
- <menu name="OpenDJ Documentation" inherit="top">
+ <menu name="OpenDJ Server Docs" inherit="top">
<item name="All Formats" href="docs.html" />
- <item name="Release Notes" href="./opendj-server-legacy/doc/bootstrap/release-notes/index.html" />
- <item name="Installation Guide" href="./opendj-server-legacy/doc/bootstrap/install-guide/index.html" />
- <item name="Administration Guide" href="./opendj-server-legacy/doc/bootstrap/admin-guide/index.html" />
- <item name="Server Dev Guide" href="./opendj-server-legacy/doc/bootstrap/server-dev-guide/index.html" />
- <item name="Reference" href="./opendj-server-legacy/doc/bootstrap/reference/index.html" />
+ <item name="Release Notes" href="./doc/bootstrap/release-notes/index.html" />
+ <item name="Installation Guide" href="./doc/bootstrap/install-guide/index.html" />
+ <item name="Administration Guide" href="./doc/bootstrap/admin-guide/index.html" />
+ <item name="Server Dev Guide" href="./doc/bootstrap/server-dev-guide/index.html" />
+ <item name="Reference" href="./doc/bootstrap/reference/index.html" />
<item name="Config Reference" href="./opendj-server-legacy/configref/index.html" />
<item name="Plugin Javadoc" href="./opendj-server-legacy/apidocs/index.html" />
+ </menu>
+
+ <menu name="OpenDJ LDAP SDK Docs" inherit="top">
+ <item name="All Formats" href="docs.html" />
<item name="SDK Release Notes" href="./doc/bootstrap/sdk-release-notes/index.html" />
<item name="SDK Developer Guide" href="./doc/bootstrap/dev-guide/index.html" />
<item name="SDK Javadoc" href="./opendj-core/apidocs/index.html" />
diff --git a/src/site/xdoc/docs.xml b/src/site/xdoc/docs.xml
index ba11a26..970ed1c 100644
--- a/src/site/xdoc/docs.xml
+++ b/src/site/xdoc/docs.xml
@@ -40,32 +40,32 @@
<dl>
<dt>Release Notes</dt>
<dd>
- <a href="./opendj-server-legacy/doc/bootstrap/release-notes/index.html">HTML</a>,
- <a href="./opendj-server-legacy/doc/OpenDJ-Release-Notes.pdf">PDF</a>
+ <a href="./doc/bootstrap/release-notes/index.html">HTML</a>,
+ <a href="./doc/OpenDJ-Release-Notes.pdf">PDF</a>
</dd>
<dt>Installation Guide</dt>
<dd>
- <a href="./opendj-server-legacy/doc/bootstrap/install-guide/index.html">HTML</a>,
- <a href="./opendj-server-legacy/doc/OpenDJ-Install-Guide.pdf">PDF</a>
+ <a href="./doc/bootstrap/install-guide/index.html">HTML</a>,
+ <a href="./doc/OpenDJ-Install-Guide.pdf">PDF</a>
</dd>
<dt>Administration Guide</dt>
<dd>
- <a href="./opendj-server-legacy/doc/bootstrap/admin-guide/index.html">HTML</a>,
- <a href="./opendj-server-legacy/doc/OpenDJ-Admin-Guide.pdf">PDF</a>
+ <a href="./doc/bootstrap/admin-guide/index.html">HTML</a>,
+ <a href="./doc/OpenDJ-Admin-Guide.pdf">PDF</a>
</dd>
<dt>Server Dev Guide</dt>
<dd>
- <a href="./opendj-server-legacy/doc/bootstrap/server-dev-guide/index.html">HTML</a>,
- <a href="./opendj-server-legacy/doc/OpenDJ-Server-Dev-Guide.pdf">PDF</a>
+ <a href="./doc/bootstrap/server-dev-guide/index.html">HTML</a>,
+ <a href="./doc/OpenDJ-Server-Dev-Guide.pdf">PDF</a>
</dd>
<dt>Reference</dt>
<dd>
- <a href="./opendj-server-legacy/doc/bootstrap/reference/index.html">HTML</a>,
- <a href="./opendj-server-legacy/doc/OpenDJ-Reference.pdf">PDF</a>
+ <a href="./doc/bootstrap/reference/index.html">HTML</a>,
+ <a href="./doc/OpenDJ-Reference.pdf">PDF</a>
</dd>
<dt>Configuration Reference</dt>
--
Gitblit v1.10.0