svn commit: r1221331 - /camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java

[davsclaus]

Author: davsclaus
Date: Tue Dec 20 16:17:19 2011
New Revision: 1221331

URL: http://svn.apache.org/viewvc?rev=1221331&view=rev
Log:
CAMEL-4803: Revert back to previous zookepper version due osgi issues with 3.4.1

Modified:
    
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java

Modified: 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java?rev=1221331&r1=1221330&r2=1221331&view=diff
==============================================================================
--- 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java
 (original)
+++ 
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/zookeeper/ZookeeperOSGiTestSupport.java
 Tue Dec 20 16:17:19 2011
@@ -34,6 +34,7 @@ import org.apache.camel.Message;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.component.zookeeper.ZooKeeperMessage;
 import org.apache.camel.itest.osgi.OSGiIntegrationTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.camel.util.FileUtil;
 import org.apache.karaf.testing.Helper;
 import org.apache.log4j.Logger;
@@ -45,8 +46,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;
@@ -128,7 +128,7 @@ public class ZookeeperOSGiTestSupport ex
     }
 
     public static class TestZookeeperServer {
-        private ServerCnxnFactory connectionFactory;
+        private NIOServerCnxn.Factory connectionFactory;
         private ZooKeeperServer zkServer;
 
         public TestZookeeperServer(int clientPort, boolean clearServerData) 
throws Exception {
@@ -146,7 +146,7 @@ public class ZookeeperOSGiTestSupport ex
             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);
         }