Author: gnodet
Date: Mon Jul 2 13:40:36 2007
New Revision: 552588
URL: http://svn.apache.org/viewvc?view=rev&rev=552588
Log:
SM-761: JRuby support (and fix the unit tests)
Upgrade to JRuby 1.0 and spring 2.0.6
Modified:
incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/pom.xml
incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java
incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/src/test/resources/RubyExchangeProcessor.rb
incubator/servicemix/trunk/pom.xml
Modified:
incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/pom.xml?view=diff&rev=552588&r1=552587&r2=552588
==============================================================================
---
incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/pom.xml
(original)
+++
incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/pom.xml
Mon Jul 2 13:40:36 2007
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
- <version>0.8.3</version>
+ <version>1.0</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java?view=diff&rev=552588&r1=552587&r2=552588
==============================================================================
---
incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java
(original)
+++
incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java
Mon Jul 2 13:40:36 2007
@@ -48,9 +48,6 @@
client.done(me);
}
- /*
- * See http://issues.apache.org/activemq/browse/SM-761
- *
public void testRuby() throws Exception {
DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
InOut me = client.createInOutExchange();
@@ -69,7 +66,6 @@
System.err.println(new
SourceTransformer().toString(me.getOutMessage().getContent()));
client.done(me);
}
- */
protected AbstractXmlApplicationContext createBeanFactory() {
return new ClassPathXmlApplicationContext("spring.xml");
Modified:
incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/src/test/resources/RubyExchangeProcessor.rb
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/src/test/resources/RubyExchangeProcessor.rb?view=diff&rev=552588&r1=552587&r2=552588
==============================================================================
---
incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/src/test/resources/RubyExchangeProcessor.rb
(original)
+++
incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/src/test/resources/RubyExchangeProcessor.rb
Mon Jul 2 13:40:36 2007
@@ -24,7 +24,8 @@
include_class 'org.apache.servicemix.common.ExchangeProcessor'
include_class 'org.apache.servicemix.script.ScriptExchangeHelper'
-class RubyExchangeProcessor < ExchangeProcessor
+class RubyExchangeProcessor
+ include ExchangeProcessor
def setExchangeHelper(exchangeHelper)
@exchangeHelper = exchangeHelper
Modified: incubator/servicemix/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/pom.xml?view=diff&rev=552588&r1=552587&r2=552588
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Mon Jul 2 13:40:36 2007
@@ -197,7 +197,7 @@
<xfire-version>1.2.5</xfire-version>
<mavenAssemblyPluginVersion>2.1</mavenAssemblyPluginVersion>
<xbean-version>3.0</xbean-version>
- <spring-version>2.0.5</spring-version>
+ <spring-version>2.0.6</spring-version>
<activemq-version>4.1.1</activemq-version>
<activeio-version>3.0.0-incubator</activeio-version>
<backport-util-concurrent-version>2.2</backport-util-concurrent-version>
