From 0210a7c2c053290fdb6945d278c39215d952ad5c Mon Sep 17 00:00:00 2001 From: slaws Date: Fri, 15 Jul 2011 08:46:43 +0000 Subject: TUSCANY-3898 - Apply Guilherme's patch to start adding invoker function to implementation-scala-runtime. Thanks for the patch Guilherme git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1147029 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/implementation/scala/ScalaException.java | 27 ++++++++++++++ .../provider/ScalaImplementationProvider.java | 12 +++++++ .../ScalaImplementationProviderFactory.java | 14 ++++---- .../scala/provider/ScalaInvoker.java | 32 +++++++++++++++-- .../sca/implementation/scala/util/ScalaEngine.java | 41 ++++++++++++++++++++++ 5 files changed, 118 insertions(+), 8 deletions(-) create mode 100644 collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany/sca/implementation/scala/ScalaException.java create mode 100644 collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany/sca/implementation/scala/util/ScalaEngine.java (limited to 'collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany') diff --git a/collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany/sca/implementation/scala/ScalaException.java b/collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany/sca/implementation/scala/ScalaException.java new file mode 100644 index 0000000000..5883a85187 --- /dev/null +++ b/collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany/sca/implementation/scala/ScalaException.java @@ -0,0 +1,27 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.implementation.scala; + +public class ScalaException extends Exception { + + public ScalaException(Exception e) { + super(e); + } +} \ No newline at end of file diff --git a/collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany/sca/implementation/scala/provider/ScalaImplementationProvider.java b/collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany/sca/implementation/scala/provider/ScalaImplementationProvider.java index 51dd8512b1..f44fe8c91c 100644 --- a/collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany/sca/implementation/scala/provider/ScalaImplementationProvider.java +++ b/collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany/sca/implementation/scala/provider/ScalaImplementationProvider.java @@ -19,14 +19,26 @@ package org.apache.tuscany.sca.implementation.scala.provider; +import org.apache.tuscany.sca.implementation.scala.ScalaImplementation; +import org.apache.tuscany.sca.implementation.scala.util.ScalaEngine; import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.provider.ImplementationProvider; +import org.apache.tuscany.sca.runtime.RuntimeComponent; import org.apache.tuscany.sca.runtime.RuntimeComponentService; public class ScalaImplementationProvider implements ImplementationProvider{ + private RuntimeComponent component; + private ScalaImplementation implementation; + private ScalaEngine scalaEngine; + + public ScalaImplementationProvider (RuntimeComponent component, ScalaImplementation implementation) { + this.component = component; + this.implementation = implementation; + } + @Override public Invoker createInvoker(RuntimeComponentService service, Operation operation) { diff --git a/collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany/sca/implementation/scala/provider/ScalaImplementationProviderFactory.java b/collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany/sca/implementation/scala/provider/ScalaImplementationProviderFactory.java index 0bb8d4ac20..956c86c31c 100644 --- a/collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany/sca/implementation/scala/provider/ScalaImplementationProviderFactory.java +++ b/collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany/sca/implementation/scala/provider/ScalaImplementationProviderFactory.java @@ -19,24 +19,26 @@ package org.apache.tuscany.sca.implementation.scala.provider; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; import org.apache.tuscany.sca.implementation.scala.ScalaImplementation; import org.apache.tuscany.sca.provider.ImplementationProvider; import org.apache.tuscany.sca.provider.ImplementationProviderFactory; import org.apache.tuscany.sca.runtime.RuntimeComponent; -public class ScalaImplementationProviderFactory implements ImplementationProviderFactory{ +public class ScalaImplementationProviderFactory implements ImplementationProviderFactory { + public ScalaImplementationProviderFactory(ExtensionPointRegistry extensionPoints) { + } + @Override public ImplementationProvider createImplementationProvider( - RuntimeComponent component, ScalaImplementation Implementation) { - // TODO Auto-generated method stub - return null; + RuntimeComponent component, ScalaImplementation implementation) { + return new ScalaImplementationProvider(component, implementation); } @Override public Class getModelType() { - // TODO Auto-generated method stub - return null; + return ScalaImplementation.class; } } diff --git a/collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany/sca/implementation/scala/provider/ScalaInvoker.java b/collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany/sca/implementation/scala/provider/ScalaInvoker.java index f9955df818..a4f90257ae 100644 --- a/collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany/sca/implementation/scala/provider/ScalaInvoker.java +++ b/collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany/sca/implementation/scala/provider/ScalaInvoker.java @@ -19,15 +19,43 @@ package org.apache.tuscany.sca.implementation.scala.provider; +import org.apache.tuscany.sca.implementation.scala.util.ScalaEngine; +import org.apache.tuscany.sca.interfacedef.Operation; import org.apache.tuscany.sca.invocation.Invoker; import org.apache.tuscany.sca.invocation.Message; public class ScalaInvoker implements Invoker { + private Operation operation; + private ScalaEngine scalaEngine; + + public ScalaInvoker(ScalaEngine scalaEngine, Operation operation) { + this.operation = operation; + this.scalaEngine = scalaEngine; + } + + private Object doInvoke(Object[] objects, Operation op) throws Exception { + + Operation oper = operation; // static setting + if (oper.getName() == null) { // if no static setting + oper = op; // use dynamic setting + } + + Object response; + response = scalaEngine.invokeFunction(oper.getName(), objects); + + return response; + } + @Override public Message invoke(Message msg) { - // TODO Auto-generated method stub - return null; + try { + Object resp = doInvoke((Object[])msg.getBody(), msg.getOperation()); + msg.setBody(resp); + } catch (Exception e) { + msg.setFaultBody(e.getCause()); + } + return msg; } } diff --git a/collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany/sca/implementation/scala/util/ScalaEngine.java b/collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany/sca/implementation/scala/util/ScalaEngine.java new file mode 100644 index 0000000000..46f5eb088b --- /dev/null +++ b/collaboration/GSoC-2011-Guilherme/modules/implementation-scala-runtime/src/main/java/org/apache/tuscany/sca/implementation/scala/util/ScalaEngine.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.tuscany.sca.implementation.scala.util; + +import org.apache.tuscany.sca.implementation.scala.ScalaException; + +public class ScalaEngine { + + private Class scalaClass; + + public ScalaEngine(String className) throws ScalaException { + try { + scalaClass = Class.forName(className); + } catch (ClassNotFoundException e) { + throw new ScalaException(e); + } + } + + public Object invokeFunction(String name, Object[] arguments) { + // TODO Auto-generated method stub + return null; + } + +} \ No newline at end of file -- cgit v1.2.3