CR-5834 OPENDJ-1747 Test latest doc build plugin

Mark Craig

22.14.2015 82d76caa80d9ffd868eb42a4021a6dcdb7c5eb7a

CR-5834 OPENDJ-1747 Test latest doc build plugin

 opendj-sdk/pom.xml

@@ -21,7 +21,7 @@
  !
  ! CDDL HEADER END
  !
  !      Copyright 2011-2014 ForgeRock AS
  !      Copyright 2011-2015 ForgeRock AS.
  !
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -136,7 +136,7 @@
    <docPreviousVersion>2.6.0</docPreviousVersion>
    <sdkDocTargetVersion>${docTargetVersion}</sdkDocTargetVersion>

    <frDocPluginVersion>2.1.5</frDocPluginVersion>
    <frDocPluginVersion>3.0.0-SNAPSHOT</frDocPluginVersion>
    <gaId>UA-23412190-8</gaId>

    <siteDistributionURL>scp://forgerock.org/var/www/vhosts/opendj.forgerock.org/httpdocs</siteDistributionURL>
@@ -157,7 +157,7 @@
    <configRefBase>http://opendj.forgerock.org/opendj-server/configref/</configRefBase>
    <serverJavadocBase>http://opendj.forgerock.org/opendj-server/javadoc/</serverJavadocBase>
    <sdkJavadocBase>http://opendj.forgerock.org/opendj-core/apidocs/</sdkJavadocBase>
  <!-- END Documentation properties -->
    <!-- END Documentation properties -->
  </properties>
  <build>
    <plugins>
@@ -167,58 +167,45 @@
        <version>${frDocPluginVersion}</version>
        <inherited>false</inherited>
        <configuration>
         <!-- Standard configuration -->
         <projectName>OpenDJ</projectName>
         <projectVersion>${docTargetVersion}</projectVersion>
         <latestJson>http://docs.forgerock.org/latest.json</latestJson>
         <releaseVersion>${docTargetVersion}</releaseVersion>
         <googleAnalyticsId>${gaId}</googleAnalyticsId>

         <!-- JCite SDK Example code -->
         <jCiteSourcePaths>
           <jCiteSourcePath>${project.basedir}/opendj-ldap-sdk-examples/src/main/java</jCiteSourcePath>
         </jCiteSourcePaths>
        </configuration>
        <executions>
          <execution>
            <id>copy-common</id>
            <phase>pre-site</phase>
            <goals>
              <goal>boilerplate</goal>
            </goals>
          </execution>
          <execution>
           <id>filter-sources</id>
           <id>pre-process-doc</id>
           <phase>pre-site</phase>
           <goals>
            <goal>filter</goal>
            <goal>process</goal>
           </goals>
          </execution>
          <execution>
           <id>run-jcite</id>
           <id>build-doc</id>
           <phase>pre-site</phase>
           <configuration>
            <sourcePaths>
             <sourcePath>${project.basedir}/opendj-ldap-sdk-examples/src/main/java</sourcePath>
            </sourcePaths>
           </configuration>
           <goals>
            <goal>jcite</goal>
            <goal>build</goal>
           </goals>
          </execution>
          <execution>
            <id>prepare-sources</id>
            <phase>pre-site</phase>
            <goals>
              <goal>prepare</goal>
            </goals>
           <id>layout-site</id>
           <phase>site</phase>
           <goals>
            <goal>site</goal>
           </goals>
          </execution>
          <execution>
            <id>build-doc</id>
            <phase>pre-site</phase>
            <goals>
              <goal>build</goal>
            </goals>
          </execution>
          <execution>
            <id>layout-doc</id>
            <phase>site</phase>
            <goals>
              <goal>layout</goal>
            </goals>
           <id>layout-release</id>
           <phase>site</phase>
           <goals>
            <goal>release</goal>
           </goals>
          </execution>
        </executions>
      </plugin>

 opendj-sdk/src/site/xdoc/docs.xml

@@ -20,7 +20,7 @@
  !
  ! CCPL HEADER END
  !
  !      Copyright 2011-2014 ForgeRock AS
  !      Copyright 2011-2015 ForgeRock AS.
  !    
-->
<document
@@ -40,28 +40,22 @@
   >docs.forgerock.org</a>.</p>
   <dl>
    <dt>Release Notes</dt>
    <dd><a href="./opendj-server/doc/OpenDJ-Release-Notes.epub">EPUB</a>,
    <a href="./opendj-server/doc/release-notes/index.html">HTML (single page)</a>,
    <a href="./opendj-server/doc/release-notes/index/index.html">HTML (1 page/chapter)</a>,
    <a href="./opendj-server/doc/OpenDJ-Release-Notes.pdf">PDF</a>,
    <a href="./opendj-server/doc/OpenDJ-Release-Notes.rtf">RTF</a>,
    <a href="./opendj-server/doc/webhelp/release-notes/index.html">Webhelp</a></dd>
    <dd>
     <a href="./opendj-server/doc/release-notes/index.html">HTML</a>,
     <a href="./opendj-server/doc/OpenDJ-Release-Notes.pdf">PDF</a>
    </dd>

    <dt>Installation Guide</dt>
    <dd><a href="./opendj-server/doc/OpenDJ-Install-Guide.epub">EPUB</a>,
    <a href="./opendj-server/doc/install-guide/index.html">HTML (single page)</a>,
    <a href="./opendj-server/doc/install-guide/index/index.html">HTML (1 page/chapter)</a>,
    <a href="./opendj-server/doc/OpenDJ-Install-Guide.pdf">PDF</a>,
    <a href="./opendj-server/doc/OpenDJ-Install-Guide.rtf">RTF</a>,
    <a href="./opendj-server/doc/webhelp/install-guide/index.html">Webhelp</a></dd>
    <dd>
     <a href="./opendj-server/doc/install-guide/index.html">HTML</a>,
     <a href="./opendj-server/doc/OpenDJ-Install-Guide.pdf">PDF</a>
    </dd>

    <dt>Administration Guide</dt>
    <dd><a href="./opendj-server/doc/OpenDJ-Admin-Guide.epub">EPUB</a>,
    <a href="./opendj-server/doc/admin-guide/index.html">HTML (single page)</a>,
    <a href="./opendj-server/doc/admin-guide/index/index.html">HTML (1 page/chapter)</a>,
    <a href="./opendj-server/doc/OpenDJ-Admin-Guide.pdf">PDF</a>,
    <a href="./opendj-server/doc/OpenDJ-Admin-Guide.rtf">RTF</a>,
    <a href="./opendj-server/doc/webhelp/admin-guide/index.html">Webhelp</a></dd>
    <dd>
     <a href="./opendj-server/doc/admin-guide/index.html">HTML</a>,
     <a href="./opendj-server/doc/OpenDJ-Admin-Guide.pdf">PDF</a>
    </dd>

    <dt>Configuration Reference</dt>
    <dd><a href="./opendj-server/configref/index.html">HTML</a></dd>
@@ -70,20 +64,16 @@
    <dd><a href="./opendj-server/javadoc/index.html">HTML</a></dd>
    
    <dt>SDK Developer Guide</dt>
    <dd><a href="./doc/OpenDJ-Dev-Guide.epub">EPUB</a>,
    <a href="./doc/dev-guide/index.html">HTML (single page)</a>,
    <a href="./doc/dev-guide/index/index.html">HTML (1 page/chapter)</a>,
    <a href="./doc/OpenDJ-Dev-Guide.pdf">PDF</a>,
    <a href="./doc/OpenDJ-Dev-Guide.rtf">RTF</a>,
    <a href="./doc/webhelp/dev-guide/index.html">Webhelp</a></dd>
    <dd>
     <a href="./doc/dev-guide/index.html">HTML</a>,
     <a href="./doc/OpenDJ-Dev-Guide.pdf">PDF</a>
    </dd>

    <dt>SDK Release Notes</dt>
    <dd><a href="./doc/OpenDJ-Sdk-Release-Notes.epub">EPUB</a>,
    <a href="./doc/sdk-release-notes/index.html">HTML (single page)</a>,
    <a href="./doc/sdk-release-notes/index/index.html">HTML (1 page/chapter)</a>,
    <a href="./doc/OpenDJ-Sdk-Release-Notes.pdf">PDF</a>,
    <a href="./doc/OpenDJ-Sdk-Release-Notes.rtf">RTF</a>,
    <a href="./doc/webhelp/sdk-release-notes/index.html">Webhelp</a></dd>
    <dd>
     <a href="./doc/sdk-release-notes/index.html">HTML</a>
     <a href="./doc/OpenDJ-Sdk-Release-Notes.pdf">PDF</a>
    </dd>

    <dt>LDAP SDK Javadoc</dt>
    <dd><a href="./opendj-core/apidocs/index.html">HTML</a></dd>