jettywrapper 0.0.10 → 1.0.0

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
+*.sw[po]
 .bundle
 Gemfile.lock
 pkg/*

data/.gitmodules

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

data/config/jetty.yml

@@ -0,0 +1,4 @@
+jetty_port: 8983
+java_opts:
+  - "-Xmx128mb"
+

data/jettywrapper.gemspec

@@ -21,17 +21,15 @@ Gem::Specification.new do |s|
   
   s.add_dependency "logger"
   s.add_dependency "mediashelf-loggable"
+  s.add_dependency "childprocess"
+  s.add_dependency "i18n"
+  s.add_dependency "activesupport", ">=3.0.0"
   
   # Bundler will install these gems too if you've checked this out from source from git and run 'bundle install'
   # It will not add these as dependencies if you require lyber-core for other projects
   s.add_development_dependency "ruby-debug"
-  s.add_development_dependency "ruby-debug-base"
   s.add_development_dependency "rspec", "< 2.0" # We're not ready to upgrade to rspec 2
-  s.add_development_dependency 'rspec-rails', '<2.0.0' # rspec-rails 2.0.0 requires Rails 3.
   s.add_development_dependency 'mocha'
-  s.add_development_dependency 'cucumber', '>=0.8.5'
-  s.add_development_dependency 'cucumber-rails'
-  s.add_development_dependency 'gherkin'
   s.add_development_dependency 'rcov'
   
   s.add_development_dependency 'yard', '0.6.5'  # Yard > 0.6.5 won't generate docs.

data/lib/jettywrapper.rb

@@ -1,12 +1,15 @@
 # Jettywrapper is a Singleton class, so you can only create one jetty instance at a time.
-require 'rubygems'
-require 'logger'
+#require 'logger'
 require 'loggable'
 require 'singleton'
 require 'ftools'
 require 'socket'
 require 'timeout'
-require 'ruby-debug'
+require 'childprocess'
+require 'active_support/core_ext/hash'
+
+Dir[File.expand_path(File.join(File.dirname(__FILE__),"tasks/*.rake"))].each { |ext| load ext } if defined?(Rake)
+
 
 class Jettywrapper
   
@@ -19,49 +22,71 @@ class Jettywrapper
   attr_accessor :startup_wait # After jetty starts, how long to wait until starting the tests? 
   attr_accessor :quiet        # Keep quiet about jetty output?
   attr_accessor :solr_home    # Where is solr located? Default is jetty_home/solr
-  attr_accessor :fedora_home  # Where is fedora located? Default is jetty_home/fedora
-  attr_accessor :logger       # Where should logs be written?
   attr_accessor :base_path    # The root of the application. Used for determining where log files and PID files should go.
+  attr_accessor :java_opts    # Options to pass to java (ex. ["-Xmx512mb", "-Xms128mb"])
   
   # configure the singleton with some defaults
   def initialize(params = {})
-    # @pid = nil
     if defined?(Rails.root)
       @base_path = Rails.root
     else
       @base_path = "."
     end
-    @logger = Logger.new(STDERR)
-    @logger.debug 'Initializing jettywrapper'
+
+    logger.debug 'Initializing jettywrapper'
   end
   
   # Methods inside of the class << self block can be called directly on Jettywrapper, as class methods. 
   # Methods outside the class << self block must be called on Jettywrapper.instance, as instance methods.
   class << self
     
+    def load_config
+      if defined? Rails 
+        config_name =  Rails.env 
+        app_root = Rails.root
+      else 
+        config_name =  ENV['environment']
+        app_root = ENV['APP_ROOT']
+        app_root ||= '.'
+      end
+      filename = "#{app_root}/config/jetty.yml"
+      begin
+        file = YAML.load_file(filename)
+      rescue Exception => e
+        logger.warn "Didn't find expected jettywrapper config file at #{filename}, using default file instead."
+        file ||= YAML.load_file(File.join(File.dirname(__FILE__),"../config/jetty.yml"))
+        #raise "Unable to load: #{file}" unless file
+      end
+      file.with_indifferent_access
+    end
+    
+
     # Set the jetty parameters. It accepts a Hash of symbols. 
     # @param [Hash<Symbol>] params
     # @param [Symbol] :jetty_home Required. Where is jetty located? 
     # @param [Symbol] :jetty_port What port should jetty start on? Default is 8888
     # @param [Symbol] :startup_wait After jetty starts, how long to wait before running tests? If you don't let jetty start all the way before running the tests, they'll fail because they can't reach jetty.
     # @param [Symbol] :solr_home Where is solr? Default is jetty_home/solr
-    # @param [Symbol] :fedora_home Where is fedora? Default is jetty_home/fedora/default
     # @param [Symbol] :quiet Keep quiet about jetty output? Default is true. 
+    # @param [Symbol] :java_opts A list of options to pass to the jvm 
     def configure(params = {})
       hydra_server = self.instance
       hydra_server.quiet = params[:quiet].nil? ? true : params[:quiet]
       if defined?(Rails.root)
        base_path = Rails.root
+      elsif defined?(APP_ROOT)
+       base_path = APP_ROOT
       else
-       raise "You must set either RAILS_ROOT or :jetty_home so I know where jetty is" unless params[:jetty_home]
+       raise "You must set either Rails.root, APP_ROOT or pass :jetty_home as a parameter so I know where jetty is" unless params[:jetty_home]
       end
       hydra_server.jetty_home = params[:jetty_home] || File.expand_path(File.join(base_path, 'jetty'))
       hydra_server.solr_home = params[:solr_home]  || File.join( hydra_server.jetty_home, "solr")
-      hydra_server.fedora_home = params[:fedora_home] || File.join( hydra_server.jetty_home, "fedora","default")
       hydra_server.port = params[:jetty_port] || 8888
       hydra_server.startup_wait = params[:startup_wait] || 5
+      hydra_server.java_opts = params[:java_opts] || []
       return hydra_server
     end
+   
      
     # Wrap the tests. Startup jetty, yield to the test task, capture any errors, shutdown
     # jetty, and return the error. 
@@ -83,13 +108,13 @@ class Jettywrapper
     #   end
     def wrap(params)
       error = false
-      jetty_server = self.instance
-      jetty_server.quiet = params[:quiet] || true
-      jetty_server.jetty_home = params[:jetty_home]
-      jetty_server.solr_home = params[:solr_home]
-      jetty_server.port = params[:jetty_port] || 8888
-      jetty_server.startup_wait = params[:startup_wait] || 5
-      jetty_server.fedora_home = params[:fedora_home] || File.join( jetty_server.jetty_home, "fedora","default")
+      jetty_server = self.configure(params)
+      # jetty_server = self.instance
+      # jetty_server.quiet = params[:quiet] || true
+      # jetty_server.jetty_home = params[:jetty_home]
+      # jetty_server.solr_home = params[:solr_home]
+      # jetty_server.port = params[:jetty_port] || 8888
+      # jetty_server.startup_wait = params[:startup_wait] || 5
 
       begin
         # puts "starting jetty on #{RUBY_PLATFORM}"
@@ -192,9 +217,15 @@ class Jettywrapper
         
    # What command is being run to invoke jetty? 
    def jetty_command
-     "java -Djetty.port=#{@port} -Dsolr.solr.home=#{@solr_home} -Dfedora.home=#{@fedora_home} -jar start.jar"
+     opts = (java_variables + java_opts).join(' ')
+     "java #{opts} -jar start.jar"
    end
-   
+
+   def java_variables
+     ["-Djetty.port=#{@port}",
+      "-Dsolr.solr.home=#{@solr_home}"]
+   end
+
    # Start the jetty server. Check the pid file to see if it is running already, 
    # and stop it if so. After you start jetty, write the PID to a file. 
    # This is the instance start method. It must be called on Jettywrapper.instance
@@ -204,11 +235,10 @@ class Jettywrapper
    #    Jettywrapper.instance.start
    #    return Jettywrapper.instance
    def start
-     @logger.debug "Starting jetty with these values: "
-     @logger.debug "jetty_home: #{@jetty_home}"
-     @logger.debug "solr_home: #{@solr_home}"
-     @logger.debug "fedora_home: #{@fedora_home}"
-     @logger.debug "jetty_command: #{jetty_command}"
+     logger.debug "Starting jetty with these values: "
+     logger.debug "jetty_home: #{@jetty_home}"
+     logger.debug "solr_home: #{@solr_home}"
+     logger.debug "jetty_command: #{jetty_command}"
      
      # Check to see if we can start.
      # 1. If there is a pid, check to see if it is really running
@@ -217,7 +247,7 @@ class Jettywrapper
        if Jettywrapper.is_pid_running?(pid)
          raise("Server is already running with PID #{pid}")
        else
-         @logger.warn "Removing stale PID file at #{pid_path}"
+         logger.warn "Removing stale PID file at #{pid_path}"
          File.delete(pid_path)
        end
        if Jettywrapper.is_port_in_use?(@jetty_port)
@@ -225,7 +255,8 @@ class Jettywrapper
        end
      end
      Dir.chdir(@jetty_home) do
-       self.send "#{platform}_process".to_sym
+       process = build_process
+       @pid = process.pid
      end
      File.makedirs(pid_dir) unless File.directory?(pid_dir)
      begin
@@ -235,9 +266,15 @@ class Jettywrapper
      end
      f.puts "#{@pid}"
      f.close
-     @logger.debug "Wrote pid file to #{pid_path} with value #{@pid}"
+     logger.debug "Wrote pid file to #{pid_path} with value #{@pid}"
    end
  
+   def build_process
+     process = ChildProcess.build(jetty_command)
+     process.io.inherit!
+     process.detach = true
+     process.start
+   end
    # Instance stop method. Must be called on Jettywrapper.instance
    # You're probably better off using Jettywrapper.stop(:jetty_home => "/path/to/jetty")
    # @example
@@ -245,13 +282,12 @@ class Jettywrapper
    #    Jettywrapper.instance.stop
    #    return Jettywrapper.instance
    def stop    
-     @logger.debug "Instance stop method called for pid #{pid}"
+     logger.debug "Instance stop method called for pid #{pid}"
      if pid
-       begin
-         self.send "#{platform}_stop".to_sym
-       rescue Errno::ESRCH
-         @logger.error "I tried to kill the process #{pid} but it seems it wasn't running."
-       end
+       process = ChildProcess.new
+       process.instance_variable_set(:@pid, pid)
+       process.instance_variable_set(:@started, true)
+       process.stop 
        begin
          File.delete(pid_path)
        rescue
@@ -259,58 +295,6 @@ class Jettywrapper
      end
    end
  
-    # Spawn a process on windows
-    def win_process
-      @pid = Process.create(
-         :app_name         => jetty_command,
-         :creation_flags   => Process::DETACHED_PROCESS,
-         :process_inherit  => false,
-         :thread_inherit   => true,
-         :cwd              => "#{@jetty_home}"
-      ).process_id
-    end
-
-    # Determine whether we're running on windows or unix. We need to know this so 
-    # we know how to start and stop processes. 
-    def platform
-      case RUBY_PLATFORM
-        when /mswin32/
-           return 'win'
-        else
-           return 'nix'
-      end
-    end
-
-   def nix_process
-     @pid = fork do
-       # STDERR.close if @quiet
-       exec jetty_command
-     end
-   end
-
-   # stop jetty the windows way
-   def win_stop
-     Process.kill(1, pid)
-   end
-
-   # stop jetty the *nix way
-   def nix_stop
-     @logger.debug "Attempting to kill process id #{pid}."
-     return nil if pid == nil
-     begin
-       pid_keeper = pid
-       # Try to kill the process a few times to make sure it dies 
-       3.times do
-          Process.kill(9,pid)
-          break if Jettywrapper.is_pid_running?(pid_keeper)==false
-          sleep 2
-       end
-       FileUtils.rm(pid_path)
-     rescue Errno::ESRCH
-       @logger.debug "I tried to kill #{pid_keeper} but it appears it wasn't running."
-       FileUtils.rm(pid_path)
-     end
-   end
 
    # The fully qualified path to the pid_file
    def pid_path
@@ -352,4 +336,4 @@ class Jettywrapper
       File.open( pid_path ) { |f| return f.gets.to_i } if File.exist?(pid_path)
    end
    
-end
+end

data/lib/jettywrapper/version.rb

@@ -1 +1 @@
-GEMVERSION = "0.0.10"
+GEMVERSION = "1.0.0"

data/lib/tasks/jettywrapper.rake

@@ -0,0 +1,44 @@
+## These tasks get loaded into the host application when jettywrapper is required
+require 'yaml'
+
+namespace :jetty do
+  
+  desc "Return the status of jetty"
+  task :status => :environment do
+    status = Jettywrapper.is_jetty_running?(JETTY_CONFIG) ? "Running: #{Jettywrapper.pid(JETTY_CONFIG)}" : "Not running"
+    puts status
+  end
+  
+  desc "Start jetty"
+  task :start => :environment do
+    Jettywrapper.start(JETTY_CONFIG)
+    puts "jetty started at PID #{Jettywrapper.pid(JETTY_CONFIG)}"
+  end
+  
+  desc "stop jetty"
+  task :stop => :environment do
+    Jettywrapper.stop(JETTY_CONFIG)
+    puts "jetty stopped"
+  end
+  
+  desc "Restarts jetty"
+  task :restart do
+    Jettywrapper.stop(JETTY_CONFIG)
+    Jettywrapper.start(JETTY_CONFIG)
+  end
+
+
+  desc "Load the jetty config"
+  task :environment do
+    unless defined? JETTY_CONFIG
+      JETTY_CONFIG = Jettywrapper.load_config
+    end
+  end
+
+end
+
+namespace :repo do
+
+
+
+end

data/spec/lib/jettywrapper_integration_spec.rb

@@ -14,7 +14,7 @@ module Hydra
       
       it "starts" do
         jetty_params = {
-          :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty1")
+          :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty")
         }
         Jettywrapper.configure(jetty_params) 
         ts = Jettywrapper.instance
@@ -28,7 +28,7 @@ module Hydra
       
         # Can we connect to solr?
         require 'net/http' 
-        response = Net::HTTP.get_response(URI.parse("http://localhost:8888/solr/admin/"))
+        response = Net::HTTP.get_response(URI.parse("http://localhost:8888/solr/development/admin/"))
         response.code.should eql("200")
         ts.stop
       
@@ -36,7 +36,7 @@ module Hydra
       
       it "won't start if it's already running" do
         jetty_params = {
-          :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty1")
+          :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty")
         }
         Jettywrapper.configure(jetty_params) 
         ts = Jettywrapper.instance
@@ -45,7 +45,7 @@ module Hydra
         ts.start
         sleep 30
         ts.logger.debug "Jetty started from rspec at #{ts.pid}"
-        response = Net::HTTP.get_response(URI.parse("http://localhost:8888/solr/admin/"))
+        response = Net::HTTP.get_response(URI.parse("http://localhost:8888/solr/development/admin/"))
         response.code.should eql("200")
         lambda { ts.start }.should raise_exception(/Server is already running/)
         ts.stop
@@ -53,7 +53,7 @@ module Hydra
       
       it "can check to see whether a port is already in use" do
         params = {
-          :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty1"),
+          :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty"),
           :jetty_port => '9999'
         }
         Jettywrapper.stop(params) 
@@ -65,50 +65,9 @@ module Hydra
         Jettywrapper.stop(params) 
       end
       
-      # I'm commenting out this test b/c it keeps messing up the hudson server. For some
-      # reason, when I spin up two copies at the same time, one of them won't shut down. 
-      # It runs fine on my local machine, and all of the individual commands work fine when
-      # issued separately. 
-      # 
-      # it "can start multiple copies of jetty, as long as they have different jetty_homes" do
-      #    jetty1_params = {
-      #      :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty1"),
-      #      :jetty_port => '8983'
-      #    }
-      #    jetty2_params = {
-      #      :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty2"),
-      #      :jetty_port => '8984'
-      #    }
-      #    
-      #    # Ensure nothing is running when we start
-      #    Jettywrapper.stop(jetty1_params) 
-      #    Jettywrapper.stop(jetty2_params)
-      #    
-      #    # Spin up two copies of jetty, with different jetty home values and on different ports
-      #    Jettywrapper.start(jetty1_params) 
-      #    pid1 = Jettywrapper.pid(jetty1_params)
-      #    Jettywrapper.start(jetty2_params) 
-      #    pid2 = Jettywrapper.pid(jetty2_params)
-      #    
-      #    # Ensure both are viable
-      #    sleep 40
-      #    response1 = Net::HTTP.get_response(URI.parse("http://localhost:8983/solr/admin/"))
-      #    response1.code.should eql("200")
-      #    response2 = Net::HTTP.get_response(URI.parse("http://localhost:8984/solr/admin/"))
-      #    response2.code.should eql("200")
-      #    
-      #    # Shut them both down
-      #    Jettywrapper.pid(jetty1_params).should eql(pid1)
-      #    Jettywrapper.stop(jetty1_params)
-      #    Jettywrapper.is_pid_running?(pid1).should eql(false)
-      #    Jettywrapper.pid(jetty2_params).should eql(pid2)
-      #    Jettywrapper.stop(jetty2_params)
-      #    Jettywrapper.is_pid_running?(pid2).should eql(false)
-      #  end
-      
       it "raises an error if you try to start a jetty that is already running" do
         jetty_params = {
-          :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty1"),
+          :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty"),
           :jetty_port => '8983'
         }
         ts = Jettywrapper.configure(jetty_params) 
@@ -120,30 +79,8 @@ module Hydra
         ts.stop
       end
       
-      # Not ready for this yet
-      # it "won't start if there is a port conflict" do
-      #   jetty1_params = {
-      #     :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty1"),
-      #     :jetty_port => '8983'
-      #   }
-      #   jetty2_params = {
-      #     :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty2"),
-      #     :jetty_port => '8983'
-      #   }
-      #   # Ensure nothing is running when we start
-      #   Jettywrapper.stop(jetty1_params) 
-      #   Jettywrapper.stop(jetty2_params)
-      #   
-      #   # Spin up two copies of jetty, with different jetty home values but the same port
-      #   Jettywrapper.start(jetty1_params) 
-      #   lambda{ Jettywrapper.start(jetty2_params) }.should raise_exception
-      #   
-      #   # Shut them both down
-      #   Jettywrapper.stop(jetty1_params) 
-      #   Jettywrapper.stop(jetty2_params)
-      # end
       
     end
     
   end
-end
+end

data/spec/lib/jettywrapper_spec.rb

@@ -14,8 +14,8 @@ module Hydra
         :jetty_home => "/path/to/jetty",
         :jetty_port => 8888,
         :solr_home => "/path/to/solr",
-        :fedora_home => "/path/to/fedora",
-        :startup_wait => 0
+        :startup_wait => 0,
+        :java_opts => ["-Xmx256mb"]
       }
     end
     
@@ -31,7 +31,6 @@ module Hydra
         ts.jetty_home.should == "/path/to/jetty"
         ts.port.should == 8888
         ts.solr_home.should == '/path/to/solr'
-        ts.fedora_home.should == '/path/to/fedora'
         ts.startup_wait.should == 0
       end
 
@@ -46,7 +45,6 @@ module Hydra
           :jetty_home => '/path/to/jetty',
           :jetty_port => nil,
           :solr_home => nil,
-          :fedora_home => nil,
           :startup_wait => nil
         }
 
@@ -55,16 +53,15 @@ module Hydra
         ts.jetty_home.should == "/path/to/jetty"
         ts.port.should == 8888
         ts.solr_home.should == File.join(ts.jetty_home, "solr")
-        ts.fedora_home.should == File.join(ts.jetty_home, "fedora","default")
         ts.startup_wait.should == 5
       end
       
       it "passes all the expected values to jetty during startup" do
         ts = Jettywrapper.configure(@jetty_params) 
         command = ts.jetty_command
-        command.should include("-Dfedora.home=#{@jetty_params[:fedora_home]}")
         command.should include("-Dsolr.solr.home=#{@jetty_params[:solr_home]}")
         command.should include("-Djetty.port=#{@jetty_params[:jetty_port]}")
+        command.should include("-Xmx256mb")
         
       end
       
@@ -73,7 +70,7 @@ module Hydra
           :jetty_home => '/tmp'
         }
         ts = Jettywrapper.configure(jetty_params) 
-        Jettywrapper.any_instance.stubs(:fork).returns(5454)
+        Jettywrapper.any_instance.stubs(:build_process).returns(stub('proc', :pid=>5454))
         ts.stop
         ts.start
         ts.pid.should eql(5454)
@@ -86,7 +83,7 @@ module Hydra
         }
         ts = Jettywrapper.configure(jetty_params) 
         ts.stop
-        Jettywrapper.any_instance.stubs(:fork).returns(2323)
+        Jettywrapper.any_instance.stubs(:build_process).returns(stub('proc', :pid=>2323))
         swp = Jettywrapper.start(jetty_params)
         swp.pid.should eql(2323)
         swp.pid_file.should eql("_tmp.pid")
@@ -100,10 +97,10 @@ module Hydra
       # return true if it's running, otherwise return false
       it "can get the status for a given jetty instance" do
         # Don't actually start jetty, just fake it
-        Jettywrapper.any_instance.stubs(:fork).returns(12345)
+        Jettywrapper.any_instance.stubs(:build_process).returns(stub('proc', :pid=>12345))
         
         jetty_params = {
-          :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty1")
+          :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty")
         }
         Jettywrapper.stop(jetty_params)
         Jettywrapper.is_jetty_running?(jetty_params).should eql(false)
@@ -114,9 +111,9 @@ module Hydra
       
       it "can get the pid for a given jetty instance" do
         # Don't actually start jetty, just fake it
-        Jettywrapper.any_instance.stubs(:fork).returns(54321)
+        Jettywrapper.any_instance.stubs(:build_process).returns(stub('proc', :pid=>54321))
         jetty_params = {
-          :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty1")
+          :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../../jetty")
         }
         Jettywrapper.stop(jetty_params)
         Jettywrapper.pid(jetty_params).should eql(nil)
@@ -129,7 +126,7 @@ module Hydra
         jetty_params = {
           :jetty_home => '/tmp', :jetty_port => 8777
         }
-        Jettywrapper.any_instance.stubs(:fork).returns(2323)
+        Jettywrapper.any_instance.stubs(:build_process).returns(stub('proc', :pid=>2323))
         swp = Jettywrapper.start(jetty_params)
         (File.file? swp.pid_path).should eql(true)
         
@@ -152,7 +149,7 @@ module Hydra
           :jetty_home => '/tmp'
         }
         ts = Jettywrapper.configure(jetty_params) 
-        Jettywrapper.any_instance.stubs(:fork).returns(2222)
+        Jettywrapper.any_instance.stubs(:build_process).returns(stub('proc', :pid=>2222))
         ts.stop
         ts.pid_file?.should eql(false)
         ts.start
@@ -190,7 +187,6 @@ module Hydra
           ts.jetty_home.should == "/path/to/jetty"
           ts.port.should == 8888
           ts.solr_home.should == "/path/to/solr"
-          ts.fedora_home.should == "/path/to/fedora"
           ts.startup_wait.should == 0     
         end
         error.should eql(false)
@@ -208,4 +204,4 @@ module Hydra
       
     end # end of wrapping context
   end
-end
+end

data/tasks/jettywrapper.rake

@@ -5,132 +5,87 @@ require 'jettywrapper'
 
 namespace :jettywrapper do
   
-  jetty1 = {
-    :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../jetty1"),
-    :jetty_port => "8983"
+  jetty = {
+    :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../jetty"),
+    :jetty_port => "8983", :java_opts=>["-Xmx128mb"]
   }
   
-  jetty2 = {
-    :jetty_home => File.expand_path("#{File.dirname(__FILE__)}/../jetty2"),
-    :jetty_port => "8984"
-  }
-  
-  namespace :status do
-    
-    desc "Return the status of jetty1"
-    task :jetty1 do
-      status = Jettywrapper.is_jetty_running?(jetty1) ? "Running: #{Jettywrapper.pid(jetty1)}" : "Not running"
-      puts status
-    end
-    
-    desc "Return the status of jetty2"
-    task :jetty2 do
-      status = Jettywrapper.is_jetty_running?(jetty2) ? "Running: #{Jettywrapper.pid(jetty2)}" : "Not running"
-      puts status
-    end
-    
+  desc "Return the status of jetty"
+  task :status do
+    status = Jettywrapper.is_jetty_running?(jetty) ? "Running: #{Jettywrapper.pid(jetty)}" : "Not running"
+    puts status
   end
   
-  namespace :start do
-    
-    desc "Start jetty1"
-    task :jetty1 do
-        Jettywrapper.start(jetty1)
-        puts "jetty1 started at PID #{Jettywrapper.pid(jetty1)}"
-    end
-    
-    desc "Start jetty2"
-    task :jetty2 do
-        Jettywrapper.start(jetty2)
-        puts "jetty2 started at PID #{Jettywrapper.pid(jetty2)}"
-    end
-    
+  desc "Start jetty"
+  task :start do
+    Jettywrapper.start(jetty)
+    puts "jetty started at PID #{Jettywrapper.pid(jetty)}"
   end
   
-  namespace :stop do
-    
-    desc "stop jetty1"
-    task :jetty1 do
-      Jettywrapper.stop(jetty1)
-      puts "jetty1 stopped"
-    end
-    
-    desc "stop jetty2"
-    task :jetty2 do
-      Jettywrapper.stop(jetty2)
-      puts "jetty2 stopped"
-    end
-    
+  desc "stop jetty"
+  task :stop do
+    Jettywrapper.stop(jetty)
+    puts "jetty stopped"
   end
   
-  namespace :restart do
-    
-    desc "Restarts jetty1"
-    task :jetty1 do
-      Jettywrapper.stop(jetty1)
-      Jettywrapper.start(jetty1)
-    end
-    
-    desc "Restarts jetty2"
-    task :jetty2 do
-      Jettywrapper.stop(jetty2)
-      Jettywrapper.start(jetty2)
-    end
-    
+  desc "Restarts jetty"
+  task :restart do
+    Jettywrapper.stop(jetty)
+    Jettywrapper.start(jetty)
   end
 
-    desc "Init Hydra configuration" 
-    task :init => [:environment] do
-      if !ENV["environment"].nil? 
-        RAILS_ENV = ENV["environment"]
-      end
-      
-      JETTY_HOME_TEST = File.expand_path(File.dirname(__FILE__) + '/../../jetty-test')
-      JETTY_HOME_DEV = File.expand_path(File.dirname(__FILE__) + '/../../jetty-dev')
-      
-      JETTY_PARAMS_TEST = {
-        :quiet => ENV['HYDRA_CONSOLE'] ? false : true,
-        :jetty_home => JETTY_HOME_TEST,
-        :jetty_port => 8983,
-        :solr_home => File.expand_path(JETTY_HOME_TEST + '/solr'),
-        :fedora_home => File.expand_path(JETTY_HOME_TEST + '/fedora/default')
-      }
-
-      JETTY_PARAMS_DEV = {
-        :quiet => ENV['HYDRA_CONSOLE'] ? false : true,
-        :jetty_home => JETTY_HOME_DEV,
-        :jetty_port => 8984,
-        :solr_home => File.expand_path(JETTY_HOME_DEV + '/solr'),
-        :fedora_home => File.expand_path(JETTY_HOME_DEV + '/fedora/default')
-      }
-      
-      # If Fedora Repository connection is not already initialized, initialize it using ActiveFedora defaults
-      ActiveFedora.init unless Thread.current[:repo]  
+  desc "Init Hydra configuration" 
+  task :init => [:environment] do
+    if !ENV["environment"].nil? 
+      RAILS_ENV = ENV["environment"]
     end
+    
+    JETTY_HOME_TEST = File.expand_path(File.dirname(__FILE__) + '/../../jetty-test')
+    JETTY_HOME_DEV = File.expand_path(File.dirname(__FILE__) + '/../../jetty-dev')
+    
+    JETTY_PARAMS_TEST = {
+      :quiet => ENV['HYDRA_CONSOLE'] ? false : true,
+      :jetty_home => JETTY_HOME_TEST,
+      :jetty_port => 8983,
+      :solr_home => File.expand_path(JETTY_HOME_TEST + '/solr'),
+      :fedora_home => File.expand_path(JETTY_HOME_TEST + '/fedora/default')
+    }
 
-    desc "Copies the default SOLR config for the bundled jetty"
-    task :config_solr => [:init] do
-      FileList['solr/conf/*'].each do |f|  
-        cp("#{f}", JETTY_PARAMS_TEST[:solr_home] + '/conf/', :verbose => true)
-        cp("#{f}", JETTY_PARAMS_DEV[:solr_home] + '/conf/', :verbose => true)
-      end
-    end
+    JETTY_PARAMS_DEV = {
+      :quiet => ENV['HYDRA_CONSOLE'] ? false : true,
+      :jetty_home => JETTY_HOME_DEV,
+      :jetty_port => 8984,
+      :solr_home => File.expand_path(JETTY_HOME_DEV + '/solr'),
+      :fedora_home => File.expand_path(JETTY_HOME_DEV + '/fedora/default')
+    }
     
-    desc "Copies a custom fedora config for the bundled jetty"
-    task :config_fedora => [:init] do
-      fcfg = 'fedora/conf/fedora.fcfg'
-      if File.exists?(fcfg)
-        puts "copying over fedora.fcfg"
-        cp("#{fcfg}", JETTY_PARAMS_TEST[:fedora_home] + '/server/config/', :verbose => true)
-        cp("#{fcfg}", JETTY_PARAMS_DEV[:fedora_home] + '/server/config/', :verbose => true)
-      else
-        puts "#{fcfg} file not found -- skipping fedora config"
-      end
+    # If Fedora Repository connection is not already initialized, initialize it using ActiveFedora defaults
+    ActiveFedora.init unless Thread.current[:repo]  
+  end
+
+  desc "Copies the default SOLR config for the bundled jetty"
+  task :config_solr => [:init] do
+    FileList['solr/conf/*'].each do |f|  
+      cp("#{f}", JETTY_PARAMS_TEST[:solr_home] + '/conf/', :verbose => true)
+      cp("#{f}", JETTY_PARAMS_DEV[:solr_home] + '/conf/', :verbose => true)
     end
-    
-    desc "Copies the default Solr & Fedora configs into the bundled jetty"
-    task :config do
-      Rake::Task["hydra:jetty:config_fedora"].invoke
-      Rake::Task["hydra:jetty:config_solr"].invoke
+  end
+  
+  desc "Copies a custom fedora config for the bundled jetty"
+  task :config_fedora => [:init] do
+    fcfg = 'fedora/conf/fedora.fcfg'
+    if File.exists?(fcfg)
+      puts "copying over fedora.fcfg"
+      cp("#{fcfg}", JETTY_PARAMS_TEST[:fedora_home] + '/server/config/', :verbose => true)
+      cp("#{fcfg}", JETTY_PARAMS_DEV[:fedora_home] + '/server/config/', :verbose => true)
+    else
+      puts "#{fcfg} file not found -- skipping fedora config"
     end
-end
+  end
+  
+  desc "Copies the default Solr & Fedora configs into the bundled jetty"
+  task :config do
+    Rake::Task["hydra:jetty:config_fedora"].invoke
+    Rake::Task["hydra:jetty:config_solr"].invoke
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jettywrapper
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  version: 1.0.0
 platform: ruby
 authors: 
 - Bess Sadler
@@ -15,10 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-15 00:00:00 -07:00
+date: 2011-10-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: logger
+  type: :runtime
+  prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,10 +32,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id001
+- !ruby/object:Gem::Dependency 
+  name: mediashelf-loggable
   type: :runtime
-  name: logger
   prerelease: false
-- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -43,10 +46,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id002
+- !ruby/object:Gem::Dependency 
+  name: childprocess
   type: :runtime
-  name: mediashelf-loggable
   prerelease: false
-- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -57,10 +60,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id003
-  type: :development
-  name: ruby-debug
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: i18n
+  type: :runtime
+  prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -71,71 +74,69 @@ dependencies:
         - 0
         version: "0"
   requirement: *id004
-  type: :development
-  name: ruby-debug-base
-  prerelease: false
 - !ruby/object:Gem::Dependency 
+  name: activesupport
+  type: :runtime
+  prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
-        - 2
+        - 3
         - 0
-        version: "2.0"
+        - 0
+        version: 3.0.0
   requirement: *id005
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
   type: :development
-  name: rspec
   prerelease: false
-- !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 3
         segments: 
-        - 2
-        - 0
         - 0
-        version: 2.0.0
+        version: "0"
   requirement: *id006
+- !ruby/object:Gem::Dependency 
+  name: rspec
   type: :development
-  name: rspec-rails
   prerelease: false
-- !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - <
       - !ruby/object:Gem::Version 
         hash: 3
         segments: 
+        - 2
         - 0
-        version: "0"
+        version: "2.0"
   requirement: *id007
-  type: :development
+- !ruby/object:Gem::Dependency 
   name: mocha
+  type: :development
   prerelease: false
-- !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 3
         segments: 
         - 0
-        - 8
-        - 5
-        version: 0.8.5
+        version: "0"
   requirement: *id008
+- !ruby/object:Gem::Dependency 
+  name: rcov
   type: :development
-  name: cucumber
   prerelease: false
-- !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -146,39 +147,11 @@ dependencies:
         - 0
         version: "0"
   requirement: *id009
-  type: :development
-  name: cucumber-rails
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id010
-  type: :development
-  name: gherkin
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id011
+  name: yard
   type: :development
-  name: rcov
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -189,12 +162,12 @@ dependencies:
         - 6
         - 5
         version: 0.6.5
-  requirement: *id012
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  name: RedCloth
   type: :development
-  name: yard
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -203,10 +176,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id013
-  type: :development
-  name: RedCloth
-  prerelease: false
+  requirement: *id011
 description: Spin up a jetty instance (e.g., the one at https://github.com/projecthydra/hydra-jetty) and wrap test in it. This lets us run tests against a real copy of solr and fedora.
 email: 
 - bess@stanford.edu
@@ -224,9 +194,11 @@ files:
 - README.textile
 - Rakefile
 - TODO.txt
+- config/jetty.yml
 - jettywrapper.gemspec
 - lib/jettywrapper.rb
 - lib/jettywrapper/version.rb
+- lib/tasks/jettywrapper.rake
 - spec/lib/jettywrapper_integration_spec.rb
 - spec/lib/jettywrapper_spec.rb
 - spec/spec_helper.rb