From 89872014128558ab6fbc69d727ce1da0bad42157 Mon Sep 17 00:00:00 2001
From: Mark Craig <mark.craig@forgerock.com>
Date: Wed, 01 Jul 2015 14:08:59 +0000
Subject: [PATCH] CR-7464 OPENDJ-2187 Add server Javadoc to OpenDJ site
---
opendj-sdk/src/site/xdoc/docs.xml | 2 +-
opendj-sdk/opendj-server-legacy/src/site/xdoc/docs.xml | 2 +-
opendj-sdk/src/site/site.xml | 2 +-
opendj-sdk/opendj-server-legacy/src/site/site.xml | 2 +-
opendj-sdk/opendj-server-legacy/pom.xml | 13 -------------
5 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/opendj-sdk/opendj-server-legacy/pom.xml b/opendj-sdk/opendj-server-legacy/pom.xml
index 512b5d8..fc5fe06 100644
--- a/opendj-sdk/opendj-server-legacy/pom.xml
+++ b/opendj-sdk/opendj-server-legacy/pom.xml
@@ -1173,19 +1173,6 @@
</plugins>
</build>
- <reporting>
- <plugins>
- <!-- No javadoc generation for the server -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
-
<profiles>
<!--
Profile to run precommit tasks: checkstyle, copyright (TODO), SVN eol check (TODO),
diff --git a/opendj-sdk/opendj-server-legacy/src/site/site.xml b/opendj-sdk/opendj-server-legacy/src/site/site.xml
index d2cbd0a..981e76c 100644
--- a/opendj-sdk/opendj-server-legacy/src/site/site.xml
+++ b/opendj-sdk/opendj-server-legacy/src/site/site.xml
@@ -78,7 +78,7 @@
<item name="Server Dev Guide" href="./doc/bootstrap/server-dev-guide/index.html" />
<item name="Reference" href="./doc/bootstrap/reference/index.html" />
<item name="Config Reference" href="./configref/index.html" />
- <item name="Plugin Javadoc" href="./javadoc/index.html" />
+ <item name="Plugin Javadoc" href="./apidocs/index.html" />
</menu>
<menu name="OpenDJ Development">
diff --git a/opendj-sdk/opendj-server-legacy/src/site/xdoc/docs.xml b/opendj-sdk/opendj-server-legacy/src/site/xdoc/docs.xml
index 78a17c8..855bf5c 100644
--- a/opendj-sdk/opendj-server-legacy/src/site/xdoc/docs.xml
+++ b/opendj-sdk/opendj-server-legacy/src/site/xdoc/docs.xml
@@ -84,7 +84,7 @@
<dd><a href="./configref/index.html">HTML</a></dd>
<dt>Server Plugin API Specification</dt>
- <dd><a href="./javadoc/index.html">HTML</a></dd>
+ <dd><a href="./apidocs/index.html">HTML</a></dd>
<dt>LDAP Client API Specification</dt>
<dd><a href="../opendj-core/apidocs/index.html">HTML</a></dd>
diff --git a/opendj-sdk/src/site/site.xml b/opendj-sdk/src/site/site.xml
index 54742c8..ec553ba 100644
--- a/opendj-sdk/src/site/site.xml
+++ b/opendj-sdk/src/site/site.xml
@@ -89,7 +89,7 @@
<item name="Server Dev Guide" href="./opendj-server-legacy/doc/bootstrap/server-dev-guide/index.html" />
<item name="Reference" href="./opendj-server-legacy/doc/bootstrap/reference/index.html" />
<item name="Config Reference" href="./opendj-server-legacy/configref/index.html" />
- <item name="Plugin Javadoc" href="./opendj-server-legacy/javadoc/index.html" />
+ <item name="Plugin Javadoc" href="./opendj-server-legacy/apidocs/index.html" />
<item name="SDK Release Notes" href="./doc/bootstrap/sdk-release-notes/index.html" />
<item name="SDK Developer Guide" href="./doc/bootstrap/dev-guide/index.html" />
<item name="SDK Javadoc" href="./opendj-core/apidocs/index.html" />
diff --git a/opendj-sdk/src/site/xdoc/docs.xml b/opendj-sdk/src/site/xdoc/docs.xml
index 2af203d..ba11a26 100644
--- a/opendj-sdk/src/site/xdoc/docs.xml
+++ b/opendj-sdk/src/site/xdoc/docs.xml
@@ -72,7 +72,7 @@
<dd><a href="./opendj-server-legacy/configref/index.html">HTML</a></dd>
<dt>Server Plugin API Specification</dt>
- <dd><a href="./opendj-server-legacy/javadoc/index.html">HTML</a></dd>
+ <dd><a href="./opendj-server-legacy/apidocs/index.html">HTML</a></dd>
<dt>SDK Developer Guide</dt>
<dd>
--
Gitblit v1.10.0