- http://issues.apache.org/activemq/browse/AMQ-734

- the failover option is no longer supported to remove it from the interfeace.



git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@515602 13f79535-47bb-0310-9956-ffa450edef68

activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java

@@ -83,16 +83,6 @@ public class DiscoveryNetworkConnector extends NetworkConnector implements Disco
                 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;
@@ -168,14 +158,6 @@ public class DiscoveryNetworkConnector extends NetworkConnector implements Disco
         }
     }
 
-    public boolean isFailover() {
-        return failover;
-    }
-
-    public void setFailover(boolean reliable) {
-        this.failover = reliable;
-    }
-
     protected void doStart() throws Exception {
         if (discoveryAgent == null) {
             throw new IllegalStateException("You must configure the 'discoveryAgent' property");

activemq-core/src/main/java/org/apache/activemq/network/NetworkConnector.java

@@ -42,7 +42,6 @@ public abstract class NetworkConnector extends ServiceSupport {
     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();