Author: dblevins Date: Wed May 19 01:29:54 2010 New Revision: 945990 URL: http://svn.apache.org/viewvc?rev=945990&view=rev Log: svn merge -r 945988:945989 https://svn.apache.org/repos/asf/openejb/trunk/openejb3
http://svn.apache.org/viewvc?rev=945989&view=rev ------------------------------------------------------------------------ r945989 | dblevins | 2010-05-18 18:28:59 -0700 (Tue, 18 May 2010) | 2 lines OPENEJB-1281: Preconfigured failover with JNDI provider url such as "failover:ejbd://foo:4201,ejbd://bar:4201" ------------------------------------------------------------------------ Added: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/FailoverConnectionFactory.java - copied unchanged from r945989, openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/FailoverConnectionFactory.java openejb/branches/openejb-3.1.x/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverConnectionFactoryTest.java - copied unchanged from r945989, openejb/trunk/openejb3/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/FailoverConnectionFactoryTest.java Modified: openejb/branches/openejb-3.1.x/ (props changed) openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java (props changed) openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml (props changed) openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/ClusterMetaData.java openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/ConnectionManager.java openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/RandomConnectionStrategy.java openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/RoundRobinConnectionStrategy.java openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/StickyConnectionStrategy.java Propchange: openejb/branches/openejb-3.1.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 19 01:29:54 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1:779593 -/openejb/trunk/openejb3:943472,943862,943965,944757 +/openejb/trunk/openejb3:943472,943862,943965,944757,945989 Propchange: openejb/branches/openejb-3.1.x/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 19 01:29:54 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1/container/openejb-core/src/test/java/org/apache/openejb/config/UberInterfaceTest.java:779593 -/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757 +/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/config/BusinessInterfacesTest.java:943472,943862,943965,944757,945989 Propchange: openejb/branches/openejb-3.1.x/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed May 19 01:29:54 2010 @@ -1,2 +1,2 @@ /openejb/branches/openejb-3.1.1/examples/alternate-descriptors/src/main/resources/META-INF/ejb-jar.xml:779593 -/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757 +/openejb/trunk/openejb3/examples/alternate-descriptors/src/main/resources/META-INF/test.ejb-jar.xml:943472,943862,943965,944757,945989 Modified: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/ClusterMetaData.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/ClusterMetaData.java?rev=945990&r1=945989&r2=945990&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/ClusterMetaData.java (original) +++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/ClusterMetaData.java Wed May 19 01:29:54 2010 @@ -56,6 +56,10 @@ public class ClusterMetaData implements return version; } + public void setConnectionStrategy(String connectionStrategy) { + this.connectionStrategy = connectionStrategy; + } + public String getConnectionStrategy() { return connectionStrategy; } Modified: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/ConnectionManager.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/ConnectionManager.java?rev=945990&r1=945989&r2=945990&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/ConnectionManager.java (original) +++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/ConnectionManager.java Wed May 19 01:29:54 2010 @@ -37,6 +37,7 @@ public class ConnectionManager { factories.register("https", httpFactory); factories.register("multicast", new MulticastConnectionFactory()); + factories.register("failover", new FailoverConnectionFactory()); strategies.register("sticky", new StickyConnectionStrategy()); strategies.register("random", new RandomConnectionStrategy()); Modified: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/RandomConnectionStrategy.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/RandomConnectionStrategy.java?rev=945990&r1=945989&r2=945990&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/RandomConnectionStrategy.java (original) +++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/RandomConnectionStrategy.java Wed May 19 01:29:54 2010 @@ -66,7 +66,7 @@ public class RandomConnectionStrategy im } } - if (available.size() == 0 && !failed.contains(server.getLocation())){ + if (available.size() == 0 && server.getLocation() != null && !failed.contains(server.getLocation())){ return connect(cluster, server.getLocation()); } Modified: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/RoundRobinConnectionStrategy.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/RoundRobinConnectionStrategy.java?rev=945990&r1=945989&r2=945990&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/RoundRobinConnectionStrategy.java (original) +++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/RoundRobinConnectionStrategy.java Wed May 19 01:29:54 2010 @@ -76,7 +76,7 @@ public class RoundRobinConnectionStrateg remaining.removeAll(failed); - if (remaining.size() == 0 && !failed.contains(server.getLocation())){ + if (remaining.size() == 0 && server.getLocation() != null && !failed.contains(server.getLocation())){ return connect(cluster, server.getLocation()); } Modified: openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/StickyConnectionStrategy.java URL: http://svn.apache.org/viewvc/openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/StickyConnectionStrategy.java?rev=945990&r1=945989&r2=945990&view=diff ============================================================================== --- openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/StickyConnectionStrategy.java (original) +++ openejb/branches/openejb-3.1.x/server/openejb-client/src/main/java/org/apache/openejb/client/StickyConnectionStrategy.java Wed May 19 01:29:54 2010 @@ -67,7 +67,7 @@ public class StickyConnectionStrategy im remaining.removeAll(failed); - if (remaining.size() == 0 && !failed.contains(server.getLocation())){ + if (remaining.size() == 0 && server.getLocation() != null && !failed.contains(server.getLocation())){ return connect(cluster, server.getLocation()); }
