# HG changeset patch # User Edho Arief # Date 1350297126 25200 # Node ID b1de54c37b7033a2846f3f063c49fd72ccd0de93 # Parent 50b8738d6428a4ea8c51740257be27fff7de38df Added support for jruby. diff -r 50b8738d6428 -r b1de54c37b70 Gemfile --- a/Gemfile Mon Oct 08 14:00:36 2012 +0700 +++ b/Gemfile Mon Oct 15 03:32:06 2012 -0700 @@ -1,12 +1,14 @@ source 'https://rubygems.org' gem 'rails', '3.2.8' +gem 'jruby-openssl', :platforms => :jruby gem 'jquery-rails' # Bundle edge Rails instead: # gem 'rails', :git => 'git://github.com/rails/rails.git' -gem 'mysql2' +gem 'mysql2', :platforms => :ruby +gem 'activerecord-jdbcmysql-adapter', :platforms => :jruby gem 'json' diff -r 50b8738d6428 -r b1de54c37b70 Gemfile.lock --- a/Gemfile.lock Mon Oct 08 14:00:36 2012 +0700 +++ b/Gemfile.lock Mon Oct 15 03:32:06 2012 -0700 @@ -22,6 +22,10 @@ activesupport (= 3.2.8) arel (~> 3.0.2) tzinfo (~> 0.3.29) + activerecord-jdbc-adapter (1.2.2) + activerecord-jdbcmysql-adapter (1.2.2) + activerecord-jdbc-adapter (~> 1.2.2) + jdbc-mysql (~> 5.1.0) activeresource (3.2.8) activemodel (= 3.2.8) activesupport (= 3.2.8) @@ -29,17 +33,22 @@ i18n (~> 0.6) multi_json (~> 1.0) arel (3.0.2) + bouncy-castle-java (1.5.0146.1) builder (3.0.3) erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) hike (1.2.1) i18n (0.6.1) + jdbc-mysql (5.1.13) journey (1.0.4) jquery-rails (2.1.3) railties (>= 3.1.0, < 5.0) thor (~> 0.14) + jruby-openssl (0.7.7) + bouncy-castle-java (>= 1.5.0146.1) json (1.7.5) + json (1.7.5-java) kgio (2.7.4) mail (2.4.4) i18n (>= 0.4.0) @@ -52,6 +61,8 @@ polyglot (0.3.3) puma (1.6.3) rack (~> 1.2) + puma (1.6.3-java) + rack (~> 1.2) rack (1.4.1) rack-cache (1.2) rack (>= 0.4) @@ -102,10 +113,13 @@ raindrops (~> 0.7) PLATFORMS + java ruby DEPENDENCIES + activerecord-jdbcmysql-adapter jquery-rails + jruby-openssl json mysql2 newrelic_rpm