Rename tests and search component to disambiguate the two kinds of plugin.
git-svn-id: https://svn.apache.org/repos/asf/incubator/lcf/upstream/solr/SOLR-1895@1175881 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSecurityFilter.java b/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
similarity index 98%
rename from solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSecurityFilter.java
rename to solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
index 4201953..91de235 100644
--- a/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSecurityFilter.java
+++ b/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
@@ -38,7 +38,7 @@
* SearchComponent plugin for ManifoldCF-specific document-level access control.
* Configuration is under the SolrACLSecurity name.
*/
-public class ManifoldCFSecurityFilter extends SearchComponent
+public class ManifoldCFSearchComponent extends SearchComponent
{
/** The component name */
static final public String COMPONENT_NAME = "mcf";
@@ -66,7 +66,7 @@
String fieldDenyShare = null;
int socketTimeOut;
- public ManifoldCFSecurityFilter()
+ public ManifoldCFSearchComponent()
{
super();
}
diff --git a/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth-load.xml b/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth-load.xml
index ad52071..ed0304a 100644
--- a/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth-load.xml
+++ b/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth-load.xml
@@ -37,14 +37,14 @@
<requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
<!-- test MCF Security Filter settings -->
- <searchComponent name="mcf-param" class="org.apache.solr.mcf.ManifoldCFSecurityFilter" >
+ <searchComponent name="mcf-param" class="org.apache.solr.mcf.ManifoldCFSearchComponent" >
<str name="AuthorityServiceBaseURL">http://localhost:8346/mcf-as</str>
<int name="SocketTimeOut">3000</int>
<str name="AllowAttributePrefix">aap-</str>
<str name="DenyAttributePrefix">dap-</str>
</searchComponent>
- <searchComponent name="mcf" class="org.apache.solr.mcf.ManifoldCFSecurityFilter" >
+ <searchComponent name="mcf" class="org.apache.solr.mcf.ManifoldCFSearchComponent" >
<str name="AuthorityServiceBaseURL">http://localhost:8346/mcf-as</str>
</searchComponent>
diff --git a/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth.xml b/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth.xml
index 0d7da4d..106c2b6 100644
--- a/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth.xml
+++ b/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth.xml
@@ -37,14 +37,14 @@
<requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
<!-- test MCF Security Filter settings -->
- <searchComponent name="mcf-param" class="org.apache.solr.mcf.ManifoldCFSecurityFilter" >
+ <searchComponent name="mcf-param" class="org.apache.solr.mcf.ManifoldCFSearchComponent" >
<str name="AuthorityServiceBaseURL">http://localhost:8345/mcf-as</str>
<int name="SocketTimeOut">3000</int>
<str name="AllowAttributePrefix">aap-</str>
<str name="DenyAttributePrefix">dap-</str>
</searchComponent>
- <searchComponent name="mcf" class="org.apache.solr.mcf.ManifoldCFSecurityFilter" >
+ <searchComponent name="mcf" class="org.apache.solr.mcf.ManifoldCFSearchComponent" >
</searchComponent>
<requestHandler name="/mcf" class="solr.SearchHandler" startup="lazy">
diff --git a/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFLoadTest.java b/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
similarity index 98%
rename from solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFLoadTest.java
rename to solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
index ebbbdce..660c91b 100644
--- a/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFLoadTest.java
+++ b/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
@@ -31,7 +31,7 @@
import org.mortbay.jetty.servlet.Context;
import org.mortbay.jetty.servlet.ServletHolder;
-public class ManifoldCFLoadTest extends SolrTestCaseJ4 {
+public class ManifoldCFSCLoadTest extends SolrTestCaseJ4 {
static MockMCFAuthorityService service;
diff --git a/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSecurityFilterTest.java b/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
similarity index 97%
rename from solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSecurityFilterTest.java
rename to solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
index cfc8632..7fb4d6e 100644
--- a/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSecurityFilterTest.java
+++ b/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
@@ -31,7 +31,7 @@
import org.mortbay.jetty.servlet.Context;
import org.mortbay.jetty.servlet.ServletHolder;
-public class ManifoldCFSecurityFilterTest extends SolrTestCaseJ4 {
+public class ManifoldCFSearchComponentTest extends SolrTestCaseJ4 {
static MockMCFAuthorityService service;
@@ -71,7 +71,7 @@
@Test
public void testParameters() throws Exception {
- ManifoldCFSecurityFilter mcfFilter = (ManifoldCFSecurityFilter)h.getCore().getSearchComponent("mcf-param");
+ ManifoldCFSearchComponent mcfFilter = (ManifoldCFSearchComponent)h.getCore().getSearchComponent("mcf-param");
assertEquals("http://localhost:8345/mcf-as", mcfFilter.authorityBaseURL);
assertEquals(3000, mcfFilter.socketTimeOut);
assertEquals("aap-document", mcfFilter.fieldAllowDocument);
