manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shinich...@apache.org
Subject svn commit: r1743105 - in /manifoldcf/integration/solr-6.x/trunk: solr/ solr/collection1/ solr/collection1/conf/ src/main/java/org/apache/solr/mcf/ src/test/java/org/apache/solr/mcf/
Date Tue, 10 May 2016 06:59:50 GMT
Author: shinichiro
Date: Tue May 10 06:59:50 2016
New Revision: 1743105

URL: http://svn.apache.org/viewvc?rev=1743105&view=rev
Log:
Fix tests

Added:
    manifoldcf/integration/solr-6.x/trunk/solr/
    manifoldcf/integration/solr-6.x/trunk/solr/collection1/
    manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/
    manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/managed-schema
    manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/schema-auth.xml.bak
    manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth-load.xml 
 (with props)
    manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth-qparser.xml
  (with props)
    manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth.xml   (with
props)
Modified:
    manifoldcf/integration/solr-6.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
    manifoldcf/integration/solr-6.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
    manifoldcf/integration/solr-6.x/trunk/src/test/java/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java
    manifoldcf/integration/solr-6.x/trunk/src/test/java/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
    manifoldcf/integration/solr-6.x/trunk/src/test/java/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java

Added: manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/managed-schema
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/managed-schema?rev=1743105&view=auto
==============================================================================
--- manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/managed-schema (added)
+++ manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/managed-schema Tue May 10
06:59:50 2016
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Solr managed schema - automatically generated - DO NOT EDIT -->
+<schema name="auth" version="1.5">
+  <uniqueKey>id</uniqueKey>
+  <fieldType name="string" class="solr.StrField"/>
+  <field name="allow_token_document" type="string" default="__nosecurity__" multiValued="true"
indexed="true" stored="false"/>
+  <field name="allow_token_parent" type="string" default="__nosecurity__" multiValued="true"
indexed="true" stored="false"/>
+  <field name="allow_token_share" type="string" default="__nosecurity__" multiValued="true"
indexed="true" stored="false"/>
+  <field name="deny_token_document" type="string" default="__nosecurity__" multiValued="true"
indexed="true" stored="false"/>
+  <field name="deny_token_parent" type="string" default="__nosecurity__" multiValued="true"
indexed="true" stored="false"/>
+  <field name="deny_token_share" type="string" default="__nosecurity__" multiValued="true"
indexed="true" stored="false"/>
+  <field name="id" type="string" indexed="true" required="true" stored="true"/>
+</schema>
\ No newline at end of file

Added: manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/schema-auth.xml.bak
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/schema-auth.xml.bak?rev=1743105&view=auto
==============================================================================
--- manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/schema-auth.xml.bak (added)
+++ manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/schema-auth.xml.bak Tue May
10 06:59:50 2016
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<schema name="auth" version="1.5">
+ <types>
+  <fieldType name="string" class="solr.StrField"/>
+ </types>
+ <fields>
+  <field name="id" type="string" indexed="true" stored="true" required="true"/>
+  <!-- MCF Security fields -->
+  <field name="allow_token_document" type="string" indexed="true" stored="false" multiValued="true"
default="__nosecurity__"/>
+  <field name="deny_token_document" type="string" indexed="true" stored="false" multiValued="true"
default="__nosecurity__"/>
+  <field name="allow_token_share" type="string" indexed="true" stored="false" multiValued="true"
default="__nosecurity__"/>
+  <field name="deny_token_share" type="string" indexed="true" stored="false" multiValued="true"
default="__nosecurity__"/>
+  <field name="allow_token_parent" type="string" indexed="true" stored="false" multiValued="true"
default="__nosecurity__"/>
+  <field name="deny_token_parent" type="string" indexed="true" stored="false" multiValued="true"
default="__nosecurity__"/>
+ </fields>
+ <uniqueKey>id</uniqueKey>
+</schema>

Added: manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth-load.xml
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth-load.xml?rev=1743105&view=auto
==============================================================================
--- manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth-load.xml (added)
+++ manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth-load.xml Tue
May 10 06:59:50 2016
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<config>
+
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+  <jmx />
+
+  <dataDir>${solr.data.dir:}</dataDir>
+
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+  <updateHandler class="solr.DirectUpdateHandler2">
+  </updateHandler>
+
+  <!-- test MCF Security Filter settings -->
+  <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.ManifoldCFSearchComponent" >
+    <str name="AuthorityServiceBaseURL">http://localhost:8346/mcf-as</str>
+  </searchComponent>
+
+  <requestHandler name="/mcf" class="solr.SearchHandler" startup="lazy">
+    <lst name="invariants">
+      <bool name="mcf">true</bool>
+    </lst>
+    <lst name="defaults">
+      <str name="echoParams">all</str>
+    </lst>
+    <arr name="components">
+      <str>query</str>
+      <str>mcf</str>
+    </arr>
+  </requestHandler>
+
+</config>

Propchange: manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth-load.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth-load.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth-qparser.xml
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth-qparser.xml?rev=1743105&view=auto
==============================================================================
--- manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth-qparser.xml
(added)
+++ manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth-qparser.xml
Tue May 10 06:59:50 2016
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<config>
+
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+  <jmx />
+
+  <dataDir>${solr.data.dir:}</dataDir>
+
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+  <updateHandler class="solr.DirectUpdateHandler2">
+  </updateHandler>
+
+  <!-- test MCF Security Filter settings -->
+  <queryParser name="mcf-security_param" class="org.apache.solr.mcf.ManifoldCFQParserPlugin"
>
+    <str name="AuthorityServiceBaseURL">http://localhost:8347/mcf-as</str>
+    <int name="SocketTimeOut">3000</int>
+    <str name="AllowAttributePrefix">aap-</str>
+    <str name="DenyAttributePrefix">dap-</str>
+  </queryParser>
+
+  <queryParser name="mcf_security" class="org.apache.solr.mcf.ManifoldCFQParserPlugin"
>
+    <str name="AuthorityServiceBaseURL">http://localhost:8347/mcf-as</str>
+  </queryParser>
+
+  <requestHandler name="/mcf" class="solr.SearchHandler" startup="lazy">
+    <lst name="invariants">
+      <bool name="mcf">true</bool>
+    </lst>
+    <lst name="defaults">
+      <str name="echoParams">all</str>
+    </lst>
+    <lst name="appends">
+      <str name="fq">{!mcf_security}</str>
+    </lst>
+    <arr name="components">
+      <str>query</str>
+    </arr>
+  </requestHandler>
+
+</config>

Propchange: manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth-qparser.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth-qparser.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth.xml
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth.xml?rev=1743105&view=auto
==============================================================================
--- manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth.xml (added)
+++ manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth.xml Tue May
10 06:59:50 2016
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<config>
+
+  <luceneMatchVersion>${tests.luceneMatchVersion:LUCENE_CURRENT}</luceneMatchVersion>
+  <jmx />
+
+  <dataDir>${solr.data.dir:}</dataDir>
+
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.RAMDirectoryFactory}"/>
+
+  <updateHandler class="solr.DirectUpdateHandler2">
+  </updateHandler>
+
+  <!-- test MCF Security Filter settings -->
+  <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.ManifoldCFSearchComponent" >
+  </searchComponent>
+
+  <requestHandler name="/mcf" class="solr.SearchHandler" startup="lazy">
+    <lst name="invariants">
+      <bool name="mcf">true</bool>
+    </lst>
+    <lst name="defaults">
+      <str name="echoParams">all</str>
+    </lst>
+    <arr name="components">
+      <str>query</str>
+      <str>mcf</str>
+    </arr>
+  </requestHandler>
+
+</config>

Propchange: manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/integration/solr-6.x/trunk/solr/collection1/conf/solrconfig-auth.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: manifoldcf/integration/solr-6.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-6.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java?rev=1743105&r1=1743104&r2=1743105&view=diff
==============================================================================
--- manifoldcf/integration/solr-6.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
(original)
+++ manifoldcf/integration/solr-6.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
Tue May 10 06:59:50 2016
@@ -258,7 +258,7 @@ public class ManifoldCFQParserPlugin ext
         }
       }
 
-      BooleanQuery bq = new BooleanQuery();
+      BooleanQuery.Builder bq = new BooleanQuery.Builder();
       //bf.setMaxClauseCount(100000);
       
       Query allowShareOpen = new TermQuery(new Term(fieldAllowShare,NOSECURITY_TOKEN));
@@ -293,7 +293,7 @@ public class ManifoldCFQParserPlugin ext
           BooleanClause.Occur.MUST);
       }
 
-      return new ConstantScoreQuery(bq);
+      return new ConstantScoreQuery(bq.build());
     }
 
     /** Calculate a complete subclause, representing something like:
@@ -302,20 +302,20 @@ public class ManifoldCFQParserPlugin ext
     */
     protected Query calculateCompleteSubquery(String allowField, String denyField, Query
allowOpen, Query denyOpen, List<String> userAccessTokens)
     {
-      BooleanQuery bq = new BooleanQuery();
+      BooleanQuery.Builder bq = new BooleanQuery.Builder();
       BooleanQuery.setMaxClauseCount(1000000);
       
       // Add the empty-acl case
-      BooleanQuery subUnprotectedClause = new BooleanQuery();
+      BooleanQuery.Builder  subUnprotectedClause = new BooleanQuery.Builder();
       subUnprotectedClause.add(allowOpen,BooleanClause.Occur.MUST);
       subUnprotectedClause.add(denyOpen,BooleanClause.Occur.MUST);
-      bq.add(subUnprotectedClause,BooleanClause.Occur.SHOULD);
+      bq.add(subUnprotectedClause.build(),BooleanClause.Occur.SHOULD);
       for (String accessToken : userAccessTokens)
       {
         bq.add(new TermQuery(new Term(allowField,accessToken)),BooleanClause.Occur.SHOULD);
         bq.add(new TermQuery(new Term(denyField,accessToken)),BooleanClause.Occur.MUST_NOT);
       }
-      return bq;
+      return bq.build();
     }
     
     // Protected methods

Modified: manifoldcf/integration/solr-6.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-6.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java?rev=1743105&r1=1743104&r2=1743105&view=diff
==============================================================================
--- manifoldcf/integration/solr-6.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
(original)
+++ manifoldcf/integration/solr-6.x/trunk/src/main/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
Tue May 10 06:59:50 2016
@@ -251,7 +251,7 @@ public class ManifoldCFSearchComponent e
       userAccessTokens = getAccessTokens(domainMap);
     }
 
-    BooleanQuery bq = new BooleanQuery();
+    BooleanQuery.Builder bq = new BooleanQuery.Builder();
     //bf.setMaxClauseCount(100000);
     
     Query allowShareOpen = new TermQuery(new Term(fieldAllowShare,NOSECURITY_TOKEN));
@@ -293,7 +293,7 @@ public class ManifoldCFSearchComponent e
       list = new ArrayList<>();
       rb.setFilters(list);
     }
-    list.add(new ConstantScoreQuery(bq));
+    list.add(new ConstantScoreQuery(bq.build()));
   }
 
   @Override
@@ -308,20 +308,20 @@ public class ManifoldCFSearchComponent e
   */
   protected Query calculateCompleteSubquery(String allowField, String denyField, Query allowOpen,
Query denyOpen, List<String> userAccessTokens)
   {
-    BooleanQuery bq = new BooleanQuery();
+    BooleanQuery.Builder bq = new BooleanQuery.Builder();
     BooleanQuery.setMaxClauseCount(1000000);
     
     // Add the empty-acl case
-    BooleanQuery subUnprotectedClause = new BooleanQuery();
+    BooleanQuery.Builder subUnprotectedClause = new BooleanQuery.Builder();
     subUnprotectedClause.add(allowOpen,BooleanClause.Occur.MUST);
     subUnprotectedClause.add(denyOpen,BooleanClause.Occur.MUST);
-    bq.add(subUnprotectedClause,BooleanClause.Occur.SHOULD);
+    bq.add(subUnprotectedClause.build(),BooleanClause.Occur.SHOULD);
     for (String accessToken : userAccessTokens)
     {
       bq.add(new TermQuery(new Term(allowField,accessToken)),BooleanClause.Occur.SHOULD);
       bq.add(new TermQuery(new Term(denyField,accessToken)),BooleanClause.Occur.MUST_NOT);
     }
-    return bq;
+    return bq.build();
   }
   
   //---------------------------------------------------------------------------------

Modified: manifoldcf/integration/solr-6.x/trunk/src/test/java/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-6.x/trunk/src/test/java/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java?rev=1743105&r1=1743104&r2=1743105&view=diff
==============================================================================
--- manifoldcf/integration/solr-6.x/trunk/src/test/java/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java
(original)
+++ manifoldcf/integration/solr-6.x/trunk/src/test/java/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java
Tue May 10 06:59:50 2016
@@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -33,6 +34,7 @@ import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 
+@SuppressSSL
 public class ManifoldCFQParserPluginTest extends SolrTestCaseJ4 {
   
   static MockMCFAuthorityService service;

Modified: manifoldcf/integration/solr-6.x/trunk/src/test/java/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-6.x/trunk/src/test/java/org/apache/solr/mcf/ManifoldCFSCLoadTest.java?rev=1743105&r1=1743104&r2=1743105&view=diff
==============================================================================
--- manifoldcf/integration/solr-6.x/trunk/src/test/java/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
(original)
+++ manifoldcf/integration/solr-6.x/trunk/src/test/java/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
Tue May 10 06:59:50 2016
@@ -25,6 +25,7 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -34,6 +35,7 @@ import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 
+@SuppressSSL
 public class ManifoldCFSCLoadTest extends SolrTestCaseJ4 {
   
   static MockMCFAuthorityService service;

Modified: manifoldcf/integration/solr-6.x/trunk/src/test/java/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
URL: http://svn.apache.org/viewvc/manifoldcf/integration/solr-6.x/trunk/src/test/java/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java?rev=1743105&r1=1743104&r2=1743105&view=diff
==============================================================================
--- manifoldcf/integration/solr-6.x/trunk/src/test/java/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
(original)
+++ manifoldcf/integration/solr-6.x/trunk/src/test/java/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
Tue May 10 06:59:50 2016
@@ -24,6 +24,7 @@ import javax.servlet.http.HttpServletReq
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -33,6 +34,7 @@ import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 
+@SuppressSSL
 public class ManifoldCFSearchComponentTest extends SolrTestCaseJ4 {
   
   static MockMCFAuthorityService service;



Mime
View raw message