jetpack 0.1.0 → 0.1.3

data/.gitignore

@@ -1,4 +1,5 @@
 spec/local_mirror
 pkg
+.rvmrc
 .idea/*
-.DS_STORE
+.DS_STORE

data/LICENSE

@@ -0,0 +1,14 @@
+Copyright 2012 Square Inc.
+
+Licensed 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.
+

data/README.markdown

@@ -1,14 +1,33 @@
 # Jetpack
 
-Jetpack prepares your (j)ruby project for jvm deployment.
+jet.pack: package your JRuby webapp for Jetty.
 
-Jetpack, as much as possible, uses standard ruby-world tools to prepare the app for deployment, and then presents the ruby app to jetty as a Java EE web application.
+There are already many tools in existence that help developers run JRuby webapps on popular servlet containers,
+such as [trinidad](https://github.com/trinidad/trinidad), [warbler](https://github.com/jruby/warbler), [mizuno](https://github.com/matadon/mizuno), and [kirk](https://github.com/strobecorp/kirk).
+Jetpack is not fundamentally different from these tools: like the rest of them it uses the [jruby-rack](https://github.com/jruby/jruby-rack) jar as a foundation. The key differences are stylistic.
+
+Jetpack:
+
+* Uses [Jetty](http://jetty.codehaus.org/jetty/)... in all of its
+  out-of-the-box, XML-configuration-file glory.
+* Uses bundler to "vendor" all of your gems.
+* Uses the [jruby-complete jar](http://jruby.org/download), and provides
+  convenience wrapper scripts (`bin/ruby` and `bin/rake`) in your project.
+* Does not attempt to run Jetty in a ruby-first, embedded manner.
+* Does not assume JRuby is already installed in your server environment (a
+  basic JRE will do just fine).
+* Does not force your ruby webapp to load files from a jar or war.
+
+In short, Jetpack creates a little self-contained JRuby/Jetty/vendored-gem world around your ruby project,
+which you only need to transport to a server and fire up using a JRE.
+
+Jetpack's implementation mainly consists of an [honest, proletarian, bash-like ruby script](https://github.com/square/jetpack/blob/master/bin/jetpack).
 
 ## Install
 
 Deploys need to be performed using MRI. Here is a sample section of a project Gemfile:
 
-    platforms :ruby_19 do
+    platforms :mri do
       gem 'jetpack'
     end
 
@@ -21,11 +40,21 @@ Create `config/jetpack.yml` in your project:
     app_user: "myapp"
     app_root: "/usr/local/myapp/myapp"
 
-Run jetpack:
+Some other settings you might care about:
+
+    java_options: "-Xmx2048m"
+    http_port: 4080
+    https_port: 4443
+    max_concurrent_connections: 20
+    ruby_version: 1.8
+    app_type: rack
+    keystore_type: JCEKS
+    keystore: /data/app/secrets/mystore.jceks
+    keystore_password: sekret
 
-    gem install jetpack
+Run Jetpack:
 
-    jetpack [your project directory]
+    bundle exec jetpack .
 
 Of note, you'll now have:
 

data/Rakefile

@@ -1,5 +1,14 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+require 'rspec/core/rake_task'
+
+task :default => :spec
+
+desc "Run all specs in spec directory"
+RSpec::Core::RakeTask.new(:spec => "spec:setup") do |t|
+  t.skip_bundler = true
+  t.pattern = "./spec/**/*_spec.rb"
+end
 
 namespace :spec do
   desc "Download required support files for running specs."
@@ -9,8 +18,10 @@ namespace :spec do
       `curl #{url} > #{local_path}` unless File.exists?(local_path)
     end
 
-    local_mirror "http://jruby.org.s3.amazonaws.com/downloads/1.6.4/jruby-complete-1.6.4.jar"
-    local_mirror "http://repo1.maven.org/maven2/org/mortbay/jetty/jetty-hightide/7.4.5.v20110725/jetty-hightide-7.4.5.v20110725.zip"
-    local_mirror "http://repo1.maven.org/maven2/org/jruby/rack/jruby-rack/1.0.10/jruby-rack-1.0.10.jar"
+    FileUtils.mkdir_p "spec/local_mirror" unless File.directory?("spec/local_mirror")
+
+    local_mirror "http://jruby.org.s3.amazonaws.com/downloads/1.6.7/jruby-complete-1.6.7.jar"
+    local_mirror "http://repo1.maven.org/maven2/org/mortbay/jetty/jetty-hightide/8.1.3.v20120416/jetty-hightide-8.1.3.v20120416.zip"
+    local_mirror "http://repo1.maven.org/maven2/org/jruby/rack/jruby-rack/1.1.5/jruby-rack-1.1.5.jar"
   end
 end

data/bin/jetpack

@@ -49,13 +49,16 @@ end
 
 script_start_time = Time.now
 
-@jruby_jar_file  = "vendor/jruby.jar"
-@jetpack_dir   = File.expand_path(File.join(File.dirname(__FILE__), ".."))
+@jruby_jar_file = "vendor/jruby.jar"
+@jetpack_dir = File.expand_path(File.join(File.dirname(__FILE__), ".."))
 
 @gem_home = "file:" + File.expand_path(File.join(@settings.app_root, @jruby_jar_file)) + "!/META-INF/jruby.home/lib/ruby/gems/1.8"
 @gem_path = @gem_home + ":vendor/bundler_gem"
 
-@java_dash_jar = "PATH=$PATH:$(dirname $0) GEM_HOME=\"#{@gem_home}\" GEM_PATH=\"#{@gem_path}\" exec java #{@settings.java_options} -jar"
+# Don't set min memory size when making the build artifact
+@jar_build_options = @settings.java_options.gsub(/(\s*)-Xms\S+/,'\1')
+
+@java_dash_jar = "PATH=$PATH:$(dirname $0) GEM_HOME=\"#{@gem_home}\" GEM_PATH=\"#{@gem_path}\" exec java #{@jar_build_options} -jar"
 @jruby_opts = @settings.ruby_version.to_s == '1.9' ? '--1.9' : ''
 
 def jruby!(cmd)
@@ -72,7 +75,7 @@ end
 
 def install_bundler_gem
   unless File.exists?("#{@path_to_project}/vendor/bundler_gem")
-    jruby! " -S gem install #{@jetpack_dir}/gems/bundler-1.1.rc.gem -i vendor/bundler_gem --no-rdoc --no-ri"
+    jruby! " -S gem install #{@jetpack_dir}/gems/bundler-1.1.0.gem -i vendor/bundler_gem --no-rdoc --no-ri"
   end
 end
 
@@ -96,7 +99,7 @@ def bundle_install
   install_bundler_gem
   regenerate_gemfile_lock_if_platform_java_is_not_found
   #Do the equivalent of 'bundle' in code so we know exactly which bundler we're using.
-  jruby! " -e 'require \"rubygems\"; require \"bundler\"; require \"bundler/cli\"; cli=Bundler::CLI.new; cli.options={:deployment=>true}; cli.install'"
+  jruby! " -e 'require \"rubygems\"; require \"bundler\"; require \"bundler/cli\"; cli=Bundler::CLI.new; cli.options={:deployment=>true, :without=> [\"test\", \"cucumber\"]}; cli.install'"
 end
 
 def install_jetty(vendor_dir)
@@ -110,6 +113,16 @@ def install_jetty(vendor_dir)
   jetty_dir
 end
 
+def install_commons_validator(lib_dir)
+  commons_validator_zip = File.join(lib_dir, "commons-validator.zip")
+  download "http://mirrors.axint.net/apache//commons/validator/binaries/commons-validator-1.4.0-bin.zip", commons_validator_zip
+  unzip commons_validator_zip, lib_dir
+  mv File.join(lib_dir, "commons-validator-1.4.0", "commons-validator-1.4.0.jar"), lib_dir
+  rm_rf(File.join(lib_dir, "commons-validator-1.4.0"))
+  rm commons_validator_zip
+  lib_dir
+end
+
 def install_jruby_rack_jar(vendor_dir)
   download @settings.jruby_rack, File.join(vendor_dir, "jruby-rack.jar")
 end
@@ -136,7 +149,7 @@ end
 
 def overlay_files(overlay_dir, target_dir)
   files_created = note_files_created(target_dir) do
-    x! "cp -pR #{overlay_dir}/ #{target_dir}/"
+    FileUtils.cp_r(Dir.glob("#{overlay_dir}/**/{*,.[^.]*}"), target_dir, :preserve => true)
   end
 
   process_template_files files_created.select{|f|f=~/\.erb$/}
@@ -159,7 +172,27 @@ if @settings.jetty?
 
   web_inf_dir = File.join(@path_to_project, "WEB-INF")
   mkdir_p web_inf_dir
+  FileUtils.mkdir_p(File.join(@path_to_project, "log"))
+  @listener = if @settings.rails?
+    "org.jruby.rack.rails.RailsServletContextListener"
+  else
+    "org.jruby.rack.RackServletContextListener"
+  end
   overlay_files File.join(@jetpack_dir, "web_inf_files"), web_inf_dir
+
+  if @settings.jetty_filters?
+    web_inf_lib_dir = File.join(web_inf_dir, "lib")
+    mkdir_p web_inf_lib_dir
+
+    install_commons_validator web_inf_lib_dir
+
+    web_inf_classes_dir = File.join(web_inf_dir, "classes")
+    mkdir_p web_inf_classes_dir
+
+    puts "Compiling Jetty filters"
+    x! "javac -classpath #{vendor_dir}/jetty/lib/servlet-api-3.0.jar -d #{web_inf_classes_dir} #{@jetpack_dir}/src/java/jetpack/filter/IgnoreUnknownHttpMethodsFilter.java"
+    x! "javac -classpath #{vendor_dir}/jetty/lib/servlet-api-3.0.jar:#{web_inf_lib_dir}/commons-validator-1.4.0.jar -d #{web_inf_classes_dir} #{@jetpack_dir}/src/java/jetpack/filter/ValidUrlFilter.java"
+  end
 end
 
 config_jetpack_dir_in_project = File.join(@path_to_project, "config/jetpack_files")

data/bin_files/launch.erb

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# trace back to the original location of the launch file,
+# or else /../vendor/jetty will be relative to a symlink
+# see: http://stackoverflow.com/a/246128
+source="${BASH_SOURCE[0]}"
+while [ -h "$source" ] ; do source="$(readlink "$source")"; done
+this_dir="$( cd -P "$( dirname "$source" )" && pwd )"
+
+cd $this_dir/../vendor/jetty
+
+exec java -jar <%= @settings.java_options %> \
+     -Djetty.logs=$this_dir/../log \
+     -Djetty.home=$this_dir/../vendor/jetty \
+     -Djava.io.tmpdir=/tmp \
+     start.jar

data/jetpack.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name        = "jetpack"
-  s.version     = "0.1.0"
+  s.version     = "0.1.3"
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Steve Conover"]
-  s.email       = ["steve@squareup.com"]
+  s.authors     = ["Steve Conover", "Xavier Shay", "Taylor Phillips", "Chris Heisterkamp"]
+  s.email       = ["steve@squareup.com", "xavier@squareup.com", "taylor@squareup.com", "cheister@squareup.com"]
   s.homepage    = "https://github.com/square/jetpack"
   s.summary     = %q{Jetpack prepares your jRuby project for jvm deployment.}
 

data/jetty_files/etc/fake.crt

@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFXjCCA0YCCQDRNB4VfOaRQTANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJV
+UzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEc
+MBoGA1UEChMTU3F1YXJlLCBJbmMuIChmYWtlKTEXMBUGA1UEAxQOKi5zcXVhcmV1
+cC5jb20wHhcNMTEwOTE5MjMxMjEyWhcNMTIwOTE4MjMxMjEyWjBxMQswCQYDVQQG
+EwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj
+bzEcMBoGA1UEChMTU3F1YXJlLCBJbmMuIChmYWtlKTEXMBUGA1UEAxQOKi5zcXVh
+cmV1cC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCXXp1MrMVb
+D6WEKq6FwkLYvOV33Luhsu+D4Wnh2y/Z8/ItO9KAVydMp6LJLz4w2n9Xe0a7yxb1
+xO/+Oa+JdrbrUwmjYfi880cTxRvqKpP5kpFlf03W1QQXYuycX+LMC0KbcXQT+SzI
+U9JxbF5qqgWRYEtHCDyX9/zWs5vUCPlO3+rQ34rR8YORStbwF0gFKXrfMDnKuVQK
+AyFE6j7DhNWUKwoSEvYb0RqSikwwyjhNvlJ5mGONb/iM6X3rtuizhLqPi67gULhj
+smOqTmTZ18fYaUfvakyBUu2LVR9Mc/1+kpW9IuiXF9nEq/vLpZuFuvlNZJfZBvNB
+ebcRUXpC+TqsgSD1dzNJDJsIKyQA5VoqY6Pu9fgN1U84ZvoOm/R27siKwKW9sOIw
+Ra3BdoEhLWn+RqZMec0/eTREZJZb2XQ4vb/A1Yf9dGOKPfT7xnWwryAom5Y7Og3d
+0ifQH46qWvR+ke32FTzIX7K5YEJgIyyoETX8TZNdqDkKnE0sdwChTyfqSZYqANLP
+RGzlnHYFMWveTwvdLBpR6OObEaiH3I2+QdQRCjV7UEs/ZKLGhtHz93Y4UUdgY0sN
+bWFxOVOCrv8FGVUTeMWo0dF+CR9gN6l54Bk40BLAKtLTI2uozM/N4Na+G0sQcu3V
+8RTOYwikVLFYNzyys2FEq7CBpIgfdfwW8wIDAQABMA0GCSqGSIb3DQEBBQUAA4IC
+AQBMvBMX++uRFm7jpyUpmfKOVvPFSgkTJbCJl1FQfqjbYM6Hs6tCam6MpwnUKxqy
+N/LG9F26nMprnYQ/qgnlMhSYjkMmfBvR2TNUpn31GPUMpa1c2jIhom2T75TrmEF4
+6SCkpPhH0gG9uhQbjE0P6pTE7FRzAqEavcSYZWo+CrnBprTuqOEmFGjNBHz57kYR
+/Gchltgw5NwE0ZjvTE12aX8tQ4WZixLY5hK6JezmLgz0z1feATKCJ9C3JaLnBium
+24JMRKFPmFElwA00QW8AFKY8Ea/On1u4mnhuJ2jQoHkWs1WQqerjG0WH2WBgNcQF
+R/l9G/O9IvOf/284dfxAB82hWhSC4DOM6h2uk2NwdwUuSoyNbVbA+YnmFW/D3whC
+Bbgo+PnE8OPQYO2lKklTCpgNNI/GN2FkowfjlM/E6WQ7nlmTVsK81eZZOvkNVtAD
+UEDQ4nB8tRv/KuMMl3u0xJxx/huIOVEWiohLygTXxnVyGSJBLK3tKMrPDXpWeFnD
+2VYEjMqZDL7ZkfOl1i/dP09XLOP6qMNA0+HLnPa+RipHvRi325VWgU/8pBg3Y3Ve
+nhGArfNE6H8N2EuQ+q3v+98PqikkOl6vLDafRj8lHo3G+My/GqHJ0ssIsT1kj0Wi
+8SIEPL65rvvNr4e81MAWMWB96ZYD8t8MVMzGAECciNha9w==
+-----END CERTIFICATE-----

data/jetty_files/etc/fake.key

@@ -0,0 +1,51 @@
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----

data/jetty_files/etc/fake.pem

@@ -0,0 +1,89 @@
+Bag Attributes
+    localKeyID: 03 AB 04 EF 7F 65 5F 38 EC F7 FF 04 B3 E6 C1 AD 00 AC 45 4E 
+subject=/C=US/ST=California/L=San Francisco/O=Square, Inc. (fake)/CN=*.squareup.com
+issuer=/C=US/ST=California/L=San Francisco/O=Square, Inc. (fake)/CN=*.squareup.com
+-----BEGIN CERTIFICATE-----
+MIIFXjCCA0YCCQDRNB4VfOaRQTANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJV
+UzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEc
+MBoGA1UEChMTU3F1YXJlLCBJbmMuIChmYWtlKTEXMBUGA1UEAxQOKi5zcXVhcmV1
+cC5jb20wHhcNMTEwOTE5MjMxMjEyWhcNMTIwOTE4MjMxMjEyWjBxMQswCQYDVQQG
+EwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNj
+bzEcMBoGA1UEChMTU3F1YXJlLCBJbmMuIChmYWtlKTEXMBUGA1UEAxQOKi5zcXVh
+cmV1cC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCXXp1MrMVb
+D6WEKq6FwkLYvOV33Luhsu+D4Wnh2y/Z8/ItO9KAVydMp6LJLz4w2n9Xe0a7yxb1
+xO/+Oa+JdrbrUwmjYfi880cTxRvqKpP5kpFlf03W1QQXYuycX+LMC0KbcXQT+SzI
+U9JxbF5qqgWRYEtHCDyX9/zWs5vUCPlO3+rQ34rR8YORStbwF0gFKXrfMDnKuVQK
+AyFE6j7DhNWUKwoSEvYb0RqSikwwyjhNvlJ5mGONb/iM6X3rtuizhLqPi67gULhj
+smOqTmTZ18fYaUfvakyBUu2LVR9Mc/1+kpW9IuiXF9nEq/vLpZuFuvlNZJfZBvNB
+ebcRUXpC+TqsgSD1dzNJDJsIKyQA5VoqY6Pu9fgN1U84ZvoOm/R27siKwKW9sOIw
+Ra3BdoEhLWn+RqZMec0/eTREZJZb2XQ4vb/A1Yf9dGOKPfT7xnWwryAom5Y7Og3d
+0ifQH46qWvR+ke32FTzIX7K5YEJgIyyoETX8TZNdqDkKnE0sdwChTyfqSZYqANLP
+RGzlnHYFMWveTwvdLBpR6OObEaiH3I2+QdQRCjV7UEs/ZKLGhtHz93Y4UUdgY0sN
+bWFxOVOCrv8FGVUTeMWo0dF+CR9gN6l54Bk40BLAKtLTI2uozM/N4Na+G0sQcu3V
+8RTOYwikVLFYNzyys2FEq7CBpIgfdfwW8wIDAQABMA0GCSqGSIb3DQEBBQUAA4IC
+AQBMvBMX++uRFm7jpyUpmfKOVvPFSgkTJbCJl1FQfqjbYM6Hs6tCam6MpwnUKxqy
+N/LG9F26nMprnYQ/qgnlMhSYjkMmfBvR2TNUpn31GPUMpa1c2jIhom2T75TrmEF4
+6SCkpPhH0gG9uhQbjE0P6pTE7FRzAqEavcSYZWo+CrnBprTuqOEmFGjNBHz57kYR
+/Gchltgw5NwE0ZjvTE12aX8tQ4WZixLY5hK6JezmLgz0z1feATKCJ9C3JaLnBium
+24JMRKFPmFElwA00QW8AFKY8Ea/On1u4mnhuJ2jQoHkWs1WQqerjG0WH2WBgNcQF
+R/l9G/O9IvOf/284dfxAB82hWhSC4DOM6h2uk2NwdwUuSoyNbVbA+YnmFW/D3whC
+Bbgo+PnE8OPQYO2lKklTCpgNNI/GN2FkowfjlM/E6WQ7nlmTVsK81eZZOvkNVtAD
+UEDQ4nB8tRv/KuMMl3u0xJxx/huIOVEWiohLygTXxnVyGSJBLK3tKMrPDXpWeFnD
+2VYEjMqZDL7ZkfOl1i/dP09XLOP6qMNA0+HLnPa+RipHvRi325VWgU/8pBg3Y3Ve
+nhGArfNE6H8N2EuQ+q3v+98PqikkOl6vLDafRj8lHo3G+My/GqHJ0ssIsT1kj0Wi
+8SIEPL65rvvNr4e81MAWMWB96ZYD8t8MVMzGAECciNha9w==
+-----END CERTIFICATE-----
+Bag Attributes
+    localKeyID: 03 AB 04 EF 7F 65 5F 38 EC F7 FF 04 B3 E6 C1 AD 00 AC 45 4E 
+Key Attributes: <No Attributes>
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----

data/jetty_files/etc/jetty.xml.erb

@@ -26,18 +26,31 @@
       </New>
     </Set>
 
+    <% unless @settings.https_port.to_s.empty? %>
     <Call name="addConnector">
       <Arg>
         <New class="org.eclipse.jetty.server.ssl.SslSelectChannelConnector">
           <Set name="port"><%=@settings.https_port%></Set>
           <Set name="maxIdleTime">30000</Set>
-          <Set name="password"><SystemProperty name="jetty.ssl.password" default="foobar" /></Set>
-          <Set name="keystore"><SystemProperty name="jetty.ssl.keystore" default="etc/fake.p12" /></Set>
-          <Set name="keystoreType">PKCS12</Set>
+          <Set name="password"><%= @settings.keystore_password %></Set>
+          <Set name="keystore"><%= @settings.keystore %></Set>
+          <!-- Using RC4 to avoid the Rizzo/Duong attack on block ciphers. -->
+          <Set name="IncludeCipherSuites">
+            <Array type="java.lang.String">
+              <Item>TLS_ECDHE_ECDSA_WITH_RC4_128_SHA</Item>
+              <Item>TLS_ECDHE_RSA_WITH_RC4_128_SHA</Item>
+              <Item>TLS_ECDH_ECDSA_WITH_RC4_128_SHA</Item>
+              <Item>TLS_ECDH_RSA_WITH_RC4_128_SHA</Item>
+              <Item>SSL_RSA_WITH_RC4_128_SHA</Item>
+            </Array>
+          </Set>
+          <Set name="keystoreType"><%= @settings.keystore_type %></Set>
         </New>
       </Arg>
     </Call>
+    <% end %>
 
+    <% unless @settings.http_port.to_s.empty? %>
     <Call name="addConnector">
       <Arg>
         <New class="org.eclipse.jetty.server.nio.SelectChannelConnector">
@@ -46,17 +59,20 @@
         </New>
       </Arg>
     </Call>
+    <% end %>
 
-    <!-- set the rails.env java system property based on the RAILS_ENV environment variable -->
-    <!-- this is used by jruby-rack to set Rails.env -->
-    <Call class="java.lang.System" name="setProperty">
-      <Arg>rails.env</Arg>
-      <Arg>
-        <Call class="java.lang.System" name="getenv">
-          <Arg>RAILS_ENV</Arg>
-        </Call>
-      </Arg>
-    </Call>
+    <% if @settings.rails? %>
+      <!-- set the rails.env java system property based on the RAILS_ENV environment variable -->
+      <!-- this is used by jruby-rack to set Rails.env -->
+      <Call class="java.lang.System" name="setProperty">
+        <Arg>rails.env</Arg>
+        <Arg>
+          <Call class="java.lang.System" name="getenv">
+            <Arg>RAILS_ENV</Arg>
+          </Call>
+        </Arg>
+      </Call>
+    <% end %>
 
     <Set name="handler">
       <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
@@ -65,17 +81,14 @@
            <Item>
              <New id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
            </Item>
-           <Item>
-             <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"/>
-           </Item>
            <Item>
 
              <!-- Set up the webapp context for the rails root, which is ../../ from here -->
              <New class="org.eclipse.jetty.webapp.WebAppContext">
                <Arg><Ref id="Contexts"/></Arg>
-               <Arg>../../</Arg> <!-- "resource base" -->
+               <Arg><Property name="jetty.home"/>/../../</Arg> <!-- "resource base" -->
                <Arg>/</Arg>      <!-- webapp root -->
-               <Set name="extraClasspath">../jruby.jar;../jruby-rack.jar</Set>
+               <Set name="extraClasspath"><Property name="jetty.home"/>/../jruby.jar;<Property name="jetty.home"/>/../jruby-rack.jar</Set>
                                  <!-- cp that makes ruby+rack work -->
              </New>
            </Item>
@@ -91,22 +104,37 @@
     <Set name="dumpAfterStart">false</Set>
     <Set name="dumpBeforeStop">false</Set>
 
+    <New id="ServerLog" class="java.io.PrintStream">
+      <Arg>
+        <New class="org.eclipse.jetty.util.RolloverFileOutputStream">
+          <Arg><Property name="jetty.home"/>/../../log/jetty_stderr_yyyy_mm_dd.log</Arg>
+          <Arg type="boolean">false</Arg>
+          <Arg type="int">30</Arg>
+          <Arg><Call class="java.util.TimeZone" name="getTimeZone"><Arg>GMT</Arg></Call></Arg>
+          <Get id="ServerLogName" name="datedFilename"/>
+        </New>
+      </Arg>
+    </New>
+
     <Ref id="Handlers">
       <Call name="addHandler">
         <Arg>
           <New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler">
-	        <Set name="requestLog">
+            <Set name="requestLog">
               <New id="RequestLogImpl" class="org.eclipse.jetty.server.NCSARequestLog">
-	            <Set name="filename">../../log/jetty_request_yyyy_mm_dd.log</Set>																																																																										
+                <Set name="filename"><Property name="jetty.home"/>/../../log/jetty_request_yyyy_mm_dd.log</Set>
                 <Set name="filenameDateFormat">yyyy_MM_dd</Set>
-                <Set name="retainDays">90</Set>
+                <Set name="retainDays">30</Set>
                 <Set name="append">true</Set>
-                <Set name="extended">false</Set>
+                <Set name="extended">true</Set>
+                <Set name="logLatency">true</Set>
+                <Set name="logDispatch">true</Set>
+                <Set name="preferProxiedForAddress">true</Set>
                 <Set name="logCookies">false</Set>
                 <Set name="LogTimeZone">GMT</Set>
-	          </New>
-	        </Set>
-	      </New>
+              </New>
+            </Set>
+          </New>
         </Arg>
       </Call>
     </Ref>