incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1176500 - in /incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf: ./ src/ src/java/ src/java/org/ src/java/org/apache/ src/java/org/apache/solr/ src/java/org/apache/solr/mcf/ src/test-files/ src/test-files/solr/ src/test-files/solr/...
Date Tue, 27 Sep 2011 18:20:00 GMT
Author: kwright
Date: Tue Sep 27 18:19:59 2011
New Revision: 1176500

URL: http://svn.apache.org/viewvc?rev=1176500&view=rev
Log:
Port MCF search component and query parser from 4.x

Added:
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/
      - copied from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/CHANGES.txt
      - copied unchanged from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/CHANGES.txt
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/README.txt
      - copied unchanged from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/README.txt
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/build.xml
      - copied unchanged from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/build.xml
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/
      - copied from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/
      - copied from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/
      - copied from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/
      - copied from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/
      - copied from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/mcf/
      - copied from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
      - copied, changed from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
      - copied, changed from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/test/
      - copied from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/test-files/
      - copied from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test-files/
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/test-files/solr/
      - copied from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test-files/solr/
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/test-files/solr/conf/
      - copied from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test-files/solr/conf/
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/test-files/solr/conf/schema-auth.xml
      - copied unchanged from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test-files/solr/conf/schema-auth.xml
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth-load.xml
      - copied unchanged from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth-load.xml
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth-qparser.xml
      - copied unchanged from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth-qparser.xml
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth.xml
      - copied unchanged from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test-files/solr/conf/solrconfig-auth.xml
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/test/org/
      - copied from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/test/org/apache/
      - copied from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/test/org/apache/solr/
      - copied from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/test/org/apache/solr/mcf/
      - copied from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java
      - copied unchanged from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFQParserPluginTest.java
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
      - copied unchanged from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSCLoadTest.java
    incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java
      - copied unchanged from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/test/org/apache/solr/mcf/ManifoldCFSearchComponentTest.java

Copied: incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
(from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java?p2=incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java&p1=incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java&r1=1176420&r2=1176500&rev=1176500&view=diff
==============================================================================
--- incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
(original)
+++ incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFQParserPlugin.java
Tue Sep 27 18:19:59 2011
@@ -18,8 +18,7 @@ package org.apache.solr.mcf;
 
 import org.apache.lucene.index.*;
 import org.apache.lucene.search.*;
-import org.apache.lucene.queries.*;
-import org.apache.lucene.queryparser.classic.ParseException;
+import org.apache.lucene.queryParser.ParseException;
 import org.apache.solr.search.QParserPlugin;
 import org.apache.solr.search.QParser;
 import org.apache.solr.common.params.CommonParams;

Copied: incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
(from r1176420, incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java)
URL: http://svn.apache.org/viewvc/incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java?p2=incubator/lcf/integration/solr-3.x/trunk/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/ManifoldCFSearchComponent.java&r1=1176420&r2=1176500&rev=1176500&view=diff
==============================================================================
--- incubator/lcf/upstream/solr/SOLR-1895/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
(original)
+++ incubator/lcf/integration/solr-3.x/trunk/solr/contrib/mcf/src/java/org/apache/solr/mcf/ManifoldCFSearchComponent.java
Tue Sep 27 18:19:59 2011
@@ -18,7 +18,6 @@ package org.apache.solr.mcf;
 
 import org.apache.lucene.index.*;
 import org.apache.lucene.search.*;
-import org.apache.lucene.queries.*;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.params.CommonParams;
 import org.apache.solr.common.params.ShardParams;



Mime
View raw message