From 486e8c768d2a73b62aaa07e6c8de186053740ff4 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Tue, 26 Nov 2013 16:59:03 +0000
Subject: [PATCH] Move remaining classes out of com.forgerock.opendj.ldap into more appropriate locations.
---
opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPConnectionFactory.java | 7 +--
opendj3/opendj-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider | 2
opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java | 2
opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java | 4 +-
opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java | 17 ++------
opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/LDAPTestCase.java | 2
/dev/null | 31 ---------------
opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java | 5 --
opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java | 8 ++--
opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java | 2
opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java | 3 +
opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java | 1
opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java | 1
13 files changed, 20 insertions(+), 65 deletions(-)
diff --git a/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/package-info.java b/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/package-info.java
deleted file mode 100644
index 291d032..0000000
--- a/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/package-info.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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 2010 Sun Microsystems, Inc.
- */
-
-/**
- * Classes implementing LDAP protocol.
- */
-package com.forgerock.opendj.ldap;
-
diff --git a/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java b/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java
index 3b0b6df..92c419a 100644
--- a/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/Connections.java
+++ b/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;
/**
diff --git a/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java b/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java
index 56ee581..29b4a9f 100644
--- a/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/HeartBeatConnectionFactory.java
+++ b/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;
diff --git a/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/InternalConnection.java b/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java
similarity index 93%
rename from opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/InternalConnection.java
rename to opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnection.java
index 18dec0e..634e535 100644
--- a/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/InternalConnection.java
+++ b/opendj3/opendj-core/src/main/java/org/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;
}
diff --git a/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java b/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java
index f5cb757..af979b5 100644
--- a/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/InternalConnectionFactory.java
+++ b/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;
/**
diff --git a/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/ConnectionState.java b/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java
similarity index 99%
rename from opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/ConnectionState.java
rename to opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/ConnectionState.java
index 9d1877d..b8cb10e 100644
--- a/opendj3/opendj-core/src/main/java/com/forgerock/opendj/ldap/ConnectionState.java
+++ b/opendj3/opendj-core/src/main/java/org/forgerock/opendj/ldap/spi/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;
diff --git a/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPConnectionFactory.java b/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPConnectionFactory.java
similarity index 94%
rename from opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPConnectionFactory.java
rename to opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPConnectionFactory.java
index fa09dc0..0eafdd2 100644
--- a/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPConnectionFactory.java
+++ b/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/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;
diff --git a/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPListener.java b/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java
similarity index 96%
rename from opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPListener.java
rename to opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicLDAPListener.java
index 48ab9ab..646c604 100644
--- a/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicLDAPListener.java
+++ b/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/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.
diff --git a/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicTransportProvider.java b/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java
similarity index 91%
rename from opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicTransportProvider.java
rename to opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/BasicTransportProvider.java
index 3444aab..9468b9b 100644
--- a/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/BasicTransportProvider.java
+++ b/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/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.
diff --git a/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/ConnectionStateTest.java b/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java
similarity index 99%
rename from opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/ConnectionStateTest.java
rename to opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/ConnectionStateTest.java
index aa0053a..08d83fd 100644
--- a/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/ConnectionStateTest.java
+++ b/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/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}.
*/
diff --git a/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/LDAPTestCase.java b/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/LDAPTestCase.java
similarity index 96%
rename from opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/LDAPTestCase.java
rename to opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/LDAPTestCase.java
index 5ee888c..eb94928 100644
--- a/opendj3/opendj-core/src/test/java/com/forgerock/opendj/ldap/LDAPTestCase.java
+++ b/opendj3/opendj-core/src/test/java/org/forgerock/opendj/ldap/spi/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;
diff --git a/opendj3/opendj-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider b/opendj3/opendj-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider
index dffae95..8e5ad98 100644
--- a/opendj3/opendj-core/src/test/resources/META-INF/services/org.forgerock.opendj.ldap.spi.TransportProvider
+++ b/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
\ No newline at end of file
+org.forgerock.opendj.ldap.spi.BasicTransportProvider
\ No newline at end of file
diff --git a/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java b/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java
index 4e7a02b..b572f98 100644
--- a/opendj3/opendj-grizzly/src/test/java/com/forgerock/opendj/grizzly/DefaultTCPNIOTransportTestCase.java
+++ b/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>
--
Gitblit v1.10.0