From e5a630b05410ceede6685b3bb3f579ea8d2aba26 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Wed, 18 Dec 2013 14:00:18 +0000
Subject: [PATCH] Align with fix for DOCS-121; additional fix for OPENDJ-1253
---
src/main/docbkx/dev-guide/index.xml | 6 +-
opends/src/main/docbkx/install-guide/index.xml | 6 +-
opends/pom.xml | 32 +++++++---------
opends/src/main/docbkx/admin-guide/index.xml | 6 +-
pom.xml | 24 ++++++-----
opends/src/main/docbkx/release-notes/index.xml | 6 +-
6 files changed, 39 insertions(+), 41 deletions(-)
diff --git a/opends/pom.xml b/opends/pom.xml
index c75643b..3118806 100644
--- a/opends/pom.xml
+++ b/opends/pom.xml
@@ -99,13 +99,15 @@
<sdkDocTargetVersion>${docTargetVersion}</sdkDocTargetVersion>
<gaId>UA-23412190-8</gaId>
<!--
- Release date is specified only when building the documentation
- for publication. For example:
- -D"releaseDate=Software release date: January 1, 1970"
- Otherwise release date should remain empty.
+ Release date and publication date are set at release build time.
+ -D"releaseDate=Software release date: January 1, 1970"
+ -D"pubDate=Publication date: December 31, 1969"
+ At all other times, the dates should be empty.
-->
<releaseDate />
<softwareReleaseDate>${releaseDate}</softwareReleaseDate>
+ <pubDate />
+ <publicationDate>${pubDate}</publicationDate>
<checkstyleHeaderLocation>org/forgerock/checkstyle/opendj-java-header</checkstyleHeaderLocation>
<frDocPluginVersion>2.0.0-SNAPSHOT</frDocPluginVersion>
@@ -115,9 +117,6 @@
<serverJavadocBase>http://opendj.forgerock.org/opendj-server/javadoc/</serverJavadocBase>
<sdkJavadocBase>http://opendj.forgerock.org/opendj-ldap-sdk/apidocs/</sdkJavadocBase>
- <docbkxSourceDirectory>${basedir}/src/main/docbkx</docbkxSourceDirectory>
- <docbkxBuildDirectory>build</docbkxBuildDirectory>
-
<!-- END Documentation properties -->
</properties>
<build>
@@ -194,22 +193,12 @@
<version>${frDocPluginVersion}</version>
<inherited>false</inherited>
<configuration>
- <buildDirectory>${docbkxBuildDirectory}</buildDirectory>
<projectName>OpenDJ</projectName>
<googleAnalyticsId>${gaId}</googleAnalyticsId>
+ <docbkxSourceDirectory>${basedir}/src/main/docbkx</docbkxSourceDirectory>
</configuration>
<executions>
<execution>
- <id>filter-sources</id>
- <phase>pre-site</phase>
- <goals>
- <goal>filter</goal>
- </goals>
- <configuration>
- <docbkxSourceDirectory>${docbkxSourceDirectory}</docbkxSourceDirectory>
- </configuration>
- </execution>
- <execution>
<id>copy-common</id>
<phase>pre-site</phase>
<goals>
@@ -217,6 +206,13 @@
</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>
diff --git a/opends/src/main/docbkx/admin-guide/index.xml b/opends/src/main/docbkx/admin-guide/index.xml
index 582cab7..bc5a334 100644
--- a/opends/src/main/docbkx/admin-guide/index.xml
+++ b/opends/src/main/docbkx/admin-guide/index.xml
@@ -54,9 +54,9 @@
</author>
</authorgroup>
<xinclude:include href='../legal.xml' />
- <date><?dbtimestamp format="B d, Y"?></date>
- <pubdate>Publication date: <?dbtimestamp format="B d, Y"?></pubdate>
- <releaseinfo><?eval ${softwareReleaseDate}?></releaseinfo>
+ <date>${publicationDate}</date>
+ <pubdate>${publicationDate}</pubdate>
+ <releaseinfo>${softwareReleaseDate}</releaseinfo>
</info>
<toc />
diff --git a/opends/src/main/docbkx/install-guide/index.xml b/opends/src/main/docbkx/install-guide/index.xml
index 84639e9..608cc2f 100644
--- a/opends/src/main/docbkx/install-guide/index.xml
+++ b/opends/src/main/docbkx/install-guide/index.xml
@@ -45,9 +45,9 @@
</author>
</authorgroup>
<xinclude:include href='../legal.xml' />
- <date><?dbtimestamp format="B d, Y"?></date>
- <pubdate>Publication date: <?dbtimestamp format="B d, Y"?></pubdate>
- <releaseinfo><?eval ${softwareReleaseDate}?></releaseinfo>
+ <date>${publicationDate}</date>
+ <pubdate>${publicationDate}</pubdate>
+ <releaseinfo>${softwareReleaseDate}</releaseinfo>
</info>
<toc />
diff --git a/opends/src/main/docbkx/release-notes/index.xml b/opends/src/main/docbkx/release-notes/index.xml
index 36a52bf..10efe89 100644
--- a/opends/src/main/docbkx/release-notes/index.xml
+++ b/opends/src/main/docbkx/release-notes/index.xml
@@ -46,9 +46,9 @@
</author>
</authorgroup>
<xinclude:include href='../legal.xml' />
- <date><?dbtimestamp format="B d, Y"?></date>
- <pubdate>Publication date: <?dbtimestamp format="B d, Y"?></pubdate>
- <releaseinfo><?eval ${softwareReleaseDate}?></releaseinfo>
+ <date>${publicationDate}</date>
+ <pubdate>${publicationDate}</pubdate>
+ <releaseinfo>${softwareReleaseDate}</releaseinfo>
</info>
<toc />
diff --git a/pom.xml b/pom.xml
index 530aa6a..7c5d065 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,13 +128,15 @@
*
</opendj.osgi.import>
<!--
- Release date is specified only when building the documentation
- for publication. For example:
- -D"releaseDate=Software release date: January 1, 1970"
- Otherwise release date should remain empty.
+ Release date and publication date are set at release build time.
+ -D"releaseDate=Software release date: January 1, 1970"
+ -D"pubDate=Publication date: December 31, 1969"
+ At all other times, the dates should be empty.
-->
<releaseDate />
<softwareReleaseDate>${releaseDate}</softwareReleaseDate>
+ <pubDate />
+ <publicationDate>${pubDate}</publicationDate>
<checkstyleHeaderLocation>org/forgerock/checkstyle/opendj-java-header</checkstyleHeaderLocation>
<frDocPluginVersion>2.0.0-SNAPSHOT</frDocPluginVersion>
@@ -157,6 +159,13 @@
</configuration>
<executions>
<execution>
+ <id>copy-common</id>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>boilerplate</goal>
+ </goals>
+ </execution>
+ <execution>
<id>filter-sources</id>
<phase>pre-site</phase>
<goals>
@@ -176,13 +185,6 @@
</goals>
</execution>
<execution>
- <id>copy-common</id>
- <phase>pre-site</phase>
- <goals>
- <goal>boilerplate</goal>
- </goals>
- </execution>
- <execution>
<id>prepare-sources</id>
<phase>pre-site</phase>
<goals>
diff --git a/src/main/docbkx/dev-guide/index.xml b/src/main/docbkx/dev-guide/index.xml
index a6f466f..d7cba07 100644
--- a/src/main/docbkx/dev-guide/index.xml
+++ b/src/main/docbkx/dev-guide/index.xml
@@ -48,9 +48,9 @@
</author>
</authorgroup>
<xinclude:include href='../legal.xml' />
- <date><?dbtimestamp format="B d, Y"?></date>
- <pubdate>Publication date: <?dbtimestamp format="B d, Y"?></pubdate>
- <releaseinfo><?eval ${softwareReleaseDate}?></releaseinfo>
+ <date>${publicationDate}</date>
+ <pubdate>${publicationDate}</pubdate>
+ <releaseinfo>${softwareReleaseDate}</releaseinfo>
</info>
<toc />
--
Gitblit v1.10.0