activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject svn commit: r1136026 - in /activemq/trunk: activemq-core/src/main/java/org/apache/activemq/advisory/ activemq-core/src/main/java/org/apache/activemq/broker/ activemq-core/src/main/java/org/apache/activemq/network/ assembly/src/sample-conf/
Date Wed, 15 Jun 2011 13:18:43 GMT
Author: dejanb
Date: Wed Jun 15 13:18:42 2011
New Revision: 1136026

URL: http://svn.apache.org/viewvc?rev=1136026&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3135 - add remoteIp to network bridge advisory

Modified:
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/EmptyBroker.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java
    activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
    activemq/trunk/assembly/src/sample-conf/activemq-static-network-broker2.xml

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java?rev=1136026&r1=1136025&r2=1136026&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
Wed Jun 15 13:18:42 2011
@@ -392,12 +392,13 @@ public class AdvisoryBroker extends Brok
     }
 
     @Override
-    public void networkBridgeStarted(BrokerInfo brokerInfo, boolean createdByDuplex) {
+    public void networkBridgeStarted(BrokerInfo brokerInfo, boolean createdByDuplex, String
remoteIp) {
         try {
          if (brokerInfo != null) {
              ActiveMQMessage advisoryMessage = new ActiveMQMessage();
              advisoryMessage.setBooleanProperty("started", true);
              advisoryMessage.setBooleanProperty("createdByDuplex", createdByDuplex);
+             advisoryMessage.setStringProperty("remoteIp", remoteIp);
 
              ActiveMQTopic topic = AdvisorySupport.getNetworkBridgeAdvisoryTopic();
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java?rev=1136026&r1=1136025&r2=1136026&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java (original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/Broker.java Wed
Jun 15 13:18:42 2011
@@ -382,7 +382,7 @@ public interface Broker extends Region, 
     
     ThreadPoolExecutor getExecutor();
 
-    void networkBridgeStarted(BrokerInfo brokerInfo, boolean createdByDuplex);
+    void networkBridgeStarted(BrokerInfo brokerInfo, boolean createdByDuplex, String remoteIp);
 
     void networkBridgeStopped(BrokerInfo brokerInfo);
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java?rev=1136026&r1=1136025&r2=1136026&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerFilter.java
Wed Jun 15 13:18:42 2011
@@ -312,8 +312,8 @@ public class BrokerFilter implements Bro
        return next.getExecutor();
     }
 
-    public void networkBridgeStarted(BrokerInfo brokerInfo, boolean createdByDuplex) {
-        next.networkBridgeStarted(brokerInfo, createdByDuplex);
+    public void networkBridgeStarted(BrokerInfo brokerInfo, boolean createdByDuplex, String
remoteIp) {
+        next.networkBridgeStarted(brokerInfo, createdByDuplex, remoteIp);
     }
 
     public void networkBridgeStopped(BrokerInfo brokerInfo) {

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/EmptyBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/EmptyBroker.java?rev=1136026&r1=1136025&r2=1136026&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/EmptyBroker.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/EmptyBroker.java
Wed Jun 15 13:18:42 2011
@@ -284,7 +284,7 @@ public class EmptyBroker implements Brok
     public void nowMasterBroker() {        
     }
 
-    public void networkBridgeStarted(BrokerInfo brokerInfo, boolean createdByDuplex) {
+    public void networkBridgeStarted(BrokerInfo brokerInfo, boolean createdByDuplex, String
remoteIp) {
     }
 
     public void networkBridgeStopped(BrokerInfo brokerInfo) {

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java?rev=1136026&r1=1136025&r2=1136026&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/ErrorBroker.java
Wed Jun 15 13:18:42 2011
@@ -314,7 +314,7 @@ public class ErrorBroker implements Brok
         throw new BrokerStoppedException(this.message);
     }
 
-    public void networkBridgeStarted(BrokerInfo brokerInfo, boolean createdByDuplex) {
+    public void networkBridgeStarted(BrokerInfo brokerInfo, boolean createdByDuplex, String
remoteIp) {
         throw new BrokerStoppedException(this.message);
     }
 

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java?rev=1136026&r1=1136025&r2=1136026&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/MutableBrokerFilter.java
Wed Jun 15 13:18:42 2011
@@ -323,8 +323,8 @@ public class MutableBrokerFilter impleme
        return getNext().getExecutor();
     }
 
-    public void networkBridgeStarted(BrokerInfo brokerInfo, boolean createdByDuplex) {
-        getNext().networkBridgeStarted(brokerInfo, createdByDuplex);
+    public void networkBridgeStarted(BrokerInfo brokerInfo, boolean createdByDuplex, String
remoteIp) {
+        getNext().networkBridgeStarted(brokerInfo, createdByDuplex, remoteIp);
     }
 
     public void networkBridgeStopped(BrokerInfo brokerInfo) {

Modified: activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java?rev=1136026&r1=1136025&r2=1136026&view=diff
==============================================================================
--- activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
(original)
+++ activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
Wed Jun 15 13:18:42 2011
@@ -298,7 +298,7 @@ public abstract class DemandForwardingBr
                     localSessionInfo = new SessionInfo(localConnectionInfo, 1);
                     localBroker.oneway(localSessionInfo);
 
-                    brokerService.getBroker().networkBridgeStarted(remoteBrokerInfo, this.createdByDuplex);
+                    brokerService.getBroker().networkBridgeStarted(remoteBrokerInfo, this.createdByDuplex,
remoteBroker.toString());
                     NetworkBridgeListener l = this.networkBridgeListener;
                     if (l != null) {
                         l.onStart(this);
@@ -347,7 +347,6 @@ public abstract class DemandForwardingBr
                 remoteConnectionInfo.setClientId(configuration.getName() + "_" + configuration.getBrokerName()
+ "_outbound");
                 remoteConnectionInfo.setUserName(configuration.getUserName());
                 remoteConnectionInfo.setPassword(configuration.getPassword());
-                remoteConnectionInfo.setClientIp(remoteBroker.toString());
                 remoteBroker.oneway(remoteConnectionInfo);
 
                 SessionInfo remoteSessionInfo = new SessionInfo(remoteConnectionInfo, 1);

Modified: activemq/trunk/assembly/src/sample-conf/activemq-static-network-broker2.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/src/sample-conf/activemq-static-network-broker2.xml?rev=1136026&r1=1136025&r2=1136026&view=diff
==============================================================================
--- activemq/trunk/assembly/src/sample-conf/activemq-static-network-broker2.xml (original)
+++ activemq/trunk/assembly/src/sample-conf/activemq-static-network-broker2.xml Wed Jun 15
13:18:42 2011
@@ -41,7 +41,7 @@
     <!-- Allows us to use system properties as variables in this configuration file -->
     <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
 
-    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="static-broker1"
dataDirectory="${activemq.base}/data">
+    <broker xmlns="http://activemq.apache.org/schema/core" brokerName="static-broker2"
dataDirectory="${activemq.base}/data">
 
         <!-- Destination specific policies using destination names or wildcards -->
         <destinationPolicy>



Mime
View raw message