incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1175881 - in /incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src: java/org/apache/solr/mcf/ test-files/solr/conf/ test/org/apache/solr/mcf/
Date Mon, 26 Sep 2011 14:21:17 GMT
Author: kwright
Date: Mon Sep 26 14:21:16 2011
New Revision: 1175881

URL: http://svn.apache.org/viewvc?rev=1175881&view=rev
Log:
Rename tests and search component to disambiguate the two kinds of plugin.

Added:
    incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
      - copied, changed from r1175819, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSecurityFilter.java
    incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
      - copied, changed from r1175815, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFLoadTest.java
    incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
      - copied, changed from r1175815, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSecurityFilterTest.java
Removed:
    incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSecurityFilter.java
    incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFLoadTest.java
    incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSecurityFilterTest.java
Modified:
    incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth-load.xml
    incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth.xml

Copied: incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
(from r1175819, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSecurityFilter.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java?p2=incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java&p1=incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSecurityFilter.java&r1=1175819&r2=1175881&rev=1175881&view=diff
==============================================================================
--- incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSecurityFilter.java
(original)
+++ incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
Mon Sep 26 14:21:16 2011
@@ -38,7 +38,7 @@ import java.net.*;
 * 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 @@ public class ManifoldCFSecurityFilter ex
   String fieldDenyShare = null;
   int socketTimeOut;
   
-  public ManifoldCFSecurityFilter()
+  public ManifoldCFSearchComponent()
   {
     super();
   }

Modified: incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth-load.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth-load.xml?rev=1175881&r1=1175880&r2=1175881&view=diff
==============================================================================
--- incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth-load.xml
(original)
+++ incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth-load.xml
Mon Sep 26 14:21:16 2011
@@ -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>
 

Modified: incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth.xml?rev=1175881&r1=1175880&r2=1175881&view=diff
==============================================================================
--- incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth.xml
(original)
+++ incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth.xml
Mon Sep 26 14:21:16 2011
@@ -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">

Copied: incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
(from r1175815, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFLoadTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java?p2=incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java&p1=incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFLoadTest.java&r1=1175815&r2=1175881&rev=1175881&view=diff
==============================================================================
--- incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFLoadTest.java
(original)
+++ incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
Mon Sep 26 14:21:16 2011
@@ -31,7 +31,7 @@ import org.mortbay.jetty.Server;
 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;
 

Copied: incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
(from r1175815, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSecurityFilterTest.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java?p2=incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java&p1=incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSecurityFilterTest.java&r1=1175815&r2=1175881&rev=1175881&view=diff
==============================================================================
--- incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSecurityFilterTest.java
(original)
+++ incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
Mon Sep 26 14:21:16 2011
@@ -31,7 +31,7 @@ import org.mortbay.jetty.Server;
 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 @@ public class ManifoldCFSecurityFilterTes
   
   @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);



Mime
View raw message