You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2016/12/21 11:04:06 UTC

activemq git commit: avoid jmx 1099 port clash - no need to create connector for these tests that use the internal mbean server

Repository: activemq
Updated Branches:
  refs/heads/master 0ae90c089 -> ef97b67f0


avoid jmx 1099 port clash - no need to create connector for these tests that use the internal mbean server


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

Branch: refs/heads/master
Commit: ef97b67f001ced35aac50dd2571d9b356b9f7d3f
Parents: 0ae90c0
Author: gtully <ga...@gmail.com>
Authored: Wed Dec 21 11:03:49 2016 +0000
Committer: gtully <ga...@gmail.com>
Committed: Wed Dec 21 11:03:49 2016 +0000

----------------------------------------------------------------------
 .../resources/org/apache/activemq/emptyManualUpdateConfig.xml     | 3 +++
 .../org/apache/activemq/emptyUpdatableConfig1000-spring-bean.xml  | 3 +++
 ...atableConfig1000-spring-property-file-list-and-beanFactory.xml | 3 +++
 .../emptyUpdatableConfig1000-spring-property-file-list.xml        | 3 +++
 .../activemq/emptyUpdatableConfig1000-spring-property-file-nc.xml | 3 +++
 .../activemq/emptyUpdatableConfig1000-spring-property-file.xml    | 3 +++
 .../activemq/emptyUpdatableConfig1000-spring-property-nc.xml      | 3 +++
 .../apache/activemq/emptyUpdatableConfig1000-spring-property.xml  | 3 +++
 8 files changed, 24 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/ef97b67f/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyManualUpdateConfig.xml
----------------------------------------------------------------------
diff --git a/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyManualUpdateConfig.xml b/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyManualUpdateConfig.xml
index 14523c1..6d4af77 100644
--- a/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyManualUpdateConfig.xml
+++ b/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyManualUpdateConfig.xml
@@ -22,6 +22,9 @@
   http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
 
   <broker xmlns="http://activemq.apache.org/schema/core" start="false" persistent="false" >
+    <managementContext>
+      <managementContext createConnector="false"/>
+    </managementContext>
     <plugins>
       <runtimeConfigurationPlugin />
     </plugins>

http://git-wip-us.apache.org/repos/asf/activemq/blob/ef97b67f/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-bean.xml
----------------------------------------------------------------------
diff --git a/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-bean.xml b/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-bean.xml
index 2047b96..bb1ec52 100644
--- a/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-bean.xml
+++ b/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-bean.xml
@@ -22,6 +22,9 @@
   http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
 
   <broker xmlns="http://activemq.apache.org/schema/core" start="false" persistent="false" >
+    <managementContext>
+      <managementContext createConnector="false"/>
+    </managementContext>
     <plugins>
       <runtimeConfigurationPlugin checkPeriod="1000" />
     </plugins>

http://git-wip-us.apache.org/repos/asf/activemq/blob/ef97b67f/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-file-list-and-beanFactory.xml
----------------------------------------------------------------------
diff --git a/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-file-list-and-beanFactory.xml b/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-file-list-and-beanFactory.xml
index 621c5d7..37f7a9e 100644
--- a/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-file-list-and-beanFactory.xml
+++ b/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-file-list-and-beanFactory.xml
@@ -34,6 +34,9 @@
   </bean>
 
   <broker xmlns="http://activemq.apache.org/schema/core" start="false" persistent="false" brokerName="${custom}">
+    <managementContext>
+      <managementContext createConnector="false"/>
+    </managementContext>
     <plugins>
       <runtimeConfigurationPlugin checkPeriod="1000" />
     </plugins>

http://git-wip-us.apache.org/repos/asf/activemq/blob/ef97b67f/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-file-list.xml
----------------------------------------------------------------------
diff --git a/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-file-list.xml b/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-file-list.xml
index 8ffdf02..da55a6f 100644
--- a/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-file-list.xml
+++ b/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-file-list.xml
@@ -31,6 +31,9 @@
   </bean>
 
   <broker xmlns="http://activemq.apache.org/schema/core" start="false" persistent="false" >
+    <managementContext>
+      <managementContext createConnector="false"/>
+    </managementContext>
     <plugins>
       <runtimeConfigurationPlugin checkPeriod="1000" />
     </plugins>

http://git-wip-us.apache.org/repos/asf/activemq/blob/ef97b67f/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-file-nc.xml
----------------------------------------------------------------------
diff --git a/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-file-nc.xml b/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-file-nc.xml
index 900270b..45d3ab6 100644
--- a/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-file-nc.xml
+++ b/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-file-nc.xml
@@ -28,6 +28,9 @@
   </bean>
 
   <broker xmlns="http://activemq.apache.org/schema/core" start="false" persistent="false" >
+    <managementContext>
+      <managementContext createConnector="false"/>
+    </managementContext>
     <plugins>
       <runtimeConfigurationPlugin checkPeriod="1000" />
     </plugins>

http://git-wip-us.apache.org/repos/asf/activemq/blob/ef97b67f/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-file.xml
----------------------------------------------------------------------
diff --git a/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-file.xml b/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-file.xml
index 45f2711..d1115b3 100644
--- a/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-file.xml
+++ b/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-file.xml
@@ -28,6 +28,9 @@
   </bean>
 
   <broker xmlns="http://activemq.apache.org/schema/core" start="false" persistent="false" >
+    <managementContext>
+      <managementContext createConnector="false"/>
+    </managementContext>
     <plugins>
       <runtimeConfigurationPlugin checkPeriod="1000" />
     </plugins>

http://git-wip-us.apache.org/repos/asf/activemq/blob/ef97b67f/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-nc.xml
----------------------------------------------------------------------
diff --git a/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-nc.xml b/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-nc.xml
index bdc9278..9c4749f 100644
--- a/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-nc.xml
+++ b/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property-nc.xml
@@ -24,6 +24,9 @@
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
 
   <broker xmlns="http://activemq.apache.org/schema/core" start="false" persistent="false" >
+    <managementContext>
+      <managementContext createConnector="false"/>
+    </managementContext>
     <plugins>
       <runtimeConfigurationPlugin checkPeriod="1000" />
     </plugins>

http://git-wip-us.apache.org/repos/asf/activemq/blob/ef97b67f/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property.xml
----------------------------------------------------------------------
diff --git a/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property.xml b/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property.xml
index ee54288..e7f4a7a 100644
--- a/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property.xml
+++ b/activemq-runtime-config/src/test/resources/org/apache/activemq/emptyUpdatableConfig1000-spring-property.xml
@@ -24,6 +24,9 @@
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
 
   <broker xmlns="http://activemq.apache.org/schema/core" start="false" persistent="false" >
+    <managementContext>
+      <managementContext createConnector="false"/>
+    </managementContext>
     <plugins>
       <runtimeConfigurationPlugin checkPeriod="1000" />
     </plugins>