You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ko...@apache.org on 2011/01/12 15:58:49 UTC

svn commit: r1058162 - in /lucene/dev/trunk/solr/contrib/clustering/src/test: java/org/apache/solr/handler/clustering/AbstractClusteringTestCase.java resources/solr-clustering/ resources/solr/

Author: koji
Date: Wed Jan 12 14:58:49 2011
New Revision: 1058162

URL: http://svn.apache.org/viewvc?rev=1058162&view=rev
Log:
SOLR-2282: rename solr-clustering to solr

Added:
    lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr/
      - copied from r1058152, lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/
Removed:
    lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/
Modified:
    lucene/dev/trunk/solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/AbstractClusteringTestCase.java

Modified: lucene/dev/trunk/solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/AbstractClusteringTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/AbstractClusteringTestCase.java?rev=1058162&r1=1058161&r2=1058162&view=diff
==============================================================================
--- lucene/dev/trunk/solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/AbstractClusteringTestCase.java (original)
+++ lucene/dev/trunk/solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/AbstractClusteringTestCase.java Wed Jan 12 14:58:49 2011
@@ -28,7 +28,7 @@ public abstract class AbstractClustering
 
   @BeforeClass
   public static void beforeClass() throws Exception {
-    initCore("solrconfig.xml", "schema.xml", "solr-clustering");
+    initCore("solrconfig.xml", "schema.xml", "solr");
     numberOfDocs = 0;
     for (String[] doc : DOCUMENTS) {
       assertNull(h.validateUpdate(adoc("id", Integer.toString(numberOfDocs), "url", doc[0], "title", doc[1], "snippet", doc[2])));



Re: svn commit: r1058162 - in /lucene/dev/trunk/solr/contrib/clustering/src/test: java/org/apache/solr/handler/clustering/AbstractClusteringTestCase.java resources/solr-clustering/ resources/solr/

Posted by Robert Muir <rc...@gmail.com>.
I don't think we should do this, as it really confuses the build.

Because test-resources are now resources, their contents should not
conflict with each other.
this is why contribs now have solr-XXX directories.

If you want to change this in SolrTestCaseJ4: use initCore(xxx, yyy,
"solr-clustering")
if you want to change this in AbstractSolrTestCase: you override:
  public String getSolrHome()

Can you please rename the directory back? It seems we just need to fix
BaseDistributedTestCase to allow you to override this parameter, i can
help


On Wed, Jan 12, 2011 at 9:58 AM,  <ko...@apache.org> wrote:
> Author: koji
> Date: Wed Jan 12 14:58:49 2011
> New Revision: 1058162
>
> URL: http://svn.apache.org/viewvc?rev=1058162&view=rev
> Log:
> SOLR-2282: rename solr-clustering to solr
>
> Added:
>    lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr/
>      - copied from r1058152, lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/
> Removed:
>    lucene/dev/trunk/solr/contrib/clustering/src/test/resources/solr-clustering/
> Modified:
>    lucene/dev/trunk/solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/AbstractClusteringTestCase.java
>
> Modified: lucene/dev/trunk/solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/AbstractClusteringTestCase.java
> URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/AbstractClusteringTestCase.java?rev=1058162&r1=1058161&r2=1058162&view=diff
> ==============================================================================
> --- lucene/dev/trunk/solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/AbstractClusteringTestCase.java (original)
> +++ lucene/dev/trunk/solr/contrib/clustering/src/test/java/org/apache/solr/handler/clustering/AbstractClusteringTestCase.java Wed Jan 12 14:58:49 2011
> @@ -28,7 +28,7 @@ public abstract class AbstractClustering
>
>   @BeforeClass
>   public static void beforeClass() throws Exception {
> -    initCore("solrconfig.xml", "schema.xml", "solr-clustering");
> +    initCore("solrconfig.xml", "schema.xml", "solr");
>     numberOfDocs = 0;
>     for (String[] doc : DOCUMENTS) {
>       assertNull(h.validateUpdate(adoc("id", Integer.toString(numberOfDocs), "url", doc[0], "title", doc[1], "snippet", doc[2])));
>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org
For additional commands, e-mail: dev-help@lucene.apache.org