Move remaining classes out of com.forgerock.opendj.ldap into more appropria...

Matthew Swift

26.59.2013 ce2867e2bd71513ddec124b5a0e1612f1f715a12

Move remaining classes out of com.forgerock.opendj.ldap into more appropriate locations.

 opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/package-info.java

File was deleted

 opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java

@@ -35,7 +35,6 @@
import org.forgerock.opendj.ldap.requests.BindRequest;
import org.forgerock.opendj.ldap.requests.SearchRequest;

import com.forgerock.opendj.ldap.InternalConnection;
import com.forgerock.opendj.util.Validator;

/**

 opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java

@@ -64,8 +64,8 @@
import org.forgerock.opendj.ldap.responses.Result;
import org.forgerock.opendj.ldap.responses.SearchResultEntry;
import org.forgerock.opendj.ldap.responses.SearchResultReference;
import org.forgerock.opendj.ldap.spi.ConnectionState;

import com.forgerock.opendj.ldap.ConnectionState;
import com.forgerock.opendj.util.AsynchronousFutureResult;
import com.forgerock.opendj.util.CompletedFutureResult;
import com.forgerock.opendj.util.FutureResultTransformer;

 opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java

File was renamed from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/InternalConnection.java
@@ -22,24 +22,15 @@
 *
 *
 *      Copyright 2010 Sun Microsystems, Inc.
 *      Portions copyright 2011-2012 ForgeRock AS.
 *      Portions copyright 2011-2013 ForgeRock AS.
 */

package com.forgerock.opendj.ldap;
package org.forgerock.opendj.ldap;

import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicInteger;

import org.forgerock.opendj.ldap.AbstractAsynchronousConnection;
import org.forgerock.opendj.ldap.Connection;
import org.forgerock.opendj.ldap.ConnectionEventListener;
import org.forgerock.opendj.ldap.FutureResult;
import org.forgerock.opendj.ldap.IntermediateResponseHandler;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ResultHandler;
import org.forgerock.opendj.ldap.SearchResultHandler;
import org.forgerock.opendj.ldap.ServerConnection;
import org.forgerock.opendj.ldap.requests.AbandonRequest;
import org.forgerock.opendj.ldap.requests.AddRequest;
import org.forgerock.opendj.ldap.requests.BindRequest;
@@ -69,7 +60,7 @@
 * internal operations directly against a {@code ServerConnection}
 * implementation.
 */
public final class InternalConnection extends AbstractAsynchronousConnection {
final class InternalConnection extends AbstractAsynchronousConnection {
    private static final class InternalBindFutureResultImpl extends
            AbstractLDAPFutureResultImpl<BindResult> {
        private final BindRequest bindRequest;
@@ -115,7 +106,7 @@
     * @param serverConnection
     *            The server connection.
     */
    public InternalConnection(final ServerConnection<Integer> serverConnection) {
    InternalConnection(final ServerConnection<Integer> serverConnection) {
        this.serverConnection = serverConnection;
    }


 opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java

@@ -27,7 +27,6 @@

package org.forgerock.opendj.ldap;

import com.forgerock.opendj.ldap.InternalConnection;
import com.forgerock.opendj.util.CompletedFutureResult;

/**

 opendj-sdk/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java

File was renamed from opendj-sdk/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/ConnectionState.java
@@ -23,7 +23,7 @@
 *
 *      Copyright 2013 ForgeRock AS.
 */
package com.forgerock.opendj.ldap;
package org.forgerock.opendj.ldap.spi;

import java.util.LinkedList;
import java.util.List;

 opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPConnectionFactory.java

File was renamed from opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPConnectionFactory.java
@@ -24,10 +24,10 @@
 *      Copyright 2013 ForgeRock AS.
 */

package com.forgerock.opendj.ldap;
package org.forgerock.opendj.ldap.spi;

import static org.forgerock.opendj.ldap.ErrorResultException.*;
import static org.mockito.Mockito.*;
import static org.forgerock.opendj.ldap.ErrorResultException.newErrorResult;
import static org.mockito.Mockito.mock;

import java.net.SocketAddress;

@@ -37,7 +37,6 @@
import org.forgerock.opendj.ldap.LDAPOptions;
import org.forgerock.opendj.ldap.ResultCode;
import org.forgerock.opendj.ldap.ResultHandler;
import org.forgerock.opendj.ldap.spi.LDAPConnectionFactoryImpl;

import com.forgerock.opendj.util.AsynchronousFutureResult;


 opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java

File was renamed from opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPListener.java
@@ -24,14 +24,14 @@
 *      Copyright 2013 ForgeRock AS.
 */

package com.forgerock.opendj.ldap;
package org.forgerock.opendj.ldap.spi;

import java.io.IOException;
import java.net.SocketAddress;

import org.forgerock.opendj.ldap.LDAPClientContext;
import org.forgerock.opendj.ldap.LDAPListenerOptions;
import org.forgerock.opendj.ldap.ServerConnectionFactory;
import org.forgerock.opendj.ldap.spi.LDAPListenerImpl;

/**
 * Basic LDAP listener implementation to use for tests only.

 opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java

File was renamed from opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicTransportProvider.java
@@ -23,7 +23,7 @@
 *
 *      Copyright 2013 ForgeRock AS.
 */
package com.forgerock.opendj.ldap;
package org.forgerock.opendj.ldap.spi;

import java.io.IOException;
import java.net.SocketAddress;
@@ -32,9 +32,6 @@
import org.forgerock.opendj.ldap.LDAPListenerOptions;
import org.forgerock.opendj.ldap.LDAPOptions;
import org.forgerock.opendj.ldap.ServerConnectionFactory;
import org.forgerock.opendj.ldap.spi.LDAPConnectionFactoryImpl;
import org.forgerock.opendj.ldap.spi.LDAPListenerImpl;
import org.forgerock.opendj.ldap.spi.TransportProvider;

/**
 * Provides an basic implementation of a transport provider doing nothing.

 opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java

File was renamed from opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/ConnectionStateTest.java
@@ -23,7 +23,7 @@
 *
 *      Copyright 2013 ForgeRock AS.
 */
package com.forgerock.opendj.ldap;
package org.forgerock.opendj.ldap.spi;

import static org.fest.assertions.Assertions.assertThat;
import static org.forgerock.opendj.ldap.ErrorResultException.newErrorResult;
@@ -42,6 +42,7 @@
import org.mockito.stubbing.Answer;
import org.testng.annotations.Test;


/**
 * Tests for {@linkConnectionState}.
 */

 opendj-sdk/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/LDAPTestCase.java

File was renamed from opendj-sdk/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/LDAPTestCase.java
@@ -25,7 +25,7 @@
 *      Portions copyright 2012 ForgeRock AS.
 */

package com.forgerock.opendj.ldap;
package org.forgerock.opendj.ldap.spi;

import org.forgerock.testng.ForgeRockTestCase;
import org.testng.annotations.Test;

 opendj-sdk/opendj3/opendj-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider

@@ -23,4 +23,4 @@
#
#      Copyright 2013 ForgeRock AS.
#
com.forgerock.opendj.ldap.BasicTransportProvider
org.forgerock.opendj.ldap.spi.BasicTransportProvider

 opendj-sdk/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java

@@ -27,23 +27,23 @@

package com.forgerock.opendj.grizzly;

import static org.forgerock.opendj.ldap.TestCaseUtils.*;
import static com.forgerock.opendj.grizzly.DefaultTCPNIOTransport.DEFAULT_TRANSPORT;
import static org.testng.Assert.*;
import static org.forgerock.opendj.ldap.TestCaseUtils.findFreeSocketAddress;
import static org.testng.Assert.assertTrue;

import java.net.Socket;
import java.net.SocketAddress;

import org.forgerock.opendj.ldap.SdkTestCase;
import org.glassfish.grizzly.nio.transport.TCPNIOTransport;
import org.testng.annotations.Test;

import com.forgerock.opendj.ldap.LDAPTestCase;
import com.forgerock.opendj.util.ReferenceCountedObject;

/**
 * Tests DefaultTCPNIOTransport class.
 */
public class DefaultTCPNIOTransportTestCase extends LDAPTestCase {
public class DefaultTCPNIOTransportTestCase extends SdkTestCase {
    /**
     * Tests the default transport.
     * <p>