You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/12/01 00:19:38 UTC
svn commit: r1415885 - in /camel/branches/camel-2.10.x: ./
components/camel-zookeeper/
components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/
components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/
Author: bvahdat
Date: Fri Nov 30 23:19:37 2012
New Revision: 1415885
URL: http://svn.apache.org/viewvc?rev=1415885&view=rev
Log:
Merged revisions 1415884 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1415884 | bvahdat | 2012-12-01 00:11:14 +0100 (Sa, 01 Dez 2012) | 1 line
CAMEL-5838: Corrected the preexisting typo in awaitExistence setter method by ZooKeeperConfiguration (setAwaitExistance instead of setAwaitExistence), added a unit-test and as well did some tiny polishments.
........
Added:
camel/branches/camel-2.10.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperEndpointTest.java
- copied unchanged from r1415884, camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZookeeperEndpointTest.java
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-zookeeper/pom.xml
camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java
camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java
camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1415884
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/components/camel-zookeeper/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-zookeeper/pom.xml?rev=1415885&r1=1415884&r2=1415885&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-zookeeper/pom.xml (original)
+++ camel/branches/camel-2.10.x/components/camel-zookeeper/pom.xml Fri Nov 30 23:19:37 2012
@@ -52,11 +52,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
Modified: camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java?rev=1415885&r1=1415884&r2=1415885&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java (original)
+++ camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperComponent.java Fri Nov 30 23:19:37 2012
@@ -43,8 +43,7 @@ public class ZooKeeperComponent extends
this.configuration = configuration;
}
- @SuppressWarnings("all")
- protected Endpoint createEndpoint(String uri, String remaining, Map parameters) throws Exception {
+ protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
if (getCamelContext() == null) {
throw new CamelException("No Camel context has been provided to this zookeeper component");
}
Modified: camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java?rev=1415885&r1=1415884&r2=1415885&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java (original)
+++ camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperConfiguration.java Fri Nov 30 23:19:37 2012
@@ -131,7 +131,7 @@ public class ZooKeeperConfiguration impl
return awaitExistence;
}
- public void setAwaitExistance(boolean awaitExistence) {
+ public void setAwaitExistence(boolean awaitExistence) {
this.awaitExistence = awaitExistence;
}
Modified: camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java?rev=1415885&r1=1415884&r2=1415885&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java (original)
+++ camel/branches/camel-2.10.x/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/ZooKeeperEndpoint.java Fri Nov 30 23:19:37 2012
@@ -151,7 +151,7 @@ public class ZooKeeperEndpoint extends D
@ManagedAttribute
public void setAwaitExistence(boolean awaitExistence) {
- getConfiguration().setAwaitExistance(awaitExistence);
+ getConfiguration().setAwaitExistence(awaitExistence);
}
@ManagedOperation