summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.x
diff options
context:
space:
mode:
authorantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2008-12-30 16:25:45 +0000
committerantelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>2008-12-30 16:25:45 +0000
commit1c0a9c79c95fd483b1ed11462af38a0186b9e974 (patch)
tree90257c41d870283668a002406f1dff2d2d4e149d /branches/sca-java-1.x
parent388c3048a9d4d9d38249dcf48a5b0205ef12c323 (diff)
Add implementation-script to compact-base jar as JDK6 includes JSR223 APIs and a javascript engine
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@730165 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-java-1.x')
-rw-r--r--branches/sca-java-1.x/modules/compact-base/pom.xml43
-rw-r--r--branches/sca-java-1.x/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java3
2 files changed, 44 insertions, 2 deletions
diff --git a/branches/sca-java-1.x/modules/compact-base/pom.xml b/branches/sca-java-1.x/modules/compact-base/pom.xml
index 3bd6983a51..765dbe7336 100644
--- a/branches/sca-java-1.x/modules/compact-base/pom.xml
+++ b/branches/sca-java-1.x/modules/compact-base/pom.xml
@@ -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>
diff --git a/branches/sca-java-1.x/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java b/branches/sca-java-1.x/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
index 9359590424..e019129554 100644
--- a/branches/sca-java-1.x/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
+++ b/branches/sca-java-1.x/modules/implementation-script/src/main/java/org/apache/tuscany/sca/implementation/script/ScriptInvokerFactory.java
@@ -43,7 +43,6 @@ import org.apache.tuscany.sca.implementation.script.engines.TuscanyJRubyScriptEn
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 @@ public class ScriptInvokerFactory implements InvokerFactory {
// 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);