Modified: trunk/rails-integration/plugins/goldspike/lib/war_config.rb (851 => 852)
--- trunk/rails-integration/plugins/goldspike/lib/war_config.rb 2007-12-15 22:26:19 UTC (rev 851)
+++ trunk/rails-integration/plugins/goldspike/lib/war_config.rb 2007-12-16 04:41:59 UTC (rev 852)
@@ -82,7 +82,7 @@
@jruby_home = ENV['JRUBY_HOME']
@maven_local_repository = ENV['MAVEN2_REPO'] # should be in settings.xml, but I need an override
@maven_local_repository ||= File.join(home, '.m2', 'repository') if home
- @maven_remote_repository = 'http://www.ibiblio.org/maven2'
+ @maven_remote_repository = 'http://repo1.maven.org/maven2'
# configured war name, defaults to the same as the ruby webapp
@name = File.basename(File.expand_path(RAILS_ROOT))
@@ -92,8 +92,8 @@
@java_libraries = {}
# default java libraries
- add_library(maven_library('org.jruby', 'jruby-complete', '1.0.1'))
- add_library(maven_library('org.jruby.extras', 'goldspike', '1.3'))
+ add_library(maven_library('org.jruby', 'jruby-complete', '1.0.3'))
+ add_library(maven_library('org.jruby.extras', 'goldspike', '1.4'))
add_library(maven_library('javax.activation', 'activation', '1.1'))
add_library(maven_library('commons-pool', 'commons-pool', '1.3'))
add_library(maven_library('bouncycastle', 'bcprov-jdk14', '124'))
@@ -101,7 +101,7 @@
# default gems
@gem_libraries = {}
add_gem('rails', rails_version) unless File.exists?('vendor/rails')
- add_gem('ActiveRecord-JDBC') if Dir['vendor/{gems/,}{activerecord-jdbc,ActiveRecord-JDBC}'].empty?
+ add_gem('activerecord-jdbc-adapter') if Dir['vendor/{gems/,}{activerecord-jdbc-adapter,ActiveRecord-JDBC}'].empty?
# default jetty libraries
@jetty_libraries = {}
Modified: trunk/rails-integration/plugins/goldspike-snapshot/lib/war_config.rb (851 => 852)
--- trunk/rails-integration/plugins/goldspike-snapshot/lib/war_config.rb 2007-12-15 22:26:19 UTC (rev 851)
+++ trunk/rails-integration/plugins/goldspike-snapshot/lib/war_config.rb 2007-12-16 04:41:59 UTC (rev 852)
@@ -99,7 +99,7 @@
# default java libraries
@java_libraries = {}
- add_library('goldspike', :version => '1.3', :group => 'org.jruby.extras')
+ add_library('goldspike', :version => '1.4', :group => 'org.jruby.extras')
add_library('activation', :version => '1.1', :group => 'javax.activation')
add_library('commons-pool', :version => '1.3', :group => 'commons-pool')
#add_library('bcprov-jdk14', :version => '124', :group => 'bouncycastle')
@@ -107,7 +107,7 @@
# default gems
@gem_libraries = {}
add_gem('rails', rails_version) unless File.exists?('vendor/rails')
- add_gem('ActiveRecord-JDBC') if Dir['vendor/{gems/,}{activerecord-jdbc,ActiveRecord-JDBC}'].empty?
+ add_gem('activerecord-jdbc-adapter') if Dir['vendor/{gems/,}{activerecord-jdbc-adapter,ActiveRecord-JDBC}'].empty?
# default jetty settings
@jetty_libraries = {}
@@ -133,7 +133,7 @@
@add_jruby_complete = true
- add_library('jruby-complete', :version => '1.0.1', :group => 'org.jruby') if @add_jruby_complete
+ add_library('jruby-complete', :version => '1.0.3', :group => 'org.jruby') if @add_jruby_complete
end # initialize
def war_file(value = @war_file)
@@ -188,7 +188,7 @@
def local_jruby(local=true)
if local
- add_library("jruby-complete", :version => '1.1-snapshot')
+ add_library("jruby-complete", :version => '1.1-SNAPSHOT')
@add_jruby_complete = false
end
end
