servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jans...@apache.org
Subject svn commit: r1462609 - in /servicemix/components/trunk/engines: servicemix-script/pom.xml servicemix-scripting/pom.xml servicemix-scripting/src/test/java/org/apache/servicemix/scripting/ScriptingComponentTest.java
Date Fri, 29 Mar 2013 19:07:47 GMT
Author: janstey
Date: Fri Mar 29 19:07:46 2013
New Revision: 1462609

URL: http://svn.apache.org/r1462609
Log:
SMXCOMP-971 - Update to jruby 1.7.2

Modified:
    servicemix/components/trunk/engines/servicemix-script/pom.xml
    servicemix/components/trunk/engines/servicemix-scripting/pom.xml
    servicemix/components/trunk/engines/servicemix-scripting/src/test/java/org/apache/servicemix/scripting/ScriptingComponentTest.java

Modified: servicemix/components/trunk/engines/servicemix-script/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-script/pom.xml?rev=1462609&r1=1462608&r2=1462609&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-script/pom.xml (original)
+++ servicemix/components/trunk/engines/servicemix-script/pom.xml Fri Mar 29 19:07:46 2013
@@ -40,7 +40,7 @@
         <backport-util-concurrent.version>2.2</backport-util-concurrent.version>
         <cglib.version>2.1_3</cglib.version>
         <groovy.version>1.8.3</groovy.version>
-        <jruby.version>1.4.0</jruby.version>
+        <jruby.version>1.7.2</jruby.version>
 
         <servicemix.osgi.import>
             !org.apache.servicemix.script*,

Modified: servicemix/components/trunk/engines/servicemix-scripting/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-scripting/pom.xml?rev=1462609&r1=1462608&r2=1462609&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-scripting/pom.xml (original)
+++ servicemix/components/trunk/engines/servicemix-scripting/pom.xml Fri Mar 29 19:07:46 2013
@@ -38,17 +38,23 @@
     <repositories>
         <!-- required for scripting engine jars -->
         <repository>
-            <id>servicemix-m2-repo</id>
-            <name>Servicemix Maven2 Repository</name>
-            <url>http://svn.apache.org/repos/asf/servicemix/m2-repo/</url>
+            <id>scriptengines</id>
+            <name>Scriptengines Google Code Maven Repository</name>
+            <url>http://scriptengines.googlecode.com/svn/m2-repo</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
         </repository>
     </repositories>    
 
     <properties>
         <groovy.version>1.8.3</groovy.version>
         <livetribe-jsr223.version>2.0.5</livetribe-jsr223.version>
-        <jsr223.version>20080611</jsr223.version>
-        <jruby.version>1.3.1</jruby.version>
+        <scriptengines.version>1.1</scriptengines.version>
+        <jruby.version>1.7.2</jruby.version>
         <rhino.version>1.7R1</rhino.version>
 
         <servicemix.osgi.import>
@@ -71,19 +77,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.sun.script</groupId>
-            <artifactId>groovy-engine</artifactId>
-            <version>${jsr223.version}</version>
+         <groupId>com.google.code.scriptengines</groupId>
+         <artifactId>scriptengines-javascript</artifactId>
+         <version>${scriptengines.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.script</groupId>
-            <artifactId>jruby-engine</artifactId>
-            <version>${jsr223.version}</version>
+         <groupId>com.google.code.scriptengines</groupId>
+         <artifactId>scriptengines-jruby</artifactId>
+         <version>${scriptengines.version}</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.script</groupId>
-            <artifactId>js-engine</artifactId>
-            <version>${jsr223.version}</version>
+         <groupId>com.google.code.scriptengines</groupId>
+         <artifactId>scriptengines-groovy</artifactId>
+         <version>${scriptengines.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-io</groupId>

Modified: servicemix/components/trunk/engines/servicemix-scripting/src/test/java/org/apache/servicemix/scripting/ScriptingComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/trunk/engines/servicemix-scripting/src/test/java/org/apache/servicemix/scripting/ScriptingComponentTest.java?rev=1462609&r1=1462608&r2=1462609&view=diff
==============================================================================
--- servicemix/components/trunk/engines/servicemix-scripting/src/test/java/org/apache/servicemix/scripting/ScriptingComponentTest.java
(original)
+++ servicemix/components/trunk/engines/servicemix-scripting/src/test/java/org/apache/servicemix/scripting/ScriptingComponentTest.java
Fri Mar 29 19:07:46 2013
@@ -35,11 +35,14 @@ import org.springframework.context.suppo
 public class ScriptingComponentTest extends SpringTestSupport {
     private static final String TEST_PROPERTY = "JSR-223-TEST-PROPERTY-NAME";
     private static final String PROP_VALUE    = "JSR-223-TEST-PROPERTY-VALUE";
-    
-    public void testGroovyInOut() throws Exception {
+
+    // TODO need to run JRuby tests first here since upgrading to 1.7.2 for some reason.
Was getting
+    // NameError: ArrayJavaProxy is already defined
+    // (root) at <script>:20
+    public void testJRubyInOut() throws Exception {
         DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
         InOut me = client.createInOutExchange();
-        me.setService(new QName("urn:test", "groovy-jsr223"));
+        me.setService(new QName("urn:test", "jruby-jsr223"));
         me.getInMessage().setContent(new StringSource("<hello>jsr-223</hello>"));
         client.sendSync(me);
         if (me.getStatus() == ExchangeStatus.ERROR) {
@@ -57,11 +60,11 @@ public class ScriptingComponentTest exte
         client.done(me);
     }
     
-    public void testGroovyInOnly() throws Exception {
+    public void testJRubyInOnly() throws Exception {
         DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
         Receiver receiver = (Receiver) getBean("receiver");
         InOnly me = client.createInOnlyExchange();
-        me.setService(new QName("urn:test", "groovy-jsr223"));
+        me.setService(new QName("urn:test", "jruby-jsr223"));
         me.getInMessage().setContent(new StringSource("<hello>jsr-223</hello>"));
         client.sendSync(me);
         
@@ -81,11 +84,11 @@ public class ScriptingComponentTest exte
             }    
         }                
     }
-
-    public void testJRubyInOut() throws Exception {
+    
+    public void testGroovyInOut() throws Exception {
         DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
         InOut me = client.createInOutExchange();
-        me.setService(new QName("urn:test", "jruby-jsr223"));
+        me.setService(new QName("urn:test", "groovy-jsr223"));
         me.getInMessage().setContent(new StringSource("<hello>jsr-223</hello>"));
         client.sendSync(me);
         if (me.getStatus() == ExchangeStatus.ERROR) {
@@ -103,11 +106,11 @@ public class ScriptingComponentTest exte
         client.done(me);
     }
     
-    public void testJRubyInOnly() throws Exception {
+    public void testGroovyInOnly() throws Exception {
         DefaultServiceMixClient client = new DefaultServiceMixClient(jbi);
         Receiver receiver = (Receiver) getBean("receiver");
         InOnly me = client.createInOnlyExchange();
-        me.setService(new QName("urn:test", "jruby-jsr223"));
+        me.setService(new QName("urn:test", "groovy-jsr223"));
         me.getInMessage().setContent(new StringSource("<hello>jsr-223</hello>"));
         client.sendSync(me);
         



Mime
View raw message