You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2009/06/10 15:17:50 UTC
svn commit: r783350 - in /activemq/sandbox/activemq-flow: activemq-broker/ activemq-broker/src/main/java/org/apache/activemq/broker/ activemq-broker/src/main/java/org/apache/activemq/broker/region/ activemq-broker/src/main/java/org/apache/activemq/xbea...

Author: chirino
Date: Wed Jun 10 13:17:49 2009
New Revision: 783350

URL: http://svn.apache.org/viewvc?rev=783350&view=rev
Log:
moving the old broker stub interfaces to the broker package.

Added:
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Broker.java
      - copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/broker/Broker.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java
      - copied, changed from r783335, activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/broker/BrokerService.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerServiceAware.java
      - copied unchanged from r783335, activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/broker/BrokerServiceAware.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/ManagementContext.java
      - copied unchanged from r783335, activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/broker/ManagementContext.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnection.java
      - copied unchanged from r783335, activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/broker/TransportConnection.java
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/
      - copied from r783335, activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/broker/region/
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/xbean/
      - copied from r783335, activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/xbean/
Removed:
    activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/broker/Broker.java
    activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/broker/BrokerService.java
    activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/broker/BrokerServiceAware.java
    activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/broker/ManagementContext.java
    activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/broker/TransportConnection.java
    activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/broker/region/
    activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/BrokerService.java
    activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/broker/BrokerServiceAware.java
    activemq/sandbox/activemq-flow/activemq-stomp/src/main/java/org/apache/activemq/xbean/
Modified:
    activemq/sandbox/activemq-flow/activemq-broker/pom.xml
    activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/Subscription.java
    activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
    activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/LdapNetworkConnector.java

Modified: activemq/sandbox/activemq-flow/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/pom.xml?rev=783350&r1=783349&r2=783350&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/pom.xml (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/pom.xml Wed Jun 10 13:17:49 2009
@@ -51,6 +51,13 @@
       <artifactId>activemq-kaha</artifactId>
       <optional>true</optional>
     </dependency>
+    
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <optional>true</optional>
+    </dependency>
+    
 
     <!-- Testing Dependencies -->    
     <dependency>

Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Broker.java (from r783335, activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/broker/Broker.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Broker.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Broker.java&p1=activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/broker/Broker.java&r1=783335&r2=783350&rev=783350&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/broker/Broker.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/Broker.java Wed Jun 10 13:17:49 2009
@@ -18,11 +18,9 @@
 
 import java.util.Set;
 
-import org.apache.activemq.command.ActiveMQDestination;
-
 public class Broker {
 
-    public Set<ActiveMQDestination> getDurableDestinations() {
+	public <T> Set<T> getDurableDestinations() {
         // TODO Auto-generated method stub
         return null;
     }

Copied: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java (from r783335, activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/broker/BrokerService.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java?p2=activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java&p1=activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/broker/BrokerService.java&r1=783335&r2=783350&rev=783350&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/broker/BrokerService.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/BrokerService.java Wed Jun 10 13:17:49 2009
@@ -19,7 +19,6 @@
 import java.net.URI;
 
 import org.apache.activemq.broker.region.RegionBroker;
-import org.apache.activemq.network.NetworkConnector;
 
 public class BrokerService {
 
@@ -43,7 +42,7 @@
         return null;
     }
 
-    public NetworkConnector addNetworkConnector(URI connectorURI) {
+    public <T> T addNetworkConnector(URI connectorURI) {
         // TODO Auto-generated method stub
         return null;
     }

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/Subscription.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/Subscription.java?rev=783350&r1=783335&r2=783350&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/Subscription.java (original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/main/java/org/apache/activemq/broker/region/Subscription.java Wed Jun 10 13:17:49 2009
@@ -16,11 +16,10 @@
  */
 package org.apache.activemq.broker.region;
 
-import org.apache.activemq.command.ConsumerInfo;
 
 public class Subscription {
 
-    public ConsumerInfo getConsumerInfo() {
+    public <T> T getConsumerInfo() {
         // TODO Auto-generated method stub
         return null;
     }

Modified: activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java?rev=783350&r1=783349&r2=783350&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java Wed Jun 10 13:17:49 2009
@@ -981,7 +981,8 @@
         Collection<Subscription> currentSubs = 
             getRegionSubscriptions(consumerInfo.getDestination().isTopic());
         for (Subscription sub : currentSubs) {
-            List<ConsumerId> networkConsumers =  sub.getConsumerInfo().getNetworkConsumerIds();
+            ConsumerInfo ci = sub.getConsumerInfo();
+			List<ConsumerId> networkConsumers =  ci.getNetworkConsumerIds();
             if (!networkConsumers.isEmpty()) {
                 if (matchFound(candidateConsumers, networkConsumers)) {
                     if (LOG.isDebugEnabled()) {

Modified: activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/LdapNetworkConnector.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/LdapNetworkConnector.java?rev=783350&r1=783349&r2=783350&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/LdapNetworkConnector.java (original)
+++ activemq/sandbox/activemq-flow/activemq-network/src/main/java/org/apache/activemq/network/LdapNetworkConnector.java Wed Jun 10 13:17:49 2009
@@ -20,6 +20,7 @@
 import java.util.Hashtable;
 import java.util.Map;
 import java.util.Random;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.naming.CommunicationException;
@@ -36,6 +37,7 @@
 import javax.naming.event.NamingExceptionEvent;
 import javax.naming.event.ObjectChangeListener;
 
+import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.util.URISupport;
 import org.apache.activemq.util.URISupport.CompositeData;
 import org.apache.commons.logging.Log;
@@ -330,7 +332,8 @@
       //      required to prevent remote broker exceptions upon connection
       connector.setLocalUri(getBrokerService().getVmConnectorURI());
       connector.setBrokerName(getBrokerService().getBrokerName());
-      connector.setDurableDestinations(getBrokerService().getBroker().getDurableDestinations());
+      Set<ActiveMQDestination> dests = getBrokerService().getBroker().getDurableDestinations();
+	  connector.setDurableDestinations(dests);
 
       // start network connector
       connectorMap.put(connectorURI, connector);