You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2008/12/30 17:25:45 UTC
svn commit: r730165 - in /tuscany/branches/sca-java-1.x/modules:
compact-base/pom.xml
implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
Author: antelder
Date: Tue Dec 30 08:25:45 2008
New Revision: 730165
URL: http://svn.apache.org/viewvc?rev=730165&view=rev
Log:
Add implementation-script to compact-base jar as JDK6 includes JSR223 APIs and a javascript engine
Modified:
tuscany/branches/sca-java-1.x/modules/compact-base/pom.xml
tuscany/branches/sca-java-1.x/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
Modified: tuscany/branches/sca-java-1.x/modules/compact-base/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/compact-base/pom.xml?rev=730165&r1=730164&r2=730165&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/compact-base/pom.xml (original)
+++ tuscany/branches/sca-java-1.x/modules/compact-base/pom.xml Tue Dec 30 08:25:45 2008
@@ -162,6 +162,49 @@
</dependency>
<dependency>
<groupId>${pom.groupId}</groupId>
+ <artifactId>tuscany-implementation-script</artifactId>
+ <version>${pom.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.bsf</groupId>
+ <artifactId>bsf-all</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-interface-wsdl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jruby</groupId>
+ <artifactId>jruby-complete</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.python</groupId>
+ <artifactId>jython</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all-minimal</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
<artifactId>tuscany-interface</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: tuscany/branches/sca-java-1.x/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java?rev=730165&r1=730164&r2=730165&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java Tue Dec 30 08:25:45 2008
@@ -43,7 +43,6 @@
import org.apache.tuscany.sca.interfacedef.InterfaceContract;
import org.apache.tuscany.sca.interfacedef.Operation;
import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;
import org.apache.tuscany.sca.invocation.Invoker;
import org.apache.tuscany.sca.runtime.RuntimeComponent;
@@ -117,7 +116,7 @@
// set the databinding and XMLHelper for WSDL interfaces
for (Service service : rc.getServices()) {
InterfaceContract ic = service.getInterfaceContract();
- if (ic instanceof WSDLInterfaceContract) {
+ if ("org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract".equals(ic.getClass())) {
// Set to use the Axiom data binding
ic.getInterface().resetDataBinding(OMElement.class.getName());
xmlHelper = XMLHelper.getArgHelper(scriptEngine);