solrmarc_wrapper 0.0.4 → 0.0.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2eb7f5c6ced53853012990d6a8560250ea2dc287
+  data.tar.gz: cc95c020039b31b93329c8d356c3acad2be9f245
+SHA512:
+  metadata.gz: 4e5427ac0c195ddb617167eea321dbeba8fd829a4b3d4ad4de11631fe6bf266e6bc788061d6da7dc8567fdfcf80ff1f31b03927814a26c3eaa4a1d4332761790
+  data.tar.gz: 3d1f28217b7729bb4eadf0063d03325da2cfd96765e7e651fa9e82899a3a2a05e496e0edb92099383ced0af46a63702d0b713b46510ee6317f9debf76b1d7977

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.gitignore

@@ -5,6 +5,8 @@ doc
 .yardoc
 *.lock
 solrmarc.log*
+solrmarc-sw
+tmp
 pkg
 
 ## vim

data/.ruby-version

@@ -0,0 +1 @@
+jruby-1.7.9

data/.travis.yml

@@ -0,0 +1,13 @@
+language: ruby
+rvm:
+  - jruby-19mode # JRuby in 1.9 mode
+  - jruby-head
+script: 
+  rake rspec_wrapped SETTINGS='ci'
+cache:
+  directories:
+  - solrmarc-sw
+notifications:
+  email:
+    - ndushay@stanford.edu
+    - laneymcg@stanford.edu

data/.yardopts

@@ -0,0 +1,3 @@
+--title 'SolrmarcWrapper Documentation'
+lib/**/*.rb -
+README.rdoc LICENSE 

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 # See solrmarc_wrapper.gemspec for this gem's dependencies
 gemspec

data/README.rdoc

@@ -1,5 +1,7 @@
 = SolrmarcWrapper
 
+{<img src="https://travis-ci.org/sul-dlss/solrmarc_wrapper.svg" alt="Build Status" />}[https://travis-ci.org/sul-dlss/solrmarc_wrapper] {<img src="https://coveralls.io/repos/sul-dlss/solrmarc_wrapper/badge.png" alt="Coverage Status" />}[https://coveralls.io/r/sul-dlss/solrmarc_wrapper] {<img src="https://gemnasium.com/sul-dlss/solrmarc_wrapper.png" alt="Dependency Status" />}[https://gemnasium.com/sul-dlss/solrmarc_wrapper] {<img src="https://badge.fury.io/rb/solrmarc_wrapper.svg" alt="Gem Version" />}[http://badge.fury.io/rb/solrmarc_wrapper]
+
 Ruby wrapper for accessing SolrMarc and Solr objects, such as using org.solrmarc.marc.SolrReIndexer to get a SolrInputDocument from a marc record stored in the Solr index.
 
 == Installation
@@ -29,7 +31,7 @@ Example:  this retrieves the full marc record stored in the Solr index, runs it
 
 == Contributing
 
-See also the wiki page for committers:  https://github.com/solrmarc/solrmarc_wrapper/wiki/For-Committers
+See also the wiki page for committers:  https://github.com/sul-dlss/solrmarc_wrapper/wiki/For-Committers
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)

data/Rakefile

@@ -2,9 +2,6 @@
 require 'bundler/setup'
 require "bundler/gem_tasks"
 
-require 'rake'
-require 'bundler'
-
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -15,8 +12,4 @@ end
 
 Dir.glob('lib/tasks/*.rake').each { |r| import r }
 
-namespace :sm_wrap do
-  task :default => :ci  
-  task :rspec => :rspec_plain
-  task :spec => :rspec_plain
-end
+task :default => :rspec_wrapped

data/config/jetty.yml

@@ -0,0 +1,5 @@
+default:
+  jetty_port: 8984
+  java_opts:
+    - "-XX:MaxPermSize=128m"
+    - "-Xmx1256m"

data/config/settings.yml

@@ -9,14 +9,14 @@ prod:
 dev:
   solrmarc_dist_dir: your_solrmarc_dist_dir
   solrmarc_conf_props_file: your_solrmarc_config.properties
-  solr_url: http://127.0.0.1:8984/solr/dev
+  solr_url: your_dev_solr_url
   log_level: info
 
 # settings for continuous integration
 ci:
-  solrmarc_dist_dir: solrmarc/dist
+  solrmarc_dist_dir: solrmarc-sw/dist
   solrmarc_conf_props_file: sw_config.properties
-  solr_url: http://127.0.0.1:8984/solr/test
+  solr_url: http://localhost:8984/solr
   log_level: info
     
 # add:

data/lib/solrmarc_wrapper.rb

@@ -53,7 +53,7 @@ protected
   # @param solr_url the url of the Solr server
   # @param config_props_fname  the name of the xx_config.properties file relative to the solr_marc_dir used in initialize method
   def setup_solr_reindexer(solr_url, config_props_fname)
-    solr_core_loader = org.solrmarc.solr.SolrCoreLoader.loadRemoteSolrServer(solr_url, false, true)
+    solr_core_loader = org.solrmarc.solr.SolrCoreLoader.loadRemoteSolrServer(solr_url, false, false)
     @solrmarc_reindexer = org.solrmarc.marc.SolrReIndexer.new(solr_core_loader)
     @solrmarc_reindexer.init([config_props_fname])
   end

data/lib/solrmarc_wrapper/version.rb

@@ -1,3 +1,3 @@
 class SolrmarcWrapper
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/tasks/ci.rake

@@ -1,9 +1,45 @@
-namespace :sm_wrap do
+require 'jettywrapper'
 
-  desc "run continuous integration suite (tests, coverage, docs)" 
-  task :ci do 
-    Rake::Task["sm_wrap:rspec_wrapped"].invoke
-    Rake::Task["sm_wrap:doc"].invoke
+desc "run continuous integration suite (tests, coverage, docs)" 
+task :ci do 
+  Rake::Task["rspec_wrapped"].invoke
+  Rake::Task["doc"].invoke
+end
+
+desc 'clone solrmarc-sw from sul-dlss github'
+task :clone_solrmarc do
+  `git clone https://github.com/sul-dlss/solrmarc-sw.git` unless File.directory? 'solrmarc-sw'
+end
+
+desc "set up Solr for testing in jetty"
+task :setup_jetty => :clone_solrmarc do
+  Dir.chdir('solrmarc-sw') do 
+    `git pull`
+    `ant ext_setup`
   end
+end
+task :setup_test_solr => :setup_jetty
 
+desc "start jetty for running tests"
+task :run_jetty do
+  `rm -rf solrmarc-sw/test/jetty/solr/data/index`
+  jetty_dir = File.expand_path(File.dirname(__FILE__) + '../../../solrmarc-sw/test/jetty')
+  jetty_params = Jettywrapper.load_config.merge({:jetty_home => jetty_dir,
+                                                :solr_home => jetty_dir + '/solr',
+                                                :java_opts => "-Dsolr.data.dir=" + jetty_dir + "/solr/data",
+                                                :startup_wait => 45,
+                                                :jetty_port => 8984
+                                                })
+  error = Jettywrapper.start(jetty_params) 
 end
+task :jetty_start => :run_jetty
+task :start_jetty => :run_jetty
+
+desc  "stop jetty used for testing"
+task :stop_jetty do
+  jetty_params = Jettywrapper.load_config.merge({:jetty_home => File.expand_path(File.dirname(__FILE__) + '../../../solrmarc-sw/test/jetty'),:startup_wait => 10})
+  error = Jettywrapper.stop(jetty_params) 
+end
+
+task :jetty_stop => :stop_jetty
+

data/lib/tasks/doc.rake

@@ -1,23 +1,19 @@
 require 'yard'
 require 'yard/rake/yardoc_task'
 
-namespace :sm_wrap do
-  
-  # Use yard to build docs
-  begin
-    project_root = File.expand_path(File.dirname(__FILE__) + "/../..")
-    doc_dest_dir = File.join(project_root, 'doc')
-
-    YARD::Rake::YardocTask.new(:doc) do |yt|
-      yt.files = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) +
-                   [ File.join(project_root, 'README.rdoc') ]
-      yt.options = ['--output-dir', doc_dest_dir, '--readme', 'README.rdoc', '--title', 'Solrmarc_Wrapper Documentation']
-    end
-  rescue LoadError
-    desc "Generate YARD Documentation"
-    task :doc do
-      abort "Please install the YARD gem to generate rdoc."
-    end
-  end  
+# Use yard to build docs
+begin
+  project_root = File.expand_path(File.dirname(__FILE__) + "/../..")
+  doc_dest_dir = File.join(project_root, 'doc')
 
+  YARD::Rake::YardocTask.new(:doc) do |yt|
+    yt.files = Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) +
+                 [ File.join(project_root, 'README.rdoc') ]
+    yt.options = ['--output-dir', doc_dest_dir, '--readme', 'README.rdoc', '--title', 'SolrmarcWrapper Documentation']
+  end
+rescue LoadError
+  desc "Generate YARD Documentation"
+  task :doc do
+    abort "Please install the YARD gem to generate rdoc."
+  end
 end

data/lib/tasks/spec.rake

@@ -1,28 +1,28 @@
 require 'rspec/core/rake_task'
 
-namespace :sm_wrap do
-
-  desc "Run all specs, with jetty instance running"
-  task :rspec_wrapped => ['sm_wrap:solrmarc:ant_dist_site', 'sm_wrap:jetty:config'] do
-    test_jetty_dir = File.expand_path(File.dirname(__FILE__) + '../../../solrmarc/test/jetty')
-    require 'jettywrapper'
-    jetty_params = Jettywrapper.load_config.merge({
-      :jetty_home => test_jetty_dir,
-      :solr_home => test_jetty_dir + '/solr',
-      :java_opts => "-Dsolr.data.dir=" + test_jetty_dir + "/solr/test/data",
-      :jetty_port => 8984,
-      :startup_wait => 25
-    })
-    error = Jettywrapper.wrap(jetty_params) do 
-      `sh ./spec/scripts/curl_empty_test_solr.sh`
-      `sh ./spec/scripts/curl_add_bare666_to_test.sh`
-      Rake::Task['sm_wrap:rspec_plain'].invoke
-    end
-    raise "TEST FAILURES: #{error}" if error
-  end
-
-  RSpec::Core::RakeTask.new(:rspec_plain) do |spec|
-    spec.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
+desc "Run all specs, with jetty instance running"
+task :rspec_wrapped => ['setup_jetty'] do
+  jetty_dir = File.expand_path(File.dirname(__FILE__) + '../../../solrmarc-sw/test/jetty')
+  require 'jettywrapper'
+  jetty_params = Jettywrapper.load_config.merge({
+    :jetty_home => jetty_dir,
+    :solr_home => jetty_dir + '/solr',
+    :java_opts => "-Dsolr.data.dir=" + jetty_dir + "/solr/data",
+    :jetty_port => 8984,
+    :startup_wait => 45
+  })
+  error = Jettywrapper.wrap(jetty_params) do 
+    sleep(3)
+    `sh ./spec/scripts/curl_empty_test_solr.sh`
+    sleep(3)
+    `sh ./spec/scripts/curl_add_bare666_to_test.sh`
+    sleep(3)
+    Rake::Task['rspec'].invoke
   end
+  raise "TEST FAILURES: #{error}" if error
+end
 
+RSpec::Core::RakeTask.new(:rspec) do |spec|
+  spec.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
 end
+task :spec => :rspec

data/solrmarc_wrapper.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.require_paths = ["lib"]
 
-  # No Runtime dependencies
+  # No Runtime dependencies (except solrmarc dist directory)
 
   # Bundler will install these gems too if you've checked out solrmarc-wrapper source from git and run 'bundle install'
   # It will not add these as dependencies if you require solrmarc-wrapper for other projects
@@ -24,9 +24,10 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rdoc"
   gem.add_development_dependency "yard"
   # tests
-	gem.add_development_dependency 'rspec'
-	gem.add_development_dependency 'simplecov'
-	gem.add_development_dependency 'simplecov-rcov'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'simplecov'
+  gem.add_development_dependency 'simplecov-rcov'
   gem.add_development_dependency "jettywrapper"
+  gem.add_development_dependency "coveralls"
 
 end

data/spec/scripts/curl_add_bare666_to_test.sh

@@ -1 +1 @@
-curl "http://localhost:8984/solr/test/update?commit=true" -H "Content-Type: text/xml" --data-binary @spec/fixtures/add_solrdoc_bare666.xml
+curl "http://localhost:8984/solr/update?commit=true" -H "Content-Type: text/xml" --data-binary @spec/fixtures/add_solrdoc_bare666.xml

data/spec/scripts/curl_empty_test_solr.sh

@@ -1 +1 @@
-curl "http://localhost:8984/solr/test/update?commit=true" -H "Content-Type: application/xml" --data-binary '<delete><query>*:*</query></delete>'
+curl "http://localhost:8984/solr/update?commit=true" -H "Content-Type: application/xml" --data-binary '<delete><query>*:*</query></delete>'

data/spec/solrmarc_wrapper_spec.rb

@@ -8,22 +8,22 @@ describe SolrmarcWrapper do
     @solrmarc_wrapper = SolrmarcWrapper.new(@@settings.solrmarc_dist_dir, @@settings.solrmarc_conf_props_file, @@settings.solr_url)
   end
   
-  it "should retrieve the SolrInputDoc generated from the marc record" do
+  it "retrieves the SolrInputDoc generated from the marc record" do
     sid = @solrmarc_wrapper.get_solr_input_doc_from_marcxml("666")
-    sid.should be_an_instance_of(Java::OrgApacheSolrCommon::SolrInputDocument)
-    sid["id"].getValue.should == "666"
-    sid["title_full_display"].getValue.should_not be_nil
+    expect(sid).to be_an_instance_of(Java::OrgApacheSolrCommon::SolrInputDocument)
+    expect(sid["id"].getValue).to eq("666")
+    expect(sid["title_full_display"].getValue).not_to be_nil
   end
   
-  it "should have a SolrInputDoc with the non-stored fields present" do
+  it "has a SolrInputDoc with the non-stored fields present" do
     sid = @solrmarc_wrapper.get_solr_input_doc_from_marcxml("666")
-    sid["title_245a_search"].getValue.should_not be_nil
+    expect(sid["title_245a_search"].getValue).not_to be_nil
   end
   
-  it "should log an error message when there is no document in the Solr index for the ckey" do
+  it "logs an error message when there is no document in the Solr index for the ckey" do
     lager = double("logger")
     @solrmarc_wrapper.logger = lager
-    lager.should_receive(:error).with("Can't find single Solr document with id aaa")
+    expect(lager).to receive(:error).with("Can't find single Solr document with id aaa")
     @solrmarc_wrapper.get_solr_input_doc_from_marcxml("aaa")
   end
   

data/spec/spec_helper.rb

@@ -1,16 +1,12 @@
+require 'coveralls'
+Coveralls.wear!
+
 # for test coverage
 require 'simplecov'
-require 'simplecov-rcov'
-class SimpleCov::Formatter::MergedFormatter
-  def format(result)
-     SimpleCov::Formatter::HTMLFormatter.new.format(result)
-     SimpleCov::Formatter::RcovFormatter.new.format(result)
-  end
-end
-SimpleCov.formatter = SimpleCov::Formatter::MergedFormatter
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
 SimpleCov.start do
-  add_filter "/spec/"
-  add_filter "/config/"
+  add_filter "spec"
+  add_filter "config"
 end
 
 require 'solrmarc_wrapper/settings'

metadata

@@ -1,91 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: solrmarc_wrapper
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Naomi Dushay
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-04-27 00:00:00.000000000Z
+date: 2014-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &4898 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *4898
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rdoc
-  version_requirements: &4916 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *4916
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: yard
-  version_requirements: &4932 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *4932
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &4948 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *4948
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: simplecov
-  version_requirements: &4964 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *4964
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
-  version_requirements: &4980 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *4980
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: jettywrapper
-  version_requirements: &4996 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
-  requirement: *4996
   prerelease: false
   type: :development
 description: Ruby wrapper for accessing SolrMarc objects and Solr objects, such as using org.solrmarc.marc.SolrReIndexer to get a SolrInputDocument from a marc record stored in the Solr index
@@ -95,21 +129,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
-- .gitmodules
-- .rvmrc
+- .ruby-version
+- .travis.yml
+- .yardopts
 - Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
+- config/jetty.yml
 - config/settings.yml
 - lib/solrmarc_wrapper.rb
 - lib/solrmarc_wrapper/settings.rb
 - lib/solrmarc_wrapper/version.rb
 - lib/tasks/ci.rake
 - lib/tasks/doc.rake
-- lib/tasks/jetty.rake
-- lib/tasks/solrmarc.rake
 - lib/tasks/spec.rake
 - solrmarc_wrapper.gemspec
 - spec/fixtures/add_solrdoc_bare666.xml
@@ -120,35 +155,27 @@ files:
 - spec/spec_helper.rb
 homepage:
 licenses: []
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      segments:
-      - 0
-      hash: 2
       version: '0'
-  none: false
 requirements:
 - This gem must be run under JRuby, and also requires a solrmarc dist directory and solr url (see config/settings.yml)
 rubyforge_project:
-rubygems_version: 1.8.15
+rubygems_version: 2.2.0
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: Ruby wrapper for accessing SolrMarc objects and Solr objects
 test_files: []
 has_rdoc:
-...

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "solrmarc"]
-	path = solrmarc
-	url = git://github.com/solrmarc/stanford-solr-marc.git

data/.rvmrc

@@ -1 +0,0 @@
-rvm use jruby-1.6.7@solrmarc_wrapper --create

data/lib/tasks/jetty.rake

@@ -1,38 +0,0 @@
-require 'jettywrapper'
-
-namespace :sm_wrap do
-  namespace :jetty do
-    
-    desc "Modify test jetty solr to be multicore"
-    task :config => ['sm_wrap:solrmarc:setup_test_jetty'] do
-
-      # copy the solr.xml file for multi-core to test jetty solr
-      jetty_solr_dir = "solrmarc/test/jetty/solr" 
-      cp('spec/solr/solr.xml', jetty_solr_dir, :verbose => true)
-
-      # set up solr dev and test conf directories
-      dev_conf_dir = "#{jetty_solr_dir}/dev/conf"
-      test_conf_dir = "#{jetty_solr_dir}/test/conf"
-      mkdir_p(dev_conf_dir) unless Dir.exists?(dev_conf_dir)
-      mkdir_p(test_conf_dir) unless Dir.exists?(test_conf_dir)
-      single_core_conf_dir = "#{jetty_solr_dir}/conf"
-      Dir["#{single_core_conf_dir}/*"].each { |f| 
-        cp_r(f, dev_conf_dir, :verbose => true)
-        cp_r(f, test_conf_dir, :verbose => true)
-      }
-      
-      require 'fileutils'
-      # remove single core conf directory
-      FileUtils.rm_rf("#{jetty_solr_dir}/conf/.", :verbose => true)
-      Dir.foreach(jetty_solr_dir + "/conf") { |f| 
-        fn = File.join(jetty_solr_dir, f)
-        File.delete(fn) if f != '.' && f != '..'
-      }
-      
-    end
-
-    desc "Copies the SOLR config files and starts up the test-jetty instance"
-    task :load => [:config, 'jetty:start']
-
-  end
-end

data/lib/tasks/solrmarc.rake

@@ -1,17 +0,0 @@
-namespace :sm_wrap do
-  namespace :solrmarc do
-    require 'ant'
-    
-    desc "run ant dist_site target in solrmarc"
-    task :ant_dist_site do
-      ant '-f solrmarc/build.xml dist_site'
-    end
-    
-    desc "run ant target to set up testing jetty per straight solrmarc"
-    task :setup_test_jetty do
-      ant '-f solrmarc/build.xml test_clean_site'
-      ant '-f solrmarc/build.xml site_setup_test_jetty'
-    end
-
-  end
-end