From 222d45f0d07e940f175c7b115118963ff8f33385 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 10 Oct 2013 19:48:01 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-175: Decouple OpenDJ LDAP SDK from Grizzly
---
opendj-sdk/opendj3/opendj-grizzly/pom.xml | 4 ++--
opendj-sdk/opendj3/opendj-core/src/main/javadoc/overview.html | 0
opendj-sdk/opendj3/opendj-ldap-toolkit/pom.xml | 2 +-
opendj-sdk/opendj3/opendj-core/pom.xml | 5 +++--
opendj-sdk/opendj3/opendj-ldap-sdk/pom.xml | 17 +++++++++--------
opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml | 18 +++++++++---------
6 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/opendj-sdk/opendj3/opendj-core/pom.xml b/opendj-sdk/opendj3/opendj-core/pom.xml
index e7b2b95..9cbb9b1 100644
--- a/opendj-sdk/opendj3/opendj-core/pom.xml
+++ b/opendj-sdk/opendj3/opendj-core/pom.xml
@@ -32,10 +32,11 @@
<version>2.7.0-SNAPSHOT</version>
</parent>
<artifactId>opendj-core</artifactId>
- <name>OpenDJ LDAP SDK</name>
+ <name>OpenDJ Core APIs</name>
<description>
This module includes OpenDJ core APIs for implementing LDAP Directory
- client and server applications.
+ client and server applications. Unlike the SDK this module does not
+ include a default network transport.
</description>
<packaging>bundle</packaging>
<dependencies>
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/src/main/javadoc/overview.html b/opendj-sdk/opendj3/opendj-core/src/main/javadoc/overview.html
similarity index 100%
rename from opendj-sdk/opendj3/opendj-ldap-sdk/src/main/javadoc/overview.html
rename to opendj-sdk/opendj3/opendj-core/src/main/javadoc/overview.html
diff --git a/opendj-sdk/opendj3/opendj-grizzly/pom.xml b/opendj-sdk/opendj3/opendj-grizzly/pom.xml
index b9a8230..33bf3de 100644
--- a/opendj-sdk/opendj3/opendj-grizzly/pom.xml
+++ b/opendj-sdk/opendj3/opendj-grizzly/pom.xml
@@ -32,9 +32,9 @@
<version>2.7.0-SNAPSHOT</version>
</parent>
<artifactId>opendj-grizzly</artifactId>
- <name>Grizzly Provider for OpenDJ LDAP SDK</name>
+ <name>OpenDJ Grizzly Transport Provider</name>
<description>
- This module includes a Grizzly-based implementation of transport provider for OpenDJ LDAP SDK.
+ This module includes a Grizzly based network transport provider for OpenDJ.
</description>
<packaging>bundle</packaging>
<dependencies>
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml b/opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml
index ce6fc4f..7dfd440 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml
@@ -32,7 +32,7 @@
<version>2.7.0-SNAPSHOT</version>
</parent>
<artifactId>opendj-ldap-sdk-examples</artifactId>
- <name>OpenDJ LDAP SDK Examples</name>
+ <name>OpenDJ SDK Examples</name>
<description>Examples illustrating usage of the OpenDJ LDAP SDK</description>
<dependencies>
<dependency>
@@ -59,14 +59,14 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <artifactSet>
- <excludes>
- <!-- avoid duplicate classes, as opendj-ldap-sdk already contains them -->
- <exclude>org.forgerock.opendj:opendj-core</exclude>
- <exclude>org.forgerock.opendj:opendj-grizzly</exclude>
- </excludes>
- </artifactSet>
+ <createDependencyReducedPom>false</createDependencyReducedPom>
+ <artifactSet>
+ <excludes>
+ <!-- avoid duplicate classes, as opendj-ldap-sdk already contains them -->
+ <exclude>org.forgerock.opendj:opendj-core</exclude>
+ <exclude>org.forgerock.opendj:opendj-grizzly</exclude>
+ </excludes>
+ </artifactSet>
</configuration>
<executions>
<execution>
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk/pom.xml b/opendj-sdk/opendj3/opendj-ldap-sdk/pom.xml
index 894a6db..4d54096 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk/pom.xml
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk/pom.xml
@@ -32,10 +32,11 @@
<version>2.7.0-SNAPSHOT</version>
</parent>
<artifactId>opendj-ldap-sdk</artifactId>
- <name>OpenDJ LDAP SDK</name>
+ <name>OpenDJ SDK</name>
<description>
- This module includes OpenDJ core APIs for implementing LDAP Directory
- client and server applications.
+ This module provides a complete LDAP SDK for developing LDAP Directory
+ client and server applications. It includes both the core APIs and a
+ default Grizzly based network transport.
</description>
<packaging>jar</packaging>
<dependencies>
@@ -94,11 +95,11 @@
</goals>
</execution>
</executions>
- <configuration>
- <instructions>
- <Include-Resource>META-INF/services=target/classes/META-INF/services</Include-Resource>
- </instructions>
- </configuration>
+ <configuration>
+ <instructions>
+ <Include-Resource>META-INF/services=target/classes/META-INF/services</Include-Resource>
+ </instructions>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/pom.xml b/opendj-sdk/opendj3/opendj-ldap-toolkit/pom.xml
index b977744..e8df93e 100644
--- a/opendj-sdk/opendj3/opendj-ldap-toolkit/pom.xml
+++ b/opendj-sdk/opendj3/opendj-ldap-toolkit/pom.xml
@@ -32,7 +32,7 @@
<version>2.7.0-SNAPSHOT</version>
</parent>
<artifactId>opendj-ldap-toolkit</artifactId>
- <name>OpenDJ LDAP Toolkit</name>
+ <name>OpenDJ SDK Toolkit</name>
<description>
This module includes LDAP command line tools based on the OpenDJ LDAP SDK.
</description>
--
Gitblit v1.10.0