[appengine-jruby] push by mando.woodie - only support 2.3.8, with most current JRuby and OpenSSL on 2010-09-04 07:42 GMT

[appengi...@googlecode.com]

Revision: 1c10b209ed
Author: John Woodell <woo...@google.com>
Date: Sat Sep 4 00:41:44 2010
Log: only support 2.3.8, with most current JRuby and OpenSSL
http://code.google.com/p/appengine-jruby/source/detail?r=1c10b209ed

Deleted:
/demos/rails2/config_238
/demos/rails2/gems_238
Modified:
/demos/rails2/Gemfile
/demos/rails2/config.ru
/demos/rails2/rails238_appengine.rb

=======================================
--- /demos/rails2/config_238 Thu Jun 24 00:27:52 2010
+++ /dev/null
@@ -1,11 +0,0 @@
-require 'appengine-rack'
-
-ENV['RAILS_ENV'] = AppEngine::Rack.environment
-
-deferred_dispatcher = AppEngine::Rack::DeferredDispatcher.new(
- :require => File.expand_path('../config/environment', __FILE__),
- :dispatch => 'ActionController::Dispatcher')
-
-map '/' do
- run deferred_dispatcher
-end
=======================================
--- /demos/rails2/gems_238 Thu Jun 24 00:27:52 2010
+++ /dev/null
@@ -1,4 +0,0 @@
-gem 'appengine-rack', '0.0.11.pre'
-gem 'jruby-openssl', '0.7'
-gem 'jruby-jars', '1.5.1'
-gem 'rails', '2.3.8'
=======================================
--- /demos/rails2/Gemfile Tue Mar 2 02:01:09 2010
+++ /demos/rails2/Gemfile Sat Sep 4 00:41:44 2010
@@ -5,4 +5,5 @@

# List gems to bundle here:
gem 'rails_dm_datastore'
-gem 'rails', "2.3.5"
+gem 'jruby-openssl'
+gem 'rails', '2.3.8'
=======================================
--- /demos/rails2/config.ru Thu Apr 8 20:12:21 2010
+++ /demos/rails2/config.ru Sat Sep 4 00:41:44 2010
@@ -1,22 +1,11 @@
require 'appengine-rack'
-AppEngine::Rack.configure_app(
- :application => 'application-id',
- :precompilation_enabled => true,
- :sessions_enabled => true,
- :version => "1")
-
-AppEngine::Rack.app.resource_files.exclude :rails_excludes
+
ENV['RAILS_ENV'] = AppEngine::Rack.environment

deferred_dispatcher = AppEngine::Rack::DeferredDispatcher.new(
:require => File.expand_path('../config/environment', __FILE__),
:dispatch => 'ActionController::Dispatcher')

-map '/contacts' do
- use AppEngine::Rack::LoginRequired
- run deferred_dispatcher
-end
-
map '/' do
run deferred_dispatcher
end
=======================================
--- /demos/rails2/rails238_appengine.rb Sat Sep 4 00:26:39 2010
+++ /demos/rails2/rails238_appengine.rb Sat Sep 4 00:41:44 2010
@@ -46,15 +46,13 @@
MORE_GEMS = 'rails_appengine/active_support_vendored'
FILE_BASE = 'http://appengine-jruby.googlecode.com/hg/demos/rails2/'
MOD_FILES = %w{ app/controllers/rails/info_controller.rb public/favicon.ico
- config_238 config/boot_rb config/environment_rb
+ config.ru config/boot_rb config/environment_rb
config/initializers/gae_init_patch.rb config/database.yml
script/console.sh script/publish.sh script/server.sh }
# Install Rails 2.3.8
FileUtils.touch 'config.ru'
gemsrc = ARGV[0].eql?('tiny_ds') ? 'Gemfile_td' : 'Gemfile'
download_file("Gemfile", "#{FILE_BASE}#{gemsrc}")
-download_file("gems_238", "#{FILE_BASE}gems_238")
-composite('Gemfile', 'gems_238', nil, -2)
FileUtils.mkdir_p 'WEB-INF'
download_file("WEB-INF/app.yaml", "#{FILE_BASE}WEB-INF/app.yaml")
system 'appcfg.rb bundle --update .'
@@ -68,8 +66,6 @@
if ARGV[0].eql? 'tiny_ds'

download_file("config/environment_rb", "#{FILE_BASE}config/environment_td")
end
-# Use the simple config.ru
-FileUtils.mv 'config_238', 'config.ru'
# Merge configs into boot.rb
composite('config/boot.rb', 'config/boot_rb', 108)
# Merge configs into environment.rb