svn commit: r1427333 - in /manifoldcf/integration/solr-4.x/branches/release-0.3-branch: ./ mcf/src/test-files/solr-mcf/ mcf/src/test-files/solr/conf/ mcf/src/test/org/apache/solr/mcf/

[kwright]

Author: kwright
Date: Tue Jan  1 07:53:47 2013
New Revision: 1427333

URL: http://svn.apache.org/viewvc?rev=1427333&view=rev
Log:
Pull up fix for CONNECTORS-595.

Added:
    
manifoldcf/integration/solr-4.x/branches/release-0.3-branch/mcf/src/test-files/solr-mcf/
      - copied from r1427332, 
manifoldcf/integration/solr-4.x/trunk/mcf/src/test-files/solr-mcf/
Removed:
    
manifoldcf/integration/solr-4.x/branches/release-0.3-branch/mcf/src/test-files/solr/conf/
Modified:
    manifoldcf/integration/solr-4.x/branches/release-0.3-branch/   (props 
changed)
    manifoldcf/integration/solr-4.x/branches/release-0.3-branch/CHANGES.txt
    
manifoldcf/integration/solr-4.x/branches/release-0.3-branch/mcf/src/test/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java
    
manifoldcf/integration/solr-4.x/branches/release-0.3-branch/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
    
manifoldcf/integration/solr-4.x/branches/release-0.3-branch/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java

Propchange: manifoldcf/integration/solr-4.x/branches/release-0.3-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/integration/solr-4.x/trunk:r1427332

Modified: 
manifoldcf/integration/solr-4.x/branches/release-0.3-branch/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/branches/release-0.3-branch/CHANGES.txt?rev=1427333&r1=1427332&r2=1427333&view=diff
==============================================================================
--- manifoldcf/integration/solr-4.x/branches/release-0.3-branch/CHANGES.txt 
(original)
+++ manifoldcf/integration/solr-4.x/branches/release-0.3-branch/CHANGES.txt Tue 
Jan  1 07:53:47 2013
@@ -3,6 +3,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/branches/release-0.3-branch/mcf/src/test/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/branches/release-0.3-branch/mcf/src/test/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java?rev=1427333&r1=1427332&r2=1427333&view=diff
==============================================================================
--- 
manifoldcf/integration/solr-4.x/branches/release-0.3-branch/mcf/src/test/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java
 (original)
+++ 
manifoldcf/integration/solr-4.x/branches/release-0.3-branch/mcf/src/test/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java
 Tue Jan  1 07:53:47 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/branches/release-0.3-branch/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/branches/release-0.3-branch/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java?rev=1427333&r1=1427332&r2=1427333&view=diff
==============================================================================
--- 
manifoldcf/integration/solr-4.x/branches/release-0.3-branch/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
 (original)
+++ 
manifoldcf/integration/solr-4.x/branches/release-0.3-branch/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
 Tue Jan  1 07:53:47 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/branches/release-0.3-branch/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/integration/solr-4.x/branches/release-0.3-branch/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java?rev=1427333&r1=1427332&r2=1427333&view=diff
==============================================================================
--- 
manifoldcf/integration/solr-4.x/branches/release-0.3-branch/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
 (original)
+++ 
manifoldcf/integration/solr-4.x/branches/release-0.3-branch/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
 Tue Jan  1 07:53:47 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();