Author: davsclaus
Date: Mon Oct 29 09:18:26 2012
New Revision: 1403202
URL: http://svn.apache.org/viewvc?rev=1403202&view=rev
Log:
Upgraded to JRuby 1.7.0
Modified:
camel/trunk/components/camel-ruby/src/main/resources/camel.rb
camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/example.rb
camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/scopes.rb
camel/trunk/parent/pom.xml
Modified: camel/trunk/components/camel-ruby/src/main/resources/camel.rb
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ruby/src/main/resources/camel.rb?rev=1403202&r1=1403201&r2=1403202&view=diff
==============================================================================
--- camel/trunk/components/camel-ruby/src/main/resources/camel.rb (original)
+++ camel/trunk/components/camel-ruby/src/main/resources/camel.rb Mon Oct 29
09:18:26 2012
@@ -18,10 +18,10 @@ require "java"
module Camel
- include_class "org.apache.camel.impl.DefaultCamelContext"
- include_class "org.apache.camel.impl.ExpressionSupport"
- include_class "org.apache.camel.model.RouteDefinition"
- include_class "org.apache.camel.ruby.ScriptRouteBuilder"
+ java_import "org.apache.camel.impl.DefaultCamelContext"
+ java_import "org.apache.camel.impl.ExpressionSupport"
+ java_import "org.apache.camel.model.RouteDefinition"
+ java_import "org.apache.camel.ruby.ScriptRouteBuilder"
class RubyRouteBuilder < ScriptRouteBuilder
Modified:
camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/example.rb
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/example.rb?rev=1403202&r1=1403201&r2=1403202&view=diff
==============================================================================
---
camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/example.rb
(original)
+++
camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/example.rb
Mon Oct 29 09:18:26 2012
@@ -16,7 +16,7 @@
## ------------------------------------------------------------------------
require 'camel'
-include_class "org.apache.camel.ruby.RubyCamel"
+java_import "org.apache.camel.ruby.RubyCamel"
class MyRoute < Camel::RubyRouteBuilder
Modified:
camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/scopes.rb
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/scopes.rb?rev=1403202&r1=1403201&r2=1403202&view=diff
==============================================================================
---
camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/scopes.rb
(original)
+++
camel/trunk/components/camel-ruby/src/test/java/org/apache/camel/ruby/scopes.rb
Mon Oct 29 09:18:26 2012
@@ -16,7 +16,7 @@
## ------------------------------------------------------------------------
require 'camel'
-include_class "org.apache.camel.ruby.RubyCamel"
+java_import "org.apache.camel.ruby.RubyCamel"
class MyScopesRoute < Camel::RubyRouteBuilder
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1403202&r1=1403201&r2=1403202&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Mon Oct 29 09:18:26 2012
@@ -198,7 +198,7 @@
<jodatime2-bundle-version>2.1</jodatime2-bundle-version>
<josql-bundle-version>1.5_5</josql-bundle-version>
<josql-version>1.5</josql-version>
- <jruby-version>1.6.8</jruby-version>
+ <jruby-version>1.7.0</jruby-version>
<jsendnsca-version>1.3.1</jsendnsca-version>
<jsmpp-version>2.1.0_4</jsmpp-version>
<jsch-bundle-version>0.1.48_1</jsch-bundle-version>
