From 451a48c7100d4fe37da3ee20221c3315b508711c Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 23 May 2011 09:35:16 +0000
Subject: [PATCH] Fix OpenDJ-160: mvn site-deploy fails to deploy doc

---
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-backup.xml                          |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-backup-restore.xml                 |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-control-panel.xml                   |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/preface.xml                               |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/chap-multithreading.xml                   |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/man-modrate.xml                           |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-start-ds.xml                        |    0 
 opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-finished.png        |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/OpenDJ-Dev-Guide.xml                      |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/appendix-file-layout.xml                |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldapmodify.xml                      |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/images/OpenDJ-Control-Panel.png         |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-import-export.xml                  |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-indexing.xml                       |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-install.xml                         |    0 
 opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-replopts.png        |    0 
 opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-welcome.png         |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-logging.xml                        |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-stop-ds.xml                         |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/chap-i18n.xml                             |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-tuning.xml                         |    0 
 opendj-sdk/opendj3/src/docbkx/install-guide/chap-uninstall.xml                    |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldifmodify.xml                      |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/OpenDJ-Admin-Guide.xml                  |    0 
 opendj-sdk/opendj3/src/docbkx/ga.html                                             |    0 
 opendj-sdk/opendj3/src/docbkx/install-guide/chap-before-you-install.xml           |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-account-lockout.xml                |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-list-backends.xml                   |    0 
 opendj-sdk/opendj3/src/docbkx/release-notes/chap-issues.xml                       |    0 
 opendj-sdk/opendj3/src/docbkx-stylesheets/epub/coredoc.xsl                        |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/chap-getting-directory-info.xml           |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-dsconfig.xml                        |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-schema.xml                         |    0 
 opendj-sdk/opendj3/src/main/resources/images/bulletpoint.png                      |    0 
 opendj-sdk/opendj3/src/docbkx/install-guide/images/uninstall-start.png            |    0 
 opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-cpstart.png         |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/man-ldapsearch.xml                        |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-upgrade.xml                         |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-manage-tasks.xml                    |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-replication.xml                    |    0 
 opendj-sdk/opendj3/src/docbkx/install-guide/chap-install-gui.xml                  |    0 
 opendj-sdk/opendj3/src/main/resources/legal-notices/CC-BY-NC-ND.txt               |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/appendix-extended-ops.xml               |    0 
 opendj-sdk/opendj3/src/main/resources/css/coredoc.css                             |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/appendix-standards.xml                  |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-listeners.xml                      |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-status.xml                          |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/appendix-controls.xml                   |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-troubleshooting.xml                |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-mv-servers.xml                     |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-admin-tools.xml                    |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-pwd-policy.xml                     |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/chap-writing.xml                          |    0 
 opendj-sdk/opendj3/src/docbkx/install-guide/chap-upgrade.xml                      |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-restore.xml                         |    0 
 opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-gendata.png         |    0 
 opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-svrconf.png         |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-dbtest.xml                          |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-create-rc-script.xml                |    0 
 opendj-sdk/opendj3/src/docbkx/install-guide/chap-jvm-opts.xml                     |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldapdelete.xml                      |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldapsearch.xml                      |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/preface.xml                             |    0 
 opendj-sdk/opendj3/src/docbkx-stylesheets/html/coredoc.xsl                        |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldappasswordmodify.xml              |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-server-process.xml                 |    0 
 opendj-sdk/opendj3/src/docbkx/install-guide/images/uninstall-finished.png         |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/chap-controls.xml                         |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/chap-using-the-sdk.xml                    |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldif-diff.xml                       |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-failover.xml                       |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-attribute-uniqueness.xml           |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-referrals.xml                      |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/chap-simple-proxy.xml                     |    0 
 opendj-sdk/opendj3/src/docbkx/release-notes/chap-testing.xml                      |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-groups.xml                         |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-dsframework.xml                     |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-export-ldif.xml                     |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/images/Manage-Entries.png               |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-setup.xml                           |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-dsreplication.xml                   |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-chaining.xml                       |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-virtual-attrs-collective-attrs.xml |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/chap-ldif.xml                             |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-ldap-operations.xml                |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-import-ldif.xml                     |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-make-ldif.xml                       |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/man-searchrate.xml                        |    0 
 opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-jvmopts.png         |    0 
 opendj-sdk/opendj3/pom.xml                                                        |  171 ++++++++++++++++++++++++
 opendj-sdk/opendj3/src/docbkx/dev-guide/chap-reading.xml                          |    0 
 opendj-sdk/opendj3/src/docbkx/release-notes/chap-whats-new.xml                    |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-pta.xml                            |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-manage-account.xml                  |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/man-ldapcompare.xml                       |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/appendix-ports-used.xml                 |    0 
 opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-review.png          |    0 
 opendj-sdk/opendj3/src/docbkx/install-guide/OpenDJ-Install-Guide.xml              |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/chap-understanding-ldap.xml               |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-verify-index.xml                    |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-rebuild-index.xml                   |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/chap-best-practices.xml                   |    0 
 opendj-sdk/opendj3/src/docbkx/install-guide/preface.xml                           |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/man-authrate.xml                          |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-base64.xml                          |    0 
 opendj-sdk/opendj3/src/docbkx/legal.xml                                           |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-encode-password.xml                 |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/man-ldapmodify.xml                        |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldifsearch.xml                      |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/chap-extended-ops.xml                     |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-privileges-acis.xml                |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-resource-limits.xml                |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/man-ldappasswordmodify.xml                |    0 
 opendj-sdk/opendj3/src/docbkx/install-guide/chap-install-cli.xml                  |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldapcompare.xml                     |    0 
 opendj-sdk/opendj3/src/docbkx-stylesheets/fo/coredoc.xsl                          |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/chap-authenticating.xml                   |    0 
 opendj-sdk/opendj3/src/docbkx/release-notes/chap-support.xml                      |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/appendix-l10n.xml                       |    0 
 /dev/null                                                                         |  215 ------------------------------
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-monitoring.xml                     |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/man-dsjavaproperties.xml                |    0 
 opendj-sdk/opendj3/src/docbkx/release-notes/chap-compatibility.xml                |    0 
 opendj-sdk/opendj3/src/docbkx/admin-guide/chap-load-balancing.xml                 |    0 
 opendj-sdk/opendj3/src/docbkx/release-notes/OpenDJ-Release-Notes.xml              |    0 
 opendj-sdk/opendj3/src/docbkx/dev-guide/chap-get-sdk.xml                          |    0 
 opendj-sdk/opendj3/src/docbkx/release-notes/chap-feedback.xml                     |    0 
 127 files changed, 170 insertions(+), 216 deletions(-)

diff --git a/opendj-sdk/opendj3/opendj-docs/pom.xml b/opendj-sdk/opendj3/opendj-docs/pom.xml
deleted file mode 100644
index 8460372..0000000
--- a/opendj-sdk/opendj3/opendj-docs/pom.xml
+++ /dev/null
@@ -1,215 +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
-  ! src/main/resources/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 ForgeRock AS
-  !    
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>opendj-docs</artifactId>
- <name>OpenDJ Core User Documentation</name>
- <inceptionYear>2011</inceptionYear>
- <licenses>
-  <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</comments>
-   <distribution>repo</distribution>
-  </license>
- </licenses>
- <packaging>pom</packaging>
- <description>DocBook XML source for OpenDJ core user documentation. Java API and configuration reference documentation is generated from OpenDJ source code.</description>
- <properties>
-  <docbkx-src>${basedir}/src/docbkx</docbkx-src>
-  <dbstyle-dir>${basedir}/src/docbkx-stylesheets</dbstyle-dir>
-  <docbkx-out>${basedir}/target/docbkx</docbkx-out>
-  <site-out>${project.parent.basedir}/target/site</site-out>
- </properties>
- <build>
-  <plugins>
-   <plugin>
-    <groupId>com.agilejava.docbkx</groupId>
-    <artifactId>docbkx-maven-plugin</artifactId>
-    <version>2.0.13</version>
-    <executions>
-     <execution>
-      <id>build-doc</id>
-      <phase>pre-site</phase>
-      <goals>
-       <goal>generate-epub</goal>
-       <goal>generate-html</goal>
-       <goal>generate-pdf</goal>
-       <goal>generate-rtf</goal>
-       <goal>generate-manpages</goal>       
-      </goals>
-      <configuration>
-       <!-- Comment the draft elements out for final build -->
-       <draftMode>yes</draftMode>
-       <draftWatermarkImage>http://docbook.sourceforge.net/release/images/draft.png</draftWatermarkImage>
-
-       <includes>*/OpenDJ-*.xml</includes>
-       <xincludeSupported>true</xincludeSupported>
-
-       <!-- EPUB -->
-       <epubCustomization>${dbstyle-dir}/epub/coredoc.xsl</epubCustomization>
-       
-       <!-- HTML -->
-       <chunkedOutput>false</chunkedOutput>
-       <htmlCustomization>${dbstyle-dir}/html/coredoc.xsl</htmlCustomization>
-       <htmlStylesheet>css/coredoc.css</htmlStylesheet>
-       
-       <!-- PDF, RTF -->
-       <foCustomization>${dbstyle-dir}/fo/coredoc.xsl</foCustomization>
-
-       <!-- Resources required but not copied by DocBook.xsl.
-            TODO: Figure out how to say foreach in ant. -->
-       <preProcess>
-        <copy todir='${docbkx-out}/epub/admin-guide/OpenDJ-Admin-Guide/images'>
-         <fileset dir='${docbkx-src}/admin-guide/images' />
-        </copy>
-        <copy todir='${docbkx-out}/html/admin-guide/images'>
-         <fileset dir='${docbkx-src}/admin-guide/images' />
-        </copy>
-        <copy todir='${docbkx-out}/html/admin-guide'>
-         <fileset dir='${basedir}/src/main/resources' />
-        </copy>
-        <copy todir='${docbkx-out}/epub/dev-guide/OpenDJ-Dev-Guide/images'>
-         <fileset dir='${docbkx-src}/dev-guide/images' />
-        </copy>
-        <copy todir='${docbkx-out}/html/dev-guide/images'>
-         <fileset dir='${docbkx-src}/dev-guide/images' />
-        </copy>
-        <copy todir='${docbkx-out}/html/dev-guide'>
-         <fileset dir='${basedir}/src/main/resources' />
-        </copy>
-        <copy todir='${docbkx-out}/epub/install-guide/OpenDJ-Install-Guide/images'>
-         <fileset dir='${docbkx-src}/install-guide/images' />
-        </copy>
-        <copy todir='${docbkx-out}/html/install-guide/images'>
-         <fileset dir='${docbkx-src}/install-guide/images' />
-        </copy>
-        <copy todir='${docbkx-out}/html/install-guide'>
-         <fileset dir='${basedir}/src/main/resources' />
-        </copy>
-        <copy todir='${docbkx-out}/epub/release-notes/OpenDJ-Release-Notes/images'>
-         <fileset dir='${docbkx-src}/release-notes/images' />
-        </copy>
-        <copy todir='${docbkx-out}/html/release-notes/images'>
-         <fileset dir='${docbkx-src}/release-notes/images' />
-        </copy>
-        <copy todir='${docbkx-out}/html/release-notes'>
-         <fileset dir='${basedir}/src/main/resources' />
-        </copy>
-       </preProcess>
-      </configuration>
-     </execution>
-    </executions>
-    <dependencies>
-     <dependency>
-      <groupId>net.sf.docbook</groupId>
-      <artifactId>docbook-xml</artifactId>
-      <version>5.0-all</version>
-      <classifier>resources</classifier>
-      <type>zip</type>
-      <scope>runtime</scope>
-     </dependency>
-     <dependency>
-      <groupId>net.sf.offo</groupId>
-      <artifactId>fop-hyph</artifactId>
-       <version>1.2</version> <!-- Should use 2.0, but it doesn't exist? -->
-      <scope>runtime</scope>
-     </dependency>
-    </dependencies>
-   </plugin>
-   <plugin>
-    <artifactId>maven-antrun-plugin</artifactId>
-    <executions>
-     <execution>
-      <id>fix-legalnotice</id>
-      <phase>site</phase>
-      <goals>
-       <goal>run</goal>
-      </goals>
-      <configuration>
-       <detail>true</detail>
-       <target>
-        <!-- TODO: Figure out how to say foreach in ant. -->
-        <copy file='${env.PWD}/legalnotice.html' todir='${basedir}/target/docbkx/html/admin-guide' />
-        <copy file='${env.PWD}/legalnotice.html' todir='${basedir}/target/docbkx/html/dev-guide' />
-        <copy file='${env.PWD}/legalnotice.html' todir='${basedir}/target/docbkx/html/install-guide' />
-        <move file='${env.PWD}/legalnotice.html' todir='${basedir}/target/docbkx/html/release-notes' />       
-       </target>
-      </configuration>
-     </execution>
-    </executions>
-   </plugin>
-   <plugin>
-    <groupId>org.apache.maven.plugins</groupId>
-    <artifactId>maven-resources-plugin</artifactId>
-    <executions>
-     <execution>
-      <phase>site</phase>
-      <goals>
-       <goal>copy-resources</goal>
-      </goals>
-      <configuration>
-       <outputDirectory>${site-out}/doc</outputDirectory>
-       <resources>
-        <resource>
-         <directory>${docbkx-out}/epub/admin-guide</directory>
-         <directory>${docbkx-out}/epub/dev-guide</directory>
-         <directory>${docbkx-out}/epub/install-guide</directory>
-         <directory>${docbkx-out}/epub/release-notes</directory>
-         <includes>
-          <include>**/*.epub</include>
-         </includes>
-        </resource>
-        <resource>
-         <directory>${docbkx-out}/html/</directory>
-        </resource>
-        <resource>
-         <directory>${docbkx-out}/pdf</directory>
-         <includes>
-          <include>**/*.pdf</include>
-         </includes>
-        </resource>
-        <resource>
-         <directory>${docbkx-out}/rtf</directory>
-         <includes>
-          <include>**/*.rtf</include>
-         </includes>
-        </resource>
-       </resources>
-      </configuration>      
-     </execution>
-    </executions>
-   </plugin>
-  </plugins>
- </build>
- <parent>
-  <groupId>org.opendj</groupId>
-  <artifactId>opendj-project</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
- </parent>
-</project>
diff --git a/opendj-sdk/opendj3/pom.xml b/opendj-sdk/opendj3/pom.xml
index 464fad0..794151b 100644
--- a/opendj-sdk/opendj3/pom.xml
+++ b/opendj-sdk/opendj3/pom.xml
@@ -92,9 +92,178 @@
     <module>opendj-maven-testng</module>
     <module>opendj-sdk</module>
     <module>opendj-client-tools</module>
-    <module>opendj-docs</module>
   </modules>
+  <properties>
+    <docbkx-src>${basedir}/src/docbkx</docbkx-src>
+    <dbstyle-dir>${basedir}/src/docbkx-stylesheets</dbstyle-dir>
+    <docbkx-out>${basedir}/target/docbkx</docbkx-out>
+    <site-out>${basedir}/target/site</site-out>
+  </properties>
   <build>
+    <plugins>
+      <plugin>
+        <groupId>com.agilejava.docbkx</groupId>
+        <artifactId>docbkx-maven-plugin</artifactId>
+        <version>2.0.13</version>
+        <inherited>false</inherited>
+        <executions>
+          <execution>
+            <id>build-doc</id>
+            <phase>pre-site</phase>
+            <goals>
+              <goal>generate-epub</goal>
+              <goal>generate-html</goal>
+              <goal>generate-pdf</goal>
+              <goal>generate-rtf</goal>
+              <goal>generate-manpages</goal>
+            </goals>
+            <configuration>
+       <!-- Comment the draft elements out for final build -->
+              <draftMode>yes</draftMode>
+              <draftWatermarkImage>http://docbook.sourceforge.net/release/images/draft.png</draftWatermarkImage>
+
+              <includes>*/OpenDJ-*.xml</includes>
+              <xincludeSupported>true</xincludeSupported>
+
+       <!-- EPUB -->
+              <epubCustomization>${dbstyle-dir}/epub/coredoc.xsl</epubCustomization>
+       
+       <!-- HTML -->
+              <chunkedOutput>false</chunkedOutput>
+              <htmlCustomization>${dbstyle-dir}/html/coredoc.xsl</htmlCustomization>
+              <htmlStylesheet>css/coredoc.css</htmlStylesheet>
+       
+       <!-- PDF, RTF -->
+              <foCustomization>${dbstyle-dir}/fo/coredoc.xsl</foCustomization>
+
+       <!-- Resources required but not copied by DocBook.xsl.
+            TODO: Figure out how to say foreach in ant. -->
+              <preProcess>
+                <copy todir='${docbkx-out}/epub/admin-guide/OpenDJ-Admin-Guide/images'>
+                  <fileset dir='${docbkx-src}/admin-guide/images' />
+                </copy>
+                <copy todir='${docbkx-out}/html/admin-guide/images'>
+                  <fileset dir='${docbkx-src}/admin-guide/images' />
+                </copy>
+                <copy todir='${docbkx-out}/html/admin-guide'>
+                  <fileset dir='${basedir}/src/main/resources' />
+                </copy>
+                <copy todir='${docbkx-out}/epub/dev-guide/OpenDJ-Dev-Guide/images'>
+                  <fileset dir='${docbkx-src}/dev-guide/images' />
+                </copy>
+                <copy todir='${docbkx-out}/html/dev-guide/images'>
+                  <fileset dir='${docbkx-src}/dev-guide/images' />
+                </copy>
+                <copy todir='${docbkx-out}/html/dev-guide'>
+                  <fileset dir='${basedir}/src/main/resources' />
+                </copy>
+                <copy
+                  todir='${docbkx-out}/epub/install-guide/OpenDJ-Install-Guide/images'>
+                  <fileset dir='${docbkx-src}/install-guide/images' />
+                </copy>
+                <copy todir='${docbkx-out}/html/install-guide/images'>
+                  <fileset dir='${docbkx-src}/install-guide/images' />
+                </copy>
+                <copy todir='${docbkx-out}/html/install-guide'>
+                  <fileset dir='${basedir}/src/main/resources' />
+                </copy>
+                <copy
+                  todir='${docbkx-out}/epub/release-notes/OpenDJ-Release-Notes/images'>
+                  <fileset dir='${docbkx-src}/release-notes/images' />
+                </copy>
+                <copy todir='${docbkx-out}/html/release-notes/images'>
+                  <fileset dir='${docbkx-src}/release-notes/images' />
+                </copy>
+                <copy todir='${docbkx-out}/html/release-notes'>
+                  <fileset dir='${basedir}/src/main/resources' />
+                </copy>
+              </preProcess>
+            </configuration>
+          </execution>
+        </executions>
+        <dependencies>
+          <dependency>
+            <groupId>net.sf.docbook</groupId>
+            <artifactId>docbook-xml</artifactId>
+            <version>5.0-all</version>
+            <classifier>resources</classifier>
+            <type>zip</type>
+            <scope>runtime</scope>
+          </dependency>
+          <dependency>
+            <groupId>net.sf.offo</groupId>
+            <artifactId>fop-hyph</artifactId>
+            <version>1.2</version> <!-- Should use 2.0, but it doesn't exist? -->
+            <scope>runtime</scope>
+          </dependency>
+        </dependencies>
+      </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>fix-legalnotice</id>
+            <phase>site</phase>
+            <inherited>false</inherited>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <detail>true</detail>
+              <target>
+        <!-- TODO: Figure out how to say foreach in ant. -->
+                <copy file='${env.PWD}/legalnotice.html' todir='${basedir}/target/docbkx/html/admin-guide' />
+                <copy file='${env.PWD}/legalnotice.html' todir='${basedir}/target/docbkx/html/dev-guide' />
+                <copy file='${env.PWD}/legalnotice.html' todir='${basedir}/target/docbkx/html/install-guide' />
+                <move file='${env.PWD}/legalnotice.html' todir='${basedir}/target/docbkx/html/release-notes' />
+              </target>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <inherited>false</inherited>
+        <executions>
+          <execution>
+            <phase>site</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${site-out}/doc</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>${docbkx-out}/epub/admin-guide</directory>
+                  <directory>${docbkx-out}/epub/dev-guide</directory>
+                  <directory>${docbkx-out}/epub/install-guide</directory>
+                  <directory>${docbkx-out}/epub/release-notes</directory>
+                  <includes>
+                    <include>**/*.epub</include>
+                  </includes>
+                </resource>
+                <resource>
+                  <directory>${docbkx-out}/html/</directory>
+                </resource>
+                <resource>
+                  <directory>${docbkx-out}/pdf</directory>
+                  <includes>
+                    <include>**/*.pdf</include>
+                  </includes>
+                </resource>
+                <resource>
+                  <directory>${docbkx-out}/rtf</directory>
+                  <includes>
+                    <include>**/*.rtf</include>
+                  </includes>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
     <pluginManagement>
       <plugins>
         <plugin>
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx-stylesheets/epub/coredoc.xsl b/opendj-sdk/opendj3/src/docbkx-stylesheets/epub/coredoc.xsl
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx-stylesheets/epub/coredoc.xsl
rename to opendj-sdk/opendj3/src/docbkx-stylesheets/epub/coredoc.xsl
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx-stylesheets/fo/coredoc.xsl b/opendj-sdk/opendj3/src/docbkx-stylesheets/fo/coredoc.xsl
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx-stylesheets/fo/coredoc.xsl
rename to opendj-sdk/opendj3/src/docbkx-stylesheets/fo/coredoc.xsl
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx-stylesheets/html/coredoc.xsl b/opendj-sdk/opendj3/src/docbkx-stylesheets/html/coredoc.xsl
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx-stylesheets/html/coredoc.xsl
rename to opendj-sdk/opendj3/src/docbkx-stylesheets/html/coredoc.xsl
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/OpenDJ-Admin-Guide.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/OpenDJ-Admin-Guide.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/OpenDJ-Admin-Guide.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/OpenDJ-Admin-Guide.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/appendix-controls.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/appendix-controls.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/appendix-controls.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/appendix-controls.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/appendix-extended-ops.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/appendix-extended-ops.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/appendix-extended-ops.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/appendix-extended-ops.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/appendix-file-layout.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/appendix-file-layout.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/appendix-file-layout.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/appendix-file-layout.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/appendix-l10n.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/appendix-l10n.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/appendix-l10n.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/appendix-l10n.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/appendix-ports-used.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/appendix-ports-used.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/appendix-ports-used.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/appendix-ports-used.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/appendix-standards.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/appendix-standards.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/appendix-standards.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/appendix-standards.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-account-lockout.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-account-lockout.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-account-lockout.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-account-lockout.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-admin-tools.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-admin-tools.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-admin-tools.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-admin-tools.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-attribute-uniqueness.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-attribute-uniqueness.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-attribute-uniqueness.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-attribute-uniqueness.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-backup-restore.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-backup-restore.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-backup-restore.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-backup-restore.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-chaining.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-chaining.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-chaining.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-chaining.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-failover.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-failover.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-failover.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-failover.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-groups.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-groups.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-groups.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-groups.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-import-export.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-import-export.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-import-export.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-import-export.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-indexing.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-indexing.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-indexing.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-indexing.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-ldap-operations.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-ldap-operations.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-ldap-operations.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-ldap-operations.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-listeners.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-listeners.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-listeners.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-listeners.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-load-balancing.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-load-balancing.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-load-balancing.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-load-balancing.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-logging.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-logging.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-logging.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-logging.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-monitoring.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-monitoring.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-monitoring.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-monitoring.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-mv-servers.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-mv-servers.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-mv-servers.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-mv-servers.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-privileges-acis.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-privileges-acis.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-privileges-acis.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-privileges-acis.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-pta.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-pta.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-pta.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-pta.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-pwd-policy.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-pwd-policy.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-pwd-policy.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-pwd-policy.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-referrals.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-referrals.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-referrals.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-referrals.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-replication.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-replication.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-replication.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-replication.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-resource-limits.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-resource-limits.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-resource-limits.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-resource-limits.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-schema.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-schema.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-schema.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-schema.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-server-process.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-server-process.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-server-process.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-server-process.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-troubleshooting.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-troubleshooting.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-troubleshooting.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-troubleshooting.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-tuning.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-tuning.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-tuning.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-tuning.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-virtual-attrs-collective-attrs.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/chap-virtual-attrs-collective-attrs.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/chap-virtual-attrs-collective-attrs.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/chap-virtual-attrs-collective-attrs.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/images/Manage-Entries.png b/opendj-sdk/opendj3/src/docbkx/admin-guide/images/Manage-Entries.png
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/images/Manage-Entries.png
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/images/Manage-Entries.png
Binary files differ
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/images/OpenDJ-Control-Panel.png b/opendj-sdk/opendj3/src/docbkx/admin-guide/images/OpenDJ-Control-Panel.png
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/images/OpenDJ-Control-Panel.png
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/images/OpenDJ-Control-Panel.png
Binary files differ
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-backup.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-backup.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-backup.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-backup.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-base64.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-base64.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-base64.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-base64.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-control-panel.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-control-panel.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-control-panel.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-control-panel.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-create-rc-script.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-create-rc-script.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-create-rc-script.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-create-rc-script.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-dbtest.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-dbtest.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-dbtest.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-dbtest.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-dsconfig.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-dsconfig.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-dsconfig.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-dsconfig.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-dsframework.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-dsframework.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-dsframework.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-dsframework.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-dsjavaproperties.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-dsjavaproperties.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-dsjavaproperties.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-dsjavaproperties.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-dsreplication.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-dsreplication.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-dsreplication.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-dsreplication.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-encode-password.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-encode-password.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-encode-password.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-encode-password.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-export-ldif.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-export-ldif.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-export-ldif.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-export-ldif.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-import-ldif.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-import-ldif.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-import-ldif.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-import-ldif.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-install.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-install.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-install.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-install.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-ldapcompare.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldapcompare.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-ldapcompare.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldapcompare.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-ldapdelete.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldapdelete.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-ldapdelete.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldapdelete.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-ldapmodify.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldapmodify.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-ldapmodify.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldapmodify.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-ldappasswordmodify.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldappasswordmodify.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-ldappasswordmodify.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldappasswordmodify.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-ldapsearch.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldapsearch.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-ldapsearch.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldapsearch.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-ldif-diff.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldif-diff.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-ldif-diff.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldif-diff.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-ldifmodify.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldifmodify.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-ldifmodify.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldifmodify.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-ldifsearch.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldifsearch.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-ldifsearch.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-ldifsearch.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-list-backends.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-list-backends.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-list-backends.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-list-backends.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-make-ldif.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-make-ldif.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-make-ldif.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-make-ldif.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-manage-account.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-manage-account.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-manage-account.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-manage-account.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-manage-tasks.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-manage-tasks.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-manage-tasks.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-manage-tasks.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-rebuild-index.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-rebuild-index.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-rebuild-index.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-rebuild-index.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-restore.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-restore.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-restore.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-restore.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-setup.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-setup.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-setup.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-setup.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-start-ds.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-start-ds.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-start-ds.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-start-ds.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-status.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-status.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-status.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-status.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-stop-ds.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-stop-ds.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-stop-ds.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-stop-ds.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-upgrade.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-upgrade.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-upgrade.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-upgrade.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-verify-index.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/man-verify-index.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/man-verify-index.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/man-verify-index.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/preface.xml b/opendj-sdk/opendj3/src/docbkx/admin-guide/preface.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/admin-guide/preface.xml
rename to opendj-sdk/opendj3/src/docbkx/admin-guide/preface.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/OpenDJ-Dev-Guide.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/OpenDJ-Dev-Guide.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/OpenDJ-Dev-Guide.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/OpenDJ-Dev-Guide.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-authenticating.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/chap-authenticating.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-authenticating.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/chap-authenticating.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-best-practices.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/chap-best-practices.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-best-practices.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/chap-best-practices.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-controls.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/chap-controls.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-controls.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/chap-controls.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-extended-ops.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/chap-extended-ops.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-extended-ops.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/chap-extended-ops.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-get-sdk.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/chap-get-sdk.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-get-sdk.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/chap-get-sdk.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-getting-directory-info.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/chap-getting-directory-info.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-getting-directory-info.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/chap-getting-directory-info.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-i18n.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/chap-i18n.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-i18n.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/chap-i18n.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-ldif.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/chap-ldif.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-ldif.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/chap-ldif.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-multithreading.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/chap-multithreading.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-multithreading.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/chap-multithreading.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-reading.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/chap-reading.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-reading.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/chap-reading.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-simple-proxy.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/chap-simple-proxy.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-simple-proxy.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/chap-simple-proxy.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-understanding-ldap.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/chap-understanding-ldap.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-understanding-ldap.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/chap-understanding-ldap.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-using-the-sdk.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/chap-using-the-sdk.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-using-the-sdk.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/chap-using-the-sdk.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-writing.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/chap-writing.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/chap-writing.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/chap-writing.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/man-authrate.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/man-authrate.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/man-authrate.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/man-authrate.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/man-ldapcompare.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/man-ldapcompare.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/man-ldapcompare.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/man-ldapcompare.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/man-ldapmodify.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/man-ldapmodify.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/man-ldapmodify.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/man-ldapmodify.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/man-ldappasswordmodify.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/man-ldappasswordmodify.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/man-ldappasswordmodify.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/man-ldappasswordmodify.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/man-ldapsearch.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/man-ldapsearch.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/man-ldapsearch.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/man-ldapsearch.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/man-modrate.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/man-modrate.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/man-modrate.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/man-modrate.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/man-searchrate.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/man-searchrate.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/man-searchrate.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/man-searchrate.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/preface.xml b/opendj-sdk/opendj3/src/docbkx/dev-guide/preface.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/dev-guide/preface.xml
rename to opendj-sdk/opendj3/src/docbkx/dev-guide/preface.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/ga.html b/opendj-sdk/opendj3/src/docbkx/ga.html
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/ga.html
rename to opendj-sdk/opendj3/src/docbkx/ga.html
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/OpenDJ-Install-Guide.xml b/opendj-sdk/opendj3/src/docbkx/install-guide/OpenDJ-Install-Guide.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/OpenDJ-Install-Guide.xml
rename to opendj-sdk/opendj3/src/docbkx/install-guide/OpenDJ-Install-Guide.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/chap-before-you-install.xml b/opendj-sdk/opendj3/src/docbkx/install-guide/chap-before-you-install.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/chap-before-you-install.xml
rename to opendj-sdk/opendj3/src/docbkx/install-guide/chap-before-you-install.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/chap-install-cli.xml b/opendj-sdk/opendj3/src/docbkx/install-guide/chap-install-cli.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/chap-install-cli.xml
rename to opendj-sdk/opendj3/src/docbkx/install-guide/chap-install-cli.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/chap-install-gui.xml b/opendj-sdk/opendj3/src/docbkx/install-guide/chap-install-gui.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/chap-install-gui.xml
rename to opendj-sdk/opendj3/src/docbkx/install-guide/chap-install-gui.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/chap-jvm-opts.xml b/opendj-sdk/opendj3/src/docbkx/install-guide/chap-jvm-opts.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/chap-jvm-opts.xml
rename to opendj-sdk/opendj3/src/docbkx/install-guide/chap-jvm-opts.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/chap-uninstall.xml b/opendj-sdk/opendj3/src/docbkx/install-guide/chap-uninstall.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/chap-uninstall.xml
rename to opendj-sdk/opendj3/src/docbkx/install-guide/chap-uninstall.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/chap-upgrade.xml b/opendj-sdk/opendj3/src/docbkx/install-guide/chap-upgrade.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/chap-upgrade.xml
rename to opendj-sdk/opendj3/src/docbkx/install-guide/chap-upgrade.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/images/QuickSetup-cpstart.png b/opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-cpstart.png
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/images/QuickSetup-cpstart.png
rename to opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-cpstart.png
Binary files differ
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/images/QuickSetup-finished.png b/opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-finished.png
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/images/QuickSetup-finished.png
rename to opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-finished.png
Binary files differ
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/images/QuickSetup-gendata.png b/opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-gendata.png
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/images/QuickSetup-gendata.png
rename to opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-gendata.png
Binary files differ
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/images/QuickSetup-jvmopts.png b/opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-jvmopts.png
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/images/QuickSetup-jvmopts.png
rename to opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-jvmopts.png
Binary files differ
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/images/QuickSetup-replopts.png b/opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-replopts.png
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/images/QuickSetup-replopts.png
rename to opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-replopts.png
Binary files differ
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/images/QuickSetup-review.png b/opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-review.png
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/images/QuickSetup-review.png
rename to opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-review.png
Binary files differ
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/images/QuickSetup-svrconf.png b/opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-svrconf.png
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/images/QuickSetup-svrconf.png
rename to opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-svrconf.png
Binary files differ
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/images/QuickSetup-welcome.png b/opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-welcome.png
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/images/QuickSetup-welcome.png
rename to opendj-sdk/opendj3/src/docbkx/install-guide/images/QuickSetup-welcome.png
Binary files differ
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/images/uninstall-finished.png b/opendj-sdk/opendj3/src/docbkx/install-guide/images/uninstall-finished.png
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/images/uninstall-finished.png
rename to opendj-sdk/opendj3/src/docbkx/install-guide/images/uninstall-finished.png
Binary files differ
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/images/uninstall-start.png b/opendj-sdk/opendj3/src/docbkx/install-guide/images/uninstall-start.png
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/images/uninstall-start.png
rename to opendj-sdk/opendj3/src/docbkx/install-guide/images/uninstall-start.png
Binary files differ
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/preface.xml b/opendj-sdk/opendj3/src/docbkx/install-guide/preface.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/install-guide/preface.xml
rename to opendj-sdk/opendj3/src/docbkx/install-guide/preface.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/legal.xml b/opendj-sdk/opendj3/src/docbkx/legal.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/legal.xml
rename to opendj-sdk/opendj3/src/docbkx/legal.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/release-notes/OpenDJ-Release-Notes.xml b/opendj-sdk/opendj3/src/docbkx/release-notes/OpenDJ-Release-Notes.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/release-notes/OpenDJ-Release-Notes.xml
rename to opendj-sdk/opendj3/src/docbkx/release-notes/OpenDJ-Release-Notes.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/release-notes/chap-compatibility.xml b/opendj-sdk/opendj3/src/docbkx/release-notes/chap-compatibility.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/release-notes/chap-compatibility.xml
rename to opendj-sdk/opendj3/src/docbkx/release-notes/chap-compatibility.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/release-notes/chap-feedback.xml b/opendj-sdk/opendj3/src/docbkx/release-notes/chap-feedback.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/release-notes/chap-feedback.xml
rename to opendj-sdk/opendj3/src/docbkx/release-notes/chap-feedback.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/release-notes/chap-issues.xml b/opendj-sdk/opendj3/src/docbkx/release-notes/chap-issues.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/release-notes/chap-issues.xml
rename to opendj-sdk/opendj3/src/docbkx/release-notes/chap-issues.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/release-notes/chap-support.xml b/opendj-sdk/opendj3/src/docbkx/release-notes/chap-support.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/release-notes/chap-support.xml
rename to opendj-sdk/opendj3/src/docbkx/release-notes/chap-support.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/release-notes/chap-testing.xml b/opendj-sdk/opendj3/src/docbkx/release-notes/chap-testing.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/release-notes/chap-testing.xml
rename to opendj-sdk/opendj3/src/docbkx/release-notes/chap-testing.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/docbkx/release-notes/chap-whats-new.xml b/opendj-sdk/opendj3/src/docbkx/release-notes/chap-whats-new.xml
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/docbkx/release-notes/chap-whats-new.xml
rename to opendj-sdk/opendj3/src/docbkx/release-notes/chap-whats-new.xml
diff --git a/opendj-sdk/opendj3/opendj-docs/src/main/resources/css/coredoc.css b/opendj-sdk/opendj3/src/main/resources/css/coredoc.css
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/main/resources/css/coredoc.css
rename to opendj-sdk/opendj3/src/main/resources/css/coredoc.css
diff --git a/opendj-sdk/opendj3/opendj-docs/src/main/resources/images/bulletpoint.png b/opendj-sdk/opendj3/src/main/resources/images/bulletpoint.png
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/main/resources/images/bulletpoint.png
rename to opendj-sdk/opendj3/src/main/resources/images/bulletpoint.png
Binary files differ
diff --git a/opendj-sdk/opendj3/opendj-docs/src/main/resources/legal-notices/CC-BY-NC-ND.txt b/opendj-sdk/opendj3/src/main/resources/legal-notices/CC-BY-NC-ND.txt
similarity index 100%
rename from opendj-sdk/opendj3/opendj-docs/src/main/resources/legal-notices/CC-BY-NC-ND.txt
rename to opendj-sdk/opendj3/src/main/resources/legal-notices/CC-BY-NC-ND.txt

--
Gitblit v1.10.0