lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romseyg...@apache.org
Subject svn commit: r1713564 - in /lucene/dev/branches/branch_5x: ./ solr/ solr/contrib/ solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java
Date Mon, 09 Nov 2015 22:37:09 GMT
Author: romseygeek
Date: Mon Nov  9 22:37:09 2015
New Revision: 1713564

URL: http://svn.apache.org/viewvc?rev=1713564&view=rev
Log:
SOLR-8260: Remove morphlines test setup with wrongly configured core discovery roots

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/solr/   (props changed)
    lucene/dev/branches/branch_5x/solr/contrib/   (props changed)
    lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java

Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java?rev=1713564&r1=1713563&r2=1713564&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java
(original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/AbstractSolrMorphlineZkTestBase.java
Mon Nov  9 22:37:09 2015
@@ -17,13 +17,16 @@
 
 package org.apache.solr.morphlines.solr;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.Locale;
+
 import com.codahale.metrics.MetricRegistry;
 import com.google.common.collect.ListMultimap;
 import com.typesafe.config.Config;
-
 import org.apache.commons.io.FileUtils;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.embedded.JettySolrRunner;
 import org.apache.solr.cloud.AbstractFullDistribZkTestBase;
 import org.apache.solr.cloud.AbstractZkTestCase;
 import org.apache.solr.common.SolrDocument;
@@ -39,12 +42,6 @@ import org.kitesdk.morphline.base.FaultT
 import org.kitesdk.morphline.base.Notifications;
 import org.kitesdk.morphline.stdlib.PipeBuilder;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Properties;
-
 public abstract class AbstractSolrMorphlineZkTestBase extends AbstractFullDistribZkTestBase
{
   private static File solrHomeDirectory;
   
@@ -146,32 +143,6 @@ public abstract class AbstractSolrMorphl
     return record;
   }
   
-  @Override
-  public JettySolrRunner createJetty(File solrHome, String dataDir,
-      String shardList, String solrConfigOverride, String schemaOverride)
-      throws Exception {
-
-    writeCoreProperties(solrHome.toPath(), DEFAULT_TEST_CORENAME);
-
-    Properties props = new Properties();
-    if (solrConfigOverride != null)
-      props.setProperty("solrconfig", solrConfigOverride);
-    if (schemaOverride != null)
-      props.setProperty("schema", schemaOverride);
-    if (shardList != null)
-      props.setProperty("shards", shardList);
-
-    String collection = System.getProperty("collection");
-    if (collection == null)
-      collection = "collection1";
-    props.setProperty("collection", collection);
-
-    JettySolrRunner jetty = new JettySolrRunner(solrHome.getAbsolutePath(), props, buildJettyConfig(context));
-    jetty.start();
-    
-    return jetty;
-  }
-  
   private void putConfig(SolrZkClient zkClient, String name) throws Exception {
     File file = new File(new File(SOLR_CONF_DIR, "conf"), name);    
     String destPath = "/configs/conf1/" + name;



Mime
View raw message