You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2013/01/13 17:45:52 UTC
svn commit: r1432654 - in /camel/trunk:
components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/
components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/
parent/
Author: cmueller
Date: Sun Jan 13 16:45:52 2013
New Revision: 1432654
URL: http://svn.apache.org/viewvc?rev=1432654&view=rev
Log:
upgrade zookeeper from 3.3.5 to 3.4.5
Modified:
camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/DeleteOperation.java
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/ZooKeeperTestSupport.java
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/DeleteOperation.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/DeleteOperation.java?rev=1432654&r1=1432653&r2=1432654&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/DeleteOperation.java (original)
+++ camel/trunk/components/camel-zookeeper/src/main/java/org/apache/camel/component/zookeeper/operations/DeleteOperation.java Sun Jan 13 16:45:52 2013
@@ -55,8 +55,7 @@ public class DeleteOperation extends Zoo
}
@Override
- @SuppressWarnings("rawtypes")
- public ZooKeeperOperation createCopy() throws Exception {
+ public ZooKeeperOperation<?> createCopy() throws Exception {
DeleteOperation copy = (DeleteOperation) super.createCopy();
copy.version = -1; // set the version to -1 for 'any version'
return copy;
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=1432654&r1=1432653&r2=1432654&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 Sun Jan 13 16:45:52 2013
@@ -19,8 +19,8 @@ package org.apache.camel.component.zooke
import java.util.List;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.CamelExchangeException;
import org.apache.camel.Exchange;
-import org.apache.camel.InvalidPayloadException;
import org.apache.camel.Message;
import org.apache.camel.NoSuchHeaderException;
import org.apache.camel.builder.RouteBuilder;
@@ -63,7 +63,7 @@ public class ConsumeChildrenTest extends
createChildListing());
}
- private void validateExchangesContainListings(MockEndpoint mock, List<?>... expected) throws InvalidPayloadException, NoSuchHeaderException {
+ private void validateExchangesContainListings(MockEndpoint mock, List<?>... expected) throws CamelExchangeException, NoSuchHeaderException {
int index = 0;
for (Exchange received : mock.getReceivedExchanges()) {
Watcher.Event.EventType expectedEvent;
Modified: camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java?rev=1432654&r1=1432653&r2=1432654&view=diff
==============================================================================
--- camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java (original)
+++ camel/trunk/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java Sun Jan 13 16:45:52 2013
@@ -44,7 +44,7 @@ import org.apache.zookeeper.ZooDefs.Ids;
import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.data.ACL;
import org.apache.zookeeper.data.Stat;
-import org.apache.zookeeper.server.NIOServerCnxn;
+import org.apache.zookeeper.server.NIOServerCnxnFactory;
import org.apache.zookeeper.server.ZooKeeperServer;
import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
@@ -102,7 +102,7 @@ public class ZooKeeperTestSupport extend
public static class TestZookeeperServer {
private static int count;
- private NIOServerCnxn.Factory connectionFactory;
+ private NIOServerCnxnFactory connectionFactory;
private ZooKeeperServer zkServer;
private File zookeeperBaseDir;
@@ -118,7 +118,8 @@ public class ZooKeeperTestSupport extend
FileTxnSnapLog ftxn = new FileTxnSnapLog(dataDir, snapDir);
zkServer.setTxnLogFactory(ftxn);
zkServer.setTickTime(1000);
- connectionFactory = new NIOServerCnxn.Factory(new InetSocketAddress("localhost", clientPort), 0);
+ connectionFactory = new NIOServerCnxnFactory();
+ connectionFactory.configure(new InetSocketAddress("localhost", clientPort), 0);
connectionFactory.startup(zkServer);
}
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1432654&r1=1432653&r2=1432654&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sun Jan 13 16:45:52 2013
@@ -384,7 +384,7 @@
<xstream-bundle-version>1.4.3_1</xstream-bundle-version>
<xstream-version>1.4.3</xstream-version>
<xom-version>1.2.5</xom-version>
- <zookeeper-version>3.3.5</zookeeper-version>
+ <zookeeper-version>3.4.5</zookeeper-version>
<!-- OSGi bundles properties -->
<camel.osgi.import.camel.version>version="[$(version;==;${camel.osgi.version.clean}),$(version;=+;${camel.osgi.version.clean}))"</camel.osgi.import.camel.version>