Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Update Kirk to jetty 7.3.0

  • Loading branch information...
commit 57f6ca14826d42c1c6916d175610c849f15f0410 1 parent 74500df
@carllerche carllerche authored
View
6 lib/kirk/jetty.rb
@@ -1,8 +1,10 @@
# Only require jars if in the "master" process
unless Kirk.sub_process?
- require "kirk/jetty/jetty-client-7.2.2.v20101205"
- require "kirk/jetty/jetty-server-7.2.2.v20101205"
require "kirk/jetty/servlet-api-2.5"
+
+ %w(util http io continuation server client).each do |mod|
+ require "kirk/jetty/jetty-#{mod}-7.3.0.v20110203"
+ end
end
module Kirk
View
BIN  lib/kirk/jetty/jetty-client-7.2.2.v20101205.jar → lib/kirk/jetty/jetty-client-7.3.0.v20110203.jar
Binary file not shown
View
BIN  lib/kirk/jetty/jetty-continuation-7.3.0.v20110203.jar
Binary file not shown
View
BIN  lib/kirk/jetty/jetty-http-7.3.0.v20110203.jar
Binary file not shown
View
BIN  lib/kirk/jetty/jetty-io-7.3.0.v20110203.jar
Binary file not shown
View
BIN  lib/kirk/jetty/jetty-server-7.2.2.v20101205.jar
Binary file not shown
View
BIN  lib/kirk/jetty/jetty-server-7.3.0.v20110203.jar
Binary file not shown
View
BIN  lib/kirk/jetty/jetty-util-7.3.0.v20110203.jar
Binary file not shown
View
3  spec/kirk/cli_spec.rb
@@ -4,6 +4,9 @@
it "reads the configuration file, starts kirk, then redeploys" do
kirk "-c #{kirked_up_path}/Kirkfile" do |c|
c.stdout.gets.should =~ /INFO - jetty/
+ c.stdout.gets.should =~ /INFO - started o.e.j.s.h.ContextHandler/
+ c.stdout.gets.should =~ /INFO - started o.e.j.s.h.ContextHandler/
+ c.stdout.gets.should =~ /INFO - started o.e.j.s.h.ContextHandler/
c.stdout.gets.should =~ /INFO - Started SelectChannelConnector@0\.0\.0\.0:9090/
get '/'
View
2  spec/kirk/client_spec.rb
@@ -199,7 +199,7 @@ def on_response_head(resp)
@buffer.first.should == {
'Content-Type' => 'text/plain',
'Content-Length' => '5',
- 'Server' => 'Jetty(7.2.2.v20101205)'
+ 'Server' => 'Jetty(7.3.0.v20110203)'
}
end
Please sign in to comment.
Something went wrong with that request. Please try again.