QPID-4390: Rename BrokerLauncher back into Broker, move AmqpPortAdapter into adapter package

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-config-qpid-4390@1447208 13f79535-47bb-0310-9956-ffa450edef68

7 files changed, 10 insertions, 13 deletions

diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerLauncher.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java
index d4c5e72131..e4a95363ef 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerLauncher.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java
@@ -41,9 +41,9 @@ import org.apache.qpid.server.logging.messages.BrokerMessages;
 import org.apache.qpid.server.registry.ApplicationRegistry;
 import org.apache.qpid.server.registry.IApplicationRegistry;
 
-public class BrokerLauncher
+public class Broker
 {
-    private static final Logger LOGGER = Logger.getLogger(BrokerLauncher.class);
+    private static final Logger LOGGER = Logger.getLogger(Broker.class);
 
     private volatile Thread _shutdownHookThread;
     private volatile IApplicationRegistry _applicationRegistry;
@@ -314,7 +314,7 @@ public class BrokerLauncher
         public void run()
         {
             LOGGER.debug("Shutdown hook running");
-            BrokerLauncher.this.shutdown();
+            Broker.this.shutdown();
         }
     }
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
index dffbbf5a19..d834dd0b1e 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/Main.java
@@ -249,7 +249,7 @@ public class Main
 
     protected void startBroker(final BrokerOptions options) throws Exception
     {
-        BrokerLauncher broker = new BrokerLauncher();
+        Broker broker = new Broker();
         broker.startup(options);
     }
 
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/AmqpPortAdapter.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
index 235c766786..2f7e89bb2b 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/AmqpPortAdapter.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AmqpPortAdapter.java
@@ -17,7 +17,7 @@
  * under the License.
  *
  */
-package org.apache.qpid.server.transport;
+package org.apache.qpid.server.model.adapter;
 
 import static org.apache.qpid.transport.ConnectionSettings.WILDCARD_ADDRESS;
 
@@ -42,7 +42,6 @@ import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.Protocol;
 import org.apache.qpid.server.model.Transport;
 import org.apache.qpid.server.model.TrustStore;
-import org.apache.qpid.server.model.adapter.PortAdapter;
 import org.apache.qpid.server.configuration.updater.TaskExecutor;
 import org.apache.qpid.server.protocol.AmqpProtocolVersion;
 import org.apache.qpid.server.protocol.MultiVersionProtocolEngineFactory;
diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java
index 42c43bd258..a1f72c8119 100644
--- a/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java
+++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortFactory.java
@@ -36,7 +36,6 @@ import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.Protocol;
 import org.apache.qpid.server.model.Protocol.ProtocolType;
 import org.apache.qpid.server.model.Transport;
-import org.apache.qpid.server.transport.AmqpPortAdapter;
 import org.apache.qpid.server.util.MapValueConverter;
 
 public class PortFactory
diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
index f20f3e53f5..14c5c265c9 100644
--- a/qpid/java/broker/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
+++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
@@ -38,7 +38,6 @@ import org.apache.qpid.server.model.Broker;
 import org.apache.qpid.server.model.Port;
 import org.apache.qpid.server.model.Protocol;
 import org.apache.qpid.server.model.Transport;
-import org.apache.qpid.server.transport.AmqpPortAdapter;
 import org.apache.qpid.test.utils.QpidTestCase;
 
 public class PortFactoryTest extends QpidTestCase
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
index ac253b3892..8bad73d0ea 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/InternalBrokerHolder.java
@@ -24,18 +24,18 @@ import java.util.Set;
 
 import org.apache.log4j.Logger;
 
-import org.apache.qpid.server.BrokerLauncher;
+import org.apache.qpid.server.Broker;
 
 public class InternalBrokerHolder implements BrokerHolder
 {
     private static final Logger LOGGER = Logger.getLogger(InternalBrokerHolder.class);
 
-    private final BrokerLauncher _broker;
+    private final Broker _broker;
     private final String _workingDirectory;
 
     private Set<Integer> _portsUsedByBroker;
 
-    public InternalBrokerHolder(final BrokerLauncher broker, String workingDirectory, Set<Integer> portsUsedByBroker)
+    public InternalBrokerHolder(final Broker broker, String workingDirectory, Set<Integer> portsUsedByBroker)
     {
         if(broker == null)
         {
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
index f56c3308ba..4259254123 100755
--- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
@@ -59,7 +59,7 @@ import org.apache.qpid.client.AMQTopic;
 import org.apache.qpid.exchange.ExchangeDefaults;
 import org.apache.qpid.jms.BrokerDetails;
 import org.apache.qpid.jms.ConnectionURL;
-import org.apache.qpid.server.BrokerLauncher;
+import org.apache.qpid.server.Broker;
 import org.apache.qpid.server.BrokerOptions;
 import org.apache.qpid.server.configuration.BrokerProperties;
 import org.apache.qpid.server.model.Port;
@@ -462,7 +462,7 @@ public class QpidBrokerTestCase extends QpidTestCase
             //set on the JVM by the JUnit runner task in module.xml.
             options.setLogConfigFile(_logConfigFile.getAbsolutePath());
 
-            BrokerLauncher broker = new BrokerLauncher();
+            Broker broker = new Broker();
             _logger.info("Starting internal broker (same JVM)");
             broker.startup(options);