hydra-core 9.6.0 → 9.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7de2e1cf6d7fffb05b9d158a071a5233e757f251
-  data.tar.gz: 190764737d16b04bca3c887f5be91a67699e1ab7
+  metadata.gz: 32db952d4340fcff7c3abdb5b1eae46a29463583
+  data.tar.gz: e80378d899ffc68b9a580c34e22cb180a2909b74
 SHA512:
-  metadata.gz: d6171dc2226ab963b5221e2a9de0e548307fbebd64881fe2b30947eb8688af55922c2ecb6f5aa9a2ee524fd38f1cc978ff6f300c26bd904899b4192b579e71de
-  data.tar.gz: 45508099ed34d6ff46463feccb5ed7214cbe8bb08a58033982f87febc83cfd46c2485503d9befbd6de279444943481161a17183ba16716350fa1987ff9cc8890
+  metadata.gz: d523625723ceb2131a6000a52a55508fd35278cadfdaa1be752b6a33aa8001ca1ff27555b1bcb2c096aecc8bcdeb49b1f0ede5f484981b07a3c0be03cf3f5197
+  data.tar.gz: 21a2f6600e6490d6a4afd76017d6a579ea2b639a66ae0f6cc56d4d95fe35ed92482a202045a5fb2984cdaa19cd7213d35cb88e562f8bb8f44ded9f67e9514138

data/hydra-core.gemspec

@@ -20,8 +20,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "rails", '~> 4.0'
   gem.add_dependency 'hydra-access-controls', version
-  gem.add_dependency 'jettywrapper', '>= 2.0.0'
-  gem.add_dependency 'active-fedora', '~> 9.1'
+  gem.add_dependency 'active-fedora', '~> 9.8'
 
   gem.add_development_dependency 'sqlite3', '~> 1.3'
   gem.add_development_dependency 'yard', '~> 0.8.7'

data/lib/generators/hydra/head_generator.rb

@@ -33,7 +33,6 @@ module Hydra
 
       gem_group :development, :test do
         gem "rspec-rails"
-        gem 'jettywrapper'
       end
 
       Bundler.with_clean_env do

data/lib/generators/hydra/templates/config/blacklight.yml

@@ -1,9 +1,9 @@
 development:
   adapter: solr
-  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/development" %>
+  url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/hydra-dev" %>
 test: &test
   adapter: solr
-  url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8983}/solr/test" %>
+  url: <%= "http://127.0.0.1:#{ENV['TEST_JETTY_PORT'] || 8985}/solr/hydra-test" %>
 production:
   adapter: solr
   url: <%= ENV['SOLR_URL'] || "http://127.0.0.1:8983/solr/blacklight-core" %>

data/lib/hydra-head/version.rb

@@ -1,3 +1,3 @@
 module HydraHead
-  VERSION = "9.6.0"
+  VERSION = "9.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hydra-core
 version: !ruby/object:Gem::Version
-  version: 9.6.0
+  version: 9.7.0
 platform: ruby
 authors:
 - Matt Zumwalt, Bess Sadler, Julie Meloni, Naomi Dushay, Jessie Keck, John Scofield,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -31,42 +31,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.6.0
+        version: 9.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 9.6.0
-- !ruby/object:Gem::Dependency
-  name: jettywrapper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 9.7.0
 - !ruby/object:Gem::Dependency
   name: active-fedora
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: '9.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '9.1'
+        version: '9.8'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -152,12 +138,10 @@ files:
 - app/models/hydra/content_negotiation/replacing_graph_finder.rb
 - app/models/hydra/datastream/properties.rb
 - app/search_builders/hydra/search_builder.rb
-- config/jetty.yml
 - config/locales/hydra.en.yml
 - hydra-core.gemspec
 - lib/application_helper.rb
 - lib/generators/hydra/head_generator.rb
-- lib/generators/hydra/jetty_generator.rb
 - lib/generators/hydra/templates/ability.rb
 - lib/generators/hydra/templates/catalog_controller.rb
 - lib/generators/hydra/templates/config/blacklight.yml
@@ -193,7 +177,6 @@ files:
 - spec/test_app_templates/Gemfile.extra
 - spec/unit/hydra-head-engine_spec.rb
 - spec/unit/hydra-head_spec.rb
-- tasks/hydra_jetty.rake
 - tasks/rspec.rake
 homepage: http://projecthydra.org
 licenses:
@@ -215,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Hydra-Head Rails Engine (requires Rails3)

data/config/jetty.yml

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

data/lib/generators/hydra/jetty_generator.rb

@@ -1,21 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'jettywrapper'
-
-module Hydra
-  class Jetty < Rails::Generators::Base
-
-    desc """
-Installs a jetty container with a solr and fedora installed in it.
-
-Requires system('unzip... ') to work, probably won't work on Windows.
-
-"""
-
-    def download_jetty
-      Jettywrapper.unzip
-    end
-
-
-  end
-end
-

data/tasks/hydra_jetty.rake

@@ -1,47 +0,0 @@
-##For jettywrapper set the app_ROOT
-APP_ROOT= File.expand_path(File.join(File.dirname(__FILE__),"../.."))
-require 'jettywrapper'
-
-namespace :hydra do
-  namespace :jetty do
-    desc "Copies the default Solr & Fedora configs into the bundled Hydra Testing Server"
-    task :config => ['jetty:stop', 'jetty:clean'] do
-      Rake::Task["hydra:jetty:config_fedora"].reenable
-      Rake::Task["hydra:jetty:config_fedora"].invoke
-      Rake::Task["hydra:jetty:config_solr"].reenable
-      Rake::Task["hydra:jetty:config_solr"].invoke
-    end
-    
-    desc "Copies the default SOLR config for the bundled Hydra Testing Server"
-    task :config_solr do
-      FileList['solr_conf/conf/*'].each do |f|  
-        cp("#{f}", 'jetty/solr/development-core/conf/', :verbose => true)
-        cp("#{f}", 'jetty/solr/test-core/conf/', :verbose => true)
-      end
-
-    end
-
-    desc "Copies a custom fedora config for the bundled Hydra Testing Server"
-    task :config_fedora do
-      # load a custom fedora.fcfg - 
-      if defined?(Rails.root)
-        app_root = Rails.root
-      else
-        app_root = File.join(File.dirname(__FILE__),"..")
-      end
-       
-      fcfg = File.join(app_root,"fedora_conf","conf","test","fedora.fcfg")
-      puts "PWD:: #{FileUtils.pwd}"
-      if File.exists?(fcfg)
-        puts "copying over fedora.fcfg"
-        cp("#{fcfg}", 'jetty/fedora/default/server/config/', :verbose => true)
-      else
-        puts "#{fcfg} file not found -- skipping fedora config"
-      end
-    end
-
-    desc "Copies the default SOLR config files and starts up the fedora instance."
-    task :load => [:config, 'jetty:start']
-
-  end
-end