svn commit: r1427332 - in /manifoldcf/integration/solr-4.x/trunk: ./ mcf/src/test-files/solr-mcf/ mcf/src/test-files/solr-mcf/solr/ mcf/src/test-files/solr-mcf/solr/collection1/ mcf/src/test-files/solr-mcf/solr/collection1/conf/ mcf/src/test-files/solr...

[kwright]

Author: kwright
Date: Tue Jan  1 07:52:03 2013
New Revision: 1427332

URL: http://svn.apache.org/viewvc?rev=1427332&view=rev
Log:
Fix for CONNECTORS-595.

Added:
    manifoldcf/integration/solr-4.x/trunk/mcf/src/test-files/solr-mcf/
    manifoldcf/integration/solr-4.x/trunk/mcf/src/test-files/solr-mcf/solr/
    
manifoldcf/integration/solr-4.x/trunk/mcf/src/test-files/solr-mcf/solr/collection1/
    
manifoldcf/integration/solr-4.x/trunk/mcf/src/test-files/solr-mcf/solr/collection1/conf/
      - copied from r1427281, 
manifoldcf/integration/solr-4.x/trunk/mcf/src/test-files/solr/conf/
Removed:
    manifoldcf/integration/solr-4.x/trunk/mcf/src/test-files/solr/conf/
Modified:
    manifoldcf/integration/solr-4.x/trunk/CHANGES.txt
    
manifoldcf/integration/solr-4.x/trunk/mcf/src/test/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java
    
manifoldcf/integration/solr-4.x/trunk/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
    
manifoldcf/integration/solr-4.x/trunk/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java

Modified: manifoldcf/integration/solr-4.x/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/trunk/CHANGES.txt?rev=1427332&r1=1427331&r2=1427332&view=diff
==============================================================================
--- manifoldcf/integration/solr-4.x/trunk/CHANGES.txt (original)
+++ manifoldcf/integration/solr-4.x/trunk/CHANGES.txt Tue Jan  1 07:52:03 2013
@@ -5,6 +5,10 @@ $Id$
 
 ======================= Release 0.3 =====================
 
+CONNECTORS-595: Fix tests to use new initCore() conventions and
+test resource layout.
+(Karl Wright)
+
 Port to final release of Solr 4.0.0.
 (Karl Wright)
 

Modified: 
manifoldcf/integration/solr-4.x/trunk/mcf/src/test/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/trunk/mcf/src/test/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java?rev=1427332&r1=1427331&r2=1427332&view=diff
==============================================================================
--- 
manifoldcf/integration/solr-4.x/trunk/mcf/src/test/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java
 (original)
+++ 
manifoldcf/integration/solr-4.x/trunk/mcf/src/test/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java
 Tue Jan  1 07:52:03 2013
@@ -40,7 +40,7 @@ public class ManifoldCFQParserPluginTest
 
   @BeforeClass
   public static void beforeClass() throws Exception {
-    initCore("solrconfig-auth-qparser.xml","schema-auth.xml");
+    
initCore("solrconfig-auth-qparser.xml","schema-auth.xml",getFile("solr-mcf/solr").getAbsolutePath());
     service = new MockMCFAuthorityService();
     service.start();
 

Modified: 
manifoldcf/integration/solr-4.x/trunk/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/trunk/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java?rev=1427332&r1=1427331&r2=1427332&view=diff
==============================================================================
--- 
manifoldcf/integration/solr-4.x/trunk/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
 (original)
+++ 
manifoldcf/integration/solr-4.x/trunk/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
 Tue Jan  1 07:52:03 2013
@@ -40,7 +40,7 @@ public class ManifoldCFSCLoadTest extend
 
   @BeforeClass
   public static void beforeClass() throws Exception {
-    initCore("solrconfig-auth-load.xml","schema-auth.xml");
+    
initCore("solrconfig-auth-load.xml","schema-auth.xml",getFile("solr-mcf/solr").getAbsolutePath());
     service = new MockMCFAuthorityService();
     service.start();
 

Modified: 
manifoldcf/integration/solr-4.x/trunk/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/trunk/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java?rev=1427332&r1=1427331&r2=1427332&view=diff
==============================================================================
--- 
manifoldcf/integration/solr-4.x/trunk/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
 (original)
+++ 
manifoldcf/integration/solr-4.x/trunk/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
 Tue Jan  1 07:52:03 2013
@@ -40,7 +40,7 @@ public class ManifoldCFSearchComponentTe
 
   @BeforeClass
   public static void beforeClass() throws Exception {
-    initCore("solrconfig-auth.xml","schema-auth.xml");
+    
initCore("solrconfig-auth.xml","schema-auth.xml",getFile("solr-mcf/solr").getAbsolutePath());
     service = new MockMCFAuthorityService();
     service.start();