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/12/20 17:20:15 UTC
svn commit: r1221332 - in /camel/trunk:
components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
parent/pom.xml
Author: davsclaus
Date: Tue Dec 20 16:20:15 2011
New Revision: 1221332
URL: http://svn.apache.org/viewvc?rev=1221332&view=rev
Log:
CAMEL-4803: Revert back to previous zookepper version due osgi issues with 3.4.1
Modified:
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/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=1221332&r1=1221331&r2=1221332&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 Tue Dec 20 16:20:15 2011
@@ -43,8 +43,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.NIOServerCnxnFactory;
-import org.apache.zookeeper.server.ServerCnxnFactory;
+import org.apache.zookeeper.server.NIOServerCnxn;
import org.apache.zookeeper.server.ZooKeeperServer;
import org.apache.zookeeper.server.persistence.FileTxnSnapLog;
import org.junit.AfterClass;
@@ -98,7 +97,7 @@ public class ZooKeeperTestSupport extend
public static class TestZookeeperServer {
private static int count;
- private ServerCnxnFactory connectionFactory;
+ private NIOServerCnxn.Factory connectionFactory;
private ZooKeeperServer zkServer;
private File zookeeperBaseDir;
@@ -114,7 +113,7 @@ public class ZooKeeperTestSupport extend
FileTxnSnapLog ftxn = new FileTxnSnapLog(dataDir, snapDir);
zkServer.setTxnLogFactory(ftxn);
zkServer.setTickTime(1000);
- connectionFactory = NIOServerCnxnFactory.createFactory(new InetSocketAddress("localhost", clientPort), 0);
+ connectionFactory = new NIOServerCnxn.Factory(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=1221332&r1=1221331&r2=1221332&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Dec 20 16:20:15 2011
@@ -165,7 +165,7 @@
<xalan-version>2.7.1</xalan-version>
<xmlunit-version>1.3</xmlunit-version>
<xmlbeans-version>2.5.0</xmlbeans-version>
- <zookeeper-version>3.4.1</zookeeper-version>
+ <zookeeper-version>3.3.4</zookeeper-version>
<!-- used by camel archetypes -->
<maven-compiler-plugin-version>2.3.2</maven-compiler-plugin-version>