You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by th...@apache.org on 2014/12/10 17:39:47 UTC
svn commit: r1644471 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/core/ solr/core/src/test/org/apache/solr/cloud/ solr/example/
solr/example/multicore/ solr/solrj/
solr/solrj/src/test-files/solrj/solr/multicore/
solr/solrj/src/test-files/solrj/so...
Author: thelabdude
Date: Wed Dec 10 16:39:46 2014
New Revision: 1644471
URL: http://svn.apache.org/r1644471
Log:
SOLR-6773: Remove the multicore example as the DIH and cloud examples illustrate multicore behavior
Added:
lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/multicore/ (props changed)
- copied from r1644461, lucene/dev/trunk/solr/solrj/src/test-files/solrj/solr/multicore/
Removed:
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/TestMultiCoreConfBootstrap.java
lucene/dev/branches/branch_5x/solr/example/multicore/
lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java
lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MultiCoreEmbeddedTest.java
lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/MultiCoreExampleJettyTest.java
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
lucene/dev/branches/branch_5x/solr/example/ (props changed)
lucene/dev/branches/branch_5x/solr/solrj/ (props changed)
lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/multicore/core0/ (props changed)
lucene/dev/branches/branch_5x/solr/solrj/src/test-files/solrj/solr/multicore/core1/ (props changed)
lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java
lucene/dev/branches/branch_5x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1644471&r1=1644470&r2=1644471&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Wed Dec 10 16:39:46 2014
@@ -424,6 +424,9 @@ Other Changes
* SOLR-6560: Purge termIndexInterval from example/test configs
(Tom Burton-West, hossman)
+* SOLR-6773: Remove the multicore example as the DIH and cloud examples
+ illustrate multicore behavior (hossman, Timothy Potter)
+
================== 4.10.3 ==================
Bug Fixes
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java?rev=1644471&r1=1644470&r2=1644471&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java Wed Dec 10 16:39:46 2014
@@ -109,23 +109,6 @@ public class ZkCLITest extends SolrTestC
}
@Test
- public void testBootstrap() throws Exception {
- // test bootstrap_conf
- String[] args = new String[] {"-zkhost", zkServer.getZkAddress(), "-cmd",
- "bootstrap", "-solrhome", this.solrHome};
- ZkCLI.main(args);
-
- assertTrue(zkClient.exists(ZkController.CONFIGS_ZKNODE + "/collection1", true));
-
- args = new String[] {"-zkhost", zkServer.getZkAddress(), "-cmd",
- "bootstrap", "-solrhome", ExternalPaths.EXAMPLE_MULTICORE_HOME};
- ZkCLI.main(args);
-
- assertTrue(zkClient.exists(ZkController.CONFIGS_ZKNODE + "/core0", true));
- assertTrue(zkClient.exists(ZkController.CONFIGS_ZKNODE + "/core1", true));
- }
-
- @Test
public void testBootstrapWithChroot() throws Exception {
String chroot = "/foo/bar";
assertFalse(zkClient.exists(chroot, true));
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java?rev=1644471&r1=1644470&r2=1644471&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/MergeIndexesExampleTestBase.java Wed Dec 10 16:39:46 2014
@@ -21,6 +21,7 @@ import java.io.File;
import java.io.IOException;
import java.util.Arrays;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.request.AbstractUpdateRequest;
import org.apache.solr.client.solrj.request.CoreAdminRequest;
import org.apache.solr.client.solrj.request.QueryRequest;
@@ -30,7 +31,6 @@ import org.apache.solr.common.params.Cor
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.SolrCore;
-import org.apache.solr.util.ExternalPaths;
import org.junit.BeforeClass;
/**
@@ -48,7 +48,7 @@ public abstract class MergeIndexesExampl
@Override
public String getSolrHome() {
- return ExternalPaths.EXAMPLE_MULTICORE_HOME;
+ return SolrTestCaseJ4.getFile("solrj/solr/multicore").getAbsolutePath();
}
@BeforeClass
Modified: lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java?rev=1644471&r1=1644470&r2=1644471&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java (original)
+++ lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/util/ExternalPaths.java Wed Dec 10 16:39:46 2014
@@ -51,9 +51,6 @@ public class ExternalPaths {
public static String TECHPRODUCTS_CONFIGSET =
new File(SOURCE_HOME, "server/solr/configsets/sample_techproducts_configs/conf").getAbsolutePath();
- /* @see #SOURCE_HOME */
- public static String EXAMPLE_MULTICORE_HOME = new File(SOURCE_HOME, "example/multicore").getAbsolutePath();
-
public static String SERVER_HOME = new File(SOURCE_HOME, "server/solr").getAbsolutePath();
/**