Move to docbkx-tools 2.0.14-SNAPSHOT, and some cleanup

Mark Craig

06.52.2011 559fb95148cffbb412b942553344f456a4fbbd14

Move to docbkx-tools 2.0.14-SNAPSHOT, and some cleanup

 opendj3/pom.xml

@@ -110,7 +110,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>
  </properties>
  <build>
@@ -118,7 +117,7 @@
      <plugin>
        <groupId>com.agilejava.docbkx</groupId>
        <artifactId>docbkx-fop-support</artifactId>
        <version>2.0.13</version>
        <version>2.0.14-SNAPSHOT</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-SNAPSHOT</version>
        <inherited>false</inherited>
        <configuration>
          <sourceDirectory>${basedir}/src/main/docbkx</sourceDirectory>
@@ -404,16 +403,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="&lt;/head&gt;">
@@ -483,20 +472,6 @@
              </preProcess>

              <postProcess>
                <copy file='${legalnotice}'
                  todir='${docbkx-out}/html/admin-guide/OpenDJ-Admin-Guide' />
                <copy file='${legalnotice}'
                  todir='${docbkx-out}/html/dev-guide/OpenDJ-Dev-Guide' />
                <copy file='${legalnotice}'
                  todir='${docbkx-out}/html/install-guide/OpenDJ-Install-Guide' />
                <copy file='${legalnotice}'
                  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="&lt;/head&gt;">

 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='target/docbkx/html/legalnotice.html'?>
 filename='legalnotice.html'?>

 <mediaobject>
  <imageobject>

 opendj3/src/main/docbkx/release-notes/chap-whats-new.xml

@@ -31,7 +31,7 @@
  xmlns:xinclude='http://www.w3.org/2001/XInclude'>
  <title>What's New in OpenDJ <?eval ${docTargetVersion}?></title>

  <para>Compared to the OpenDJ <?eval ${stableServerVersion} ?>, OpenDJ
  <para>Compared to the OpenDJ <?eval ${stableServerVersion}?>, OpenDJ
  <?eval ${docTargetVersion}?> fixes a number of issues. OpenDJ
  <?eval ${docTargetVersion}?> provides the following new features.</para>
  
@@ -82,7 +82,7 @@
      the same way you would assign a password policy. See the
      <link xlink:href="admin-guide#chap-pta"
      xlink:role="http://docbook.org/xlink/role/olink"
      ><citetitle>Administration Guide</citetitle> for details.</link></para>
      ><citetitle>Administration Guide</citetitle></link> for details.</para>
    </listitem>
    <listitem>
     <para>OpenDJ now lets you configure attributes to be removed or renamed