activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbert...@apache.org
Subject [3/4] activemq-6 git commit: ACTIVEMQ6-14 - more JNDI removal
Date Wed, 31 Dec 2014 15:45:01 GMT
ACTIVEMQ6-14 - more JNDI removal

https://issues.apache.org/jira/browse/ACTIVEMQ6-14

cleaned up more remaining server JNDI code and fixed some abstraction and naming around JNDI and bindings


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/25146112
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/25146112
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/25146112

Branch: refs/heads/master
Commit: 251461128592193fd957708fec0c4e694bb528f2
Parents: 2e14352
Author: Andy Taylor <andytaylor@apache.org>
Authored: Thu Dec 18 08:22:54 2014 +0000
Committer: Andy Taylor <andytaylor@apache.org>
Committed: Fri Dec 19 08:07:06 2014 +0000

----------------------------------------------------------------------
 .../management/ConnectionFactoryControl.java    |  16 +-
 .../api/jms/management/JMSQueueControl.java     |  10 +-
 .../api/jms/management/TopicControl.java        |  12 +-
 .../impl/JMSConnectionFactoryControlImpl.java   |  12 +-
 .../management/impl/JMSQueueControlImpl.java    |  12 +-
 .../management/impl/JMSServerControlImpl.java   |  36 +-
 .../management/impl/JMSTopicControlImpl.java    |   8 +-
 .../jms/persistence/JMSStorageManager.java      |  10 +-
 .../persistence/config/PersistedBindings.java   | 171 +++++++++
 .../jms/persistence/config/PersistedJNDI.java   | 171 ---------
 .../journal/JMSJournalStorageManagerImpl.java   |  66 ++--
 .../impl/nullpm/NullJMSStorageManagerImpl.java  |  10 +-
 .../jms/server/ActiveMQJMSServerBundle.java     |   4 +-
 .../jms/server/ActiveMQJMSServerLogger.java     |   4 +-
 .../activemq/jms/server/JMSServerManager.java   |  64 ++--
 .../jms/server/config/JMSConfiguration.java     |   6 -
 .../config/impl/JMSConfigurationImpl.java       |  15 -
 .../jms/server/impl/JMSServerDeployer.java      |   4 +-
 .../jms/server/impl/JMSServerManagerImpl.java   | 368 +++++++++----------
 .../ServletContextBindingRegistry.java          |  10 -
 .../core/registry/JndiBindingRegistry.java      |  16 -
 .../core/registry/MapBindingRegistry.java       |  11 -
 .../spi/core/naming/BindingRegistry.java        |  11 -
 .../apache/activemq/tools/XmlDataExporter.java  |  18 +-
 .../spring/SpringBindingRegistry.java           |  12 -
 .../byteman/tests/StartStopDeadlockTest.java    |   3 +-
 .../integration/client/FailureDeadlockTest.java |   3 +-
 .../integration/client/PagingOrderTest.java     |   9 +-
 .../tests/integration/jms/FloodServerTest.java  |   3 +-
 .../ManualReconnectionToSingleServerTest.java   |   8 +-
 .../integration/jms/bridge/BridgeTestBase.java  |   5 +-
 .../jms/bridge/ClusteredBridgeTestBase.java     |   5 +-
 .../jms/client/RemoteConnectionStressTest.java  |   3 +-
 .../integration/jms/client/StoreConfigTest.java |  26 +-
 .../jms/cluster/JMSFailoverListenerTest.java    |   5 +-
 .../jms/cluster/JMSFailoverTest.java            |   5 +-
 .../jms/cluster/ReplicatedJMSFailoverTest.java  |   5 +-
 .../jms/connection/ExceptionListenerTest.java   |   3 +-
 .../jms/server/JMSServerDeployerTest.java       |   3 +-
 .../jms/server/JMSServerStartStopTest.java      |   2 +-
 .../jms/server/config/JMSConfigurationTest.java |   4 +-
 .../ConnectionFactoryControlTest.java           |   3 +-
 .../server/management/JMSQueueControlTest.java  |  11 +-
 .../management/JMSQueueControlUsingJMSTest.java |   6 +-
 .../management/JMSServerControl2Test.java       |   3 +-
 .../management/JMSServerControlRestartTest.java |   3 +-
 .../server/management/JMSServerControlTest.java |  21 +-
 .../jms/server/management/TopicControlTest.java |   5 +-
 .../management/TopicControlUsingJMSTest.java    |   6 +-
 .../management/ManagementActivationTest.java    |   7 +-
 .../integration/openwire/OpenWireTestBase.java  |   3 +-
 .../persistence/JMSDynamicConfigTest.java       |   2 +-
 .../persistence/JMSStorageManagerTest.java      |  12 +-
 .../persistence/XmlImportExportTest.java        |   3 +-
 .../tests/integration/stomp/ExtraStompTest.java |   5 +-
 .../tests/integration/stomp/StompTestBase.java  |   3 +-
 .../integration/stomp/StompWebSocketTest.java   |   2 +-
 .../integration/stomp/v11/StompV11TestBase.java |   3 +-
 .../tests/util/JMSClusteredTestBase.java        |   5 +-
 .../apache/activemq/tests/util/JMSTestBase.java |   5 +-
 .../jms/tests/ActiveMQServerTestCase.java       |   1 -
 .../tests/tools/container/LocalTestServer.java  |   2 +
 .../jms/bridge/impl/JMSBridgeImplTest.java      |   3 +-
 63 files changed, 600 insertions(+), 683 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25146112/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/ConnectionFactoryControl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/ConnectionFactoryControl.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/ConnectionFactoryControl.java
index 3ae395b..83283be 100644
--- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/ConnectionFactoryControl.java
+++ b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/ConnectionFactoryControl.java
@@ -39,9 +39,9 @@ public interface ConnectionFactoryControl
    String getName();
 
    /**
-    * Returns the JNDI bindings associated  to this connection factory.
+    * Returns the Registry bindings associated  to this connection factory.
     */
-   String[] getJNDIBindings();
+   String[] getRegistryBindings();
 
    /**
     * does ths cf support HA
@@ -380,14 +380,14 @@ public interface ConnectionFactoryControl
    DiscoveryGroupConfiguration getDiscoveryGroupConfiguration();
 
    /**
-    * Add the JNDI binding to this destination
+    * Add the Registry binding to this destination
     */
-   @Operation(desc = "Adds the factory to another JNDI binding")
-   void addJNDI(@Parameter(name = "jndiBinding", desc = "the name of the binding for JNDI") String jndi) throws Exception;
+   @Operation(desc = "Adds the factory to another Registry binding")
+   void addBinding(@Parameter(name = "binding", desc = "the name of the binding for the Registry") String binding) throws Exception;
 
    /**
-    * Remove a JNDI binding
+    * Remove a Registry binding
     */
-   @Operation(desc = "Remove an existing JNDI binding")
-   void removeJNDI(@Parameter(name = "jndiBinding", desc = "the name of the binding for JNDI") String jndi) throws Exception;
+   @Operation(desc = "Remove an existing Registry binding")
+   void removeBinding(@Parameter(name = "binding", desc = "the name of the binding for Registry") String binding) throws Exception;
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25146112/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSQueueControl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSQueueControl.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSQueueControl.java
index aa4aebf..6eac841 100644
--- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSQueueControl.java
+++ b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/JMSQueueControl.java
@@ -74,16 +74,16 @@ public interface JMSQueueControl extends DestinationControl
    // Operations ----------------------------------------------------
 
    /**
-    * Returns the JNDI bindings associated  to this connection factory.
+    * Returns the Registry bindings associated  to this connection factory.
     */
-   @Operation(desc = "Returns the list of JNDI bindings associated")
-   String[] getJNDIBindings();
+   @Operation(desc = "Returns the list of Registry bindings associated")
+   String[] getRegistryBindings();
 
    /**
     * Add the JNDI binding to this destination
     */
-   @Operation(desc = "Adds the queue to another JNDI binding")
-   void addJNDI(@Parameter(name = "jndiBinding", desc = "the name of the binding for JNDI") String jndi) throws Exception;
+   @Operation(desc = "Adds the queue to another Registry binding")
+   void addBinding(@Parameter(name = "binding", desc = "the name of the binding for the registry") String binding) throws Exception;
 
    /**
     * Lists all the JMS messages in this queue matching the specified filter.

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25146112/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/TopicControl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/TopicControl.java b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/TopicControl.java
index cd26e21..145f764 100644
--- a/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/TopicControl.java
+++ b/activemq-jms-client/src/main/java/org/apache/activemq/api/jms/management/TopicControl.java
@@ -57,16 +57,16 @@ public interface TopicControl extends DestinationControl
    int getNonDurableMessageCount();
 
    /**
-    * Returns the JNDI bindings associated  to this connection factory.
+    * Returns the Registry bindings associated  to this connection factory.
     */
-   @Operation(desc = "Returns the list of JNDI bindings associated")
-   String[] getJNDIBindings();
+   @Operation(desc = "Returns the list of Registry bindings associated")
+   String[] getRegistryBindings();
 
    /**
-    * Add the JNDI binding to this destination
+    * Add the Registry binding to this destination
     */
-   @Operation(desc = "Adds the queue to another JNDI binding")
-   void addJNDI(@Parameter(name = "jndiBinding", desc = "the name of the binding for JNDI") String jndi) throws Exception;
+   @Operation(desc = "Adds the queue to another Registry binding")
+   void addBinding(@Parameter(name = "binding", desc = "the name of the binding for Registry") String binding) throws Exception;
 
 
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25146112/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSConnectionFactoryControlImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSConnectionFactoryControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSConnectionFactoryControlImpl.java
index 050eab2..27063ab 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSConnectionFactoryControlImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSConnectionFactoryControlImpl.java
@@ -66,9 +66,9 @@ public class JMSConnectionFactoryControlImpl extends StandardMBean implements Co
 
    // ManagedConnectionFactoryMBean implementation ------------------
 
-   public String[] getJNDIBindings()
+   public String[] getRegistryBindings()
    {
-      return jmsManager.getJNDIOnConnectionFactory(name);
+      return jmsManager.getBindingsOnConnectionFactory(name);
    }
 
    public boolean isCompressLargeMessages()
@@ -331,14 +331,14 @@ public class JMSConnectionFactoryControlImpl extends StandardMBean implements Co
       return cf.getDiscoveryGroupConfiguration();
    }
 
-   public void addJNDI(@Parameter(name = "jndiBinding", desc = "the name of the binding for JNDI") String jndi) throws Exception
+   public void addBinding(@Parameter(name = "binding", desc = "the name of the binding for the Registry") String binding) throws Exception
    {
-      jmsManager.addConnectionFactoryToJNDI(name, jndi);
+      jmsManager.addConnectionFactoryToBindingRegistry(name, binding);
    }
 
-   public void removeJNDI(@Parameter(name = "jndiBinding", desc = "the name of the binding for JNDI") String jndi) throws Exception
+   public void removeBinding(@Parameter(name = "binding", desc = "the name of the binding for the Registry") String binding) throws Exception
    {
-      jmsManager.removeConnectionFactoryFromJNDI(name, jndi);
+      jmsManager.removeConnectionFactoryFromBindingRegistry(name, binding);
    }
 
    public long getCallTimeout()

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25146112/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java
index 161c937..7c85e8c 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSQueueControlImpl.java
@@ -159,19 +159,19 @@ public class JMSQueueControlImpl extends StandardMBean implements JMSQueueContro
    }
 
    @Override
-   public void addJNDI(String jndi) throws Exception
+   public void addBinding(String binding) throws Exception
    {
-      jmsServerManager.addQueueToJndi(managedQueue.getName(), jndi);
+      jmsServerManager.addQueueToBindingRegistry(managedQueue.getName(), binding);
    }
 
-   public void removeJNDI(String jndi) throws Exception
+   public void removeBinding(String binding) throws Exception
    {
-      jmsServerManager.removeQueueFromJNDI(managedQueue.getName(), jndi);
+      jmsServerManager.removeQueueFromBindingRegistry(managedQueue.getName(), binding);
    }
 
-   public String[] getJNDIBindings()
+   public String[] getRegistryBindings()
    {
-      return jmsServerManager.getJNDIOnQueue(managedQueue.getName());
+      return jmsServerManager.getBindingsOnQueue(managedQueue.getName());
    }
 
    public boolean removeMessage(final String messageID) throws Exception

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25146112/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSServerControlImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSServerControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSServerControlImpl.java
index c04735a..2fb73c4 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSServerControlImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSServerControlImpl.java
@@ -76,14 +76,14 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
 
    // Static --------------------------------------------------------
 
-   private static String[] convert(final Object[] jndiBindings)
+   private static String[] convert(final Object[] bindings)
    {
-      String[] bindings = new String[jndiBindings.length];
-      for (int i = 0, jndiBindingsLength = jndiBindings.length; i < jndiBindingsLength; i++)
+      String[] theBindings = new String[bindings.length];
+      for (int i = 0, bindingsLength = bindings.length; i < bindingsLength; i++)
       {
-         bindings[i] = jndiBindings[i].toString().trim();
+         theBindings[i] = bindings[i].toString().trim();
       }
-      return bindings;
+      return theBindings;
    }
 
    private static String[] toArray(final String commaSeparatedString)
@@ -217,7 +217,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
                                        boolean useDiscovery,
                                        int cfType,
                                        String connectors,
-                                       String jndiBindings,
+                                       String bindings,
                                        String clientID,
                                        long clientFailureCheckPeriod,
                                        long connectionTTL,
@@ -253,7 +253,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
                               useDiscovery,
                               cfType,
                               toArray(connectors),
-                              toArray(jndiBindings),
+                              toArray(bindings),
                               clientID,
                               clientFailureCheckPeriod,
                               connectionTTL,
@@ -392,16 +392,16 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
    /**
     * Create a JMS ConnectionFactory with the specified name connected to a single live-backup pair of servers.
     * <br>
-    * The ConnectionFactory is bound to JNDI for all the specified bindings Strings.
+    * The ConnectionFactory is bound to the Registry for all the specified bindings Strings.
     */
    public void createConnectionFactory(String name,
                                        boolean ha,
                                        boolean useDiscovery,
                                        int cfType,
                                        String connectors,
-                                       String jndiBindings) throws Exception
+                                       String bindings) throws Exception
    {
-      createConnectionFactory(name, ha, useDiscovery, cfType, toArray(connectors), toArray(jndiBindings));
+      createConnectionFactory(name, ha, useDiscovery, cfType, toArray(connectors), toArray(bindings));
    }
 
    public boolean createQueue(final String name) throws Exception
@@ -409,19 +409,19 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       return createQueue(name, null, null, true);
    }
 
-   public boolean createQueue(final String name, final String jndiBindings) throws Exception
+   public boolean createQueue(final String name, final String bindings) throws Exception
    {
-      return createQueue(name, jndiBindings, null, true);
+      return createQueue(name, bindings, null, true);
    }
 
    @Override
-   public boolean createQueue(String name, String jndiBindings, String selector) throws Exception
+   public boolean createQueue(String name, String bindings, String selector) throws Exception
    {
-      return createQueue(name, jndiBindings, selector, true);
+      return createQueue(name, bindings, selector, true);
    }
 
    public boolean createQueue(@Parameter(name = "name", desc = "Name of the queue to create") String name,
-                              @Parameter(name = "jndiBindings", desc = "comma-separated list of JNDI bindings (use '&comma;' if u need to use commas in your jndi name)") String jndiBindings,
+                              @Parameter(name = "bindings", desc = "comma-separated list of Registry bindings (use '&comma;' if u need to use commas in your bindings name)") String bindings,
                               @Parameter(name = "selector", desc = "the jms selector") String selector,
                               @Parameter(name = "durable", desc = "is the queue persistent and resilient to restart") boolean durable) throws Exception
    {
@@ -432,7 +432,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       try
       {
          return server.createQueue(true, name, selector, durable,
-               JMSServerControlImpl.toArray(jndiBindings));
+               JMSServerControlImpl.toArray(bindings));
       }
       finally
       {
@@ -466,7 +466,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
       return createTopic(name, null);
    }
 
-   public boolean createTopic(final String topicName, final String jndiBindings) throws Exception
+   public boolean createTopic(final String topicName, final String bindings) throws Exception
    {
       checkStarted();
 
@@ -474,7 +474,7 @@ public class JMSServerControlImpl extends AbstractControl implements JMSServerCo
 
       try
       {
-         return server.createTopic(true, topicName, JMSServerControlImpl.toArray(jndiBindings));
+         return server.createTopic(true, topicName, JMSServerControlImpl.toArray(bindings));
       }
       finally
       {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25146112/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java
index e957a0d..9867b72 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/management/impl/JMSTopicControlImpl.java
@@ -80,14 +80,14 @@ public class JMSTopicControlImpl extends StandardMBean implements TopicControl
    // TopicControlMBean implementation ------------------------------
 
    @Override
-   public void addJNDI(String jndi) throws Exception
+   public void addBinding(String binding) throws Exception
    {
-      jmsServerManager.addTopicToJndi(managedTopic.getName(), jndi);
+      jmsServerManager.addTopicToBindingRegistry(managedTopic.getName(), binding);
    }
 
-   public String[] getJNDIBindings()
+   public String[] getRegistryBindings()
    {
-      return jmsServerManager.getJNDIOnTopic(managedTopic.getName());
+      return jmsServerManager.getBindingsOnTopic(managedTopic.getName());
    }
 
    public String getName()

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25146112/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/JMSStorageManager.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/JMSStorageManager.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/JMSStorageManager.java
index 908c048..13741cb 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/JMSStorageManager.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/JMSStorageManager.java
@@ -21,7 +21,7 @@ import java.util.List;
 import org.apache.activemq.core.server.ActiveMQComponent;
 import org.apache.activemq.jms.persistence.config.PersistedConnectionFactory;
 import org.apache.activemq.jms.persistence.config.PersistedDestination;
-import org.apache.activemq.jms.persistence.config.PersistedJNDI;
+import org.apache.activemq.jms.persistence.config.PersistedBindings;
 import org.apache.activemq.jms.persistence.config.PersistedType;
 
 /**
@@ -48,11 +48,11 @@ public interface JMSStorageManager extends ActiveMQComponent
 
    List<PersistedConnectionFactory> recoverConnectionFactories();
 
-   void addJNDI(PersistedType type, String name, String ... address) throws Exception;
+   void addBindings(PersistedType type, String name, String... address) throws Exception;
 
-   List<PersistedJNDI> recoverPersistedJNDI() throws Exception;
+   List<PersistedBindings> recoverPersistedBindings() throws Exception;
 
-   void deleteJNDI(PersistedType type, String name, String address) throws Exception;
+   void deleteBindings(PersistedType type, String name, String address) throws Exception;
 
-   void deleteJNDI(PersistedType type, String name) throws Exception;
+   void deleteBindings(PersistedType type, String name) throws Exception;
 }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25146112/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedBindings.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedBindings.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedBindings.java
new file mode 100644
index 0000000..58aa098
--- /dev/null
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedBindings.java
@@ -0,0 +1,171 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.activemq.jms.persistence.config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.activemq.api.core.ActiveMQBuffer;
+import org.apache.activemq.core.journal.EncodingSupport;
+import org.apache.activemq.utils.BufferHelper;
+import org.apache.activemq.utils.DataConstants;
+
+/**
+ * A PersistedBinding
+ *
+ * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
+ */
+public class PersistedBindings implements EncodingSupport
+{
+
+   // Constants -----------------------------------------------------
+
+   // Attributes ----------------------------------------------------
+
+   private long id;
+
+   private PersistedType type;
+
+   private String name;
+
+   private ArrayList<String> bindings = new ArrayList<String>();
+
+   // Static --------------------------------------------------------
+
+   // Constructors --------------------------------------------------
+
+   public PersistedBindings()
+   {
+   }
+
+   /**
+    * @param type
+    * @param name
+    */
+   public PersistedBindings(PersistedType type, String name)
+   {
+      super();
+      this.type = type;
+      this.name = name;
+   }
+
+   // Public --------------------------------------------------------
+   @Override
+   public void decode(ActiveMQBuffer buffer)
+   {
+      type = PersistedType.getType(buffer.readByte());
+      name = buffer.readSimpleString().toString();
+      int bindingArraySize = buffer.readInt();
+      bindings = new ArrayList<String>(bindingArraySize);
+
+      for (int i = 0; i < bindingArraySize; i++)
+      {
+         bindings.add(buffer.readSimpleString().toString());
+      }
+   }
+
+   @Override
+   public void encode(ActiveMQBuffer buffer)
+   {
+      buffer.writeByte(type.getType());
+      BufferHelper.writeAsSimpleString(buffer, name);
+      buffer.writeInt(bindings.size());
+      for (String bindingsEl : bindings)
+      {
+         BufferHelper.writeAsSimpleString(buffer, bindingsEl);
+      }
+   }
+
+   @Override
+   public int getEncodeSize()
+   {
+      return DataConstants.SIZE_BYTE +
+         BufferHelper.sizeOfSimpleString(name) +
+         sizeOfBindings();
+   }
+
+   private int sizeOfBindings()
+   {
+      int size = DataConstants.SIZE_INT; // for the number of elements written
+
+      for (String str : bindings)
+      {
+         size += BufferHelper.sizeOfSimpleString(str);
+      }
+
+      return size;
+   }
+
+   /**
+    * @return the id
+    */
+   public long getId()
+   {
+      return id;
+   }
+
+   /**
+    * @param id the id to set
+    */
+   public void setId(long id)
+   {
+      this.id = id;
+   }
+
+   /**
+    * @return the type
+    */
+   public PersistedType getType()
+   {
+      return type;
+   }
+
+   /**
+    * @return the name
+    */
+   public String getName()
+   {
+      return name;
+   }
+
+   /**
+    * @return the bindings
+    */
+   public List<String> getBindings()
+   {
+      return bindings;
+   }
+
+   public void addBinding(String address)
+   {
+      bindings.add(address);
+   }
+
+   public void deleteBinding(String address)
+   {
+      bindings.remove(address);
+   }
+
+   // Package protected ---------------------------------------------
+
+   // Protected -----------------------------------------------------
+
+   // Private -------------------------------------------------------
+
+   // Inner classes -------------------------------------------------
+
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25146112/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedJNDI.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedJNDI.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedJNDI.java
deleted file mode 100644
index 451dbe4..0000000
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/config/PersistedJNDI.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.activemq.jms.persistence.config;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.activemq.api.core.ActiveMQBuffer;
-import org.apache.activemq.core.journal.EncodingSupport;
-import org.apache.activemq.utils.BufferHelper;
-import org.apache.activemq.utils.DataConstants;
-
-/**
- * A PersistedJNDI
- *
- * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
- */
-public class PersistedJNDI implements EncodingSupport
-{
-
-   // Constants -----------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   private long id;
-
-   private PersistedType type;
-
-   private String name;
-
-   private ArrayList<String> jndi = new ArrayList<String>();
-
-   // Static --------------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   public PersistedJNDI()
-   {
-   }
-
-   /**
-    * @param type
-    * @param name
-    */
-   public PersistedJNDI(PersistedType type, String name)
-   {
-      super();
-      this.type = type;
-      this.name = name;
-   }
-
-   // Public --------------------------------------------------------
-   @Override
-   public void decode(ActiveMQBuffer buffer)
-   {
-      type = PersistedType.getType(buffer.readByte());
-      name = buffer.readSimpleString().toString();
-      int jndiArraySize = buffer.readInt();
-      jndi = new ArrayList<String>(jndiArraySize);
-
-      for (int i = 0; i < jndiArraySize; i++)
-      {
-         jndi.add(buffer.readSimpleString().toString());
-      }
-   }
-
-   @Override
-   public void encode(ActiveMQBuffer buffer)
-   {
-      buffer.writeByte(type.getType());
-      BufferHelper.writeAsSimpleString(buffer, name);
-      buffer.writeInt(jndi.size());
-      for (String jndiEl : jndi)
-      {
-         BufferHelper.writeAsSimpleString(buffer, jndiEl);
-      }
-   }
-
-   @Override
-   public int getEncodeSize()
-   {
-      return DataConstants.SIZE_BYTE +
-         BufferHelper.sizeOfSimpleString(name) +
-         sizeOfJNDI();
-   }
-
-   private int sizeOfJNDI()
-   {
-      int size = DataConstants.SIZE_INT; // for the number of elements written
-
-      for (String str : jndi)
-      {
-         size += BufferHelper.sizeOfSimpleString(str);
-      }
-
-      return size;
-   }
-
-   /**
-    * @return the id
-    */
-   public long getId()
-   {
-      return id;
-   }
-
-   /**
-    * @param id the id to set
-    */
-   public void setId(long id)
-   {
-      this.id = id;
-   }
-
-   /**
-    * @return the type
-    */
-   public PersistedType getType()
-   {
-      return type;
-   }
-
-   /**
-    * @return the name
-    */
-   public String getName()
-   {
-      return name;
-   }
-
-   /**
-    * @return the jndi
-    */
-   public List<String> getJndi()
-   {
-      return jndi;
-   }
-
-   public void addJNDI(String address)
-   {
-      jndi.add(address);
-   }
-
-   public void deleteJNDI(String address)
-   {
-      jndi.remove(address);
-   }
-
-   // Package protected ---------------------------------------------
-
-   // Protected -----------------------------------------------------
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-
-}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25146112/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
index b78bc96..0642c3a 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/journal/JMSJournalStorageManagerImpl.java
@@ -38,7 +38,7 @@ import org.apache.activemq.core.server.JournalType;
 import org.apache.activemq.jms.persistence.JMSStorageManager;
 import org.apache.activemq.jms.persistence.config.PersistedConnectionFactory;
 import org.apache.activemq.jms.persistence.config.PersistedDestination;
-import org.apache.activemq.jms.persistence.config.PersistedJNDI;
+import org.apache.activemq.jms.persistence.config.PersistedBindings;
 import org.apache.activemq.jms.persistence.config.PersistedType;
 import org.apache.activemq.utils.IDGenerator;
 
@@ -56,7 +56,7 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager
 
    public static final byte DESTINATION_RECORD = 2;
 
-   public static final byte JNDI_RECORD = 3;
+   public static final byte BINDING_RECORD = 3;
 
    // Attributes ----------------------------------------------------
 
@@ -74,7 +74,7 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager
 
    private final Map<Pair<PersistedType, String>, PersistedDestination> destinations = new ConcurrentHashMap<Pair<PersistedType, String>, PersistedDestination>();
 
-   private final Map<Pair<PersistedType, String>, PersistedJNDI> mapJNDI = new ConcurrentHashMap<Pair<PersistedType, String>, PersistedJNDI>();
+   private final Map<Pair<PersistedType, String>, PersistedBindings> mapBindings = new ConcurrentHashMap<Pair<PersistedType, String>, PersistedBindings>();
 
    // Static --------------------------------------------------------
 
@@ -166,87 +166,87 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager
       destinations.put(new Pair<PersistedType, String>(destination.getType(), destination.getName()), destination);
    }
 
-   public List<PersistedJNDI> recoverPersistedJNDI() throws Exception
+   public List<PersistedBindings> recoverPersistedBindings() throws Exception
    {
-      ArrayList<PersistedJNDI> list = new ArrayList<PersistedJNDI>(mapJNDI.values());
+      ArrayList<PersistedBindings> list = new ArrayList<PersistedBindings>(mapBindings.values());
       return list;
    }
 
-   public void addJNDI(PersistedType type, String name, String... address) throws Exception
+   public void addBindings(PersistedType type, String name, String... address) throws Exception
    {
       Pair<PersistedType, String> key = new Pair<PersistedType, String>(type, name);
 
       long tx = idGenerator.generateID();
 
-      PersistedJNDI currentJNDI = mapJNDI.get(key);
-      if (currentJNDI != null)
+      PersistedBindings currentBindings = mapBindings.get(key);
+      if (currentBindings != null)
       {
-         jmsJournal.appendDeleteRecordTransactional(tx, currentJNDI.getId());
+         jmsJournal.appendDeleteRecordTransactional(tx, currentBindings.getId());
       }
       else
       {
-         currentJNDI = new PersistedJNDI(type, name);
+         currentBindings = new PersistedBindings(type, name);
       }
 
-      mapJNDI.put(key, currentJNDI);
+      mapBindings.put(key, currentBindings);
 
       for (String adItem : address)
       {
-         currentJNDI.addJNDI(adItem);
+         currentBindings.addBinding(adItem);
       }
 
 
       long newId = idGenerator.generateID();
 
-      currentJNDI.setId(newId);
+      currentBindings.setId(newId);
 
-      jmsJournal.appendAddRecordTransactional(tx, newId, JNDI_RECORD, currentJNDI);
+      jmsJournal.appendAddRecordTransactional(tx, newId, BINDING_RECORD, currentBindings);
 
       jmsJournal.appendCommitRecord(tx, true);
    }
 
-   public void deleteJNDI(PersistedType type, String name, String address) throws Exception
+   public void deleteBindings(PersistedType type, String name, String address) throws Exception
    {
       Pair<PersistedType, String> key = new Pair<PersistedType, String>(type, name);
 
       long tx = idGenerator.generateID();
 
-      PersistedJNDI currentJNDI = mapJNDI.get(key);
-      if (currentJNDI == null)
+      PersistedBindings currentBindings = mapBindings.get(key);
+      if (currentBindings == null)
       {
          return;
       }
       else
       {
-         jmsJournal.appendDeleteRecordTransactional(tx, currentJNDI.getId());
+         jmsJournal.appendDeleteRecordTransactional(tx, currentBindings.getId());
       }
 
-      currentJNDI.deleteJNDI(address);
+      currentBindings.deleteBinding(address);
 
-      if (currentJNDI.getJndi().size() == 0)
+      if (currentBindings.getBindings().size() == 0)
       {
-         mapJNDI.remove(key);
+         mapBindings.remove(key);
       }
       else
       {
          long newId = idGenerator.generateID();
-         currentJNDI.setId(newId);
-         jmsJournal.appendAddRecordTransactional(tx, newId, JNDI_RECORD, currentJNDI);
+         currentBindings.setId(newId);
+         jmsJournal.appendAddRecordTransactional(tx, newId, BINDING_RECORD, currentBindings);
       }
 
       jmsJournal.appendCommitRecord(tx, true);
    }
 
 
-   public void deleteJNDI(PersistedType type, String name) throws Exception
+   public void deleteBindings(PersistedType type, String name) throws Exception
    {
       Pair<PersistedType, String> key = new Pair<PersistedType, String>(type, name);
 
-      PersistedJNDI currentJNDI = mapJNDI.remove(key);
+      PersistedBindings currentBindings = mapBindings.remove(key);
 
-      if (currentJNDI != null)
+      if (currentBindings != null)
       {
-         jmsJournal.appendDeleteRecord(currentJNDI.getId(), true);
+         jmsJournal.appendDeleteRecord(currentBindings.getId(), true);
       }
    }
 
@@ -316,13 +316,13 @@ public final class JMSJournalStorageManagerImpl implements JMSStorageManager
             destination.setId(id);
             destinations.put(new Pair<PersistedType, String>(destination.getType(), destination.getName()), destination);
          }
-         else if (rec == JNDI_RECORD)
+         else if (rec == BINDING_RECORD)
          {
-            PersistedJNDI jndi = new PersistedJNDI();
-            jndi.decode(buffer);
-            jndi.setId(id);
-            Pair<PersistedType, String> key = new Pair<PersistedType, String>(jndi.getType(), jndi.getName());
-            mapJNDI.put(key, jndi);
+            PersistedBindings bindings = new PersistedBindings();
+            bindings.decode(buffer);
+            bindings.setId(id);
+            Pair<PersistedType, String> key = new Pair<PersistedType, String>(bindings.getType(), bindings.getName());
+            mapBindings.put(key, bindings);
          }
          else
          {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25146112/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java
index 5ad4678..f4d2f9d 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/persistence/impl/nullpm/NullJMSStorageManagerImpl.java
@@ -22,7 +22,7 @@ import java.util.List;
 import org.apache.activemq.jms.persistence.JMSStorageManager;
 import org.apache.activemq.jms.persistence.config.PersistedConnectionFactory;
 import org.apache.activemq.jms.persistence.config.PersistedDestination;
-import org.apache.activemq.jms.persistence.config.PersistedJNDI;
+import org.apache.activemq.jms.persistence.config.PersistedBindings;
 import org.apache.activemq.jms.persistence.config.PersistedType;
 
 /**
@@ -80,12 +80,12 @@ public class NullJMSStorageManagerImpl implements JMSStorageManager
    }
 
    @Override
-   public void addJNDI(PersistedType type, String name, String ... address) throws Exception
+   public void addBindings(PersistedType type, String name, String... address) throws Exception
    {
    }
 
    @Override
-   public void deleteJNDI(PersistedType type, String name, String address) throws Exception
+   public void deleteBindings(PersistedType type, String name, String address) throws Exception
    {
    }
 
@@ -95,12 +95,12 @@ public class NullJMSStorageManagerImpl implements JMSStorageManager
    }
 
    @Override
-   public void deleteJNDI(PersistedType type, String name) throws Exception
+   public void deleteBindings(PersistedType type, String name) throws Exception
    {
    }
 
    @Override
-   public List<PersistedJNDI> recoverPersistedJNDI() throws Exception
+   public List<PersistedBindings> recoverPersistedBindings() throws Exception
    {
       return Collections.emptyList();
    }

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25146112/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerBundle.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerBundle.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerBundle.java
index 8c97a41..bbec815 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerBundle.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerBundle.java
@@ -58,8 +58,8 @@ public interface ActiveMQJMSServerBundle
    @Message(id = 129005, value = "Connector ''{0}'' not found on the main configuration file" , format = Message.Format.MESSAGE_FORMAT)
    ActiveMQIllegalStateException noConnectorNameConfiguredOnCF(String name);
 
-   @Message(id = 129006, value =  "JNDI {0} is already being used by another connection factory", format = Message.Format.MESSAGE_FORMAT)
-   ActiveMQAddressExistsException cfJndiExists(String name);
+   @Message(id = 129006, value =  "Binding {0} is already being used by another connection factory", format = Message.Format.MESSAGE_FORMAT)
+   ActiveMQAddressExistsException cfBindingsExists(String name);
 
    @Message(id = 129007, value = "Error decoding password using codec instance", format = Message.Format.MESSAGE_FORMAT)
    ActiveMQIllegalStateException errorDecodingPassword(@Cause Exception e);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25146112/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerLogger.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerLogger.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerLogger.java
index eb97abb..ab205bf 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerLogger.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/ActiveMQJMSServerLogger.java
@@ -73,8 +73,8 @@ public interface ActiveMQJMSServerLogger extends BasicLogger
    void recoveryConnectFailed(String s);
 
    @LogMessage(level = Logger.Level.WARN)
-   @Message(id = 122011, value = "error unbinding {0} from JNDI" , format = Message.Format.MESSAGE_FORMAT)
-   void jndiUnbindError(@Cause Exception e, String key);
+   @Message(id = 122011, value = "error unbinding {0} from Registry" , format = Message.Format.MESSAGE_FORMAT)
+   void bindingsUnbindError(@Cause Exception e, String key);
 
    @LogMessage(level = Logger.Level.WARN)
    @Message(id = 122012, value = "JMS Server Manager error" , format = Message.Format.MESSAGE_FORMAT)

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25146112/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerManager.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerManager.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerManager.java
index 28e124a..e67e38f 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerManager.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/JMSServerManager.java
@@ -19,8 +19,6 @@ package org.apache.activemq.jms.server;
 import java.util.List;
 import java.util.Set;
 
-import javax.naming.Context;
-
 import org.apache.activemq.api.jms.JMSFactoryType;
 import org.apache.activemq.core.security.Role;
 import org.apache.activemq.core.server.ActiveMQComponent;
@@ -56,17 +54,17 @@ public interface JMSServerManager extends ActiveMQComponent
     * @param selectorString
     * @param durable
     * @return true if the queue is created or if it existed and was added to
-    *         JNDI
+    *         the Binding Registry
     * @throws Exception
     *            if problems were encountered creating the queue.
     */
    boolean createQueue(boolean storeConfig, String queueName, String selectorString, boolean durable, String ...bindings) throws Exception;
 
-   boolean addTopicToJndi(final String topicName, final String binding) throws Exception;
+   boolean addTopicToBindingRegistry(final String topicName, final String binding) throws Exception;
 
-   boolean addQueueToJndi(final String queueName, final String binding) throws Exception;
+   boolean addQueueToBindingRegistry(final String queueName, final String binding) throws Exception;
 
-   boolean addConnectionFactoryToJNDI(final String name, final String binding) throws Exception;
+   boolean addConnectionFactoryToBindingRegistry(final String name, final String binding) throws Exception;
 
    /**
     * Creates a JMS Topic
@@ -74,68 +72,68 @@ public interface JMSServerManager extends ActiveMQComponent
     * @param topicName
     *           the name of the topic
     * @param bindings
-    *           the names of the binding for JNDI or BindingRegistry
+    *           the names of the binding for the Binding Registry or BindingRegistry
     * @return true if the topic was created or if it existed and was added to
-    *         JNDI
+    *         the Binding Registry
     * @throws Exception
     *            if a problem occurred creating the topic
     */
    boolean createTopic(boolean storeConfig, String topicName, String ... bindings) throws Exception;
 
    /**
-    * Remove the topic from JNDI or BindingRegistry.
+    * Remove the topic from the Binding Registry or BindingRegistry.
     * Calling this method does <em>not</em> destroy the destination.
     *
     * @param name
-    *           the name of the destination to remove from JNDI or BindingRegistry
+    *           the name of the destination to remove from the BindingRegistry
     * @return true if removed
     * @throws Exception
     *            if a problem occurred removing the destination
     */
-   boolean removeTopicFromJNDI(String name, String binding) throws Exception;
+   boolean removeTopicFromBindingRegistry(String name, String binding) throws Exception;
 
    /**
-    * Remove the topic from JNDI or BindingRegistry.
+    * Remove the topic from the BindingRegistry.
     * Calling this method does <em>not</em> destroy the destination.
     *
     * @param name
-    *           the name of the destination to remove from JNDI or BindingRegistry
+    *           the name of the destination to remove from the BindingRegistry
     * @return true if removed
     * @throws Exception
     *            if a problem occurred removing the destination
     */
-   boolean removeTopicFromJNDI(String name) throws Exception;
+   boolean removeTopicFromBindingRegistry(String name) throws Exception;
 
    /**
-    * Remove the queue from JNDI or BindingRegistry.
+    * Remove the queue from the BindingRegistry.
     * Calling this method does <em>not</em> destroy the destination.
     *
     * @param name
-    *           the name of the destination to remove from JNDI or BindingRegistry
+    *           the name of the destination to remove from the BindingRegistry
     * @return true if removed
     * @throws Exception
     *            if a problem occurred removing the destination
     */
-   boolean removeQueueFromJNDI(String name, String binding) throws Exception;
+   boolean removeQueueFromBindingRegistry(String name, String binding) throws Exception;
 
    /**
-    * Remove the queue from JNDI or BindingRegistry.
+    * Remove the queue from the BindingRegistry.
     * Calling this method does <em>not</em> destroy the destination.
     *
     * @param name
-    *           the name of the destination to remove from JNDI or BindingRegistry
+    *           the name of the destination to remove from the BindingRegistry
     * @return true if removed
     * @throws Exception
     *            if a problem occurred removing the destination
     */
-   boolean removeQueueFromJNDI(String name) throws Exception;
+   boolean removeQueueFromBindingRegistry(String name) throws Exception;
 
-   boolean removeConnectionFactoryFromJNDI(String name, String binding) throws Exception;
+   boolean removeConnectionFactoryFromBindingRegistry(String name, String binding) throws Exception;
 
-   boolean removeConnectionFactoryFromJNDI(String name) throws Exception;
+   boolean removeConnectionFactoryFromBindingRegistry(String name) throws Exception;
 
    /**
-    * destroys a queue and removes it from JNDI or BindingRegistry
+    * destroys a queue and removes it from the BindingRegistry
     *
     * @param name
     *           the name of the queue to destroy
@@ -146,7 +144,7 @@ public interface JMSServerManager extends ActiveMQComponent
    boolean destroyQueue(String name) throws Exception;
 
    /**
-    * destroys a queue and removes it from JNDI or BindingRegistry.
+    * destroys a queue and removes it from the BindingRegistry.
     * disconnects any consumers connected to the queue.
     *
     * @param name
@@ -157,14 +155,14 @@ public interface JMSServerManager extends ActiveMQComponent
     */
    boolean destroyQueue(String name, boolean removeConsumers) throws Exception;
 
-   String[] getJNDIOnQueue(String queue);
+   String[] getBindingsOnQueue(String queue);
 
-   String[] getJNDIOnTopic(String topic);
+   String[] getBindingsOnTopic(String topic);
 
-   String[] getJNDIOnConnectionFactory(String factoryName);
+   String[] getBindingsOnConnectionFactory(String factoryName);
 
    /**
-    * destroys a topic and removes it from JNDI  or BindingRegistry
+    * destroys a topic and removes it from the BindingRegistry
     *
     * @param name
     *           the name of the topic to destroy
@@ -175,7 +173,7 @@ public interface JMSServerManager extends ActiveMQComponent
    boolean destroyTopic(String name, boolean removeConsumers) throws Exception;
 
    /**
-    * destroys a topic and removes it from JNDI  or BindingRegistry
+    * destroys a topic and removes it from theBindingRegistry
     *
     * @param name
     *           the name of the topic to destroy
@@ -185,11 +183,11 @@ public interface JMSServerManager extends ActiveMQComponent
     */
    boolean destroyTopic(String name) throws Exception;
 
-   /** Call this method to have a CF rebound to JNDI and stored on the Journal
+   /** Call this method to have a CF rebound to the Binding Registry and stored on the Journal
     * @throws Exception */
    ActiveMQConnectionFactory recreateCF(String name,  ConnectionFactoryConfiguration cf) throws Exception;
 
-   void createConnectionFactory(String name, boolean ha, JMSFactoryType cfType, String discoveryGroupName, String ... jndiBindings) throws Exception;
+   void createConnectionFactory(String name, boolean ha, JMSFactoryType cfType, String discoveryGroupName, String ... bindings) throws Exception;
 
    void createConnectionFactory(String name,
                                 boolean ha,
@@ -300,8 +298,6 @@ public interface JMSServerManager extends ActiveMQComponent
 
    String listPreparedTransactionDetailsAsHTML() throws Exception;
 
-   void setContext(final Context context);
-
    ActiveMQServer getActiveMQServer();
 
    void addAddressSettings(String address, AddressSettings addressSettings);
@@ -315,7 +311,7 @@ public interface JMSServerManager extends ActiveMQComponent
    BindingRegistry getRegistry();
 
    /**
-    * Set this property if you want something other than JNDI for your registry
+    * Set this property if you want JMS resources bound to a registry
     *
     * @param registry
     */

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25146112/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSConfiguration.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSConfiguration.java
index 170e54c..7b47cb6 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSConfiguration.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/JMSConfiguration.java
@@ -18,8 +18,6 @@ package org.apache.activemq.jms.server.config;
 
 import java.util.List;
 
-import javax.naming.Context;
-
 /**
  * A JMSConfiguration
  *
@@ -29,10 +27,6 @@ import javax.naming.Context;
  */
 public interface JMSConfiguration
 {
-   JMSConfiguration setContext(Context context);
-
-   Context getContext();
-
    List<JMSQueueConfiguration> getQueueConfigurations();
 
    JMSConfiguration setQueueConfigurations(List<JMSQueueConfiguration> queueConfigurations);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25146112/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java
index ae4ca7f..25de05a 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java
@@ -19,8 +19,6 @@ package org.apache.activemq.jms.server.config.impl;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.naming.Context;
-
 import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
 import org.apache.activemq.jms.server.config.JMSConfiguration;
@@ -42,8 +40,6 @@ public class JMSConfigurationImpl implements JMSConfiguration
 
    private String domain = ActiveMQDefaultConfiguration.getDefaultJmxDomain();
 
-   private Context context = null;
-
    // JMSConfiguration implementation -------------------------------
 
    public JMSConfigurationImpl()
@@ -83,17 +79,6 @@ public class JMSConfigurationImpl implements JMSConfiguration
       return this;
    }
 
-   public Context getContext()
-   {
-      return context;
-   }
-
-   public JMSConfigurationImpl setContext(final Context context)
-   {
-      this.context = context;
-      return this;
-   }
-
    public String getDomain()
    {
       return domain;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/25146112/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java
index eab54a6..7d3d568 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerDeployer.java
@@ -115,12 +115,12 @@ public class JMSServerDeployer extends XmlDeployer
       if (node.getNodeName().equals(JMSServerDeployer.QUEUE_NODE_NAME))
       {
          String queueName = node.getAttributes().getNamedItem(getKeyAttribute()).getNodeValue();
-         jmsServerManager.removeQueueFromJNDI(queueName);
+         jmsServerManager.removeQueueFromBindingRegistry(queueName);
       }
       else if (node.getNodeName().equals(JMSServerDeployer.TOPIC_NODE_NAME))
       {
          String topicName = node.getAttributes().getNamedItem(getKeyAttribute()).getNodeValue();
-         jmsServerManager.removeTopicFromJNDI(topicName);
+         jmsServerManager.removeTopicFromBindingRegistry(topicName);
       }
    }
 


Mime
View raw message