Author: davsclaus
Date: Fri Dec 14 08:45:57 2012
New Revision: 1421730
URL: http://svn.apache.org/viewvc?rev=1421730&view=rev
Log:
Upgraded to JRuby 1.7.0
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-ruby/src/main/resources/camel.rb
camel/branches/camel-2.10.x/components/camel-ruby/src/test/java/org/apache/camel/ruby/example.rb
camel/branches/camel-2.10.x/components/camel-ruby/src/test/java/org/apache/camel/ruby/scopes.rb
camel/branches/camel-2.10.x/parent/pom.xml
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1403202
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.10.x/components/camel-ruby/src/main/resources/camel.rb
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-ruby/src/main/resources/camel.rb?rev=1421730&r1=1421729&r2=1421730&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-ruby/src/main/resources/camel.rb
(original)
+++
camel/branches/camel-2.10.x/components/camel-ruby/src/main/resources/camel.rb
Fri Dec 14 08:45:57 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/branches/camel-2.10.x/components/camel-ruby/src/test/java/org/apache/camel/ruby/example.rb
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-ruby/src/test/java/org/apache/camel/ruby/example.rb?rev=1421730&r1=1421729&r2=1421730&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-ruby/src/test/java/org/apache/camel/ruby/example.rb
(original)
+++
camel/branches/camel-2.10.x/components/camel-ruby/src/test/java/org/apache/camel/ruby/example.rb
Fri Dec 14 08:45:57 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/branches/camel-2.10.x/components/camel-ruby/src/test/java/org/apache/camel/ruby/scopes.rb
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-ruby/src/test/java/org/apache/camel/ruby/scopes.rb?rev=1421730&r1=1421729&r2=1421730&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-ruby/src/test/java/org/apache/camel/ruby/scopes.rb
(original)
+++
camel/branches/camel-2.10.x/components/camel-ruby/src/test/java/org/apache/camel/ruby/scopes.rb
Fri Dec 14 08:45:57 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/branches/camel-2.10.x/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/parent/pom.xml?rev=1421730&r1=1421729&r2=1421730&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/parent/pom.xml (original)
+++ camel/branches/camel-2.10.x/parent/pom.xml Fri Dec 14 08:45:57 2012
@@ -127,7 +127,7 @@
<jettison-version>1.3.2</jettison-version>
<jexcelapi-version>2.4.2</jexcelapi-version>
<jibx-version>1.2.4.5</jibx-version>
- <jruby-version>1.6.7</jruby-version>
+ <jruby-version>1.7.0</jruby-version>
<jsmpp-version>2.1.0_4</jsmpp-version>
<jsch-version>0.1.48</jsch-version>
<jsonlib-version>2.4</jsonlib-version>