3 to 4

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "forgerock-parent"]
+	path = forgerock-parent
+	url = https://github.com/OpenIdentityPlatform/forgerock-parent.git

.travis.yml

@@ -0,0 +1,26 @@
+language: java
+matrix:
+    include:
+        - os: linux
+          jdk: oraclejdk8
+        - os: linux
+          jdk: openjdk8
+        - os: osx
+          osx_image: xcode9.1
+before_install:
+ - date -u
+ - uname -a
+ - env | sort
+branches:
+ only:
+   - master
+notifications:
+ email:
+  - [email protected]
+cache:
+  directories:
+  - $HOME/.m2
+before_install:
+  -  mvn -q -DskipTests install -f forgerock-parent
+script:
+  -  mvn -q install

README.md

@@ -0,0 +1,127 @@
+<!--
+  The contents of this file are subject to the terms of the Common Development and
+  Distribution License (the License). You may not use this file except in compliance with the
+  License.
+
+  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
+  specific language governing permission and limitations under the License.
+
+  When distributing Covered Software, include this CDDL Header Notice in each file and include
+  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
+  Header, with the fields enclosed by brackets [] replaced by your own identifying
+  information: "Portions copyright [year] [name of copyright owner]".
+
+  Copyright 2016 ForgeRock AS.
+  Portions copyright 2017 3A Systems, LLC
+  -->
+
+OpenDJ SDK
+==========
+[![Build Status](https://travis-ci.org/OpenIdentityPlatform/OpenDJ-SDK.svg)](https://travis-ci.org/OpenIdentityPlatform/OpenDJ-SDK)
+
+## How-to build
+
+```bash
+git clone --recursive  https://github.com/OpenIdentityPlatform/OpenDJ-SDK.git
+mvn clean install -f OpenDJ-SDK/forgerock-parent
+mvn clean install -f OpenDJ-SDK
+```
+
+About
+==========
+
+The **OpenDJ LDAP SDK** provides a set of modern, developer-friendly Java APIs as part of the
+[OpenDJ](https://github.com/OpenIdentityPlatform/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
+[RFC 4510: LDAP - Technical Specification Road Map](http://tools.ietf.org/html/rfc4510).
+
+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.
+
+Documentation
+=============
+
+Javadoc for this module can be found [here](http://opendj.forgerock.org/opendj-core/apidocs/index.html). Read the
+[developer guide](http://opendj.forgerock.org/doc/dev-guide/index.html) for a deeper understanding of LDAP application
+development, as well as a detailed overview of LDAP itself.
+
+Get the OpenDJ LDAP SDK
+=======================
+
+You can start developing your LDAP applications now by obtaining the **OpenDJ LDAP SDK** using any of the following
+methods:
+
+Maven
+-----
+
+The following dependencies will load both the [OpenDJ Core APIs](opendj-core) and the [OpenDJ Grizzly](opendj-grizzly)
+network transport. Remember to override the version according to your needs:
+
+```xml
+<dependencies>
+  <dependency>
+    <groupId>org.forgerock.opendj</groupId>
+    <artifactId>opendj-sdk-core</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+  </dependency>
+  <dependency>
+    <groupId>org.forgerock.opendj</groupId>
+    <artifactId>opendj-sdk-grizzly</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+  </dependency>
+</dependencies>
+```
+
+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:
+
+```xml
+<dependencies>
+  <dependency>
+    <groupId>org.forgerock.opendj</groupId>
+    <artifactId>opendj-sdk-core</artifactId>
+    <version>4.0.0-SNAPSHOT</version>
+  </dependency>
+</dependencies>
+```
+
+
+Getting started
+===============
+
+The following example shows how the **OpenDJ LDAP 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:
+
+```java
+// Create an LDIF writer which will write the search results to stdout.
+final LDIFEntryWriter writer = new LDIFEntryWriter(System.out);
+
+// Connect and bind to the server.
+final LDAPConnectionFactory factory = new LDAPConnectionFactory(hostName, port);
+final Connection connection = factory.getConnection();
+connection.bind(userName, password.toCharArray());
+
+// Read the entries and output them as LDIF.
+final ConnectionEntryReader reader = connection.search(baseDN, scope, filter, attributes);
+while (reader.hasNext()) {
+    if (!reader.isReference()) {
+        final SearchResultEntry entry = reader.readEntry();
+        writer.writeComment("Search result entry: " + entry.getName());
+        writer.writeEntry(entry);
+    } else {
+        final SearchResultReference ref = reader.readReference();
+        writer.writeComment("Search result reference: " + ref.getURIs());
+    }
+}
+writer.flush();
+connection.close();
+```
+
+License
+=======
+
+**OpenDJ LDAP SDK** is licensed under [CDDL 1.0](legal-notices/CDDLv1_0.txt) (COMMON DEVELOPMENT AND DISTRIBUTION
+LICENSE Version 1.0)

opendj-cli/pom.xml

@@ -1,38 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ! CDDL HEADER START
-  !
-  ! The contents of this file are subject to the terms of the
-  ! Common Development and Distribution License, Version 1.0 only
-  ! (the "License").  You may not use this file except in compliance
-  ! with the License.
-  !
-  ! You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
-  ! or http://forgerock.org/license/CDDLv1.0.html.
-  ! See the License for the specific language governing permissions
-  ! and limitations under the License.
-  !
-  ! When distributing Covered Code, include this CDDL HEADER in each
-  ! file and include the License file at legal-notices/CDDLv1_0.txt.
-  ! If applicable, add the following below this CDDL HEADER, with the
-  ! fields enclosed by brackets "[]" replaced with your own identifying
-  ! information:
-  !      Portions Copyright [yyyy] [name of copyright owner]
-  !
-  ! CDDL HEADER END
-  !
-  !      Copyright 2014-2015 ForgeRock AS.
-  !    
+  The contents of this file are subject to the terms of the Common Development and
+  Distribution License (the License). You may not use this file except in compliance with the
+  License.
+
+  You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
+  specific language governing permission and limitations under the License.
+
+  When distributing Covered Software, include this CDDL Header Notice in each file and include
+  the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
+  Header, with the fields enclosed by brackets [] replaced by your own identifying
+  information: "Portions Copyright [year] [name of copyright owner]".
+
+  Copyright 2014-2016 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">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <artifactId>opendj-sdk-parent</artifactId>
         <groupId>org.forgerock.opendj</groupId>
-        <version>3.0.0-SNAPSHOT</version>
-        <relativePath>../opendj-sdk-parent/pom.xml</relativePath>
+        <version>4.0.0-SNAPSHOT</version>
     </parent>
+
     <artifactId>opendj-cli</artifactId>
     <name>OpenDJ CLI API</name>
     <description>This module includes CLI API for implementing CLI applications.</description>
@@ -42,12 +32,12 @@
     <dependencies>
         <dependency>
             <groupId>org.forgerock.opendj</groupId>
-            <artifactId>opendj-core</artifactId>
+            <artifactId>opendj-sdk-core</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.forgerock.opendj</groupId>
-            <artifactId>opendj-core</artifactId>
+            <artifactId>opendj-sdk-core</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>

opendj-cli/src/main/java/com/forgerock/opendj/cli/ApplicationKeyManager.java

@@ -1,29 +1,19 @@
 /*
- * CDDL HEADER START
+ * The contents of this file are subject to the terms of the Common Development and
+ * Distribution License (the License). You may not use this file except in compliance with the
+ * License.
  *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * You can obtain a copy of the License at legal/CDDLv1.0.txt. See the License for the
+ * specific language governing permission and limitations under the License.
  *
- * You can obtain a copy of the license at legal-notices/CDDLv1_0.txt
- * or http://forgerock.org/license/CDDLv1.0.html.
- * See the License for the specific language governing permissions
- * and limitations under the License.
+ * When distributing Covered Software, include this CDDL Header Notice in each file and include
+ * the License file at legal/CDDLv1.0.txt. If applicable, add the following below the CDDL
+ * Header, with the fields enclosed by brackets [] replaced by your own identifying
+ * information: "Portions Copyright [year] [name of copyright owner]".
  *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at legal-notices/CDDLv1_0.txt.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information:
- *      Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- *
- *
- *      Copyright 2008-2010 Sun Microsystems, Inc.
- *      Portions Copyright 2009 Parametric Technology Corporation (PTC)
- *      Portions copyright 2014 ForgeRock AS
+ * Copyright 2008-2010 Sun Microsystems, Inc.
+ * Portions Copyright 2009 Parametric Technology Corporation (PTC)
+ * Portions copyright 2014-2016 ForgeRock AS.
  */
 package com.forgerock.opendj.cli;
 
@@ -160,6 +150,7 @@ final class ApplicationKeyManager implements X509KeyManager {
      * @return the alias name for the desired key, or null if there are no
      *         matches.
      */
+    @Override
     public String chooseClientAlias(final String[] keyType, final Principal[] issuers,
             final Socket socket) {
         if (keyManager != null) {
@@ -186,6 +177,7 @@ public String chooseClientAlias(final String[] keyType, final Principal[] issuer
      * @return the alias name for the desired key, or null if there are no
      *         matches.
      */
+    @Override
     public String chooseServerAlias(final String keyType, final Principal[] issuers, final Socket socket) {
         if (keyManager != null) {
             return keyManager.chooseServerAlias(keyType, issuers, socket);
@@ -202,6 +194,7 @@ public String chooseServerAlias(final String keyType, final Principal[] issuers,
      *         and the root certificate authority last), or null if the alias
      *         can't be found.
      */
+    @Override
     public X509Certificate[] getCertificateChain(final String alias) {
         if (keyManager != null) {
             return keyManager.getCertificateChain(alias);
@@ -222,6 +215,7 @@ public X509Certificate[] getCertificateChain(final String alias) {
      * @return an array of the matching alias names, or null if there were no
      *         matches.
      */
+    @Override
     public String[] getClientAliases(final String keyType, final Principal[] issuers) {
         if (keyManager != null) {
             return keyManager.getClientAliases(keyType, issuers);
@@ -236,6 +230,7 @@ public String[] getClientAliases(final String keyType, final Principal[] issuers
      *            the alias name
      * @return the requested key, or null if the alias can't be found.
      */
+    @Override
     public PrivateKey getPrivateKey(final String alias) {
         if (keyManager != null) {
             return keyManager.getPrivateKey(alias);
@@ -256,6 +251,7 @@ public PrivateKey getPrivateKey(final String alias) {
      * @return an array of the matching alias names, or null if there were no
      *         matches.
      */
+    @Override
     public String[] getServerAliases(final String keyType, final Principal[] issuers) {
         if (keyManager != null) {
             return keyManager.getServerAliases(keyType, issuers);