You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2010/07/08 08:48:28 UTC
svn commit: r961602 - in
/servicemix/components/engines/servicemix-script/trunk: ./
src/test/java/org/apache/servicemix/script/ src/test/resources/
Author: gnodet
Date: Thu Jul 8 06:48:27 2010
New Revision: 961602
URL: http://svn.apache.org/viewvc?rev=961602&view=rev
Log:
SMXCOMP-771: Upgrade to spring 3.x
Modified:
servicemix/components/engines/servicemix-script/trunk/pom.xml
servicemix/components/engines/servicemix-script/trunk/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java
servicemix/components/engines/servicemix-script/trunk/src/test/resources/GroovyConsumerExchangeProcessor.groovy
servicemix/components/engines/servicemix-script/trunk/src/test/resources/GroovyExchangeProcessor.groovy
Modified: servicemix/components/engines/servicemix-script/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-script/trunk/pom.xml?rev=961602&r1=961601&r2=961602&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-script/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-script/trunk/pom.xml Thu Jul 8 06:48:27 2010
@@ -52,9 +52,9 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>groovy</groupId>
- <artifactId>groovy-all-1.0-jsr</artifactId>
- <version>04</version>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>1.6.3</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -80,7 +80,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
- <version>1.0</version>
+ <version>1.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: servicemix/components/engines/servicemix-script/trunk/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-script/trunk/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java?rev=961602&r1=961601&r2=961602&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-script/trunk/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java (original)
+++ servicemix/components/engines/servicemix-script/trunk/src/test/java/org/apache/servicemix/script/ScriptComponentTest.java Thu Jul 8 06:48:27 2010
@@ -90,7 +90,10 @@ public class ScriptComponentTest extends
}
protected AbstractXmlApplicationContext createBeanFactory() {
- return new ClassPathXmlApplicationContext("spring.xml");
+ ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(new String[] { "spring.xml" }, false);
+ context.setValidating(false);
+ context.refresh();
+ return context;
}
}
Modified: servicemix/components/engines/servicemix-script/trunk/src/test/resources/GroovyConsumerExchangeProcessor.groovy
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-script/trunk/src/test/resources/GroovyConsumerExchangeProcessor.groovy?rev=961602&r1=961601&r2=961602&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-script/trunk/src/test/resources/GroovyConsumerExchangeProcessor.groovy (original)
+++ servicemix/components/engines/servicemix-script/trunk/src/test/resources/GroovyConsumerExchangeProcessor.groovy Thu Jul 8 06:48:27 2010
@@ -26,7 +26,7 @@ import org.apache.servicemix.jbi.jaxp.So
class GroovyExchangeProcessor implements ExchangeProcessor {
- @Property ScriptExchangeHelper exchangeHelper;
+ ScriptExchangeHelper exchangeHelper;
def void start() {
println "Starting GroovyConsumer";
Modified: servicemix/components/engines/servicemix-script/trunk/src/test/resources/GroovyExchangeProcessor.groovy
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-script/trunk/src/test/resources/GroovyExchangeProcessor.groovy?rev=961602&r1=961601&r2=961602&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-script/trunk/src/test/resources/GroovyExchangeProcessor.groovy (original)
+++ servicemix/components/engines/servicemix-script/trunk/src/test/resources/GroovyExchangeProcessor.groovy Thu Jul 8 06:48:27 2010
@@ -23,7 +23,7 @@ import org.apache.servicemix.jbi.jaxp.So
class GroovyExchangeProcessor implements ExchangeProcessor {
- @Property ScriptExchangeHelper exchangeHelper;
+ ScriptExchangeHelper exchangeHelper;
def void start() {
println "Starting";