hydra-access-controls 0.0.5 → 5.0.0.pre1

data/Rakefile

@@ -1,10 +1,11 @@
 #!/usr/bin/env rake
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
-APP_ROOT = File.expand_path("#{File.dirname(__FILE__)}")
-require "jettywrapper"
+
+APP_ROOT= File.expand_path(File.join(File.dirname(__FILE__),".."))
+require 'jettywrapper'
 # re-using hydra_jetty.rake from hydra-head
-import "lib/tasks/hydra_jetty.rake"
+#import "lib/tasks/hydra_jetty.rake"
 import "lib/tasks/hydra-access-controls.rake"
 
 desc 'Default: run specs.'
@@ -16,4 +17,9 @@ RSpec::Core::RakeTask.new do |t|
     t.rcov = true
     t.rcov_opts = %w{--exclude spec\/*,gems\/*,ruby\/* --aggregate coverage.data}
   end
-end
+end
+
+desc "clean"
+task :clean do
+  #nop, required by hydra-head ci
+end

data/config/solr.yml

@@ -1,6 +1,4 @@
 development:
-  default:
-    url: http://localhost:<%= ENV['TEST_JETTY_PORT'] || 8983 %>/solr/development
+  url: http://localhost:<%= ENV['TEST_JETTY_PORT'] || 8983 %>/solr/development
 test: 
-  default:
-    url: http://localhost:<%= ENV['TEST_JETTY_PORT'] || 8983 %>/solr/test
+  url: http://localhost:<%= ENV['TEST_JETTY_PORT'] || 8983 %>/solr/test

data/hydra-access-controls.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require File.expand_path('../lib/hydra-access-controls/version', __FILE__)
+version = File.read(File.expand_path("../../HYDRA_VERSION", __FILE__)).strip
 
 Gem::Specification.new do |gem|
   gem.authors       = ["Chris Beer", "Justin Coyne", "Matt Zumwalt"]
@@ -13,7 +13,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "hydra-access-controls"
   gem.require_paths = ["lib"]
-  gem.version       = Hydra::Access::Controls::VERSION
+  gem.version       = version
 
   gem.add_dependency 'activesupport'
   gem.add_dependency 'active-fedora'

data/lib/hydra-access-controls.rb

@@ -1,13 +1,6 @@
 require 'active_support'
 require 'active-fedora'
 require 'cancan'
-require 'deprecation'
-require "hydra-access-controls/version"
-begin
-  require 'hydra/model_mixins'
-rescue LoadError
-end
-require 'hydra/datastream'
 
 module Hydra
   extend ActiveSupport::Autoload
@@ -16,12 +9,14 @@ module Hydra
   autoload :PolicyAwareAccessControlsEnforcement
   autoload :AccessControlsEvaluation
   autoload :Ability
+  autoload :Datastream
   autoload :PolicyAwareAbility
   autoload :AdminPolicy
   autoload :RoleMapperBehavior
 
   module ModelMixins
-    autoload :RightsMetadata, 'hydra/model_mixins/rights_metadata'
+    extend ActiveSupport::Autoload
+    autoload :RightsMetadata
   end
 
   # This error is raised when a user isn't allowed to access a given controller action.

data/lib/hydra/ability.rb

@@ -25,14 +25,10 @@ module Hydra::Ability
 
   def hydra_default_permissions(user, session)
     logger.debug("Usergroups are " + user_groups(user, session).inspect)
-    if user.respond_to?(:is_being_superuser?) && Deprecation.silence(Hydra::SuperuserAttributes) {user.is_being_superuser?(session)}
-      can :manage, :all
-    else
-      create_permissions(user, session)
-      edit_permissions(user, session)
-      read_permissions(user, session)
-      custom_permissions(user, session)
-    end
+    create_permissions(user, session)
+    edit_permissions(user, session)
+    read_permissions(user, session)
+    custom_permissions(user, session)
   end
 
   def create_permissions(user, session)

data/lib/hydra/policy_aware_access_controls_enforcement.rb

@@ -7,7 +7,7 @@ module Hydra::PolicyAwareAccessControlsEnforcement
     super
     additional_clauses = policy_clauses
     unless additional_clauses.nil? || additional_clauses.empty?
-      solr_parameters[:fq].first << " OR " + policy_clauses
+      solr_parameters[:fq].first << " OR " + additional_clauses
       logger.debug("POLICY-aware Solr parameters: #{ solr_parameters.inspect }")
     end
   end
@@ -67,4 +67,4 @@ module Hydra::PolicyAwareAccessControlsEnforcement
     end
   end
   
-end
+end

data/lib/hydra/role_mapper_behavior.rb

@@ -15,7 +15,7 @@ module Hydra::RoleMapperBehavior
       if user_or_uid.kind_of?(String)
         user = ::User.find_by_user_key(user_or_uid)
         user_id = user_or_uid
-      elsif user_or_uid.kind_of?(::User) && user_or_uid.user_key  
+      elsif user_or_uid.kind_of?(::User) && user_or_uid.user_key   
         user = user_or_uid
         user_id = user.user_key
       end

data/spec/unit/policy_aware_access_controls_enforcement_spec.rb

@@ -66,7 +66,7 @@ describe Hydra::PolicyAwareAccessControlsEnforcement do
   end
   
   after(:all) do
-    @policies.access.each {|p| p.delete }
+    @sample_policies.each {|p| p.delete }
   end
   
   subject { MockController.new }
@@ -97,6 +97,9 @@ describe Hydra::PolicyAwareAccessControlsEnforcement do
   
   describe "apply_gated_discovery" do
     it "should include policy-aware query" do
+      # stubbing out policies_with_access because solr doesn't always return them in the same order.
+      policy_pids = (1..6).map {|n| "test:policy#{n}"}
+      subject.should_receive(:policies_with_access).and_return(policy_pids)
       subject.apply_gated_discovery(@solr_parameters, @user_parameters)
       @solr_parameters[:fq].first.should include(" OR (is_governed_by_s:info\\:fedora/test\\:policy1 OR is_governed_by_s:info\\:fedora/test\\:policy2 OR is_governed_by_s:info\\:fedora/test\\:policy3 OR is_governed_by_s:info\\:fedora/test\\:policy4 OR is_governed_by_s:info\\:fedora/test\\:policy5 OR is_governed_by_s:info\\:fedora/test\\:policy6)")
     end
@@ -106,4 +109,4 @@ describe Hydra::PolicyAwareAccessControlsEnforcement do
       @solr_parameters[:fq].first.should_not include(" OR (is_governed_by_s:info\\:fedora/test\\:policy1 OR is_governed_by_s:info\\:fedora/test\\:policy2 OR is_governed_by_s:info\\:fedora/test\\:policy3 OR is_governed_by_s:info\\:fedora/test\\:policy4 OR is_governed_by_s:info\\:fedora/test\\:policy5 OR is_governed_by_s:info\\:fedora/test\\:policy6)")
     end
   end
-end
+end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: hydra-access-controls
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 5.0.0.pre1
+  prerelease: 6
 platform: ruby
 authors:
 - Chris Beer
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -132,20 +132,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
-- .rspec
-- Gemfile
-- LICENSE
 - README.textile
 - Rakefile
 - config/fedora.yml
-- config/jetty.yml
 - config/solr.yml
 - hydra-access-controls.gemspec
 - lib/ability.rb
 - lib/hydra-access-controls.rb
-- lib/hydra-access-controls/version.rb
 - lib/hydra/ability.rb
 - lib/hydra/access_controls_enforcement.rb
 - lib/hydra/access_controls_evaluation.rb
@@ -161,9 +154,6 @@ files:
 - lib/role_mapper.rb
 - lib/tasks/hydra-access-controls.rake
 - lib/tasks/hydra_jetty.rake
-- solr_conf/conf/schema.xml
-- solr_conf/conf/solrconfig.xml
-- solr_conf/solr.xml
 - spec/factories.rb
 - spec/spec_helper.rb
 - spec/support/blacklight.rb
@@ -197,9 +187,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -225,3 +215,4 @@ test_files:
 - spec/unit/policy_aware_access_controls_enforcement_spec.rb
 - spec/unit/rights_metadata_spec.rb
 - spec/unit/role_mapper_spec.rb
+has_rdoc: 

data/.gitignore

@@ -1,19 +0,0 @@
-*.gem
-*.rbc
-.rvmrc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.swp

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "jetty"]
-	path = jetty
-	url = git://github.com/projecthydra/hydra-jetty.git

data/.rspec

@@ -1,2 +0,0 @@
---color
---format documentation

data/Gemfile

@@ -1,17 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in hydra-access-controls.gemspec
-gemspec
-
-group :development do
-  gem 'jettywrapper'
-  gem 'debugger', :platform => :mri_19
-end
-
-group :test do
-  gem 'cucumber-rails', '>=1.2.0', :require=>false
-  gem 'rcov', :platform => :mri_18
-  gem 'simplecov', :platform => :mri_19
-  gem 'simplecov-rcov', :platform => :mri_19
-  gem 'factory_girl', '< 3.0.0' # factory girl 3+ doesn't work with ruby 1.8
-end

data/LICENSE

@@ -1,22 +0,0 @@
-Copyright (c) 2012 TODO: Write your name
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/config/jetty.yml

@@ -1,5 +0,0 @@
-default:
-  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8983 %>
-  java_opts:
-    - "-Xmx256m" 
-    - "-XX:MaxPermSize=128m"

data/lib/hydra-access-controls/version.rb

@@ -1,7 +0,0 @@
-module Hydra
-  module Access
-    module Controls
-      VERSION = "0.0.5"
-    end
-  end
-end

data/solr_conf/conf/schema.xml

@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-IMPORTANT
-This copy of the solr schema is only used in the context of testing hydra-head.  If you want to make changes available to individual hydra heads, you must apply them to the template in lib/generators/hydra/templates/solr_config
--->
-<schema name="Hydra" version="1.1">
-  <!-- For complete comments from the Solr project example schema.xml:
-      http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/solr/conf/schema.xml?view=markup
-    See also:  
-      http://wiki.apache.org/solr/SchemaXml
-  -->
-  <types>
-    <fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
-    <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true" omitNorms="true"/>
-    <fieldType name="integer" class="solr.IntField" omitNorms="true"/>
-    <fieldType name="long" class="solr.LongField" omitNorms="true"/>
-    <fieldType name="float" class="solr.FloatField" omitNorms="true"/>
-    <fieldType name="double" class="solr.DoubleField" omitNorms="true"/>
-    <fieldType name="sint" class="solr.SortableIntField" sortMissingLast="true" omitNorms="true"/>
-    <fieldType name="slong" class="solr.SortableLongField" sortMissingLast="true" omitNorms="true"/>
-    <fieldType name="sfloat" class="solr.SortableFloatField" sortMissingLast="true" omitNorms="true"/>
-    <fieldType name="sdouble" class="solr.SortableDoubleField" sortMissingLast="true" omitNorms="true"/>
-    <fieldType name="date" class="solr.DateField" sortMissingLast="true" omitNorms="true"/>
-    <fieldType name="random" class="solr.RandomSortField" indexed="true" />
-    
-    <fieldType name="text_ws" class="solr.TextField" positionIncrementGap="100">
-      <analyzer>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <fieldType name="text" class="solr.TextField" positionIncrementGap="100">
-      <analyzer type="index">
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.StopFilterFactory"
-                ignoreCase="true"
-                words="stopwords.txt"
-                enablePositionIncrements="true"
-                />
-        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.EnglishPorterFilterFactory" protected="protwords.txt"/>
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
-        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.EnglishPorterFilterFactory" protected="protwords.txt"/>
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <fieldType name="textTight" class="solr.TextField" positionIncrementGap="100" >
-      <analyzer>
-        <tokenizer class="solr.WhitespaceTokenizerFactory"/>
-        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="false"/>
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
-        <filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-        <filter class="solr.EnglishPorterFilterFactory" protected="protwords.txt"/>
-        <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
-      </analyzer>
-    </fieldType>
-
-    <fieldType name="alphaOnlySort" class="solr.TextField" sortMissingLast="true" omitNorms="true">
-      <analyzer>
-        <tokenizer class="solr.KeywordTokenizerFactory"/>
-        <filter class="solr.LowerCaseFilterFactory" />
-        <filter class="solr.TrimFilterFactory" />
-        <filter class="solr.PatternReplaceFilterFactory"
-                pattern="([^a-z])" replacement="" replace="all"
-        />
-      </analyzer>
-    </fieldType>
-
-    <fieldtype name="ignored" stored="false" indexed="false" class="solr.StrField" /> 
-
- </types>
-
- <!-- For complete comments from the Solr project example schema.xml:
-     http://svn.apache.org/viewvc/lucene/dev/trunk/solr/example/solr/conf/schema.xml?view=markup
-   See also:  
-     http://wiki.apache.org/solr/SchemaXml
- -->
- <fields>
-
-   <field name="id" type="string" indexed="true" stored="true" required="true" />
-   <field name="text" type="text" indexed="true" stored="true" multiValued="true"/>
-   <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
-
-   <!-- format is used for facet, display, and choosing which partial to use for the show view, so it must be stored and indexed -->
-   <field name="format" type="string" indexed="true" stored="true"/>
-   <!-- pub_date is assumed by Blacklight's default configuration, so we must define it here to avoid errors -->
-   <field name="pub_date" type="string" indexed="true" stored="true" multiValued="true"/>
-   
-   <dynamicField name="*_i"  type="sint"    indexed="true"  stored="true"/>
-   <dynamicField name="*_s"  type="string"  indexed="true"  stored="true" multiValued="true"/>
-   <dynamicField name="*_l"  type="slong"   indexed="true"  stored="true"/>
-   <dynamicField name="*_t"  type="text"    indexed="true"  stored="true" multiValued="true"/>
-   <dynamicField name="*_b"  type="boolean" indexed="true"  stored="true"/>
-   <dynamicField name="*_f"  type="sfloat"  indexed="true"  stored="true"/>
-   <dynamicField name="*_d"  type="sdouble" indexed="true"  stored="true"/>
-   <dynamicField name="*_dt" type="date"    indexed="true"  stored="true"/>
-
-   <dynamicField name="random*" type="random" />
-   <!-- FIXME: Solr can't sort on a multivalued field -->
-   <dynamicField name="*_sort" type="string" indexed="true" stored="false" multiValued="true"/>
-   <!-- FIXME: generally, facet fields are not stored -->
-   <dynamicField name="*_facet" type="string" indexed="true" stored="true" multiValued="true" />
-   <dynamicField name="*_display" type="string" indexed="false" stored="true" multiValued="true" />
-
- </fields>
-
- <uniqueKey>id</uniqueKey>
- <defaultSearchField>text</defaultSearchField>
- <solrQueryParser defaultOperator="AND" />
- <copyField source="*_facet" dest="text" />
- <copyField source="*_t" dest="text" />
- <copyField source="*_s" dest="text" />
-
-</schema>

data/solr_conf/conf/solrconfig.xml

@@ -1,329 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<config>
-  <!-- For complete comments from the Solr project example solrconfig.xml:
-      http://svn.apache.org/repos/asf/lucene/dev/trunk/solr/example/solr/conf/solrconfig.xml
-    See also:  
-      http://wiki.apache.org/solr/SolrConfigXml
-  -->
-  <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
-
-  <indexDefaults>
-    <useCompoundFile>false</useCompoundFile>
-    <mergeFactor>10</mergeFactor>
-    <ramBufferSizeMB>32</ramBufferSizeMB>
-    <maxMergeDocs>2147483647</maxMergeDocs>
-    <maxFieldLength>10000</maxFieldLength>
-    <writeLockTimeout>1000</writeLockTimeout>
-    <commitLockTimeout>10000</commitLockTimeout>
-    <lockType>single</lockType>
-  </indexDefaults>
-
-  <mainIndex>
-    <useCompoundFile>false</useCompoundFile>
-    <ramBufferSizeMB>32</ramBufferSizeMB>
-    <mergeFactor>10</mergeFactor>
-    <maxMergeDocs>2147483647</maxMergeDocs>
-    <maxFieldLength>10000</maxFieldLength>
-    <unlockOnStartup>false</unlockOnStartup>
-  </mainIndex>
-  
-  <jmx />
-
-  <!-- the default high-performance update handler -->
-  <updateHandler class="solr.DirectUpdateHandler2">
-  </updateHandler>
-
-
-  <query>
-    <maxBooleanClauses>1024</maxBooleanClauses>
-    <filterCache class="solr.LRUCache"
-      size="512"
-      initialSize="512"
-      autowarmCount="128"/>
-    <queryResultCache class="solr.LRUCache"
-      size="512"
-      initialSize="512"
-      autowarmCount="32"/>
-    <documentCache class="solr.LRUCache"
-      size="512"
-      initialSize="512"
-      autowarmCount="0"/>
-    <enableLazyFieldLoading>true</enableLazyFieldLoading>
-    <queryResultWindowSize>50</queryResultWindowSize>
-    <queryResultMaxDocsCached>200</queryResultMaxDocsCached>
-    <HashDocSet maxSize="3000" loadFactor="0.75"/>
-
-    <listener event="newSearcher" class="solr.QuerySenderListener">
-      <arr name="queries">
-        <lst> <str name="q">hydrus</str></lst>
-      </arr>
-    </listener>
-
-    <listener event="firstSearcher" class="solr.QuerySenderListener">
-      <arr name="queries">
-        <lst> <str name="q">hydrus</str></lst>
-      </arr>
-    </listener>
-
-    <useColdSearcher>false</useColdSearcher>
-    <maxWarmingSearchers>2</maxWarmingSearchers>
-  </query>
-
-  <requestDispatcher handleSelect="true" >
-    <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
-    <httpCaching lastModifiedFrom="openTime"
-                 etagSeed="Solr">
-    </httpCaching>
-  </requestDispatcher>
-  
-  <requestHandler name="standard" class="solr.SearchHandler">
-     <lst name="defaults">
-       <str name="echoParams">explicit</str>
-     </lst>
-  </requestHandler>
-
-  <!-- For complete comments from the Solr project example solrconfig.xml:
-      http://svn.apache.org/repos/asf/lucene/dev/trunk/solr/example/solr/conf/solrconfig.xml
-    See also:  
-      http://wiki.apache.org/solr/SolrConfigXml
-  -->
-
-  <requestHandler name="search" class="solr.SearchHandler" default="true">
-    <lst name="defaults">
-      <str name="defType">dismax</str>
-      <!-- dismax params -->
-      <str name="mm"> 2&lt;-1 5&lt;-2 6&lt;90% </str>
-      <str name="q.alt">*:*</str>
-      <!-- general -->
-      <str name="facet">true</str>
-      <str name="facet.mincount">1</str>
-	    <str name="echoParams">explicit</str>
-      <str name="fl">
-        id,title_t,title_display,date_t,year_facet,month_facet,has_model_s,has_collection_member_s,is_part_of_s,system_create_dt,
-        person_0_role_t,person_1_role_t,person_2_role_t,person_3_role_t,person_4_role_t,person_5_role_t,person_6_role_t,
-        person_7_role_t,person_8_role_t,person_9_role_t,
-        person_0_first_name_t,person_1_first_name_t,person_2_first_name_t,person_3_first_name_t,person_4_first_name_t,
-        person_5_first_name_t,person_6_first_name_t,person_7_first_name_t,person_8_first_name_t,person_9_first_name_t,
-        person_0_last_name_t,person_1_last_name_t,person_2_last_name_t,person_3_last_name_t,person_4_last_name_t,
-        person_5_last_name_t,person_6_last_name_t,person_7_last_name_t,person_8_last_name_t,person_9_last_name_t,
-        status_t,subject_t,depositor_t,
-				journal_title_info_t,journal_issue_publication_date_t,
-				journal_issue_pages_end_t,journal_issue_volume_t,journal_title_info_main_title_t,journal_issue_pages_start_t,
-				journal_issue_start_page_t, journal_issue_end_page_t, abstract_t,
-        person_0_institution_t,person_1_institution_t,person_2_institution_t,person_3_institution_t,person_4_institution_t,person_5_institution_t,person_institution_role_t,
-        person_7_institution_t,person_8_institution_t,person_9_institution_t,
-        mods_gps_t, mods_region_t, mods_site_t, mods_ecosystem_t,
-        mods_timespan_start_t, mods_timespan_end_t, description_t, mods_title_info_main_title_t, mods_0_title_info_0_main_title_t, embargo_release_date_dt, note_t,
-        object_type_facet, department_facet, peer_reviewed_facet
-      </str>
-    </lst>
-  </requestHandler>
-  
-  <requestHandler name="public_search" class="solr.SearchHandler" >
-    <lst name="defaults">
-      <!-- Making defType lucene to exclude file assets -->
-      <str name="defType">lucene</str>
-      <!-- lucene params -->
-      <str name="df">has_model_s</str>
-      <str name="q.op">AND</str>
-      <!-- dismax params -->
-      <str name="mm"> 2&lt;-1 5&lt;-2 6&lt;90% </str>
-      <str name="q.alt">*:*</str>
-      <str name="qf_dismax">id^0.8 id_t^0.8 format text^0.3</str>
-      <str name="pf_dismax">id^0.9  id_t^0.9 text^0.5</str>
-      <int name="ps">100</int>
-      <float name="tie">0.01</float>
-      <!-- general -->
-      <str name="facet">on</str>
-      <str name="facet.mincount">1</str>
-	    <str name="echoParams">explicit</str>
-      <str name="fl">
-        id,text,title_t,date_t,year_facet,month_facet,medium_t,series_facet,box_facet,folder_facet,has_model_s,has_collection_member_s,system_create_dt,
-        person_0_role_t,person_1_role_t,person_2_role_t,person_3_role_t,person_4_role_t,person_5_role_t,person_6_role_t,person_7_role_t,person_8_role_t,person_9_role_t,
-        person_0_first_name_t,person_1_first_name_t,person_2_first_name_t,person_3_first_name_t,person_4_first_name_t,person_5_first_name_t,person_6_first_name_t,person_7_first_name_t,person_8_first_name_t,person_9_first_name_t,
-        person_0_last_name_t,person_1_last_name_t,person_2_last_name_t,person_3_last_name_t,person_4_last_name_t,person_5_last_name_t,person_6_last_name_t,person_7_last_name_t,person_8_last_name_t,person_9_last_name_t,depositor_t,
-
-        journal_title_info_t, journal_title_info_main_title_t, journal_issue_publication_date_t, journal_issue_pages_start_t, journal_issue_pages_end_t, journal_issue_volume_t, journal_issue_start_page_t, journal_issue_end_page_t, abstract_t,
-        person_0_institution_t,person_1_institution_t,person_2_institution_t,person_3_institution_t,person_4_institution_t,person_5_institution_t,person_institution_role_t,
-        person_7_institution_t,person_8_institution_t,person_9_institution_t,
-        mods_gps_t, mods_region_t, mods_site_t, mods_ecosystem_t,
-        mods_timespan_start_t, mods_timespan_end_t, description_t, mods_title_info_t,mods_0_title_info_0_main_title_t, embargo_release_date_dt, note_t,
-        object_type_facet, department_facet, peer_reviewed_facet
-      </str>
-    </lst>
-  </requestHandler>
-  
-  <requestHandler name="fulltext" class="solr.SearchHandler" >
-    <lst name="defaults">
-      <str name="defType">dismax</str>
-      <str name="facet">on</str>
-      <str name="facet.mincount">1</str> 
-      <str name="echoParams">explicit</str>
-      <float name="tie">0.01</float>
-      <str name="qf">id^0.8 id_t^0.8 format text^0.3</str>
-      <str name="pf">id^0.9  id_t^0.9 text^0.5</str>
-      <str name="fl">
-        id,text,title_t,date_t,year_facet,month_facet,medium_t,series_facet,box_facet,folder_facet
-      </str>
-      <str name="mm"> 2&lt;-1 5&lt;-2 6&lt;90% </str>
-      <int name="ps">100</int>
-      <str name="q.alt">*:*</str>
-    </lst>
-  </requestHandler>
-  
-  <!-- 
-    Hydra Permissions request Handler
-    For requests to get just the permissions related info about a document 
-  -->
-  <requestHandler name="permissions" class="solr.SearchHandler" >
-    <lst name="defaults">
-      <str name="facet">off</str>
-      <str name="echoParams">all</str>
-      <str name="rows">1</str>
-      <str name="q">{!raw f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
-      <str name="fl">
-        id,access_t,
-        discover_access_group_t,discover_access_person_t,
-        read_access_group_t,read_access_person_t,
-        edit_access_group_t,edit_access_person_t,
-        depositor_t,
-        embargo_release_date_dt
-        inheritable_access_t,
-        inheritable_discover_access_group_t,inheritable_discover_access_person_t,
-        inheritable_read_access_group_t,inheritable_read_access_person_t,
-        inheritable_edit_access_group_t,inheritable_edit_access_person_t,
-        inheritable_embargo_release_date_dt
-      </str>
-    </lst>
-  </requestHandler>
-  
-  <!-- for requests to get a single document; use id=666 instead of q=id:666 -->
-  <requestHandler name="document" class="solr.SearchHandler" >
-    <lst name="defaults">
-      <str name="echoParams">all</str>
-      <str name="fl">*</str>
-      <str name="rows">1</str>
-      <str name="q">{!raw f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
-
-      <!-- facets on for a single document response??? -->      
-      <str name="facet">on</str>
-	    <str name="facet.mincount">1</str>
-
-      <str name="facet.field">collection_facet</str>
-      <str name="facet.field">technology_facet</str>
-      <str name="facet.field">person_facet</str>
-      <!-- <str name="facet.field">title_t</str>       -->
-      <str name="facet.field">city_facet</str>
-      <str name="facet.field">organization_facet</str>
-      <str name="facet.field">company_facet</str>
-      <str name="facet.field">year_facet</str>
-      <str name="facet.field">state_facet</str>
-      <str name="facet.field">series_facet</str>
-      <str name="facet.field">box_facet</str>
-      <str name="facet.field">folder_facet</str>
-      <str name="facet.field">donor_tags_facet</str>
-      <str name="facet.field">archivist_tags_facet</str>
-
-    </lst>
-  </requestHandler>
-  
-   <!-- The spell check component can return a list of alternative spelling
-  suggestions.  -->
-  <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
-
-    <str name="queryAnalyzerFieldType">textSpell</str>
-
-    <lst name="spellchecker">
-      <str name="name">default</str>
-      <str name="field">spell</str>
-      <str name="spellcheckIndexDir">./spellchecker1</str>
-
-    </lst>
-    <lst name="spellchecker">
-      <str name="name">jarowinkler</str>
-      <str name="field">spell</str>
-      <!-- Use a different Distance Measure -->
-      <str name="distanceMeasure">org.apache.lucene.search.spell.JaroWinklerDistance</str>
-      <str name="spellcheckIndexDir">./spellchecker2</str>
-
-    </lst>
-
-    <lst name="spellchecker">
-      <str name="classname">solr.FileBasedSpellChecker</str>
-      <str name="name">file</str>
-      <str name="sourceLocation">spellings.txt</str>
-      <str name="characterEncoding">UTF-8</str>
-      <str name="spellcheckIndexDir">./spellcheckerFile</str>
-    </lst>
-  </searchComponent>
-
-  <!-- a request handler utilizing the spellcheck component -->
-  <requestHandler name="/spellCheckCompRH" class="solr.SearchHandler">
-    <lst name="defaults">
-      <!-- omp = Only More Popular -->
-      <str name="spellcheck.onlyMorePopular">false</str>
-      <!-- exr = Extended Results -->
-      <str name="spellcheck.extendedResults">false</str>
-      <!--  The number of suggestions to return -->
-      <str name="spellcheck.count">1</str>
-    </lst>
-    <arr name="last-components">
-      <str>spellcheck</str>
-    </arr>
-  </requestHandler>
- 
-  <!-- a search component that enables you to configure the top results for
-       a given query regardless of the normal lucene scoring.-->
-  <searchComponent name="elevator" class="solr.QueryElevationComponent" >
-    <!-- pick a fieldType to analyze queries -->
-    <str name="queryFieldType">string</str>
-    <str name="config-file">elevate.xml</str>
-  </searchComponent>
- 
-  <!-- a request handler utilizing the elevator component -->
-  <requestHandler name="/elevate" class="solr.SearchHandler" startup="lazy">
-    <lst name="defaults">
-      <str name="echoParams">explicit</str>
-    </lst>
-    <arr name="last-components">
-      <str>elevator</str>
-    </arr>
-  </requestHandler>
-
-  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" />
-  <requestHandler name="/analysis" class="solr.AnalysisRequestHandler" />
-  <requestHandler name="/update/csv" class="solr.CSVRequestHandler" startup="lazy" />
-  <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
-  <requestHandler name="/admin/ping" class="PingRequestHandler">
-    <lst name="defaults">
-      <str name="qt">standard</str>
-      <str name="q">solrpingquery</str>
-      <str name="echoParams">all</str>
-    </lst>
-  </requestHandler>
-  <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" >
-    <lst name="defaults">
-     <str name="echoParams">explicit</str> <!-- for all params (including the default etc) use: 'all' -->
-     <str name="echoHandler">true</str>
-    </lst>
-  </requestHandler>
-  
-  <!-- 
-  <queryResponseWriter name="xml" class="org.apache.solr.request.XMLResponseWriter" default="true"/>
-  <queryResponseWriter name="json" class="org.apache.solr.request.JSONResponseWriter"/>
-  <queryResponseWriter name="ruby" class="org.apache.solr.request.RubyResponseWriter"/>
-  -->
-
-  <!-- XSLT response writer transforms the XML output by any xslt file found
-       in Solr's conf/xslt directory.  Changes to xslt files are checked for
-       every xsltCacheLifetimeSeconds.  
-   -->
-  <queryResponseWriter name="xslt" class="org.apache.solr.request.XSLTResponseWriter">
-    <int name="xsltCacheLifetimeSeconds">5</int>
-  </queryResponseWriter> 
-
-  <admin>
-    <defaultQuery>hydra</defaultQuery>
-  </admin>
-
-</config>

data/solr_conf/solr.xml

@@ -1,35 +0,0 @@
-<?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.
--->
-
-<!--
- All (relative) paths are relative to the installation path
-  
-  persistent: Save changes made via the API to this file
-  sharedLib: path to a lib directory that will be shared across all cores
--->
-<solr persistent="false">
-
-  <!--
-  adminPath: RequestHandler path to manage cores.  
-    If 'null' (or absent), cores will not be manageable via REST
-  -->
-  <cores adminPath="/admin/cores">
-    <core name="core0" instanceDir="core0" />
-    <core name="core1" instanceDir="core1" />
-  </cores>
-</solr>