mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Mark Craig
08.42.2011 70f6b473527f05252f15a7d5e8505e7554e23f0d
Fix OPENDJ-193: Misplaced legalnotice.html in generated docs
2 files modified
19 ■■■■ changed files
opendj3/pom.xml 17 ●●●● patch | view | raw | blame | history
opendj3/src/main/docbkx/legal.xml 2 ●●● patch | view | raw | blame | history
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>
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>