You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/09/20 18:32:15 UTC
svn commit: r1388105 - in
/lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache:
solr/common/cloud/ zookeeper/
Author: rmuir
Date: Thu Sep 20 16:32:14 2012
New Revision: 1388105
URL: http://svn.apache.org/viewvc?rev=1388105&view=rev
Log:
SOLR-3733: nuke this o.a.zookeeper package, Uwe your turn
Added:
lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java
- copied, changed from r1388092, lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/zookeeper/SolrZooKeeper.java
Removed:
lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/zookeeper/
Modified:
lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java
lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java
Modified: lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java?rev=1388105&r1=1388104&r2=1388105&view=diff
==============================================================================
--- lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java (original)
+++ lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java Thu Sep 20 16:32:14 2012
@@ -21,7 +21,6 @@ import java.util.concurrent.CountDownLat
import java.util.concurrent.TimeoutException;
import org.apache.solr.common.SolrException;
-import org.apache.zookeeper.SolrZooKeeper;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.Watcher.Event.KeeperState;
Modified: lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java?rev=1388105&r1=1388104&r2=1388105&view=diff
==============================================================================
--- lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java (original)
+++ lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/DefaultConnectionStrategy.java Thu Sep 20 16:32:14 2012
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.concurrent.TimeoutException;
import org.apache.solr.common.SolrException;
-import org.apache.zookeeper.SolrZooKeeper;
import org.apache.zookeeper.Watcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java?rev=1388105&r1=1388104&r2=1388105&view=diff
==============================================================================
--- lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java (original)
+++ lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java Thu Sep 20 16:32:14 2012
@@ -39,7 +39,6 @@ import org.apache.solr.common.cloud.ZkCl
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.KeeperException.NoNodeException;
-import org.apache.zookeeper.SolrZooKeeper;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.ZooDefs;
import org.apache.zookeeper.ZooKeeper;
Copied: lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java (from r1388092, lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/zookeeper/SolrZooKeeper.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java?p2=lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java&p1=lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/zookeeper/SolrZooKeeper.java&r1=1388092&r2=1388105&rev=1388105&view=diff
==============================================================================
--- lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/zookeeper/SolrZooKeeper.java (original)
+++ lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZooKeeper.java Thu Sep 20 16:32:14 2012
@@ -1,4 +1,4 @@
-package org.apache.zookeeper;
+package org.apache.solr.common.cloud;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -25,6 +25,10 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
+import org.apache.zookeeper.ClientCnxn;
+import org.apache.zookeeper.Watcher;
+import org.apache.zookeeper.ZooKeeper;
+
// we use this class to expose nasty stuff for tests
public class SolrZooKeeper extends ZooKeeper {
List<Thread> spawnedThreads = new CopyOnWriteArrayList<Thread>();
@@ -53,6 +57,8 @@ public class SolrZooKeeper extends ZooKe
try {
synchronized (cnxn) {
try {
+ // nocommit: reflect me, move me somewehre else as static method,
+ // something. i am only used by tests! the rest of this file is clean.
((SocketChannel) cnxn.sendThread.sockKey.channel()).socket()
.close();
} catch (Exception e) {
Modified: lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java?rev=1388105&r1=1388104&r2=1388105&view=diff
==============================================================================
--- lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java (original)
+++ lucene/dev/branches/solr3733/solr/solrj/src/java/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java Thu Sep 20 16:32:14 2012
@@ -23,7 +23,6 @@ import java.util.List;
import java.util.concurrent.TimeoutException;
import org.apache.solr.common.SolrException;
-import org.apache.zookeeper.SolrZooKeeper;
import org.apache.zookeeper.Watcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;