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

Gaetan Boismal
07.14.2014 0e1ac7c8da21e591ae3056f6f7801b6c03e0c9a3
OPENDJ-1509 (CR-3963) The opendj-ldap-sdk is redundant and can be removed
Remove the opendj-ldap-sdk project and update dependencies in all pom files and in the project documentation.
* all pom.xml
** Removing reference to the opendj-ldap-sdk project and add dependencies to opendj-core and openj-grizzly
* opendj-core/.../index.xml.vm
** Updating the opendj-core documentation with the opendj-ldap-sdk old documentation page
* opendj-project site.xml chap-get-sdk.xml
** Updating project documentation menu and developer guide
2 files deleted
7 files modified
396 ■■■■ changed files
opendj-core/src/site/xdoc/index.xml.vm 110 ●●●● patch | view | raw | blame | history
opendj-ldap-sdk-examples/pom.xml 8 ●●●● patch | view | raw | blame | history
opendj-ldap-sdk/pom.xml 69 ●●●●● patch | view | raw | blame | history
opendj-ldap-sdk/src/site/xdoc/index.xml.vm 185 ●●●●● patch | view | raw | blame | history
opendj-ldap-toolkit/src/main/assembly/descriptor.xml 3 ●●●●● patch | view | raw | blame | history
opendj-virtual/pom.xml 7 ●●●● patch | view | raw | blame | history
pom.xml 1 ●●●● patch | view | raw | blame | history
src/main/docbkx/dev-guide/chap-get-sdk.xml 11 ●●●● patch | view | raw | blame | history
src/site/site.xml 2 ●●● patch | view | raw | blame | history
opendj-core/src/site/xdoc/index.xml.vm
@@ -26,25 +26,41 @@
<document xmlns="http://maven.apache.org/XDOC/2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
  <properties>
    <title>About ${project.name}</title>
    <title>About OpenDJ LDAP SDK</title>
    <author email="opendj-dev@forgerock.org">${project.organization.name}</author>
  </properties>
  <body>
    <section name="About ${project.name}">
    <section name="About OpenDJ LDAP SDK">
      <p>
        ${project.description}
        The OpenDJ LDAP SDK provides a set of modern, developer-friendly Java
        APIs as part of the OpenDJ product suite. The product suite includes the
        client SDK alongside command-line tools and sample code, a 100% pure
        Java directory server, and more. You can use OpenDJ SDK to create client
        applications for use with any server that complies with the,
        <a href='http://tools.ietf.org/html/rfc4510'>RFC 4510: Lightweight Directory
        Access Protocol (LDAP): Technical Specification Road Map</a>.
      </p>
      <p>
        The OpenDJ LDAP SDK brings you easy-to-use connection management,
        connection pooling, load balancing, and all the standard LDAP operations
        to read and write directory entries. OpenDJ LDAP SDK also lets you build
        applications with capabilities defined in additional draft and
        experimental RFCs that are supported by modern LDAP servers.
      </p>
    </section>
    <section name="Documentation for ${project.name}">
    <section name="Documentation for OpenDJ SDK">
      <p>
        Javadoc for this module can be found <a href="apidocs/index.html">here</a>.
        Read the <a href="../doc/dev-guide/index.html">developer guide</a> for
        a deeper understanding of LDAP application development, as well as a
        detailed over of LDAP itself.
      </p>
    </section>
    <section name="Get ${project.name}">
    <section name="Get the OpenDJ LDAP SDK">
      <p>
        Start developing your applications by obtaining ${project.name}
        using any of the following methods:
    </p>
        You can start developing your LDAP applications now by obtaining the
        OpenDJ LDAP SDK using any of the following methods:
      </p>
      <subsection name="Maven">
        <p>
          By far the simplest method is to develop your application using Maven
@@ -67,11 +83,29 @@
      &lt;enabled>false&lt;/enabled>
    &lt;/releases>
  &lt;/repository>
&lt;/repositories>
...
&lt;dependencies>
&lt;/repositories></source>
        <p>
          The following dependencies will load both the OpenDJ Core APIs and the
          OpenDJ Grizzly network transport:
        </p>
        <source>&lt;dependencies>
  &lt;dependency>
    &lt;groupId>${project.groupId}&lt;/groupId>
    &lt;artifactId>${project.artifactId}&lt;/artifactId>
    &lt;version>${project.version}&lt;/version>
  &lt;/dependency>
  &lt;dependency>
    &lt;groupId>${project.groupId}&lt;/groupId>
    &lt;artifactId>opendj-grizzly&lt;/artifactId>
    &lt;version>${project.version}&lt;/version>
  &lt;/dependency>
&lt;/dependencies></source>
        <p>
          In some use-cases, such as developing LDAP unit tests or embedded
          LDAP applications, the network transport is not required, in which
          case you can simply declare a dependency on the OpenDJ core APIs:
        </p>
        <source>&lt;dependencies>
  &lt;dependency>
    &lt;groupId>${project.groupId}&lt;/groupId>
    &lt;artifactId>${project.artifactId}&lt;/artifactId>
@@ -100,7 +134,55 @@
    </section>
    <section name="Getting started">
      <p>
        Please refer to the <a href="../opendj-ldap-sdk">example</a> in the OpenDJ LDAP SDK page.
        The following example shows how the OpenDJ SDK may be used to
        connect to a Directory Server, authenticate, and then perform a
        search. The search results are output as LDIF to the standard output:
      </p>
      <source>// Create an LDIF writer which will write the search results to stdout.
final LDIFEntryWriter writer = new LDIFEntryWriter(System.out);
Connection connection = null;
try
{
  // Connect and bind to the server.
  final LDAPConnectionFactory factory = new LDAPConnectionFactory("localhost", 1389);
  connection = factory.getConnection();
  connection.bind(userName, password);
  // Read the entries and output them as LDIF.
  final ConnectionEntryReader reader = connection.search(baseDN, scope, filter, attributes);
  while (reader.hasNext())
  {
    if (reader.isEntry())
    {
      // Got an entry.
      final SearchResultEntry entry = reader.readEntry();
      writer.writeComment("Search result entry: " + entry.getName().toString());
      writer.writeEntry(entry);
    }
    else
    {
      // Got a continuation reference.
      final SearchResultReference ref = reader.readReference();
      writer.writeComment("Search result reference: " + ref.getURIs().toString());
    }
  }
  writer.flush();
}
catch (final Exception e)
{
  // Handle exceptions...
  System.err.println(e.getMessage());
}
finally
{
  if (connection != null)
  {
    connection.close();
  }
}</source>
      <p>
        You can find more examples in the <a href="../opendj-ldap-sdk-examples/index.html">OpenDJ LDAP SDK Examples</a> module.
      </p>
    </section>
  </body>
opendj-ldap-sdk-examples/pom.xml
@@ -37,9 +37,13 @@
  <dependencies>
    <dependency>
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-ldap-sdk</artifactId>
      <artifactId>opendj-core</artifactId>
      <version>${project.version}</version>
      <type>pom</type>
    </dependency>
    <dependency>
      <groupId>org.forgerock.opendj</groupId>
      <artifactId>opendj-grizzly</artifactId>
      <version>${project.version}</version>
    </dependency>
    <dependency>
      <groupId>org.slf4j</groupId>
opendj-ldap-sdk/pom.xml
File was deleted
opendj-ldap-sdk/src/site/xdoc/index.xml.vm
File was deleted
opendj-ldap-toolkit/src/main/assembly/descriptor.xml
@@ -93,9 +93,6 @@
      <outputDirectory>lib</outputDirectory>
      <directoryMode>0755</directoryMode>
      <fileMode>0644</fileMode>
      <excludes>
        <exclude>org.forgerock.opendj:opendj-ldap-sdk</exclude>
      </excludes>
    </dependencySet>
  </dependencySets>
</assembly>
opendj-virtual/pom.xml
@@ -35,7 +35,12 @@
    <dependencies>
        <dependency>
            <groupId>org.forgerock.opendj</groupId>
            <artifactId>opendj-ldap-sdk</artifactId>
            <artifactId>opendj-core</artifactId>
            <version>${project.version}</version>
        </dependency>
        <dependency>
            <groupId>org.forgerock.opendj</groupId>
            <artifactId>opendj-grizzly</artifactId>
            <version>${project.version}</version>
        </dependency>
        <dependency>
pom.xml
@@ -94,7 +94,6 @@
    <module>opendj-core</module>
    <module>opendj-grizzly</module>
    <module>opendj-config</module>
    <module>opendj-ldap-sdk</module>
    <module>opendj-cli</module>
    <module>opendj-ldap-toolkit</module>
    <module>opendj-ldap-sdk-examples</module>
src/main/docbkx/dev-guide/chap-get-sdk.xml
@@ -123,11 +123,16 @@
&lt;dependencies&gt;
  &lt;dependency&gt;
    &lt;groupId&gt;${project.groupId}&lt;/groupId&gt;
    &lt;artifactId&gt;opendj-ldap-sdk&lt;/artifactId&gt;
    &lt;artifactId&gt;opendj-core&lt;/artifactId&gt;
    &lt;version&gt;<?eval ${docTargetVersion}?>&lt;/version&gt;
    &lt;type&gt;pom&lt;/type&gt;
  &lt;/dependency&gt;
&lt;/dependencies&gt;</programlisting>
  &lt;dependency&gt;
    &lt;groupId&gt;${project.groupId}&lt;/groupId&gt;
    &lt;artifactId&gt;opendj-grizzly&lt;/artifactId&gt;
    &lt;version&gt;<?eval ${docTargetVersion}?>&lt;/version&gt;
  &lt;/dependency&gt;
&lt;/dependencies&gt;
    </programlisting>
   </step>
  </procedure>
src/site/site.xml
@@ -62,7 +62,7 @@
  </menu>
  <menu name="OpenDJ LDAP SDK" inherit="top">
    <item name="About" href="opendj-ldap-sdk" />
    <item name="About" href="opendj-core" />
    <item name="Grizzly Integration" href="opendj-grizzly" />
    <item name="Examples" href="opendj-ldap-sdk-examples" />
    <item name="Toolkit" href="opendj-ldap-toolkit" />