From d665df9c328f89e6cb9900bba6ba25b4a5db9bf7 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Thu, 23 May 2013 14:15:27 +0000
Subject: [PATCH] Fix for OPENDJ-939: Upgrade to forgerock-doc-maven-plugin 1.2.0
---
opendj3/src/main/docbkx/admin-guide/index.xml | 3 +
opendj3/src/main/docbkx/admin-guide/appendix-interface-stability.xml | 37 ++++++++++++++++++
opendj3/pom.xml | 10 ++++
opendj3/src/main/docbkx/shared/sec-interface-stability.xml | 33 ++++++++++++++++
opendj3/src/main/docbkx/shared/sec-release-levels.xml | 33 ++++++++++++++++
5 files changed, 114 insertions(+), 2 deletions(-)
diff --git a/opendj3/pom.xml b/opendj3/pom.xml
index 34ae347..e471743 100644
--- a/opendj3/pom.xml
+++ b/opendj3/pom.xml
@@ -129,6 +129,7 @@
<releaseDate/>
<softwareReleaseDate>${releaseDate}</softwareReleaseDate>
<checkstyleHeaderLocation>org/forgerock/checkstyle/opendj-java-header</checkstyleHeaderLocation>
+ <frDocPluginVersion>1.2.0</frDocPluginVersion>
</properties>
<build>
<plugins>
@@ -161,7 +162,7 @@
<plugin>
<groupId>org.forgerock.commons</groupId>
<artifactId>forgerock-doc-maven-plugin</artifactId>
- <version>1.1.0</version>
+ <version>${frDocPluginVersion}</version>
<inherited>false</inherited>
<configuration>
<projectName>OpenDJ</projectName>
@@ -169,6 +170,13 @@
</configuration>
<executions>
<execution>
+ <id>copy-common</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>boilerplate</goal>
+ </goals>
+ </execution>
+ <execution>
<id>build-doc</id>
<phase>pre-site</phase>
<goals>
diff --git a/opendj3/src/main/docbkx/admin-guide/appendix-interface-stability.xml b/opendj3/src/main/docbkx/admin-guide/appendix-interface-stability.xml
new file mode 100644
index 0000000..4be83b6
--- /dev/null
+++ b/opendj3/src/main/docbkx/admin-guide/appendix-interface-stability.xml
@@ -0,0 +1,37 @@
+<?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.
+ !
+ ! 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 2013 ForgeRock AS
+ !
+-->
+ <appendix xml:id="appendix-interface-stability"
+ xmlns='http://docbook.org/ns/docbook' version='5.0' xml:lang='en'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
+ xmlns:xlink='http://www.w3.org/1999/xlink'
+ xmlns:xinclude='http://www.w3.org/2001/XInclude'>
+ <title>Release Levels & Interface Stability</title>
+
+ <para>This appendix includes ForgeRock definitions for product release levels
+ and interface stability.</para>
+
+ <xinclude:include href="../shared/sec-release-levels.xml" />
+ <xinclude:include href="../shared/sec-interface-stability.xml" />
+</appendix>
diff --git a/opendj3/src/main/docbkx/admin-guide/index.xml b/opendj3/src/main/docbkx/admin-guide/index.xml
index 1eded9b..ccf78a7 100644
--- a/opendj3/src/main/docbkx/admin-guide/index.xml
+++ b/opendj3/src/main/docbkx/admin-guide/index.xml
@@ -142,7 +142,8 @@
<xinclude:include href='appendix-controls.xml' />
<xinclude:include href='appendix-extended-ops.xml' />
<xinclude:include href='appendix-l10n.xml' />
- <xinclude:include href='../../../../target/logref/log-message-reference.xml' />
+ <xinclude:include href='appendix-interface-stability.xml' />
+ <xinclude:include href='../../../target/logref/log-message-reference.xml' />
<index />
</book>
diff --git a/opendj3/src/main/docbkx/shared/sec-interface-stability.xml b/opendj3/src/main/docbkx/shared/sec-interface-stability.xml
new file mode 100644
index 0000000..b743ebe
--- /dev/null
+++ b/opendj3/src/main/docbkx/shared/sec-interface-stability.xml
@@ -0,0 +1,33 @@
+<?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.
+ !
+ ! 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 2013 ForgeRock AS
+ !
+-->
+ <section xml:id="interface-stability"
+ xmlns='http://docbook.org/ns/docbook' version='5.0' xml:lang='en'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
+ xmlns:xlink='http://www.w3.org/1999/xlink'
+ xmlns:xinclude='http://www.w3.org/2001/XInclude'>
+ <title>Interface Stability</title>
+
+ <para>This should be overwritten at build time.</para>
+</section>
diff --git a/opendj3/src/main/docbkx/shared/sec-release-levels.xml b/opendj3/src/main/docbkx/shared/sec-release-levels.xml
new file mode 100644
index 0000000..24b53fd
--- /dev/null
+++ b/opendj3/src/main/docbkx/shared/sec-release-levels.xml
@@ -0,0 +1,33 @@
+<?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.
+ !
+ ! 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 2013 ForgeRock AS
+ !
+-->
+ <section xml:id="release-levels"
+ xmlns='http://docbook.org/ns/docbook' version='5.0' xml:lang='en'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+ xsi:schemaLocation='http://docbook.org/ns/docbook http://docbook.org/xml/5.0/xsd/docbook.xsd'
+ xmlns:xlink='http://www.w3.org/1999/xlink'
+ xmlns:xinclude='http://www.w3.org/2001/XInclude'>
+ <title>Release Levels</title>
+
+ <para>This should be overwritten at build time.</para>
+</section>
--
Gitblit v1.10.0