From 77bdb9d50266392278347a60e05de668ff983623 Mon Sep 17 00:00:00 2001
From: jbertram <jbertram@redhat.com>
Date: Fri, 5 Dec 2014 13:45:19 -0600
Subject: [PATCH] ACTIVEMQ6-14 Remove naming from bootstrap

---
 .../activemq/src/main/resources/config/clustered/bootstrap.xml  | 2 --
 .../src/main/resources/config/non-clustered/bootstrap.xml       | 2 --
 .../activemq/src/main/resources/config/replicated/bootstrap.xml | 2 --
 .../src/main/resources/config/shared-store/bootstrap.xml        | 2 --
 4 files changed, 8 deletions(-)

diff --git a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
index 76f88d1fda..681a1f5fa3 100644
--- a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
@@ -24,8 +24,6 @@
 
    <basic-security/>
 
-   <naming bindAddress="localhost" port="1099" rmiBindAddress="localhost" rmiPort="1098"/>
-
    <web bind="http://localhost:8161" path="web">
        <app url="jolokia" war="jolokia-war-1.2.3.war"/>
    </web>
diff --git a/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml
index a88b77718e..e031b163ee 100644
--- a/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml
@@ -24,8 +24,6 @@
 
    <basic-security/>
 
-   <naming bindAddress="localhost" port="1099" rmiBindAddress="localhost" rmiPort="1098"/>
-
    <web bind="http://localhost:8161" path="web">
        <app url="jolokia" war="jolokia-war-1.2.3.war"/>
    </web>
diff --git a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
index 6fd5686ae1..037f5d2f17 100644
--- a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
@@ -24,8 +24,6 @@
 
    <basic-security/>
 
-   <naming bindAddress="localhost" port="1099" rmiBindAddress="localhost" rmiPort="1098"/>
-
    <web bind="http://localhost:8161" path="web">
        <app url="jolokia" war="jolokia-war-1.2.3.war"/>
    </web>
diff --git a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml b/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
index 344157b8d6..362070989f 100644
--- a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
+++ b/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
@@ -24,8 +24,6 @@
 
    <basic-security/>
 
-   <naming bindAddress="localhost" port="1099" rmiBindAddress="localhost" rmiPort="1098"/>
-
    <web bind="http://localhost:8161" path="web">
        <app url="jolokia" war="jolokia-war-1.2.3.war"/>
    </web>