From 4ece481ddc81b3cf975a1917100547a760b6d756 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Thu, 22 Jan 2015 13:20:31 +0000
Subject: [PATCH] CR-5834 OPENDJ-1747 Test latest doc build plugin
---
opendj3-server-dev/src/site/xdoc/docs.xml | 50 ++++++++++--------------
opendj3-server-dev/pom.xml | 32 ++++++----------
2 files changed, 33 insertions(+), 49 deletions(-)
diff --git a/opendj3-server-dev/pom.xml b/opendj3-server-dev/pom.xml
index fb49b75..c600358 100644
--- a/opendj3-server-dev/pom.xml
+++ b/opendj3-server-dev/pom.xml
@@ -22,7 +22,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2011-2014 ForgeRock AS
+ ! Copyright 2011-2015 ForgeRock AS.
!
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -170,30 +170,15 @@
<configuration>
<projectName>OpenDJ</projectName>
<projectVersion>${docTargetVersion}</projectVersion>
+ <releaseVersion>${docTargetVersion}</releaseVersion>
<googleAnalyticsId>${gaId}</googleAnalyticsId>
- <latestJson>http://docs.forgerock.org/latest.json</latestJson>
- <docbkxSourceDirectory>${basedir}/src/main/docbkx</docbkxSourceDirectory>
</configuration>
<executions>
<execution>
- <id>copy-common</id>
+ <id>pre-process-doc</id>
<phase>pre-site</phase>
<goals>
- <goal>boilerplate</goal>
- </goals>
- </execution>
- <execution>
- <id>filter-sources</id>
- <phase>pre-site</phase>
- <goals>
- <goal>filter</goal>
- </goals>
- </execution>
- <execution>
- <id>prepare-sources</id>
- <phase>pre-site</phase>
- <goals>
- <goal>prepare</goal>
+ <goal>process</goal>
</goals>
</execution>
<execution>
@@ -207,7 +192,14 @@
<id>layout-doc</id>
<phase>site</phase>
<goals>
- <goal>layout</goal>
+ <goal>site</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>layout-release</id>
+ <phase>site</phase>
+ <goals>
+ <goal>release</goal>
</goals>
</execution>
</executions>
diff --git a/opendj3-server-dev/src/site/xdoc/docs.xml b/opendj3-server-dev/src/site/xdoc/docs.xml
index c204103..42d0760 100644
--- a/opendj3-server-dev/src/site/xdoc/docs.xml
+++ b/opendj3-server-dev/src/site/xdoc/docs.xml
@@ -20,15 +20,15 @@
!
! CCPL HEADER END
!
- ! Copyright 2011-2014 ForgeRock AS
- !
+ ! Copyright 2011-2015 ForgeRock AS.
+ !
-->
<document
xmlns="http://maven.apache.org/XDOC/2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
- <title>OpenDJ 3 Core User Documentation</title>
+ <title>OpenDJ Core User Documentation</title>
<author email="opendj-dev@forgerock.org">ForgeRock AS</author>
</properties>
<body>
@@ -46,43 +46,35 @@
<dl>
<dt>Release Notes</dt>
- <dd><a href="./doc/OpenDJ-Release-Notes.epub">EPUB</a>,
- <a href="./doc/release-notes/index.html">HTML (single page)</a>,
- <a href="./doc/release-notes/index/index.html">HTML (1 page/chapter)</a>,
- <a href="./doc/OpenDJ-Release-Notes.pdf">PDF</a>,
- <a href="./doc/OpenDJ-Release-Notes.rtf">RTF</a>,
- <a href="./doc/webhelp/release-notes/index.html">Webhelp</a></dd>
+ <dd>
+ <a href="./doc/release-notes/index.html">HTML</a>,
+ <a href="./doc/OpenDJ-Release-Notes.pdf">PDF</a>
+ </dd>
<dt>Installation Guide</dt>
- <dd><a href="./doc/OpenDJ-Install-Guide.epub">EPUB</a>,
- <a href="./doc/install-guide/index.html">HTML (single page)</a>,
- <a href="./doc/install-guide/index/index.html">HTML (1 page/chapter)</a>,
- <a href="./doc/OpenDJ-Install-Guide.pdf">PDF</a>,
- <a href="./doc/OpenDJ-Install-Guide.rtf">RTF</a>,
- <a href="./doc/webhelp/install-guide/index.html">Webhelp</a></dd>
+ <dd>
+ <a href="./doc/install-guide/index.html">HTML</a>,
+ <a href="./doc/OpenDJ-Install-Guide.pdf">PDF</a>
+ </dd>
<dt>Administration Guide</dt>
- <dd><a href="./doc/OpenDJ-Admin-Guide.epub">EPUB</a>,
- <a href="./doc/admin-guide/index.html">HTML (single page)</a>,
- <a href="./doc/admin-guide/index/index.html">HTML (1 page/chapter)</a>,
- <a href="./doc/OpenDJ-Admin-Guide.pdf">PDF</a>,
- <a href="./doc/OpenDJ-Admin-Guide.rtf">RTF</a>,
- <a href="./doc/webhelp/admin-guide/index.html">Webhelp</a></dd>
+ <dd>
+ <a href="./doc/admin-guide/index.html">HTML</a>
+ <a href="./doc/OpenDJ-Admin-Guide.pdf">PDF</a>
+ </dd>
<dt>Developer Guide</dt>
- <dd><a href="../doc/OpenDJ-Dev-Guide.epub">EPUB</a>,
- <a href="../doc/dev-guide/index.html">HTML (single page)</a>,
- <a href="../doc/dev-guide/index/index.html">HTML (1 page/chapter)</a>,
- <a href="../doc/OpenDJ-Dev-Guide.pdf">PDF</a>,
- <a href="../doc/OpenDJ-Dev-Guide.rtf">RTF</a>,
- <a href="../doc/webhelp/dev-guide/index.html">Webhelp</a></dd>
+ <dd>
+ <a href="../doc/dev-guide/index.html">HTML</a>
+ <a href="../doc/OpenDJ-Dev-Guide.pdf">PDF</a>
+ </dd>
<dt>Configuration Reference</dt>
<dd><a href="./configref/index.html">HTML</a></dd>
-
+
<dt>Server Plugin API Specification</dt>
<dd><a href="./javadoc/index.html">HTML</a></dd>
-
+
<dt>LDAP Client API Specification</dt>
<dd><a href="../opendj-core/apidocs/index.html">HTML</a></dd>
</dl>
--
Gitblit v1.10.0