You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by ma...@apache.org on 2010/02/17 18:45:46 UTC
svn commit: r911110 - in /lucene/solr/branches/cloud/src:
common/org/apache/solr/common/cloud/ java/org/apache/solr/cloud/
java/org/apache/solr/core/ java/org/apache/solr/handler/component/
solrj/org/apache/solr/client/solrj/impl/ test/org/apache/solr/...
Author: markrmiller
Date: Wed Feb 17 17:45:45 2010
New Revision: 911110
URL: http://svn.apache.org/viewvc?rev=911110&view=rev
Log:
more refactoring for solrj and add missing license headers
Added:
lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/Slice.java
- copied, changed from r911075, lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/Slice.java
lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java
- copied, changed from r911075, lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkClientConnectionStrategy.java
lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ZkNodeProps.java
- copied, changed from r911075, lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkNodeProps.java
lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ZooKeeperException.java
- copied, changed from r911075, lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZooKeeperException.java
Removed:
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/Slice.java
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkClientConnectionStrategy.java
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkNodeProps.java
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZooKeeperException.java
Modified:
lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/CloudState.java
lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ConnectionManager.java
lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/DefaultConnectionStrategy.java
lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/OnReconnect.java
lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/SolrZkClient.java
lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/SolrZooKeeper.java
lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ZkStateReader.java
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java
lucene/solr/branches/cloud/src/java/org/apache/solr/core/SolrCore.java
lucene/solr/branches/cloud/src/java/org/apache/solr/handler/component/QueryComponent.java
lucene/solr/branches/cloud/src/solrj/org/apache/solr/client/solrj/impl/CloudSolrServer.java
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java
lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkNodePropsTest.java
Modified: lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/CloudState.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/CloudState.java?rev=911110&r1=911109&r2=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/CloudState.java (original)
+++ lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/CloudState.java Wed Feb 17 17:45:45 2010
@@ -25,10 +25,6 @@
import java.util.Map;
import java.util.Set;
-import org.apache.solr.cloud.Slice;
-import org.apache.solr.cloud.ZkController;
-import org.apache.solr.cloud.ZkNodeProps;
-import org.apache.solr.cloud.ZooKeeperException;
import org.apache.solr.common.SolrException;
import org.apache.zookeeper.KeeperException;
import org.slf4j.Logger;
Modified: lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ConnectionManager.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ConnectionManager.java?rev=911110&r1=911109&r2=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ConnectionManager.java (original)
+++ lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ConnectionManager.java Wed Feb 17 17:45:45 2010
@@ -21,8 +21,6 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeoutException;
-import org.apache.solr.cloud.ZkClientConnectionStrategy;
-import org.apache.solr.cloud.ZkClientConnectionStrategy.ZkUpdate;
import org.apache.zookeeper.WatchedEvent;
import org.apache.zookeeper.Watcher;
import org.apache.zookeeper.Watcher.Event.KeeperState;
Modified: lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/DefaultConnectionStrategy.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/DefaultConnectionStrategy.java?rev=911110&r1=911109&r2=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/DefaultConnectionStrategy.java (original)
+++ lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/DefaultConnectionStrategy.java Wed Feb 17 17:45:45 2010
@@ -23,8 +23,6 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import org.apache.solr.cloud.ZkClientConnectionStrategy;
-import org.apache.solr.cloud.ZkClientConnectionStrategy.ZkUpdate;
import org.apache.zookeeper.Watcher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/OnReconnect.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/OnReconnect.java?rev=911110&r1=911109&r2=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/OnReconnect.java (original)
+++ lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/OnReconnect.java Wed Feb 17 17:45:45 2010
@@ -1,5 +1,22 @@
package org.apache.solr.common.cloud;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
public interface OnReconnect {
public void command();
}
Copied: lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/Slice.java (from r911075, lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/Slice.java)
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/Slice.java?p2=lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/Slice.java&p1=lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/Slice.java&r1=911075&r2=911110&rev=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/Slice.java (original)
+++ lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/Slice.java Wed Feb 17 17:45:45 2010
@@ -1,4 +1,4 @@
-package org.apache.solr.cloud;
+package org.apache.solr.common.cloud;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,6 +20,7 @@
import java.util.Collections;
import java.util.Map;
+
// immutable
public class Slice {
private final Map<String,ZkNodeProps> shards;
Modified: lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/SolrZkClient.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/SolrZkClient.java?rev=911110&r1=911109&r2=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/SolrZkClient.java (original)
+++ lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/SolrZkClient.java Wed Feb 17 17:45:45 2010
@@ -24,10 +24,8 @@
import java.util.concurrent.TimeoutException;
import org.apache.commons.io.FileUtils;
-import org.apache.solr.cloud.ZkClientConnectionStrategy;
-import org.apache.solr.cloud.ZooKeeperException;
-import org.apache.solr.cloud.ZkClientConnectionStrategy.ZkUpdate;
import org.apache.solr.common.SolrException;
+import org.apache.solr.common.cloud.ZkClientConnectionStrategy.ZkUpdate;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.Watcher;
Modified: lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/SolrZooKeeper.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/SolrZooKeeper.java?rev=911110&r1=911109&r2=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/SolrZooKeeper.java (original)
+++ lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/SolrZooKeeper.java Wed Feb 17 17:45:45 2010
@@ -1,5 +1,22 @@
package org.apache.solr.common.cloud;
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
import java.io.IOException;
import org.apache.zookeeper.ClientCnxn;
Copied: lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java (from r911075, lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkClientConnectionStrategy.java)
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java?p2=lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java&p1=lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkClientConnectionStrategy.java&r1=911075&r2=911110&rev=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkClientConnectionStrategy.java (original)
+++ lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ZkClientConnectionStrategy.java Wed Feb 17 17:45:45 2010
@@ -1,4 +1,4 @@
-package org.apache.solr.cloud;
+package org.apache.solr.common.cloud;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,6 @@
import java.io.IOException;
import java.util.concurrent.TimeoutException;
-import org.apache.solr.common.cloud.SolrZooKeeper;
import org.apache.zookeeper.Watcher;
/**
Copied: lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ZkNodeProps.java (from r911075, lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkNodeProps.java)
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ZkNodeProps.java?p2=lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ZkNodeProps.java&p1=lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkNodeProps.java&r1=911075&r2=911110&rev=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkNodeProps.java (original)
+++ lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ZkNodeProps.java Wed Feb 17 17:45:45 2010
@@ -1,4 +1,4 @@
-package org.apache.solr.cloud;
+package org.apache.solr.common.cloud;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ZkStateReader.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ZkStateReader.java?rev=911110&r1=911109&r2=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ZkStateReader.java (original)
+++ lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ZkStateReader.java Wed Feb 17 17:45:45 2010
@@ -28,8 +28,6 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import org.apache.solr.cloud.Slice;
-import org.apache.solr.cloud.ZooKeeperException;
import org.apache.solr.common.SolrException;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.WatchedEvent;
Copied: lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ZooKeeperException.java (from r911075, lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZooKeeperException.java)
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ZooKeeperException.java?p2=lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ZooKeeperException.java&p1=lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZooKeeperException.java&r1=911075&r2=911110&rev=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZooKeeperException.java (original)
+++ lucene/solr/branches/cloud/src/common/org/apache/solr/common/cloud/ZooKeeperException.java Wed Feb 17 17:45:45 2010
@@ -1,4 +1,4 @@
-package org.apache.solr.cloud;
+package org.apache.solr.common.cloud;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java?rev=911110&r1=911109&r2=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkController.java Wed Feb 17 17:45:45 2010
@@ -30,7 +30,9 @@
import org.apache.solr.common.cloud.CloudState;
import org.apache.solr.common.cloud.OnReconnect;
import org.apache.solr.common.cloud.SolrZkClient;
+import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.cloud.ZooKeeperException;
import org.apache.solr.common.params.SolrParams;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java?rev=911110&r1=911109&r2=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java (original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java Wed Feb 17 17:45:45 2010
@@ -18,13 +18,13 @@
*/
import java.io.ByteArrayInputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.util.List;
import java.util.Properties;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
+import org.apache.solr.common.cloud.ZooKeeperException;
import org.apache.solr.core.SolrResourceLoader;
import org.apache.zookeeper.KeeperException;
Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java?rev=911110&r1=911109&r2=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java Wed Feb 17 17:45:45 2010
@@ -34,6 +34,7 @@
import javax.xml.xpath.XPathExpressionException;
import org.apache.solr.common.SolrException;
+import org.apache.solr.common.cloud.ZooKeeperException;
import org.apache.solr.common.params.CoreAdminParams;
import org.apache.solr.common.util.DOMUtil;
import org.apache.solr.common.util.XML;
Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/core/SolrCore.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/core/SolrCore.java?rev=911110&r1=911109&r2=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/core/SolrCore.java (original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/core/SolrCore.java Wed Feb 17 17:45:45 2010
@@ -23,8 +23,8 @@
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.store.Directory;
import org.apache.solr.cloud.ZkController;
-import org.apache.solr.cloud.ZooKeeperException;
import org.apache.solr.common.SolrException;
+import org.apache.solr.common.cloud.ZooKeeperException;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.CommonParams.EchoParamStyle;
import org.apache.solr.common.params.SolrParams;
Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/handler/component/QueryComponent.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/handler/component/QueryComponent.java?rev=911110&r1=911109&r2=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/handler/component/QueryComponent.java (original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/handler/component/QueryComponent.java Wed Feb 17 17:45:45 2010
@@ -28,6 +28,8 @@
import org.apache.solr.common.SolrDocumentList;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.cloud.CloudState;
+import org.apache.solr.common.cloud.Slice;
+import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.ShardParams;
Modified: lucene/solr/branches/cloud/src/solrj/org/apache/solr/client/solrj/impl/CloudSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/solrj/org/apache/solr/client/solrj/impl/CloudSolrServer.java?rev=911110&r1=911109&r2=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/solrj/org/apache/solr/client/solrj/impl/CloudSolrServer.java (original)
+++ lucene/solr/branches/cloud/src/solrj/org/apache/solr/client/solrj/impl/CloudSolrServer.java Wed Feb 17 17:45:45 2010
@@ -14,13 +14,13 @@
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServer;
import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.cloud.Slice;
import org.apache.solr.cloud.ZkController;
-import org.apache.solr.cloud.ZkNodeProps;
-import org.apache.solr.cloud.ZooKeeperException;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.cloud.CloudState;
+import org.apache.solr.common.cloud.Slice;
+import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.cloud.ZooKeeperException;
import org.apache.solr.common.util.NamedList;
import org.apache.zookeeper.KeeperException;
Modified: lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractZkTestCase.java?rev=911110&r1=911109&r2=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractZkTestCase.java (original)
+++ lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/AbstractZkTestCase.java Wed Feb 17 17:45:45 2010
@@ -20,6 +20,7 @@
import java.io.File;
import org.apache.solr.common.cloud.SolrZkClient;
+import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.util.AbstractSolrTestCase;
import org.apache.solr.util.TestHarness;
Modified: lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java?rev=911110&r1=911109&r2=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java (original)
+++ lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/CloudStateUpdateTest.java Wed Feb 17 17:45:45 2010
@@ -24,7 +24,9 @@
import junit.framework.TestCase;
import org.apache.solr.common.cloud.CloudState;
+import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.SolrZkClient;
+import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.core.SolrCore;
Modified: lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java?rev=911110&r1=911109&r2=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java (original)
+++ lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkControllerTest.java Wed Feb 17 17:45:45 2010
@@ -24,7 +24,9 @@
import junit.framework.TestCase;
import org.apache.solr.common.cloud.CloudState;
+import org.apache.solr.common.cloud.Slice;
import org.apache.solr.common.cloud.SolrZkClient;
+import org.apache.solr.common.cloud.ZkNodeProps;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
Modified: lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkNodePropsTest.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkNodePropsTest.java?rev=911110&r1=911109&r2=911110&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkNodePropsTest.java (original)
+++ lucene/solr/branches/cloud/src/test/org/apache/solr/cloud/ZkNodePropsTest.java Wed Feb 17 17:45:45 2010
@@ -19,6 +19,8 @@
import java.io.IOException;
+import org.apache.solr.common.cloud.ZkNodeProps;
+
import junit.framework.TestCase;