From 70f6b473527f05252f15a7d5e8505e7554e23f0d Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Wed, 08 Jun 2011 12:42:59 +0000
Subject: [PATCH] Fix OPENDJ-193: Misplaced legalnotice.html in generated docs
---
opendj3/src/main/docbkx/legal.xml | 2 +-
opendj3/pom.xml | 17 +++++++++++++----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/opendj3/pom.xml b/opendj3/pom.xml
index fed6384..2338925 100644
--- a/opendj3/pom.xml
+++ b/opendj3/pom.xml
@@ -102,6 +102,7 @@
<dbstyle-dir>${basedir}/src/main/docbkx-stylesheets</dbstyle-dir>
<docbkx-out>${basedir}/target/docbkx</docbkx-out>
<site-out>${basedir}/target/site</site-out>
+ <legalnotice>${docbkx-out}/html/legalnotice.html</legalnotice>
</properties>
<build>
<plugins>
@@ -217,10 +218,18 @@
<detail>true</detail>
<target>
<!-- TODO: Figure out how to say foreach in ant. -->
- <copy file='${env.PWD}/legalnotice.html' todir='${basedir}/target/docbkx/html/admin-guide' />
- <copy file='${env.PWD}/legalnotice.html' todir='${basedir}/target/docbkx/html/dev-guide' />
- <copy file='${env.PWD}/legalnotice.html' todir='${basedir}/target/docbkx/html/install-guide' />
- <move file='${env.PWD}/legalnotice.html' todir='${basedir}/target/docbkx/html/release-notes' />
+ <copy file='${legalnotice}' todir='${basedir}/target/docbkx/html/admin-guide' />
+ <copy file='${legalnotice}' todir='${basedir}/target/docbkx/html/dev-guide' />
+ <copy file='${legalnotice}' todir='${basedir}/target/docbkx/html/install-guide' />
+ <copy file='${legalnotice}' todir='${basedir}/target/docbkx/html/release-notes' />
+ </target>
+ <target>
+ <replace
+ dir="${basedir}/target/docbkx/html/"
+ token="target/docbkx/html/legalnotice.html"
+ value="legalnotice.html">
+ <include name="**/**/*.html" />
+ </replace>
</target>
</configuration>
</execution>
diff --git a/opendj3/src/main/docbkx/legal.xml b/opendj3/src/main/docbkx/legal.xml
index 7e56d73..33b7dff 100644
--- a/opendj3/src/main/docbkx/legal.xml
+++ b/opendj3/src/main/docbkx/legal.xml
@@ -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='legalnotice.html'?>
+ filename='target/docbkx/html/legalnotice.html'?>
<mediaobject>
<imageobject>
--
Gitblit v1.10.0