summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java')
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingProviderFactory.java94
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangInvoker.java209
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNode.java118
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNodeElement.java50
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangReferenceBindingProvider.java87
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangServiceBindingProvider.java83
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/MessageHelper.java127
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ServiceExecutor.java378
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/TypeMismatchException.java50
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/exceptions/ErlangException.java37
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AnnotatedListTypeHelper.java71
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AtomTypeHelper.java39
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BinaryTypeHelper.java39
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BooleanTypeHelper.java44
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ByteTypeHelper.java39
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/CharTypeHelper.java40
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/DoubleTypeHelper.java39
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/FloatTypeHelper.java39
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/IntTypeHelper.java40
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ListTypeHelper.java65
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/LongTypeHelper.java39
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ShortTypeHelper.java40
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/StringTypeHelper.java39
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TupleTypeHelper.java70
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelper.java33
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelpersProxy.java291
-rw-r--r--sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/meta/ErlangAtom.java28
27 files changed, 0 insertions, 2228 deletions
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingProviderFactory.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingProviderFactory.java
deleted file mode 100644
index f7ea057e56..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingProviderFactory.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * 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.binding.erlang.impl;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.binding.erlang.ErlangBinding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.provider.BindingProviderFactory;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ErlangBindingProviderFactory implements
- BindingProviderFactory<ErlangBinding> {
-
- private static final Logger logger = Logger
- .getLogger(ErlangBindingProviderFactory.class.getName());
-
- private Set<String> nodes = new HashSet<String>();
-
- public ErlangBindingProviderFactory(ExtensionPointRegistry registry) {
-
- }
-
- /**
- * @see org.apache.tuscany.sca.provider.BindingProviderFactory#createReferenceBindingProvider(org.apache.tuscany.sca.runtime.RuntimeComponent,
- * org.apache.tuscany.sca.runtime.RuntimeComponentReference,
- * org.apache.tuscany.sca.assembly.Binding)
- */
- public ReferenceBindingProvider createReferenceBindingProvider(
- RuntimeComponent component, RuntimeComponentReference reference,
- ErlangBinding binding) {
- return new ErlangReferenceBindingProvider(binding, reference);
- }
-
- /**
- * @see org.apache.tuscany.sca.provider.BindingProviderFactory#createServiceBindingProvider(org.apache.tuscany.sca.runtime.RuntimeComponent,
- * org.apache.tuscany.sca.runtime.RuntimeComponentService,
- * org.apache.tuscany.sca.assembly.Binding)
- */
- public ServiceBindingProvider createServiceBindingProvider(
- RuntimeComponent component, RuntimeComponentService service,
- ErlangBinding binding) {
- ServiceBindingProvider provider = null;
- try {
- if (nodes.contains(binding.getNode())) {
- // TODO: externalize message?
- logger.log(Level.WARNING,
- "Node name '" + binding.getNode() + "' already registered. This service will not be spawned.");
- } else {
- provider = new ErlangServiceBindingProvider(binding, service);
- nodes.add(binding.getNode());
- }
- } catch (Exception e) {
- // TODO: externalize message?
- logger.log(Level.WARNING,
- "Exception during creating ServiceBindingProvider", e);
- }
- return provider;
- }
-
- /**
- * @see org.apache.tuscany.sca.provider.ProviderFactory#getModelType()
- */
- public Class<ErlangBinding> getModelType() {
- return ErlangBinding.class;
- }
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangInvoker.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangInvoker.java
deleted file mode 100644
index a2cf71a053..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangInvoker.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * 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.binding.erlang.impl;
-
-import java.lang.reflect.Method;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.binding.erlang.ErlangBinding;
-import org.apache.tuscany.sca.binding.erlang.impl.exceptions.ErlangException;
-import org.apache.tuscany.sca.binding.erlang.impl.types.TypeHelpersProxy;
-import org.apache.tuscany.sca.interfacedef.java.JavaOperation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-
-import com.ericsson.otp.erlang.OtpAuthException;
-import com.ericsson.otp.erlang.OtpConnection;
-import com.ericsson.otp.erlang.OtpEpmd;
-import com.ericsson.otp.erlang.OtpErlangList;
-import com.ericsson.otp.erlang.OtpErlangObject;
-import com.ericsson.otp.erlang.OtpErlangTuple;
-import com.ericsson.otp.erlang.OtpMbox;
-import com.ericsson.otp.erlang.OtpMsg;
-import com.ericsson.otp.erlang.OtpNode;
-import com.ericsson.otp.erlang.OtpPeer;
-import com.ericsson.otp.erlang.OtpSelf;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ErlangInvoker implements Invoker {
-
- private static final Logger logger = Logger.getLogger(ErlangInvoker.class
- .getName());
-
- private ErlangBinding binding;
-
- public ErlangInvoker(ErlangBinding binding) {
- this.binding = binding;
- }
-
- private void reportProblem(Message msg, Exception e) {
- if (msg.getOperation().getFaultTypes().size() > 0) {
- msg.setFaultBody(e);
- } else {
- // NOTE: don't throw exception if not declared
- // TODO: externalize message?
- msg.setBody(null);
- logger
- .log(Level.WARNING, "Problem while sending/receiving data",
- e);
- }
- }
-
- private String getClientNodeName() {
- return "_connector_to_" + binding.getNode()
- + System.currentTimeMillis();
- }
-
- private Message sendMessage(Message msg) {
- OtpMbox tmpMbox = null;
- OtpNode node = null;
- try {
- node = new OtpNode(getClientNodeName());
- if (binding.hasCookie()) {
- node.setCookie(binding.getCookie());
- }
- tmpMbox = node.createMbox();
- // obtain args, make sure they aren't null
- // NOTE: sending message with no content (but only with senders PID)
- // is possible
- Object[] args = (Object[]) (msg.getBody() != null ? msg.getBody()
- : new Object[0]);
- Method jmethod = ((JavaOperation) msg.getOperation())
- .getJavaMethod();
- // create and send msg with self pid in the beginning
- OtpErlangObject[] argsArray = {
- tmpMbox.self(),
- TypeHelpersProxy.toErlang(args, jmethod
- .getParameterAnnotations()) };
- OtpErlangObject otpArgs = new OtpErlangTuple(argsArray);
- tmpMbox.send(msg.getOperation().getName(), binding.getNode(),
- otpArgs);
- if (msg.getOperation().getOutputType() != null) {
- OtpMsg resultMsg = null;
- if (binding.hasTimeout()) {
- resultMsg = tmpMbox.receiveMsg(binding.getTimeout());
- } else {
- resultMsg = tmpMbox.receiveMsg();
- }
- OtpErlangObject result = resultMsg.getMsg();
- msg.setBody(TypeHelpersProxy.toJava(result, msg.getOperation()
- .getOutputType().getPhysical(), jmethod
- .getAnnotations()));
- }
- } catch (InterruptedException e) {
- // TODO: externalize message?
- ErlangException ee = new ErlangException(
- "Timeout while receiving message reply", e);
- msg.setBody(null);
- reportProblem(msg, ee);
- } catch (Exception e) {
- reportProblem(msg, e);
- } finally {
- if (tmpMbox != null) {
- tmpMbox.close();
- }
- if (node != null) {
- OtpEpmd.unPublishPort(node);
- node.close();
- }
- }
- return msg;
- }
-
- private Message invokeOperation(Message msg) {
- OtpSelf self = null;
- OtpPeer other = null;
- OtpConnection connection = null;
- try {
- self = new OtpSelf(getClientNodeName());
- if (binding.hasCookie()) {
- self.setCookie(binding.getCookie());
- }
- other = new OtpPeer(binding.getNode());
- connection = self.connect(other);
- Method jmethod = ((JavaOperation) msg.getOperation())
- .getJavaMethod();
- OtpErlangList params = TypeHelpersProxy.toErlangAsList(msg
- .getBody(), jmethod.getParameterAnnotations());
- OtpErlangTuple message = MessageHelper.rpcMessage(self.pid(), self
- .createRef(), binding.getModule(), msg.getOperation()
- .getName(), params);
- connection.send(MessageHelper.RPC_MBOX, message);
- OtpErlangObject rpcResponse = null;
- if (binding.hasTimeout()) {
- rpcResponse = connection.receive(binding.getTimeout());
- } else {
- rpcResponse = connection.receive();
- }
- OtpErlangObject result = ((OtpErlangTuple) rpcResponse)
- .elementAt(1);
- if (MessageHelper.isfunctionUndefMessage(result)) {
- // TODO: externalize message?
- Exception e = new ErlangException("No '" + binding.getModule()
- + ":" + msg.getOperation().getName()
- + "' operation defined on remote '" + binding.getNode()
- + "' node.");
- reportProblem(msg, e);
- msg.setBody(null);
- } else if (msg.getOperation().getOutputType() != null) {
- jmethod.getAnnotations();
- msg.setBody(TypeHelpersProxy.toJava(result, msg.getOperation()
- .getOutputType().getPhysical(), jmethod
- .getAnnotations()));
- }
- } catch (OtpAuthException e) {
- // TODO: externalize message?
- ErlangException ee = new ErlangException(
- "Problem while authenticating client - check your cookie",
- e);
- msg.setBody(null);
- reportProblem(msg, ee);
- } catch (InterruptedException e) {
- // TODO: externalize message?
- ErlangException ee = new ErlangException(
- "Timeout while receiving RPC reply", e);
- msg.setBody(null);
- reportProblem(msg, ee);
- } catch (Exception e) {
- reportProblem(msg, e);
- } finally {
- if (connection != null) {
- connection.close();
- }
- }
- return msg;
- }
-
- /**
- * @see org.apache.tuscany.sca.invocation.Invoker#invoke(org.apache.tuscany.sca.invocation.Message)
- */
- public Message invoke(Message msg) {
- if (binding.isMbox()) {
- return sendMessage(msg);
- } else {
- return invokeOperation(msg);
- }
-
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNode.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNode.java
deleted file mode 100644
index 8a2ca44290..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNode.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * 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.binding.erlang.impl;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.binding.erlang.ErlangBinding;
-import org.apache.tuscany.sca.binding.erlang.impl.exceptions.ErlangException;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-import com.ericsson.otp.erlang.OtpAuthException;
-import com.ericsson.otp.erlang.OtpConnection;
-import com.ericsson.otp.erlang.OtpSelf;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ErlangNode implements Runnable {
-
- private static final Logger logger = Logger.getLogger(ErlangNode.class
- .getName());
-
- private ErlangNodeElement nodeElement;
- private String name;
- private OtpSelf self;
- private ExecutorService executors;
- private boolean stopRequested;
- private Map<String, List<Operation>> groupedOperations;
-
- public ErlangNode(String name, ErlangBinding binding,
- RuntimeComponentService service) throws Exception {
- this.name = name;
- self = new OtpSelf(name);
- boolean registered = self.publishPort();
- if (!registered) {
- // TODO: externalize message?
- throw new ErlangException(
- "Problem with publishing service under epmd server.");
- }
- if (binding.hasCookie()) {
- self.setCookie(binding.getCookie());
- }
- registerBinding(binding, service);
- }
-
- public void stop() {
- stopRequested = true;
- executors.shutdownNow();
- }
-
- public void run() {
- executors = Executors.newFixedThreadPool(nodeElement.getBinding().getServiceThreadPool());
- while (!stopRequested) {
- try {
- OtpConnection connection = self.accept();
- executors.execute(new ServiceExecutor(connection,
- groupedOperations, nodeElement, name));
- } catch (IOException e) {
- // TODO: externalzie message?
- logger.log(Level.WARNING,
- "Error occured while accepting connection on '" + name
- + "' node", e);
- } catch (OtpAuthException e) {
- // TODO: externalize message?
- logger.log(Level.WARNING, "Error while authenticating client", e);
- }
- }
- executors.shutdownNow();
- }
-
- private void registerBinding(ErlangBinding binding,
- RuntimeComponentService service) throws ErlangException {
- if (binding.isMbox()) {
- List<Operation> operations = service.getInterfaceContract()
- .getInterface().getOperations();
- groupedOperations = new HashMap<String, List<Operation>>();
- for (Operation operation : operations) {
- List<Operation> operationsGroup = groupedOperations
- .get(operation.getName());
- if (operationsGroup == null) {
- operationsGroup = new ArrayList<Operation>();
- groupedOperations.put(operation.getName(), operationsGroup);
- }
- operationsGroup.add(operation);
- }
- }
- nodeElement = new ErlangNodeElement();
- nodeElement.setService(service);
- nodeElement.setBinding(binding);
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNodeElement.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNodeElement.java
deleted file mode 100644
index f945a841ec..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNodeElement.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.binding.erlang.impl;
-
-import org.apache.tuscany.sca.binding.erlang.ErlangBinding;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * Holds information (RuntimeComponentService, ErlangBindin) for element (program module, mbox) binded on node.
- * @version $Rev$ $Date$
- */
-public class ErlangNodeElement {
-
- private ErlangBinding binding;
- private RuntimeComponentService service;
-
- public void setBinding(ErlangBinding binding) {
- this.binding = binding;
- }
-
- public ErlangBinding getBinding() {
- return binding;
- }
-
- public void setService(RuntimeComponentService service) {
- this.service = service;
- }
-
- public RuntimeComponentService getService() {
- return service;
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangReferenceBindingProvider.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangReferenceBindingProvider.java
deleted file mode 100644
index b96a4524e1..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangReferenceBindingProvider.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * 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.binding.erlang.impl;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.binding.erlang.ErlangBinding;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ErlangReferenceBindingProvider implements ReferenceBindingProvider {
-
- private static final Logger logger = Logger
- .getLogger(ErlangReferenceBindingProvider.class.getName());
- private RuntimeComponentReference reference;
- private ErlangBinding binding;
-
- public ErlangReferenceBindingProvider(ErlangBinding binding,
- RuntimeComponentReference reference) {
- this.reference = reference;
- this.binding = binding;
- }
-
- /**
- * @see org.apache.tuscany.sca.provider.ReferenceBindingProvider#createInvoker(org.apache.tuscany.sca.interfacedef.Operation)
- */
- public Invoker createInvoker(Operation operation) {
- try {
- return new ErlangInvoker(binding);
- } catch (Exception e) {
- logger.log(Level.WARNING,
- "Exception during creating Erlang invoker", e);
- }
- return null;
- }
-
- /**
- * @see org.apache.tuscany.sca.provider.ReferenceBindingProvider#getBindingInterfaceContract()
- */
- public InterfaceContract getBindingInterfaceContract() {
- return reference.getInterfaceContract();
- }
-
- /**
- * @see org.apache.tuscany.sca.provider.ReferenceBindingProvider#start()
- */
- public void start() {
- }
-
- /**
- * @see org.apache.tuscany.sca.provider.ReferenceBindingProvider#stop()
- */
- public void stop() {
- }
-
- /**
- * @see org.apache.tuscany.sca.provider.ReferenceBindingProvider#supportsOneWayInvocation()
- */
- public boolean supportsOneWayInvocation() {
- return false;
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangServiceBindingProvider.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangServiceBindingProvider.java
deleted file mode 100644
index 725c62fca0..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangServiceBindingProvider.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 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.binding.erlang.impl;
-
-import org.apache.tuscany.sca.binding.erlang.ErlangBinding;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-import org.osoa.sca.ServiceRuntimeException;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ErlangServiceBindingProvider implements ServiceBindingProvider {
-
- private RuntimeComponentService service;
- private ErlangNode node;
-
- public ErlangServiceBindingProvider(ErlangBinding binding,
- RuntimeComponentService service) throws Exception {
- this.service = service;
- this.node = new ErlangNode(binding.getNode(), binding, service);
- }
-
- /**
- * @see org.apache.tuscany.sca.provider.ServiceBindingProvider#getBindingInterfaceContract()
- */
- public InterfaceContract getBindingInterfaceContract() {
- return service.getInterfaceContract();
- }
-
- /**
- * @see org.apache.tuscany.sca.provider.ServiceBindingProvider#start()
- */
- public void start() {
- try {
- Thread thread = new Thread(node);
- // prevents blocking stop procedure by service listener
- thread.setDaemon(true);
- thread.start();
- } catch (Exception e) {
- throw new ServiceRuntimeException(e);
- }
-
- }
-
- /**
- * @see org.apache.tuscany.sca.provider.ServiceBindingProvider#stop()
- */
- public void stop() {
- try {
- node.stop();
- } catch (Exception e) {
- throw new ServiceRuntimeException(e);
- }
-
- }
-
- /**
- * @see org.apache.tuscany.sca.provider.ServiceBindingProvider#supportsOneWayInvocation()
- */
- public boolean supportsOneWayInvocation() {
- return false;
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/MessageHelper.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/MessageHelper.java
deleted file mode 100644
index ee7957406b..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/MessageHelper.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * 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.binding.erlang.impl;
-
-import com.ericsson.otp.erlang.OtpErlangAtom;
-import com.ericsson.otp.erlang.OtpErlangList;
-import com.ericsson.otp.erlang.OtpErlangObject;
-import com.ericsson.otp.erlang.OtpErlangPid;
-import com.ericsson.otp.erlang.OtpErlangRef;
-import com.ericsson.otp.erlang.OtpErlangTuple;
-
-/**
- * @version $Rev$ $Date$
- */
-public class MessageHelper {
-
- /**
- * Mbox name used for Remote Procedure Calls
- */
- public static String RPC_MBOX = "rex";
-
- public static final OtpErlangAtom ATOM_OK = new OtpErlangAtom("ok");
- public static final OtpErlangAtom ATOM_ERROR = new OtpErlangAtom("error");
- public static final OtpErlangAtom ATOM_BADRPC = new OtpErlangAtom("badrpc");
- private static final OtpErlangAtom ATOM_EXIT = new OtpErlangAtom("EXIT");
- private static final OtpErlangAtom ATOM_UNDEF = new OtpErlangAtom("undef");
- private static final OtpErlangAtom ATOM_CALL = new OtpErlangAtom("call");
- private static final OtpErlangAtom ATOM_GEN_CALL = new OtpErlangAtom(
- "$gen_call");
-
- public static OtpErlangObject functionUndefMessage(String module,
- String function, OtpErlangList args, String tuscanyMsg) {
- OtpErlangObject[] args4 = new OtpErlangObject[3];
- args4[0] = new OtpErlangAtom(module);
- args4[1] = new OtpErlangAtom(function);
- args4[2] = args;
-
- OtpErlangObject[] args3 = new OtpErlangObject[2];
- args3[0] = new OtpErlangTuple(args4);
- args3[1] = new OtpErlangAtom(tuscanyMsg);
-
- OtpErlangObject[] args2 = new OtpErlangObject[2];
- args2[0] = ATOM_UNDEF;
- args2[1] = new OtpErlangList(args3);
-
- OtpErlangObject[] args1 = new OtpErlangObject[2];
- args1[0] = ATOM_EXIT;
- args1[1] = new OtpErlangTuple(args2);
-
- OtpErlangTuple result = new OtpErlangTuple(args1);
- return result;
- }
-
- public static boolean isfunctionUndefMessage(OtpErlangObject msg) {
- if (msg.getClass().equals(OtpErlangTuple.class)) {
- OtpErlangTuple tupleMsg = (OtpErlangTuple) msg;
- if (tupleMsg.arity() == 2
- && tupleMsg.elementAt(0).getClass().equals(
- OtpErlangAtom.class)
- && tupleMsg.elementAt(1).getClass().equals(
- OtpErlangTuple.class)
- && ((OtpErlangAtom) tupleMsg.elementAt(0)).atomValue()
- .equals(ATOM_BADRPC.atomValue())) {
- OtpErlangTuple badrpcTuple = (OtpErlangTuple) tupleMsg
- .elementAt(1);
- if (badrpcTuple.arity() == 2
- && badrpcTuple.elementAt(0).getClass().equals(
- OtpErlangAtom.class)
- && badrpcTuple.elementAt(1).getClass().equals(
- OtpErlangTuple.class)
- && ((OtpErlangAtom) badrpcTuple.elementAt(0))
- .atomValue().equals(ATOM_EXIT.atomValue())) {
- OtpErlangTuple exitTuple = (OtpErlangTuple) badrpcTuple
- .elementAt(1);
- if (exitTuple.arity() == 2
- && exitTuple.elementAt(0).getClass().equals(
- OtpErlangAtom.class)
- && ((OtpErlangAtom) exitTuple.elementAt(0))
- .atomValue().equals(ATOM_UNDEF.atomValue())) {
- return true;
- }
- }
-
- }
- }
- return false;
- }
-
- public static OtpErlangTuple rpcMessage(OtpErlangPid senderPid,
- OtpErlangRef ref, String module, String function, OtpErlangList args) {
- OtpErlangObject[] args3 = new OtpErlangObject[5];
- args3[0] = ATOM_CALL;
- args3[1] = new OtpErlangAtom(module);
- args3[2] = new OtpErlangAtom(function);
- args3[3] = args;
- args3[4] = senderPid;
-
- OtpErlangObject[] args2 = new OtpErlangObject[2];
- args2[0] = senderPid;
- args2[1] = ref;
-
- OtpErlangObject[] args1 = new OtpErlangObject[3];
- args1[0] = ATOM_GEN_CALL;
- args1[1] = new OtpErlangTuple(args2);
- args1[2] = new OtpErlangTuple(args3);
-
- OtpErlangTuple result = new OtpErlangTuple(args1);
- return result;
- }
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ServiceExecutor.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ServiceExecutor.java
deleted file mode 100644
index 9e292fe3bb..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ServiceExecutor.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- * 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.binding.erlang.impl;
-
-import java.io.IOException;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.binding.erlang.ErlangBinding;
-import org.apache.tuscany.sca.binding.erlang.impl.types.TypeHelpersProxy;
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.java.JavaOperation;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-import com.ericsson.otp.erlang.OtpAuthException;
-import com.ericsson.otp.erlang.OtpConnection;
-import com.ericsson.otp.erlang.OtpErlangAtom;
-import com.ericsson.otp.erlang.OtpErlangDecodeException;
-import com.ericsson.otp.erlang.OtpErlangExit;
-import com.ericsson.otp.erlang.OtpErlangList;
-import com.ericsson.otp.erlang.OtpErlangObject;
-import com.ericsson.otp.erlang.OtpErlangPid;
-import com.ericsson.otp.erlang.OtpErlangRef;
-import com.ericsson.otp.erlang.OtpErlangString;
-import com.ericsson.otp.erlang.OtpErlangTuple;
-import com.ericsson.otp.erlang.OtpMsg;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ServiceExecutor implements Runnable {
-
- private static final Logger logger = Logger.getLogger(ServiceExecutor.class
- .getName());
-
- private ErlangNodeElement nodeElement;
- private OtpConnection connection;
- private Map<String, List<Operation>> groupedOperations;
- private String name;
-
- public ServiceExecutor(OtpConnection connection,
- Map<String, List<Operation>> groupedOperations,
- ErlangNodeElement nodeElement, String name) {
- this.connection = connection;
- this.groupedOperations = groupedOperations;
- this.nodeElement = nodeElement;
- this.name = name;
- }
-
- private void sendMessage(OtpConnection connection, OtpErlangPid pid,
- OtpErlangRef ref, OtpErlangAtom head, OtpErlangObject message)
- throws IOException {
- OtpErlangObject tResult = null;
- if (head != null) {
- tResult = new OtpErlangTuple(
- new OtpErlangObject[] { head, message });
- } else {
- tResult = message;
- }
- OtpErlangObject msg = null;
- msg = new OtpErlangTuple(new OtpErlangObject[] { ref, tResult });
- connection.send(pid, msg);
- }
-
- private void handleRpc(OtpMsg msg) {
- OtpErlangTuple request = null;
- OtpErlangPid senderPid = null;
- OtpErlangRef senderRef = null;
- try {
- OtpErlangTuple call = (OtpErlangTuple) msg.getMsg();
- OtpErlangTuple from = (OtpErlangTuple) call.elementAt(1);
- request = (OtpErlangTuple) call.elementAt(2);
- senderPid = (OtpErlangPid) from.elementAt(0);
- senderRef = (OtpErlangRef) from.elementAt(1);
- String module = ((OtpErlangAtom) request.elementAt(1)).atomValue();
- String function = ((OtpErlangAtom) request.elementAt(2))
- .atomValue();
- OtpErlangObject args = request.elementAt(3);
- OtpErlangList argsList = null;
- // normalize input
- if (args instanceof OtpErlangList) {
- argsList = (OtpErlangList) args;
- } else {
- argsList = new OtpErlangList(args);
- }
- if (!nodeElement.getBinding().getModule().equals(module)) {
- // module not found
- // TODO: externalize message?
- OtpErlangObject errorMsg = MessageHelper.functionUndefMessage(
- module, function, argsList,
- "Module not found in SCA component.");
- sendMessage(connection, senderPid, senderRef,
- MessageHelper.ATOM_BADRPC, errorMsg);
- } else {
- // module found, looking for operation
- RuntimeComponentService service = nodeElement.getService();
- ErlangBinding binding = nodeElement.getBinding();
- List<Operation> operations = service.getInterfaceContract()
- .getInterface().getOperations();
- Operation operation = null;
- for (Operation o : operations) {
- if (o.getName().equals(function)) {
- operation = o;
- break;
- }
- }
- if (operation != null) {
- // operation found
- List<DataType> iTypes = operation.getInputType()
- .getLogical();
- Class<?>[] forClasses = new Class<?>[iTypes.size()];
- for (int i = 0; i < iTypes.size(); i++) {
- forClasses[i] = iTypes.get(i).getPhysical();
- }
- try {
- // invoke operation
- Method jmethod = ((JavaOperation) operation)
- .getJavaMethod();
- Object result = service.getRuntimeWire(binding,
- service.getInterfaceContract()).invoke(
- operation,
- TypeHelpersProxy.toJavaFromList(argsList,
- forClasses, jmethod
- .getParameterAnnotations()));
- OtpErlangObject response = null;
-
- // send reply
- if (operation.getOutputType() != null
- && operation.getOutputType().getPhysical()
- .isArray()) {
- // output type is array
- response = TypeHelpersProxy.toErlangAsResultList(
- result, jmethod.getAnnotations());
- } else if (operation.getOutputType() == null) {
- // output type is void, create empty reply
- Object[] arrArg = new Object[] {};
- response = TypeHelpersProxy.toErlang(arrArg,
- new Annotation[0][0]);
- } else {
- // output type is not void and not array
- response = TypeHelpersProxy.toErlang(result,
- jmethod.getAnnotations());
- }
- sendMessage(connection, senderPid, senderRef, null,
- response);
- } catch (Exception e) {
- if ((e.getClass().equals(
- InvocationTargetException.class) && e
- .getCause().getClass().equals(
- IllegalArgumentException.class))
- || e.getClass().equals(
- TypeMismatchException.class)) {
- // wrong params
- // TODO: externalize message?
- OtpErlangObject errorMsg = MessageHelper
- .functionUndefMessage(module, function,
- argsList,
- "Operation name found in SCA component, but parameters types didn't match.");
- sendMessage(connection, senderPid, senderRef,
- MessageHelper.ATOM_BADRPC, errorMsg);
- } else {
- // unexpected error
- throw e;
- }
- }
- } else {
- // operation not found
- // TODO: externalize message?
- OtpErlangObject errorMsg = MessageHelper
- .functionUndefMessage(module, function, argsList,
- "Operation name not found in SCA component.");
- sendMessage(connection, senderPid, senderRef,
- MessageHelper.ATOM_BADRPC, errorMsg);
- }
- }
- } catch (ClassCastException e) {
- // invalid request
- // TODO: externalize message?
- try {
- logger
- .log(
- Level.WARNING,
- "On node '"
- + nodeElement.getBinding().getNode()
- + "' received RPC request which is invalid. Request content is: "
- + msg.getMsg());
- } catch (OtpErlangDecodeException e1) {
- }
- } catch (Exception e) {
- // unknown error
- try {
- sendMessage(connection, senderPid, senderRef,
- MessageHelper.ATOM_ERROR, new OtpErlangString(
- "Unhandled error while processing request: "
- + e.getClass().getCanonicalName()
- + ", message: " + e.getMessage()));
- } catch (Exception e1) {
- // error while sending error message. Can't do anything now
- logger.log(Level.WARNING, "Error during sending error message",
- e);
- }
- }
- }
-
- private void handleMsg(OtpMsg msg) {
- Operation matchedOperation = null;
- Object args[] = null;
- OtpErlangPid senderPid = null;
- OtpErlangObject msgNoSender = null;
- List<Operation> operations = groupedOperations.get(msg
- .getRecipientName());
- try {
- if (msg.getMsg().getClass().equals(OtpErlangTuple.class)
- && (((OtpErlangTuple) msg.getMsg()).elementAt(0))
- .getClass().equals(OtpErlangPid.class)) {
- // PID provided by client
- senderPid = (OtpErlangPid) ((OtpErlangTuple) msg.getMsg())
- .elementAt(0);
- msgNoSender = ((OtpErlangTuple) msg.getMsg()).elementAt(1);
- } else {
- // PID obtained from jinterface
- senderPid = msg.getSenderPid();
- msgNoSender = msg.getMsg();
- }
- } catch (Exception e) {
- logger.log(Level.WARNING, "Unexpected error", e);
- }
-
- if (operations == null) {
- // operation name not found
- // TODO: externalize message?
- // NOTE: I assume in Erlang sender doesn't get confirmation so
- // no message will be send
- logger.log(Level.WARNING, "Node '" + name
- + "' received message addressed to non exising mbox: "
- + msg.getRecipientName());
- } else {
- // find proper operation for received parameters
- for (Operation operation : operations) {
- Method method = ((JavaOperation) operation).getJavaMethod();
- List<DataType> iTypes = operation.getInputType().getLogical();
- Class<?>[] forClasses = new Class<?>[iTypes.size()];
- for (int i = 0; i < iTypes.size(); i++) {
- forClasses[i] = iTypes.get(i).getPhysical();
- }
- try {
- args = TypeHelpersProxy.toJavaAsArgs(msgNoSender,
- forClasses, method.getParameterAnnotations());
- matchedOperation = operation;
- break;
- } catch (Exception e) {
- // this exception is expected while processing operation
- // version with mismatched arguments
- }
- }
- if (matchedOperation != null) {
- // operation found, invoke it
- try {
- Method jmethod = ((JavaOperation) matchedOperation)
- .getJavaMethod();
- Object result = nodeElement.getService().getRuntimeWire(
- nodeElement.getBinding()).invoke(matchedOperation,
- args);
- OtpErlangObject response = null;
-
- // create and send send reply
- if (matchedOperation.getOutputType() != null
- && matchedOperation.getOutputType().getPhysical()
- .isArray()) {
- // result type is array
- response = TypeHelpersProxy.toErlangAsResultList(
- result, jmethod.getAnnotations());
- } else if (matchedOperation.getOutputType() != null) {
- // result type is not array and not void
- response = TypeHelpersProxy.toErlang(result, jmethod
- .getAnnotations());
- }
- if (response != null && senderPid != null) {
- connection.send(senderPid, response);
- } else if (response != null && senderPid == null) {
- // couldn't send reply - sender pid unavailable
- // TODO: externalize message?
- // TODO: do we need to send this reply?
- logger
- .log(
- Level.WARNING,
- "Cannot send reply - Erlang client didn't provide it's PID and couldn't obtain sender PID from jinterface");
- }
- } catch (InvocationTargetException e) {
- if (e.getCause() != null
- && e.getCause().getClass().equals(
- IllegalArgumentException.class)) {
- // arguments number or type mismatch
- try {
- // TODO: externalize message?
- connection
- .send(
- senderPid,
- new OtpErlangString(
- "Operation name found in SCA component, but parameters types didn't match."));
- } catch (IOException e1) {
- e1.printStackTrace();
- }
- } else {
- logger.log(Level.WARNING, "Unexpected error", e);
- }
- } catch (Exception e) {
- logger.log(Level.WARNING, "Unexpected error", e);
- }
- } else {
- // TODO: externalize message?
- // NOTE: don't send error message if mapping not found
- logger.log(Level.WARNING, "No mapping for such arguments in '"
- + msg.getRecipientName() + "' operation in '" + name
- + "' node. Recevied arguments: " + msgNoSender);
- }
- }
- }
-
- public void run() {
- try {
- // NOTE: there's also a timeout, like in reference bindings
- OtpMsg msg = null;
- if (nodeElement.getBinding().hasTimeout()) {
- msg = connection.receiveMsg(nodeElement.getBinding()
- .getTimeout());
- } else {
- msg = connection.receiveMsg();
- }
- // check if request is message or RPC
- if (msg.getRecipientName().equals(MessageHelper.RPC_MBOX)
- && !nodeElement.getBinding().isMbox()) {
- handleRpc(msg);
- } else if (!msg.getRecipientName().equals(MessageHelper.RPC_MBOX)
- && nodeElement.getBinding().isMbox()) {
- handleMsg(msg);
- } else {
- // received wrong message type
- }
- } catch (IOException e) {
- // TODO: externalize message?
- logger.log(Level.WARNING, "Problem while receiving message", e);
- } catch (OtpErlangExit e) {
- // TODO: linking?
- } catch (OtpAuthException e) {
- // TODO: cookies? does this exception occur sometime?
- } catch (InterruptedException e) {
- // NOTE: timeout will be logged
- // TODO: externalize message?
- logger.log(Level.WARNING, "Timeout while waiting for request", e);
- } finally {
- connection.close();
- }
- }
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/TypeMismatchException.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/TypeMismatchException.java
deleted file mode 100644
index b3562cc413..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/TypeMismatchException.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.binding.erlang.impl;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TypeMismatchException extends Exception {
-
- private static final long serialVersionUID = 1L;
- private Class<?> expected;
- private Class<?> received;
-
- public TypeMismatchException(Class<?> expected, Class<?> received) {
- super("Received " + received + " cannot be mapped to "
- + expected.getCanonicalName());
- this.expected = expected;
- this.received = received;
- }
-
- public TypeMismatchException() {
- super("Arguments don't match");
- }
-
- public Class<?> getExpected() {
- return expected;
- }
-
- public Class<?> getReceived() {
- return received;
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/exceptions/ErlangException.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/exceptions/ErlangException.java
deleted file mode 100644
index 587d7a509c..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/exceptions/ErlangException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.binding.erlang.impl.exceptions;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ErlangException extends Exception {
-
- private static final long serialVersionUID = 1L;
-
- public ErlangException(String message) {
- super(message);
- }
-
- public ErlangException(String message, Throwable cause) {
- super(message, cause);
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AnnotatedListTypeHelper.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AnnotatedListTypeHelper.java
deleted file mode 100644
index 154f0c27fc..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AnnotatedListTypeHelper.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.binding.erlang.impl.types;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.ericsson.otp.erlang.OtpErlangList;
-import com.ericsson.otp.erlang.OtpErlangObject;
-
-/**
- * @version $Rev$ $Date$
- */
-public class AnnotatedListTypeHelper implements TypeHelper {
-
- private Annotation[] notes;
-
- public AnnotatedListTypeHelper(Annotation[] notes) {
- this.notes = notes;
- }
-
- public OtpErlangObject toErlang(Object object) {
- int i = 0;
- List<OtpErlangObject> elements = new ArrayList<OtpErlangObject>();
- while (true) {
- try {
- elements.add(TypeHelpersProxy.toErlang(Array.get(object, i),
- notes));
- i++;
- } catch (ArrayIndexOutOfBoundsException e) {
- // expected
- break;
- }
- }
- return new OtpErlangList(elements.toArray(new OtpErlangObject[elements
- .size()]));
- }
-
- public Object toJava(OtpErlangObject object, Class<?> forClass)
- throws Exception {
- OtpErlangList erlangList = (OtpErlangList) object;
- Object result = Array.newInstance(forClass.getComponentType(),
- erlangList.arity());
- for (int i = 0; i < erlangList.arity(); i++) {
- Array.set(result, i, TypeHelpersProxy.toJava(erlangList
- .elementAt(i), forClass.getComponentType(),
- new Annotation[0]));
- }
- return result;
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AtomTypeHelper.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AtomTypeHelper.java
deleted file mode 100644
index 94285c66bf..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AtomTypeHelper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.binding.erlang.impl.types;
-
-import com.ericsson.otp.erlang.OtpErlangAtom;
-import com.ericsson.otp.erlang.OtpErlangObject;
-
-/**
- * @version $Rev$ $Date$
- */
-public class AtomTypeHelper implements TypeHelper {
-
- public OtpErlangObject toErlang(Object object) {
- return new OtpErlangAtom((String) object);
- }
-
- public Object toJava(OtpErlangObject object, Class<?> forClass)
- throws Exception {
- return ((OtpErlangAtom) object).atomValue();
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BinaryTypeHelper.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BinaryTypeHelper.java
deleted file mode 100644
index 7385fe64e4..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BinaryTypeHelper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.binding.erlang.impl.types;
-
-import com.ericsson.otp.erlang.OtpErlangBinary;
-import com.ericsson.otp.erlang.OtpErlangObject;
-
-/**
- * @version $Rev$ $Date$
- */
-public class BinaryTypeHelper implements TypeHelper {
-
- public OtpErlangObject toErlang(Object object) {
- return new OtpErlangBinary((byte[])object);
- }
-
- public Object toJava(OtpErlangObject object, Class<?> forClass)
- throws Exception {
- return ((OtpErlangBinary)object).binaryValue();
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BooleanTypeHelper.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BooleanTypeHelper.java
deleted file mode 100644
index 9463b72eb9..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BooleanTypeHelper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.binding.erlang.impl.types;
-
-import com.ericsson.otp.erlang.OtpErlangAtom;
-import com.ericsson.otp.erlang.OtpErlangBoolean;
-import com.ericsson.otp.erlang.OtpErlangObject;
-
-/**
- * @version $Rev$ $Date$
- */
-public class BooleanTypeHelper implements TypeHelper {
-
- public OtpErlangObject toErlang(Object object) {
- return new OtpErlangBoolean((Boolean) object);
- }
-
- public Object toJava(OtpErlangObject object, Class<?> forClass)
- throws Exception {
- if (object.getClass().equals(OtpErlangAtom.class)) {
- return ((OtpErlangAtom) object).booleanValue();
- } else {
- return ((OtpErlangBoolean) object).booleanValue();
- }
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ByteTypeHelper.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ByteTypeHelper.java
deleted file mode 100644
index c6c8f6690f..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ByteTypeHelper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.binding.erlang.impl.types;
-
-import com.ericsson.otp.erlang.OtpErlangByte;
-import com.ericsson.otp.erlang.OtpErlangLong;
-import com.ericsson.otp.erlang.OtpErlangObject;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ByteTypeHelper implements TypeHelper {
-
- public OtpErlangObject toErlang(Object object) {
- return new OtpErlangByte((Byte) object);
- }
-
- public Object toJava(OtpErlangObject object, Class<?> forClass)
- throws Exception {
- return (byte) ((OtpErlangLong) object).longValue();
- }
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/CharTypeHelper.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/CharTypeHelper.java
deleted file mode 100644
index b0479c9b0c..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/CharTypeHelper.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.binding.erlang.impl.types;
-
-import com.ericsson.otp.erlang.OtpErlangChar;
-import com.ericsson.otp.erlang.OtpErlangLong;
-import com.ericsson.otp.erlang.OtpErlangObject;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CharTypeHelper implements TypeHelper {
-
- public OtpErlangObject toErlang(Object object) {
- return new OtpErlangChar((Character) object);
- }
-
- public Object toJava(OtpErlangObject object, Class<?> forClass)
- throws Exception {
- return (char) ((OtpErlangLong) object).longValue();
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/DoubleTypeHelper.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/DoubleTypeHelper.java
deleted file mode 100644
index 92dd4749ac..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/DoubleTypeHelper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.binding.erlang.impl.types;
-
-import com.ericsson.otp.erlang.OtpErlangDouble;
-import com.ericsson.otp.erlang.OtpErlangObject;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DoubleTypeHelper implements TypeHelper {
-
- public OtpErlangObject toErlang(Object object) {
- return new OtpErlangDouble((Double) object);
- }
-
- public Object toJava(OtpErlangObject object, Class<?> forClass)
- throws Exception {
- return ((OtpErlangDouble) object).doubleValue();
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/FloatTypeHelper.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/FloatTypeHelper.java
deleted file mode 100644
index 3ee695c3cc..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/FloatTypeHelper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.binding.erlang.impl.types;
-
-import com.ericsson.otp.erlang.OtpErlangDouble;
-import com.ericsson.otp.erlang.OtpErlangObject;
-
-/**
- * @version $Rev$ $Date$
- */
-public class FloatTypeHelper implements TypeHelper {
-
- public OtpErlangObject toErlang(Object object) {
- return new OtpErlangDouble((Float) object);
- }
-
- public Object toJava(OtpErlangObject object, Class<?> forClass)
- throws Exception {
- return (float) ((OtpErlangDouble) object).doubleValue();
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/IntTypeHelper.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/IntTypeHelper.java
deleted file mode 100644
index 3ee8e7d9ac..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/IntTypeHelper.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.binding.erlang.impl.types;
-
-import com.ericsson.otp.erlang.OtpErlangInt;
-import com.ericsson.otp.erlang.OtpErlangLong;
-import com.ericsson.otp.erlang.OtpErlangObject;
-
-/**
- * @version $Rev$ $Date$
- */
-public class IntTypeHelper implements TypeHelper {
-
- public OtpErlangObject toErlang(Object object) {
- return new OtpErlangInt((Integer) object);
- }
-
- public Object toJava(OtpErlangObject object, Class<?> forClass)
- throws Exception {
- return (int) ((OtpErlangLong) object).longValue();
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ListTypeHelper.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ListTypeHelper.java
deleted file mode 100644
index 7bb62d4cf8..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ListTypeHelper.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.binding.erlang.impl.types;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.ericsson.otp.erlang.OtpErlangList;
-import com.ericsson.otp.erlang.OtpErlangObject;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ListTypeHelper implements TypeHelper {
-
- public OtpErlangObject toErlang(Object object) {
- int i = 0;
- List<OtpErlangObject> elements = new ArrayList<OtpErlangObject>();
- while (true) {
- try {
- elements.add(TypeHelpersProxy.toErlang(Array.get(object, i),
- new Annotation[0]));
- i++;
- } catch (ArrayIndexOutOfBoundsException e) {
- // expected
- break;
- }
- }
- return new OtpErlangList(elements.toArray(new OtpErlangObject[elements
- .size()]));
- }
-
- public Object toJava(OtpErlangObject object, Class<?> forClass)
- throws Exception {
- OtpErlangList erlangList = (OtpErlangList) object;
- Object result = Array.newInstance(forClass.getComponentType(),
- erlangList.arity());
- for (int i = 0; i < erlangList.arity(); i++) {
- Array.set(result, i, TypeHelpersProxy.toJava(erlangList
- .elementAt(i), forClass.getComponentType(),
- new Annotation[0]));
- }
- return result;
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/LongTypeHelper.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/LongTypeHelper.java
deleted file mode 100644
index 711057569a..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/LongTypeHelper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.binding.erlang.impl.types;
-
-import com.ericsson.otp.erlang.OtpErlangLong;
-import com.ericsson.otp.erlang.OtpErlangObject;
-
-/**
- * @version $Rev$ $Date$
- */
-public class LongTypeHelper implements TypeHelper {
-
- public OtpErlangObject toErlang(Object object) {
- return new OtpErlangLong((Long) object);
- }
-
- public Object toJava(OtpErlangObject object, Class<?> forClass)
- throws Exception {
- return ((OtpErlangLong) object).longValue();
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ShortTypeHelper.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ShortTypeHelper.java
deleted file mode 100644
index 73a68691a4..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ShortTypeHelper.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.binding.erlang.impl.types;
-
-import com.ericsson.otp.erlang.OtpErlangLong;
-import com.ericsson.otp.erlang.OtpErlangObject;
-import com.ericsson.otp.erlang.OtpErlangShort;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ShortTypeHelper implements TypeHelper {
-
- public OtpErlangObject toErlang(Object object) {
- return new OtpErlangShort((Short) object);
- }
-
- public Object toJava(OtpErlangObject object, Class<?> forClass)
- throws Exception {
- return (short) ((OtpErlangLong) object).longValue();
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/StringTypeHelper.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/StringTypeHelper.java
deleted file mode 100644
index 001ec47655..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/StringTypeHelper.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.binding.erlang.impl.types;
-
-import com.ericsson.otp.erlang.OtpErlangObject;
-import com.ericsson.otp.erlang.OtpErlangString;
-
-/**
- * @version $Rev$ $Date$
- */
-public class StringTypeHelper implements TypeHelper {
-
- public OtpErlangObject toErlang(Object object) {
- return new OtpErlangString((String) object);
- }
-
- public Object toJava(OtpErlangObject object, Class<?> forClass)
- throws Exception {
- return ((OtpErlangString) object).stringValue();
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TupleTypeHelper.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TupleTypeHelper.java
deleted file mode 100644
index 64ea57f836..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TupleTypeHelper.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.binding.erlang.impl.types;
-
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-
-import com.ericsson.otp.erlang.OtpErlangObject;
-import com.ericsson.otp.erlang.OtpErlangTuple;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TupleTypeHelper implements TypeHelper {
-
- public OtpErlangObject toErlang(Object object) {
- Class<?> forClass = object.getClass();
- List<OtpErlangObject> tupleMembers = new ArrayList<OtpErlangObject>();
- Field[] fields = forClass.getFields();
- for (int i = 0; i < fields.length; i++) {
- try {
- OtpErlangObject member = TypeHelpersProxy.toErlang(fields[i]
- .get(object), fields[i].getAnnotations());
- tupleMembers.add(member);
- } catch (IllegalArgumentException e) {
- // no problem should occur here
- } catch (IllegalAccessException e) {
- // and here
- }
- }
- OtpErlangObject result = new OtpErlangTuple(tupleMembers
- .toArray(new OtpErlangObject[tupleMembers.size()]));
- return result;
- }
-
- public Object toJava(OtpErlangObject object, Class<?> forClass)
- throws Exception {
- Object result = null;
- OtpErlangTuple tuple = (OtpErlangTuple) object;
- Field[] fields = forClass.getFields();
- result = forClass.newInstance();
- for (int i = 0; i < tuple.arity(); i++) {
- OtpErlangObject tupleMember = tuple.elementAt(i);
- Object javaMember = TypeHelpersProxy.toJava(tupleMember, fields[i]
- .getType(), fields[i].getAnnotations());
- fields[i].setAccessible(true);
- fields[i].set(result, javaMember);
- }
- return result;
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelper.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelper.java
deleted file mode 100644
index add885ef6e..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelper.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.binding.erlang.impl.types;
-
-import com.ericsson.otp.erlang.OtpErlangObject;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface TypeHelper {
-
- Object toJava(OtpErlangObject object, Class<?> forClass) throws Exception;
-
- OtpErlangObject toErlang(Object object);
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelpersProxy.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelpersProxy.java
deleted file mode 100644
index 2ab29490e3..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelpersProxy.java
+++ /dev/null
@@ -1,291 +0,0 @@
-/*
- * 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.binding.erlang.impl.types;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sca.binding.erlang.impl.TypeMismatchException;
-import org.apache.tuscany.sca.binding.erlang.meta.ErlangAtom;
-
-import com.ericsson.otp.erlang.OtpErlangList;
-import com.ericsson.otp.erlang.OtpErlangObject;
-import com.ericsson.otp.erlang.OtpErlangTuple;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TypeHelpersProxy {
-
- private static Map<Class<?>, TypeHelper> primitiveTypes = null;
-
- static {
- // initiate type helpers
- primitiveTypes = new HashMap<Class<?>, TypeHelper>();
- primitiveTypes.put(boolean.class, new BooleanTypeHelper());
- primitiveTypes.put(short.class, new ShortTypeHelper());
- primitiveTypes.put(byte.class, new ByteTypeHelper());
- primitiveTypes.put(char.class, new CharTypeHelper());
- primitiveTypes.put(int.class, new IntTypeHelper());
- primitiveTypes.put(long.class, new LongTypeHelper());
- primitiveTypes.put(float.class, new FloatTypeHelper());
- primitiveTypes.put(double.class, new DoubleTypeHelper());
- primitiveTypes.put(String.class, new StringTypeHelper());
- primitiveTypes.put(Boolean.class, primitiveTypes.get(boolean.class));
- primitiveTypes.put(Character.class, primitiveTypes.get(char.class));
- primitiveTypes.put(Short.class, primitiveTypes.get(char.class));
- primitiveTypes.put(Byte.class, primitiveTypes.get(byte.class));
- primitiveTypes.put(Short.class, primitiveTypes.get(short.class));
- primitiveTypes.put(Integer.class, primitiveTypes.get(int.class));
- primitiveTypes.put(Long.class, primitiveTypes.get(long.class));
- primitiveTypes.put(Float.class, primitiveTypes.get(float.class));
- primitiveTypes.put(Double.class, primitiveTypes.get(double.class));
- primitiveTypes.put(byte[].class, new BinaryTypeHelper());
- primitiveTypes.put(ErlangAtom.class, new AtomTypeHelper());
- }
-
- private static TypeHelper getTypeHelper(Class<?> forClass,
- Annotation[] notes) {
- TypeHelper typeHelper = null;
- // check for special types marked by annotations
- for (int i = 0; i < notes.length; i++) {
- typeHelper = primitiveTypes.get(notes[i].annotationType());
- if (typeHelper != null) {
- // get type which is annotated, reduce array if needed
- Class<?> annotatedType = forClass;
- while (annotatedType.isArray()) {
- annotatedType = annotatedType.getComponentType();
- }
- if (notes[i].annotationType().equals(ErlangAtom.class)
- && !annotatedType.equals(String.class)) {
- // NOTE: @ErlangAtom atom will be ignored if not annotates
- // string
- typeHelper = null;
- } else {
- // check if annotation points to array
- if (forClass.isArray()) {
- typeHelper = new AnnotatedListTypeHelper(notes);
- }
- break;
- }
- }
- }
- // check for standard types
- if (typeHelper == null) {
- typeHelper = primitiveTypes.get(forClass);
- }
- // check for arrays
- if (typeHelper == null && forClass.isArray()) {
- typeHelper = new ListTypeHelper();
- }
- // others would be tuples
- if (typeHelper == null) {
- typeHelper = new TupleTypeHelper();
- }
- return typeHelper;
- }
-
- /**
- * Converts single Java object into Erlang
- *
- * @param object
- * @param notes
- * @return
- */
- public static OtpErlangObject toErlang(Object object, Annotation[] notes) {
- TypeHelper helper = getTypeHelper(object.getClass(), notes);
- return helper.toErlang(object);
- }
-
- /**
- * Converts Java objects arrays to Erlang: 1. single object (if array arity
- * == 1) or 2. tuple (if array arity > 1)
- *
- * @param objects
- * @return
- */
- public static OtpErlangObject toErlang(Object[] objects,
- Annotation[][] notes) {
- OtpErlangObject result = null;
- if (objects != null) {
- TypeHelper helper = null;
- switch (objects.length) {
- case 0:
- result = new OtpErlangList();
- break;
- case 1:
- helper = getTypeHelper(objects[0].getClass(), notes[0]);
- result = helper.toErlang(objects[0]);
- break;
- default:
- OtpErlangObject[] erlObjects = new OtpErlangObject[objects.length];
- for (int i = 0; i < objects.length; i++) {
- helper = getTypeHelper(objects[i].getClass(), notes[i]);
- erlObjects[i] = helper.toErlang(objects[i]);
- }
- result = new OtpErlangTuple(erlObjects);
- break;
- }
- }
- return result;
- }
-
- /**
- * Creates Erlang list basing on unknown Java arrays
- *
- * @param array
- * @param notes
- * @return
- */
- public static OtpErlangList toErlangAsList(Object array,
- Annotation[][] notes) {
- return toErlangAsList(array, notes, false);
- }
-
- /**
- * Creates Erlang list of result elements
- *
- * @param array
- * @param notes
- * @return
- */
- public static OtpErlangList toErlangAsResultList(Object array,
- Annotation[] notes) {
- return toErlangAsList(array, new Annotation[][] { notes }, true);
- }
-
- /**
- *
- * @param array
- * @param notes
- * @param isArray
- * @return
- */
- private static OtpErlangList toErlangAsList(Object array,
- Annotation[][] notes, boolean isArray) {
- OtpErlangList result = null;
- if (array != null) {
- List<OtpErlangObject> attrsList = new ArrayList<OtpErlangObject>();
- int i = 0;
- while (true) {
- try {
- Annotation[] currNotes = isArray ? notes[0] : notes[i];
- TypeHelper helper = getTypeHelper(Array.get(array, i)
- .getClass(), currNotes);
- attrsList.add(helper.toErlang(Array.get(array, i)));
- i++;
- } catch (ArrayIndexOutOfBoundsException e) {
- break;
- }
- }
- result = new OtpErlangList(attrsList
- .toArray(new OtpErlangObject[attrsList.size()]));
- } else {
- result = new OtpErlangList();
- }
- return result;
- }
-
- /**
- * Converts single Erlang object to Java
- *
- * @param object
- * @param forClass
- * @return
- * @throws Exception
- */
- public static Object toJava(OtpErlangObject object, Class<?> forClass,
- Annotation[] notes) throws Exception {
- try {
- TypeHelper helper = getTypeHelper(forClass, notes);
- return helper.toJava(object, forClass);
- } catch (ClassCastException e) {
- throw new TypeMismatchException(forClass, object.getClass());
- }
- }
-
- /**
- * Creates array of Java objects from Erlang list
- *
- * @param objects
- * @param forClass
- * @return
- * @throws Exception
- */
- public static Object[] toJavaFromList(OtpErlangList objects,
- Class<?>[] forClass, Annotation[][] notes) throws Exception {
- Object[] result = new Object[objects.arity()];
- try {
- for (int i = 0; i < objects.arity(); i++) {
- TypeHelper helper = getTypeHelper(forClass[i], notes[i]);
- result[i] = helper.toJava(objects.elementAt(i), forClass[i]);
- }
- } catch (Exception e) {
- // type mismatch as mismatch of parameters count or parameters type
- if (e.getClass().equals(ClassCastException.class)
- || e.getClass()
- .equals(ArrayIndexOutOfBoundsException.class))
- throw new TypeMismatchException();
- }
- return result;
- }
-
- /**
- * Converts incoming Erlang message to operation arguments
- *
- * @param objects
- * @param forClass
- * @return
- * @throws Exception
- */
- public static Object[] toJavaAsArgs(OtpErlangObject objects,
- Class<?>[] forClass, Annotation[][] notes) throws Exception {
- OtpErlangObject[] args = null;
- // normalize input
- if (objects.getClass().equals(OtpErlangTuple.class)) {
- args = new OtpErlangObject[((OtpErlangTuple) objects).arity()];
- for (int i = 0; i < ((OtpErlangTuple) objects).arity(); i++) {
- args[i] = ((OtpErlangTuple) objects).elementAt(i);
- }
- } else {
- args = new OtpErlangObject[1];
- args[0] = objects;
- }
- Object[] result = new Object[args.length];
- try {
- for (int i = 0; i < args.length; i++) {
- TypeHelper helper = getTypeHelper(forClass[i], notes[i]);
- result[i] = helper.toJava(args[i], forClass[i]);
- }
- } catch (Exception e) {
- // type mismatch as mismatch of parameters count or parameters type
- if (e.getClass().equals(ClassCastException.class)
- || e.getClass()
- .equals(ArrayIndexOutOfBoundsException.class))
- throw new TypeMismatchException();
- }
- return result;
- }
-
-}
diff --git a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/meta/ErlangAtom.java b/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/meta/ErlangAtom.java
deleted file mode 100644
index 48037eaa1c..0000000000
--- a/sca-java-1.x/tags/1.6.1-TUSCANY-3909/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/meta/ErlangAtom.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.binding.erlang.meta;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-
-@Retention(RetentionPolicy.RUNTIME)
-public @interface ErlangAtom {
-
-}