svn commit: r515602 - in /activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network: DiscoveryNetworkConnector.java NetworkConnector.java

[chirino]

Author: chirino
Date: Wed Mar  7 07:15:54 2007
New Revision: 515602

URL: http://svn.apache.org/viewvc?view=rev&rev=515602
Log:
- http://issues.apache.org/activemq/browse/AMQ-734
- the failover option is no longer supported to remove it from the interfeace.


Modified:
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
    
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java?view=diff&rev=515602&r1=515601&r2=515602
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
 Wed Mar  7 07:15:54 2007
@@ -83,16 +83,6 @@
                 return;
 
             URI connectUri = uri;
-            if (failover) {
-                try {
-                    connectUri = new URI("failover:(" + 
connectUri+")?maxReconnectDelay=1000");
-                }
-                catch (URISyntaxException e) {
-                    log.warn("Could not create failover URI: " + connectUri);
-                    return;
-                }
-            }
-
             log.info("Establishing network connection between from " + 
localURI + " to " + connectUri);
 
             Transport remoteTransport;
@@ -166,14 +156,6 @@
             this.discoveryAgent.setDiscoveryListener(this);
             this.discoveryAgent.setBrokerName(getBrokerName());
         }
-    }
-
-    public boolean isFailover() {
-        return failover;
-    }
-
-    public void setFailover(boolean reliable) {
-        this.failover = reliable;
     }
 
     protected void doStart() throws Exception {

Modified: 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java
URL: 
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java?view=diff&rev=515602&r1=515601&r2=515602
==============================================================================
--- 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java
 (original)
+++ 
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java
 Wed Mar  7 07:15:54 2007
@@ -42,7 +42,6 @@
     private String brokerName = "localhost";
 
     private Set durableDestinations;
-    protected boolean failover = false;
     private List excludedDestinations = new CopyOnWriteArrayList();
     private List dynamicallyIncludedDestinations = new CopyOnWriteArrayList();
     private List staticallyIncludedDestinations = new CopyOnWriteArrayList();