From 507c160f51c4f3451a64c63ae39be219acb946c6 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 31 Oct 2016 17:57:28 +0000
Subject: [PATCH] OPENDJ-2773 Fix map pages generation
---
opendj-doc-generated-ref/src/main/assembly/sdk-tools-man-pages-assembly.xml | 36 +++++++----
opendj-doc-generated-ref/pom.xml | 120 ++++++---------------------------------
2 files changed, 43 insertions(+), 113 deletions(-)
diff --git a/opendj-doc-generated-ref/pom.xml b/opendj-doc-generated-ref/pom.xml
index 5b43d21..285bffe 100644
--- a/opendj-doc-generated-ref/pom.xml
+++ b/opendj-doc-generated-ref/pom.xml
@@ -178,7 +178,7 @@
<extendedClasspath>
${project.build.directory}/dependency/freemarker-${freemarker.version}.jar
</extendedClasspath>
- <outputDir>${project.build.directory}/generated-man-pages</outputDir>
+ <outputDir>${project.build.directory}/docbkx-sources/man-pages</outputDir>
<tools>
<tool>
<name>addrate</name>
@@ -199,6 +199,15 @@
</tool>
<tool>
+ <name>base64</name>
+ <application>com.forgerock.opendj.ldap.tools.Base64</application>
+ <trailingSectionPaths>
+ <trailingSectionPath>exit-codes-0-gt0.xml</trailingSectionPath>
+ <trailingSectionPath>base64-examples.xml</trailingSectionPath>
+ </trailingSectionPaths>
+ </tool>
+
+ <tool>
<name>ldapcompare</name>
<application>com.forgerock.opendj.ldap.tools.LDAPCompare</application>
<trailingSectionPaths>
@@ -209,6 +218,16 @@
</tool>
<tool>
+ <name>ldapdelete</name>
+ <application>com.forgerock.opendj.ldap.tools.LDAPDelete</application>
+ <trailingSectionPaths>
+ <trailingSectionPath>exit-codes-0-ldap-89.xml</trailingSectionPath>
+ <trailingSectionPath>files.xml</trailingSectionPath>
+ <trailingSectionPath>ldapdelete-examples.xml</trailingSectionPath>
+ </trailingSectionPaths>
+ </tool>
+
+ <tool>
<name>ldapmodify</name>
<application>com.forgerock.opendj.ldap.tools.LDAPModify</application>
<trailingSectionPaths>
@@ -392,15 +411,6 @@
</tool>
<tool>
- <name>base64</name>
- <application>org.opends.server.util.Base64</application>
- <trailingSectionPaths>
- <trailingSectionPath>exit-codes-0-gt0.xml</trailingSectionPath>
- <trailingSectionPath>base64-examples.xml</trailingSectionPath>
- </trailingSectionPaths>
- </tool>
-
- <tool>
<name>control-panel</name>
<application>org.opends.guitools.controlpanel.ControlPanelLauncher
</application>
@@ -476,86 +486,6 @@
</tool>
<tool>
- <name>ldapcompare</name>
- <application>org.opends.server.tools.LDAPCompare</application>
- <trailingSectionPaths>
- <trailingSectionPath>ldapcompare-exit-codes.xml</trailingSectionPath>
- <trailingSectionPath>files.xml</trailingSectionPath>
- <trailingSectionPath>ldapcompare-examples.xml</trailingSectionPath>
- </trailingSectionPaths>
- </tool>
-
- <tool>
- <name>ldapdelete</name>
- <application>org.opends.server.tools.LDAPDelete</application>
- <trailingSectionPaths>
- <trailingSectionPath>exit-codes-0-ldap-89.xml</trailingSectionPath>
- <trailingSectionPath>files.xml</trailingSectionPath>
- <trailingSectionPath>ldapdelete-examples.xml</trailingSectionPath>
- </trailingSectionPaths>
- </tool>
-
- <tool>
- <name>ldapmodify</name>
- <application>org.opends.server.tools.LDAPModify</application>
- <trailingSectionPaths>
- <trailingSectionPath>exit-codes-0-ldap-89.xml</trailingSectionPath>
- <trailingSectionPath>files.xml</trailingSectionPath>
- <trailingSectionPath>ldapmodify-examples.xml</trailingSectionPath>
- </trailingSectionPaths>
- </tool>
-
- <tool>
- <name>ldappasswordmodify</name>
- <application>org.opends.server.tools.LDAPPasswordModify</application>
- <trailingSectionPaths>
- <trailingSectionPath>exit-codes-0-ldap-89.xml</trailingSectionPath>
- <trailingSectionPath>files.xml</trailingSectionPath>
- <trailingSectionPath>ldappasswordmodify-examples.xml
- </trailingSectionPath>
- </trailingSectionPaths>
- </tool>
-
- <tool>
- <name>ldapsearch</name>
- <application>org.opends.server.tools.LDAPSearch</application>
- <trailingSectionPaths>
- <trailingSectionPath>filters.xml</trailingSectionPath>
- <trailingSectionPath>attributes.xml</trailingSectionPath>
- <trailingSectionPath>exit-codes-0-ldap-89.xml</trailingSectionPath>
- <trailingSectionPath>files.xml</trailingSectionPath>
- <trailingSectionPath>ldapsearch-examples.xml</trailingSectionPath>
- </trailingSectionPaths>
- </tool>
-
- <tool>
- <name>ldif-diff</name>
- <application>org.opends.server.tools.LDIFDiff</application>
- <trailingSectionPaths>
- <trailingSectionPath>exit-codes-0-5-6-other.xml</trailingSectionPath>
- <trailingSectionPath>ldif-diff-examples.xml</trailingSectionPath>
- </trailingSectionPaths>
- </tool>
-
- <tool>
- <name>ldifmodify</name>
- <application>org.opends.server.tools.LDIFModify</application>
- <trailingSectionPaths>
- <trailingSectionPath>exit-codes-0-gt0.xml</trailingSectionPath>
- <trailingSectionPath>ldifmodify-examples.xml</trailingSectionPath>
- </trailingSectionPaths>
- </tool>
-
- <tool>
- <name>ldifsearch</name>
- <application>org.opends.server.tools.LDIFSearch</application>
- <trailingSectionPaths>
- <trailingSectionPath>exit-codes-0-gt0.xml</trailingSectionPath>
- <trailingSectionPath>ldifsearch-examples.xml</trailingSectionPath>
- </trailingSectionPaths>
- </tool>
-
- <tool>
<name>list-backends</name>
<application>org.opends.server.tools.ListBackends</application>
<trailingSectionPaths>
@@ -565,16 +495,6 @@
</tool>
<tool>
- <name>make-ldif</name>
- <application>org.opends.server.tools.makeldif.MakeLDIF</application>
- <trailingSectionPaths>
- <trailingSectionPath>exit-codes-0-gt0.xml</trailingSectionPath>
- <trailingSectionPath>make-ldif-examples.xml</trailingSectionPath>
- <trailingSectionPath>make-ldif-see-also.xml</trailingSectionPath>
- </trailingSectionPaths>
- </tool>
-
- <tool>
<name>manage-account</name>
<application>org.opends.server.tools.ManageAccount</application>
<trailingSectionPaths>
diff --git a/opendj-doc-generated-ref/src/main/assembly/sdk-tools-man-pages-assembly.xml b/opendj-doc-generated-ref/src/main/assembly/sdk-tools-man-pages-assembly.xml
index b5fb958..2586947 100644
--- a/opendj-doc-generated-ref/src/main/assembly/sdk-tools-man-pages-assembly.xml
+++ b/opendj-doc-generated-ref/src/main/assembly/sdk-tools-man-pages-assembly.xml
@@ -12,7 +12,7 @@
Header, with the fields enclosed by brackets [] replaced by your own identifying
information: "Portions Copyright [year] [name of copyright owner]".
- Copyright 2015 ForgeRock AS.
+ Copyright 2015-2016 ForgeRock AS.
-->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -29,62 +29,72 @@
<files>
<file>
<outputDirectory>man-pages</outputDirectory>
- <source>target/generated-man-pages/man-addrate.xml</source>
+ <source>${project.build.directory}/docbkx-sources/man-pages/man-addrate.xml</source>
</file>
<file>
<outputDirectory>man-pages</outputDirectory>
- <source>target/generated-man-pages/man-authrate.xml</source>
+ <source>${project.build.directory}/docbkx-sources/man-pages/man-authrate.xml</source>
</file>
<file>
<outputDirectory>man-pages</outputDirectory>
- <source>target/generated-man-pages/man-ldapcompare.xml</source>
+ <source>${project.build.directory}/docbkx-sources/man-pages/man-base64.xml</source>
</file>
<file>
<outputDirectory>man-pages</outputDirectory>
- <source>target/generated-man-pages/man-ldapmodify.xml</source>
+ <source>${project.build.directory}/docbkx-sources/man-pages/man-ldapcompare.xml</source>
</file>
<file>
<outputDirectory>man-pages</outputDirectory>
- <source>target/generated-man-pages/man-ldappasswordmodify.xml</source>
+ <source>${project.build.directory}/docbkx-sources/man-pages/man-ldapdelete.xml</source>
</file>
<file>
<outputDirectory>man-pages</outputDirectory>
- <source>target/generated-man-pages/man-ldapsearch.xml</source>
+ <source>${project.build.directory}/docbkx-sources/man-pages/man-ldapmodify.xml</source>
</file>
<file>
<outputDirectory>man-pages</outputDirectory>
- <source>target/generated-man-pages/man-ldifdiff.xml</source>
+ <source>${project.build.directory}/docbkx-sources/man-pages/man-ldappasswordmodify.xml</source>
</file>
<file>
<outputDirectory>man-pages</outputDirectory>
- <source>target/generated-man-pages/man-ldifmodify.xml</source>
+ <source>${project.build.directory}/docbkx-sources/man-pages/man-ldapsearch.xml</source>
</file>
<file>
<outputDirectory>man-pages</outputDirectory>
- <source>target/generated-man-pages/man-ldifsearch.xml</source>
+ <source>${project.build.directory}/docbkx-sources/man-pages/man-ldifdiff.xml</source>
</file>
<file>
<outputDirectory>man-pages</outputDirectory>
- <source>target/generated-man-pages/man-makeldif.xml</source>
+ <source>${project.build.directory}/docbkx-sources/man-pages/man-ldifmodify.xml</source>
</file>
<file>
<outputDirectory>man-pages</outputDirectory>
- <source>target/generated-man-pages/man-modrate.xml</source>
+ <source>${project.build.directory}/docbkx-sources/man-pages/man-ldifsearch.xml</source>
</file>
<file>
<outputDirectory>man-pages</outputDirectory>
- <source>target/generated-man-pages/man-searchrate.xml</source>
+ <source>${project.build.directory}/docbkx-sources/man-pages/man-makeldif.xml</source>
+ </file>
+
+ <file>
+ <outputDirectory>man-pages</outputDirectory>
+ <source>${project.build.directory}/docbkx-sources/man-pages/man-modrate.xml</source>
+ </file>
+
+ <file>
+ <outputDirectory>man-pages</outputDirectory>
+ <source>${project.build.directory}/docbkx-sources/man-pages/man-searchrate.xml</source>
</file>
</files>
--
Gitblit v1.10.0