incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1176690 - in /incubator/lcf/trunk: ./ connectors/solr/ connectors/solr/integration/
Date Wed, 28 Sep 2011 02:46:42 GMT
Author: kwright
Date: Wed Sep 28 02:46:41 2011
New Revision: 1176690

URL: http://svn.apache.org/viewvc?rev=1176690&view=rev
Log:
Add solr integration components for solr 3.x and 4.x

Added:
    incubator/lcf/trunk/connectors/solr/integration/
    incubator/lcf/trunk/connectors/solr/integration/README-3.x.txt   (with props)
    incubator/lcf/trunk/connectors/solr/integration/README-4.x.txt   (with props)
    incubator/lcf/trunk/connectors/solr/integration/apache-solr-mcf-3.x.jar   (with props)
    incubator/lcf/trunk/connectors/solr/integration/apache-solr-mcf-4.x.jar   (with props)
Modified:
    incubator/lcf/trunk/build.xml
    incubator/lcf/trunk/connectors/solr/build.xml

Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1176690&r1=1176689&r2=1176690&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Wed Sep 28 02:46:41 2011
@@ -1362,6 +1362,10 @@
         <copy todir="dist/lib">
             <fileset dir="connectors/solr/dist/lib"/>
         </copy>
+        <mkdir dir="dist/solr-integration"/>
+        <copy todir="dist/solr-integration">
+            <fileset dir="connectors/solr/dist/integration"/>
+        </copy>
     </target>
     
     <target name="deliver-solr-connector-doc" depends="calculate-solr-doc-condition" if="solr-doc.include">

Modified: incubator/lcf/trunk/connectors/solr/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/solr/build.xml?rev=1176690&r1=1176689&r2=1176690&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/solr/build.xml (original)
+++ incubator/lcf/trunk/connectors/solr/build.xml Wed Sep 28 02:46:41 2011
@@ -51,7 +51,17 @@
         <copy todir="dist/lib" file="build/jar/mcf-solr-connector.jar"/>
     </target>
 
-    <target name="build" depends="lib"/>
+    <target name="integration">
+        <mkdir dir="dist/integration"/>
+        <copy todir="dist/integration">
+          <fileset dir="integration">
+              <include name="*.jar"/>
+              <include name="*.txt"/>
+          </fileset>
+        </copy>
+    </target>
+    
+    <target name="build" depends="lib,integration"/>
     <target name="build-tests">
       <mkdir dir="build/test-jar"/>
     </target>

Added: incubator/lcf/trunk/connectors/solr/integration/README-3.x.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/solr/integration/README-3.x.txt?rev=1176690&view=auto
==============================================================================
--- incubator/lcf/trunk/connectors/solr/integration/README-3.x.txt (added)
+++ incubator/lcf/trunk/connectors/solr/integration/README-3.x.txt Wed Sep 28 02:46:41 2011
@@ -0,0 +1,73 @@
+ 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.
+
+
+Getting Started
+---------------
+
+There are two ways to hook up security to Solr in this package.  The first is using a Query
Parser plugin.
+The second is using a Search Component.  In both cases, the first step is to have ManifoldCF
installed and running.  See:
+http://incubator.apache.org/incubator/connectors/how-to-build-and-deploy.html
+
+Then, you will need to add fields to your Solr schema.xml file that can be used to contain
document
+authorization information.  There will need to be four of these fields, an 'allow' field
for both
+documents and shares, and a 'deny' field for both documents and shares.  For example:
+
+  <field name="allow_token_document" type="string" indexed="true" stored="false" multiValued="true"
required="false" default="__nosecurity__"/>
+  <field name="allow_token_share" type="string" indexed="true" stored="false" multiValued="true"
required="false" default="__nosecurity__"/>
+  <field name="deny_token_document" type="string" indexed="true" stored="false" multiValued="true"
required="false" default="__nosecurity__"/>
+  <field name="deny_token_share" type="string" indexed="true" stored="false" multiValued="true"
required="false" default="__nosecurity__"/>
+
+Using the Query Parser Plugin
+----------------------------
+
+To set up the query parser plugin, modify your solrconfig.xml to add the query parser:
+
+  <!-- ManifoldCF document security enforcement component -->
+  <queryParser name="manifoldCFSecurity"
+    class="org.apache.solr.mcf.ManifoldCFQParserPlugin">
+    <str name="AuthorityServiceBaseURL">http://localhost:8345/mcf-authority-service</str>
+  </queryParser>
+
+Hook up the search component in the solrconfig.xml file wherever you want it, e.g.:
+
+<requestHandler name="search" class="solr.SearchHandler" default="true">
+  <lst name="appends">
+    <str name="fq">{!manifoldCFSecurity}</str>
+  </lst>
+  ...
+</requestHandler>
+
+
+Using the Search Component
+----------------------------
+
+To set up the search component, modify your solrconfig.xml to add the search component:
+
+  <!-- ManifoldCF document security enforcement component -->
+  <searchComponent name="manifoldCFSecurity"
+    class="org.apache.solr.mcf.ManifoldCFSearchComponent">
+    <str name="AuthorityServiceBaseURL">http://localhost:8345/mcf-authority-service</str>
+  </searchComponent>
+
+Hook up the search component in the solrconfig.xml file wherever you want it, e.g.:
+
+<requestHandler name="search" class="solr.SearchHandler" default="true">
+  <arr name="last-components">
+    <str>manifoldCFSecurity</str>
+  </arr>
+  ...
+</requestHandler>
+

Propchange: incubator/lcf/trunk/connectors/solr/integration/README-3.x.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/lcf/trunk/connectors/solr/integration/README-4.x.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/solr/integration/README-4.x.txt?rev=1176690&view=auto
==============================================================================
--- incubator/lcf/trunk/connectors/solr/integration/README-4.x.txt (added)
+++ incubator/lcf/trunk/connectors/solr/integration/README-4.x.txt Wed Sep 28 02:46:41 2011
@@ -0,0 +1,73 @@
+ 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.
+
+
+Getting Started
+---------------
+
+There are two ways to hook up security to Solr in this package.  The first is using a Query
Parser plugin.
+The second is using a Search Component.  In both cases, the first step is to have ManifoldCF
installed and running.  See:
+http://incubator.apache.org/incubator/connectors/how-to-build-and-deploy.html
+
+Then, you will need to add fields to your Solr schema.xml file that can be used to contain
document
+authorization information.  There will need to be four of these fields, an 'allow' field
for both
+documents and shares, and a 'deny' field for both documents and shares.  For example:
+
+  <field name="allow_token_document" type="string" indexed="true" stored="false" multiValued="true"
required="false" default="__nosecurity__"/>
+  <field name="allow_token_share" type="string" indexed="true" stored="false" multiValued="true"
required="false" default="__nosecurity__"/>
+  <field name="deny_token_document" type="string" indexed="true" stored="false" multiValued="true"
required="false" default="__nosecurity__"/>
+  <field name="deny_token_share" type="string" indexed="true" stored="false" multiValued="true"
required="false" default="__nosecurity__"/>
+
+Using the Query Parser Plugin
+----------------------------
+
+To set up the query parser plugin, modify your solrconfig.xml to add the query parser:
+
+  <!-- ManifoldCF document security enforcement component -->
+  <queryParser name="manifoldCFSecurity"
+    class="org.apache.solr.mcf.ManifoldCFQParserPlugin">
+    <str name="AuthorityServiceBaseURL">http://localhost:8345/mcf-authority-service</str>
+  </queryParser>
+
+Hook up the search component in the solrconfig.xml file wherever you want it, e.g.:
+
+<requestHandler name="search" class="solr.SearchHandler" default="true">
+  <lst name="appends">
+    <str name="fq">{!manifoldCFSecurity}</str>
+  </lst>
+  ...
+</requestHandler>
+
+
+Using the Search Component
+----------------------------
+
+To set up the search component, modify your solrconfig.xml to add the search component:
+
+  <!-- ManifoldCF document security enforcement component -->
+  <searchComponent name="manifoldCFSecurity"
+    class="org.apache.solr.mcf.ManifoldCFSearchComponent">
+    <str name="AuthorityServiceBaseURL">http://localhost:8345/mcf-authority-service</str>
+  </searchComponent>
+
+Hook up the search component in the solrconfig.xml file wherever you want it, e.g.:
+
+<requestHandler name="search" class="solr.SearchHandler" default="true">
+  <arr name="last-components">
+    <str>manifoldCFSecurity</str>
+  </arr>
+  ...
+</requestHandler>
+

Propchange: incubator/lcf/trunk/connectors/solr/integration/README-4.x.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/lcf/trunk/connectors/solr/integration/apache-solr-mcf-3.x.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/solr/integration/apache-solr-mcf-3.x.jar?rev=1176690&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/lcf/trunk/connectors/solr/integration/apache-solr-mcf-3.x.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/lcf/trunk/connectors/solr/integration/apache-solr-mcf-4.x.jar
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/solr/integration/apache-solr-mcf-4.x.jar?rev=1176690&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/lcf/trunk/connectors/solr/integration/apache-solr-mcf-4.x.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream



Mime
View raw message