Author: antelder
Date: Sun Nov 21 11:07:01 2010
New Revision: 1037415
URL: http://svn.apache.org/viewvc?rev=1037415&view=rev
Log:
TUSCANY-3794: Update the jython version to match implementation.python which
fixes the jython incompatibility, but that then has a conflict with JRuby so
update the JRuby level too, and that causes something funny in the JRuby
refernce test whcih only seems to work now with the target component defined
before the reference component in the scdl so update that too.
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/pom.xml
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/pom.xml?rev=1037415&r1=1037414&r2=1037415&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/pom.xml
(original)
+++ tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/pom.xml
Sun Nov 21 11:07:01 2010
@@ -57,8 +57,22 @@
<dependency>
<groupId>org.apache.bsf</groupId>
- <artifactId>bsf-all</artifactId>
- <version>3.0</version>
+ <artifactId>bsf-utils</artifactId>
+ <version>3.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.bsf</groupId>
+ <artifactId>bsf-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.bsf</groupId>
+ <artifactId>bsf-engines</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -143,7 +157,7 @@
<dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby-complete</artifactId>
- <version>1.4.0</version>
+ <version>1.5.5</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
@@ -164,7 +178,7 @@
<dependency>
<groupId>org.python</groupId>
<artifactId>jython</artifactId>
- <version>2.2.1</version>
+ <version>2.5.2-beta1</version>
<scope>runtime</scope>
</dependency>
Modified:
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite?rev=1037415&r1=1037414&r2=1037415&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
(original)
+++
tuscany/sca-java-2.x/trunk/modules/implementation-script-runtime/src/test/resources/org/apache/tuscany/sca/implementation/script/itests/references/JRubyReference.composite
Sun Nov 21 11:07:01 2010
@@ -21,6 +21,10 @@
xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1";
targetNamespace="http://sample";
name="JRubyReference">
+ <component name="TargetComponent">
+ <implementation.java
class="org.apache.tuscany.sca.implementation.script.itests.references.HelloWorldTarget"/>
+ </component>
+
<component name="ClientComponent">
<implementation.java
class="org.apache.tuscany.sca.implementation.script.itests.helloworld.HelloWorldProxy"/>
<reference name="delegate" target="ReferenceComponent"></reference>
@@ -31,8 +35,4 @@
<reference name="ref" target="TargetComponent" />
</component>
- <component name="TargetComponent">
- <implementation.java
class="org.apache.tuscany.sca.implementation.script.itests.references.HelloWorldTarget"/>
- </component>
-
</composite>
