You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2011/08/27 09:17:57 UTC
svn commit: r1162305 - in /camel/trunk/components/camel-zookeeper/src:
main/resources/META-INF/services/org/apache/camel/component/
test/java/org/apache/camel/component/zookeeper/
test/java/org/apache/camel/component/zookeeper/policy/
Author: davsclaus
Date: Sat Aug 27 07:17:57 2011
New Revision: 1162305
URL: http://svn.apache.org/viewvc?rev=1162305&view=rev
Log:
CAMEL-2472: Removed zoo scheme name for zookeeper, as we should favor using zookeeper as the scheme name.
Modified:
camel/trunk/components/camel-zookeeper/src/main/resources/META-INF/services/org/apache/camel/component/zoo
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperConnectionManagerTest.java
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperProducerTest.java
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/FailoverRoutePolicyTest.java
camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/ZookeeperRoutePolicyTest.java
Modified: camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java?rev=1162305&r1=1162304&r2=1162305&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java (original)
+++ camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeChildrenTest.java Sat Aug 27 07:17:57 2011
@@ -36,7 +36,7 @@ public class ConsumeChildrenTest extends
protected RouteBuilder[] createRouteBuilders() throws Exception {
return new RouteBuilder[] {new RouteBuilder() {
public void configure() throws Exception {
- from("zoo://localhost:39913/grimm?repeat=true&listChildren=true").sort(body(), new NaturalSortComparator(Order.Descending)).to("mock:zookeeper-data");
+ from("zookeeper://localhost:39913/grimm?repeat=true&listChildren=true").sort(body(), new NaturalSortComparator(Order.Descending)).to("mock:zookeeper-data");
}
}};
}
Modified: camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java?rev=1162305&r1=1162304&r2=1162305&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java (original)
+++ camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ConsumeDataTest.java Sat Aug 27 07:17:57 2011
@@ -29,7 +29,7 @@ public class ConsumeDataTest extends Zoo
protected RouteBuilder[] createRouteBuilders() throws Exception {
return new RouteBuilder[] {new RouteBuilder() {
public void configure() throws Exception {
- from("zoo://localhost:39913/camel?repeat=true").to("mock:zookeeper-data");
+ from("zookeeper://localhost:39913/camel?repeat=true").to("mock:zookeeper-data");
}
}};
}
Modified: camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java?rev=1162305&r1=1162304&r2=1162305&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java (original)
+++ camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperManagedEndpointTest.java Sat Aug 27 07:17:57 2011
@@ -64,7 +64,7 @@ public class ZooKeeperManagedEndpointTes
@Test
public void testEnpointConfigurationCanBeSetViaJMX() throws Exception {
- Set s = getMBeanServer().queryNames(new ObjectName("org.apache.camel:type=endpoints,name=\"zoo:*\",*"), null);
+ Set s = getMBeanServer().queryNames(new ObjectName("org.apache.camel:type=endpoints,name=\"zookeeper:*\",*"), null);
assertEquals("Could not find zookeper endpoint: " + s, 1, s.size());
ObjectName zepName = new ArrayList<ObjectName>(s).get(0);
@@ -104,7 +104,7 @@ public class ZooKeeperManagedEndpointTes
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
- from("zoo://localhost:39913/node").to("mock:test");
+ from("zookeeper://localhost:39913/node").to("mock:test");
}
};
}
Modified: camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperConnectionManagerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperConnectionManagerTest.java?rev=1162305&r1=1162304&r2=1162305&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperConnectionManagerTest.java (original)
+++ camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperConnectionManagerTest.java Sat Aug 27 07:17:57 2011
@@ -31,7 +31,7 @@ public class ZookeeperConnectionManagerT
component.setConfiguration(config);
component.setCamelContext(context);
- ZooKeeperEndpoint zep = new ZooKeeperEndpoint("zoo:someserver/this/is/a/path", component, config);
+ ZooKeeperEndpoint zep = new ZooKeeperEndpoint("zookeeper:someserver/this/is/a/path", component, config);
ZooKeeperConnectionManager zkcm = new ZooKeeperConnectionManager(zep);
ZooKeeper zk = zkcm.getConnection();
Modified: camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperProducerTest.java?rev=1162305&r1=1162304&r2=1162305&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperProducerTest.java (original)
+++ camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperProducerTest.java Sat Aug 27 07:17:57 2011
@@ -44,22 +44,22 @@ public class ZookeeperProducerTest exten
protected RouteBuilder[] createRouteBuilders() throws Exception {
return new RouteBuilder[] {new RouteBuilder() {
public void configure() throws Exception {
- zookeeperUri = "zoo://localhost:39913/node?create=true";
+ zookeeperUri = "zookeeper://localhost:39913/node?create=true";
from("direct:roundtrip").to(zookeeperUri).to("mock:producer-out");
from(zookeeperUri).to("mock:consumed-from-node");
}
}, new RouteBuilder() {
public void configure() throws Exception {
- from("direct:no-create-fails-set").to("zoo://localhost:39913/doesnotexist");
+ from("direct:no-create-fails-set").to("zookeeper://localhost:39913/doesnotexist");
}
}, new RouteBuilder() {
public void configure() throws Exception {
- from("direct:node-from-header").to("zoo://localhost:39913/notset?create=true");
- from("zoo://localhost:39913/set?create=true").to("mock:consumed-from-set-node");
+ from("direct:node-from-header").to("zookeeper://localhost:39913/notset?create=true");
+ from("zookeeper://localhost:39913/set?create=true").to("mock:consumed-from-set-node");
}
}, new RouteBuilder() {
public void configure() throws Exception {
- from("direct:create-mode").to("zoo://localhost:39913/persistent?create=true&createMode=PERSISTENT").to("mock:create-mode");
+ from("direct:create-mode").to("zookeeper://localhost:39913/persistent?create=true&createMode=PERSISTENT").to("mock:create-mode");
}
}};
}
@@ -144,7 +144,7 @@ public class ZookeeperProducerTest exten
Exchange exchange = createExchangeWithBody(testPayload);
exchange.getIn().setHeader(ZOOKEEPER_NODE, "/set-listing/firstborn");
exchange.setPattern(ExchangePattern.InOut);
- template.send("zoo://localhost:39913/set-listing?create=true&listChildren=true", exchange);
+ template.send("zookeeper://localhost:39913/set-listing?create=true&listChildren=true", exchange);
List<String> children = ExchangeHelper.getMandatoryOutBody(exchange, List.class);
assertEquals(1, children.size());
assertEquals("firstborn", children.get(0));
Modified: camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/FailoverRoutePolicyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/FailoverRoutePolicyTest.java?rev=1162305&r1=1162304&r2=1162305&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/FailoverRoutePolicyTest.java (original)
+++ camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/FailoverRoutePolicyTest.java Sat Aug 27 07:17:57 2011
@@ -108,7 +108,7 @@ public class FailoverRoutePolicyTest ext
}
public void configure() throws Exception {
- ZooKeeperRoutePolicy policy = new ZooKeeperRoutePolicy("zoo:localhost:39913/someapp/somepolicy", 1);
+ ZooKeeperRoutePolicy policy = new ZooKeeperRoutePolicy("zookeeper:localhost:39913/someapp/somepolicy", 1);
from("vm:" + routename).routePolicy(policy).id(routename).to("mock:controlled");
}
};
Modified: camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/ZookeeperRoutePolicyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/ZookeeperRoutePolicyTest.java?rev=1162305&r1=1162304&r2=1162305&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/ZookeeperRoutePolicyTest.java (original)
+++ camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/policy/ZookeeperRoutePolicyTest.java Sat Aug 27 07:17:57 2011
@@ -41,7 +41,7 @@ public class ZookeeperRoutePolicyTest ex
public static class ZooKeeperPolicyEnforcedRoute extends RouteBuilder {
public void configure() throws Exception {
- ZooKeeperRoutePolicy policy = new ZooKeeperRoutePolicy("zoo:localhost:39913/someapp/somepolicy", 1);
+ ZooKeeperRoutePolicy policy = new ZooKeeperRoutePolicy("zookeeper:localhost:39913/someapp/somepolicy", 1);
from("direct:policy-controlled").routePolicy(policy).to("mock:controlled");
}
};