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

---
 src/site/resources/.htaccess |   81 ++++++++++++++++++----------------------
 1 files changed, 36 insertions(+), 45 deletions(-)

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 ###
 

--
Gitblit v1.10.0