From 9961779998d28db8b63f934b24563e81bfb2dfa9 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Tue, 07 Feb 2012 13:35:49 +0000
Subject: [PATCH] Fix for COMMWEB-43: Broken links in core documentation when long descriptions, legal notices, etc. are generated in the wrong place
---
opendj3/src/main/docbkx/legal.xml | 4 ++--
opendj3/pom.xml | 19 ++-----------------
2 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/opendj3/pom.xml b/opendj3/pom.xml
index 61ade90..a2c93d5 100644
--- a/opendj3/pom.xml
+++ b/opendj3/pom.xml
@@ -109,7 +109,6 @@
<fonts-src>${basedir}/src/fonts</fonts-src>
<fonts-gen>${basedir}/target/fonts</fonts-gen>
<site-out>${basedir}/target/site</site-out>
- <legalnotice>${basedir}/target/docbkx/html/legalnotice.html</legalnotice>
<siteDistributionURL>scp://forgerock.org/var/www/vhosts/opendj.forgerock.org/httpdocs</siteDistributionURL>
<i18nFrameworkVersion>1.4.0</i18nFrameworkVersion>
</properties>
@@ -118,7 +117,7 @@
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-fop-support</artifactId>
- <version>2.0.13</version>
+ <version>2.0.14</version>
<inherited>false</inherited>
<executions>
<execution>
@@ -135,7 +134,7 @@
<plugin>
<groupId>com.agilejava.docbkx</groupId>
<artifactId>docbkx-maven-plugin</artifactId>
- <version>2.0.13</version>
+ <version>2.0.14</version>
<inherited>false</inherited>
<configuration>
<sourceDirectory>${basedir}/src/main/docbkx</sourceDirectory>
@@ -399,13 +398,6 @@
</preProcess>
<postProcess>
- <copy file="${docbkx-out}/html/admin-guide/OpenDJ-Admin-Guide/target/docbkx/html/legalnotice.html" todir="${docbkx-out}/html/admin-guide/OpenDJ-Admin-Guide" />
- <copy file="${docbkx-out}/html/dev-guide/OpenDJ-Dev-Guide/target/docbkx/html/legalnotice.html" todir="${docbkx-out}/html/dev-guide/OpenDJ-Dev-Guide" />
- <copy file="${docbkx-out}/html/install-guide/OpenDJ-Install-Guide/target/docbkx/html/legalnotice.html" todir="${docbkx-out}/html/install-guide/OpenDJ-Install-Guide" />
- <copy file="${docbkx-out}/html/release-notes/OpenDJ-Release-Notes/target/docbkx/html/legalnotice.html" todir="${docbkx-out}/html/release-notes/OpenDJ-Release-Notes" />
- <replace dir="${basedir}/target/docbkx/html/" token="target/docbkx/html/legalnotice.html" value="legalnotice.html">
- <include name="**/**/**/*.html" />
- </replace>
<replace dir="${basedir}/target/docbkx/html/" token="</head>">
<include name="**/**/**/*.html" />
<replacevalue>
@@ -488,13 +480,6 @@
</preProcess>
<postProcess>
- <copy file="${legalnotice}" todir="${docbkx-out}/html/admin-guide" />
- <copy file="${legalnotice}" todir="${docbkx-out}/html/dev-guide" />
- <copy file="${legalnotice}" todir="${docbkx-out}/html/install-guide" />
- <copy file="${legalnotice}" todir="${docbkx-out}/html/release-notes" />
- <replace dir="${basedir}/target/docbkx/html/" token="target/docbkx/html/legalnotice.html" value="legalnotice.html">
- <include name="**/**/*.html" />
- </replace>
<replace dir="${basedir}/target/docbkx/html/" token="</head>">
<include name="**/**/*.html" />
<replacevalue>
diff --git a/opendj3/src/main/docbkx/legal.xml b/opendj3/src/main/docbkx/legal.xml
index 196cbaf..d4c4e84 100644
--- a/opendj3/src/main/docbkx/legal.xml
+++ b/opendj3/src/main/docbkx/legal.xml
@@ -20,7 +20,7 @@
!
! CCPL HEADER END
!
- ! Copyright 2011 ForgeRock AS
+ ! Copyright 2011-2012 ForgeRock AS
!
-->
<legalnotice xml:id='legalnotice'
@@ -29,7 +29,7 @@
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'><?dbhtml
- filename='target/docbkx/html/legalnotice.html'?>
+ filename='legalnotice.html'?>
<mediaobject xml:id="figure-cc-logo">
<imageobject>
--
Gitblit v1.10.0