summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.5/modules/binding-erlang-runtime
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/LICENSE205
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/NOTICE6
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/pom.xml91
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingProviderFactory.java94
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangInvoker.java204
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNode.java118
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNodeElement.java50
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangReferenceBindingProvider.java87
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangServiceBindingProvider.java81
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/MessageHelper.java127
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ServiceExecutor.java386
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/TypeMismatchException.java50
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/exceptions/ErlangException.java37
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AnnotatedListTypeHelper.java71
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AtomTypeHelper.java39
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BinaryTypeHelper.java39
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BooleanTypeHelper.java44
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ByteTypeHelper.java39
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/CharTypeHelper.java40
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/DoubleTypeHelper.java39
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/FloatTypeHelper.java39
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/IntTypeHelper.java40
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ListTypeHelper.java65
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/LongTypeHelper.java39
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ShortTypeHelper.java40
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/StringTypeHelper.java39
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TupleTypeHelper.java70
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelper.java33
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelpersProxy.java263
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/meta/ErlangAtom.java28
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory19
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/AtomTuple.java30
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/MboxInterface.java65
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/MboxListener.java97
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ModuleInterface.java31
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceServiceTestCase.java897
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceTestComponent.java27
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceTestComponentImpl.java110
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceInterface.java45
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponent.java35
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImpl.java44
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImplClone.java44
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImplTimeout.java61
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/SmallTuple.java35
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/StructuredTuple.java37
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/dynaignore/IgnorableRunner.java139
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/dynaignore/IgnoreTest.java29
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangReference.composite39
-rw-r--r--branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangService.composite35
49 files changed, 0 insertions, 4322 deletions
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/LICENSE b/branches/sca-java-1.5/modules/binding-erlang-runtime/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
-
-
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/NOTICE b/branches/sca-java-1.5/modules/binding-erlang-runtime/NOTICE
deleted file mode 100644
index 1325efd8bf..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/pom.xml b/branches/sca-java-1.5/modules/binding-erlang-runtime/pom.xml
deleted file mode 100644
index f0a5a4163c..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/pom.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-modules</artifactId>
- <version>1.5-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>tuscany-binding-erlang-runtime</artifactId>
- <name>Apache Tuscany SCA Erlang Binding Runtime</name>
-
- <repositories>
- <repository>
- <id>wjaniszewski-jinterface</id>
- <url>http://people.apache.org/~wjaniszewski/jinterface-repo</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-interface-java</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.5-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-erlang</artifactId>
- <version>1.5-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>com.ericsson</groupId>
- <artifactId>otperlang</artifactId>
- <version>1.4.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.5-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
-
- <configuration>
- <instructions>
- <Bundle-Version>${tuscany.version}</Bundle-Version>
- <Bundle-SymbolicName>org.apache.tuscany.sca.binding.erlang</Bundle-SymbolicName>
- <Bundle-Description>${pom.name}</Bundle-Description>
- <Export-Package>org.apache.tuscany.sca.binding.erlang*</Export-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingProviderFactory.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangBindingProviderFactory.java
deleted file mode 100644
index f7ea057e56..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangInvoker.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangInvoker.java
deleted file mode 100644
index 2fe9ae38b9..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangInvoker.java
+++ /dev/null
@@ -1,204 +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?
- 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();
- Object[] args = msg.getBody();
- 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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNode.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNode.java
deleted file mode 100644
index 8a2ca44290..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNodeElement.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangNodeElement.java
deleted file mode 100644
index f945a841ec..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangReferenceBindingProvider.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangReferenceBindingProvider.java
deleted file mode 100644
index b96a4524e1..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangServiceBindingProvider.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangServiceBindingProvider.java
deleted file mode 100644
index c2546a4336..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ErlangServiceBindingProvider.java
+++ /dev/null
@@ -1,81 +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);
- 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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/MessageHelper.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/MessageHelper.java
deleted file mode 100644
index ee7957406b..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ServiceExecutor.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ServiceExecutor.java
deleted file mode 100644
index 26b772f5e3..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/ServiceExecutor.java
+++ /dev/null
@@ -1,386 +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
- Annotation[][] outNotes = new Annotation[][] { jmethod
- .getAnnotations() };
- response = TypeHelpersProxy.toErlangAsList(result,
- outNotes);
- } 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) {
- // TODO: check when this exception can occur
- e.printStackTrace();
- }
-
- 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
- Annotation[][] outNotes = new Annotation[][] { jmethod
- .getAnnotations() };
- response = TypeHelpersProxy.toErlangAsList(result,
- outNotes);
- } 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 {
- // unknown/unhandled error
- // TODO: decide what to do with this exception
- e.printStackTrace();
- }
- } catch (Exception e) {
- // FIXME: log this problem? use linking feature? send error?
- e.printStackTrace();
- }
- } 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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/TypeMismatchException.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/TypeMismatchException.java
deleted file mode 100644
index b3562cc413..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/exceptions/ErlangException.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/exceptions/ErlangException.java
deleted file mode 100644
index 587d7a509c..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AnnotatedListTypeHelper.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AnnotatedListTypeHelper.java
deleted file mode 100644
index 154f0c27fc..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AtomTypeHelper.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/AtomTypeHelper.java
deleted file mode 100644
index 94285c66bf..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BinaryTypeHelper.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BinaryTypeHelper.java
deleted file mode 100644
index 7385fe64e4..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BooleanTypeHelper.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/BooleanTypeHelper.java
deleted file mode 100644
index 9463b72eb9..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ByteTypeHelper.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ByteTypeHelper.java
deleted file mode 100644
index c6c8f6690f..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/CharTypeHelper.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/CharTypeHelper.java
deleted file mode 100644
index b0479c9b0c..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/DoubleTypeHelper.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/DoubleTypeHelper.java
deleted file mode 100644
index 92dd4749ac..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/FloatTypeHelper.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/FloatTypeHelper.java
deleted file mode 100644
index 3ee695c3cc..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/IntTypeHelper.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/IntTypeHelper.java
deleted file mode 100644
index 3ee8e7d9ac..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ListTypeHelper.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ListTypeHelper.java
deleted file mode 100644
index 7bb62d4cf8..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/LongTypeHelper.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/LongTypeHelper.java
deleted file mode 100644
index 711057569a..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ShortTypeHelper.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/ShortTypeHelper.java
deleted file mode 100644
index 73a68691a4..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/StringTypeHelper.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/StringTypeHelper.java
deleted file mode 100644
index 001ec47655..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TupleTypeHelper.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TupleTypeHelper.java
deleted file mode 100644
index 64ea57f836..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelper.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelper.java
deleted file mode 100644
index add885ef6e..0000000000
--- a/branches/sca-java-1.5/modules/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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelpersProxy.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelpersProxy.java
deleted file mode 100644
index 380abb852b..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/impl/types/TypeHelpersProxy.java
+++ /dev/null
@@ -1,263 +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) {
- // annotation found, check if it points to array
- // FIXME: check if annotation points to proper type
- // ie. ErlangAtom -> String. If not, then log? exception?
- 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
- * @return
- */
- public static OtpErlangList toErlangAsList(Object array,
- Annotation[][] notes) {
- OtpErlangList result = null;
- if (array != null) {
- List<OtpErlangObject> attrsList = new ArrayList<OtpErlangObject>();
- int i = 0;
- while (true) {
- try {
- // FIXME: if notes.length == 1 then its used to annotate
- // array. Clean up.
- Annotation[] currNotes = null;
- if (notes.length == 1) {
- currNotes = notes[0];
- } else {
- currNotes = 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/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/meta/ErlangAtom.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/java/org/apache/tuscany/sca/binding/erlang/meta/ErlangAtom.java
deleted file mode 100644
index 48037eaa1c..0000000000
--- a/branches/sca-java-1.5/modules/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 {
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index 8e1c659797..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ /dev/null
@@ -1,19 +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.
-
-# Implementation class for the binding extension
-org.apache.tuscany.sca.binding.erlang.impl.ErlangBindingProviderFactory;model=org.apache.tuscany.sca.binding.erlang.ErlangBinding
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/AtomTuple.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/AtomTuple.java
deleted file mode 100644
index f0930295a7..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/AtomTuple.java
+++ /dev/null
@@ -1,30 +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.testing;
-
-import org.apache.tuscany.sca.binding.erlang.meta.ErlangAtom;
-
-public class AtomTuple {
-
- @ErlangAtom
- public String field1;
- public int field2;
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/MboxInterface.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/MboxInterface.java
deleted file mode 100644
index 8f950d54f7..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/MboxInterface.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.testing;
-
-import org.apache.tuscany.sca.binding.erlang.meta.ErlangAtom;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface MboxInterface {
-
- String sendArgs(String arg) throws Exception;
-
- boolean sendArgs(boolean arg) throws Exception;
-
- float sendArgs(float arg) throws Exception;
-
- double sendArgs(double arg) throws Exception;
-
- long sendArgs(long arg) throws Exception;
-
- int sendArgs(int arg) throws Exception;
-
- char sendArgs(char arg) throws Exception;
-
- short sendArgs(short arg) throws Exception;
-
- byte sendArgs(byte arg) throws Exception;
-
- void sendArgs(int arg1, String arg2) throws Exception;
-
- StructuredTuple sendArgs(StructuredTuple arg) throws Exception;
-
- String[] sendArgs(String[] arg) throws Exception;
-
- String[][] sendArgs(String[][] arg);
-
- byte[] sendArgs(byte[] arg);
-
- @ErlangAtom
- String[] sendArgs(@ErlangAtom String arg1, AtomTuple arg2);
-
- @ErlangAtom
- String[][] sendArgs(@ErlangAtom String[][] arg1, int arg2);
-
- void sendArgs();
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/MboxListener.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/MboxListener.java
deleted file mode 100644
index 0cab5c0b0e..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/MboxListener.java
+++ /dev/null
@@ -1,97 +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.testing;
-
-import java.lang.annotation.Annotation;
-
-import org.apache.tuscany.sca.binding.erlang.impl.types.TypeHelpersProxy;
-
-import com.ericsson.otp.erlang.OtpErlangObject;
-import com.ericsson.otp.erlang.OtpErlangPid;
-import com.ericsson.otp.erlang.OtpErlangTuple;
-import com.ericsson.otp.erlang.OtpMbox;
-import com.ericsson.otp.erlang.OtpMsg;
-
-/**
- * @version $Rev$ $Date$
- */
-public class MboxListener implements Runnable {
-
- private OtpMbox mbox;
- private OtpMsg msg;
- private Object response;
- private long duration;
-
- public MboxListener(OtpMbox mbox, Object response) {
- this(mbox, response, 0);
- }
-
- public MboxListener(OtpMbox mbox, Object response, long duration) {
- this.mbox = mbox;
- this.response = response;
- this.duration = duration;
- }
-
- public void run() {
- try {
- msg = mbox.receiveMsg();
- Thread.sleep(duration);
- OtpErlangPid senderPid = null;
- if (response != null) {
- if (msg.getMsg().getClass().equals(OtpErlangTuple.class)
- && ((OtpErlangTuple) msg.getMsg()).elementAt(0)
- .getClass().equals(OtpErlangPid.class)) {
- senderPid = (OtpErlangPid) ((OtpErlangTuple) msg.getMsg())
- .elementAt(0);
- } else {
- senderPid = msg.getSenderPid();
- }
- mbox.send(senderPid, TypeHelpersProxy.toErlang(response,
- new Annotation[0]));
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public OtpErlangObject getMsg() {
- try {
- // Sometimes clients tries to get message which isn't fully
- // received.
- // If so - give it more tries. This sometimes caused
- // NullPointerException in
- // ReferenceServiceTestCase.testMultipleArguments().
- for (int i = 0; i < 3; i++) {
- if (msg != null) {
- return ((OtpErlangTuple) msg.getMsg()).elementAt(1);
- } else {
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- }
- }
- }
- return ((OtpErlangTuple) msg.getMsg()).elementAt(1);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return null;
- }
-}
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ModuleInterface.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ModuleInterface.java
deleted file mode 100644
index 6fc95ac120..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ModuleInterface.java
+++ /dev/null
@@ -1,31 +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.testing;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface ModuleInterface {
-
- String start(String arg1, String arg2) throws Exception;
-
- String start() throws Exception;
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceServiceTestCase.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceServiceTestCase.java
deleted file mode 100644
index 0c80df7a04..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceServiceTestCase.java
+++ /dev/null
@@ -1,897 +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.testing;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.binding.erlang.impl.TypeMismatchException;
-import org.apache.tuscany.sca.binding.erlang.impl.exceptions.ErlangException;
-import org.apache.tuscany.sca.binding.erlang.testing.dynaignore.IgnorableRunner;
-import org.apache.tuscany.sca.binding.erlang.testing.dynaignore.IgnoreTest;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import com.ericsson.otp.erlang.OtpAuthException;
-import com.ericsson.otp.erlang.OtpConnection;
-import com.ericsson.otp.erlang.OtpErlangAtom;
-import com.ericsson.otp.erlang.OtpErlangBinary;
-import com.ericsson.otp.erlang.OtpErlangBoolean;
-import com.ericsson.otp.erlang.OtpErlangDouble;
-import com.ericsson.otp.erlang.OtpErlangInt;
-import com.ericsson.otp.erlang.OtpErlangList;
-import com.ericsson.otp.erlang.OtpErlangLong;
-import com.ericsson.otp.erlang.OtpErlangObject;
-import com.ericsson.otp.erlang.OtpErlangString;
-import com.ericsson.otp.erlang.OtpErlangTuple;
-import com.ericsson.otp.erlang.OtpMbox;
-import com.ericsson.otp.erlang.OtpNode;
-import com.ericsson.otp.erlang.OtpPeer;
-import com.ericsson.otp.erlang.OtpSelf;
-
-/**
- * Test is annotated with test runner, which will ignore tests if epmd is not
- * available
- *
- * @version $Rev$ $Date$
- */
-@RunWith(IgnorableRunner.class)
-public class ReferenceServiceTestCase {
-
- private static final String EPMD_COMMAND = "epmd";
-
- private static MboxInterface mboxReference;
- private static MboxInterface timeoutMboxReference;
- private static ServiceInterface moduleReference;
- private static ServiceInterface cookieModuleReference;
- private static ServiceInterface invalidCookieModuleReference;
- private static ServiceInterface timeoutModuleReference;
- private static OtpNode serNode;
- private static OtpMbox serMbox;
- private static OtpNode refNode;
- private static OtpMbox refMbox;
- private static Process epmdProcess;
-
- @BeforeClass
- public static void init() throws IOException {
- try {
- epmdProcess = Runtime.getRuntime().exec(EPMD_COMMAND);
- SCADomain domain = SCADomain
- .newInstance("ErlangReference.composite");
- SCADomain.newInstance("ErlangService.composite");
- ReferenceTestComponentImpl component = domain.getService(
- ReferenceTestComponentImpl.class, "ReferenceTest");
-
- mboxReference = component.getMboxReference();
- timeoutMboxReference = component.getTimeoutMboxReference();
- moduleReference = component.getModuleReference();
- cookieModuleReference = component.getCookieModuleReference();
- invalidCookieModuleReference = component
- .getInvalidCookieModuleReference();
- timeoutModuleReference = component.getTimeoutModuleReference();
-
- serNode = new OtpNode("MboxServer");
- serMbox = serNode.createMbox("sendArgs");
- refNode = new OtpNode("MboxClient");
- refMbox = refNode.createMbox("connector_to_SCA_mbox");
- } catch (IOException e) {
- System.out.println("Problem executing " + EPMD_COMMAND + ": "
- + e.getLocalizedMessage() + ". Tests will be IGNORED.");
- }
- }
-
- @AfterClass
- public static void clean() {
- if (epmdProcess != null) {
- epmdProcess.destroy();
- }
- }
-
- @Before
- public void before() {
- if (epmdProcess == null) {
- throw new IgnoreTest();
- }
- }
-
- /**
- * Tests passing strings
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testStrings() throws Exception {
- String strArg = "Test message";
- String strResult = "OK";
- MboxListener mboxListener = new MboxListener(serMbox, strResult);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- String testResult = mboxReference.sendArgs(strArg);
- assertEquals(strArg, ((OtpErlangString) mboxListener.getMsg())
- .stringValue());
- assertEquals(strResult, testResult);
- }
-
- /**
- * Tests passing booleans
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testBooleans() throws Exception {
- boolean booleanArg = true;
- boolean booleanResult = false;
- MboxListener mboxListener = new MboxListener(serMbox, booleanResult);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- boolean testResult = mboxReference.sendArgs(booleanArg);
- assertEquals(booleanArg, ((OtpErlangAtom) mboxListener.getMsg())
- .booleanValue());
- assertEquals(booleanResult, testResult);
- }
-
- /**
- * Tests passing floats
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testFloats() throws Exception {
- float floatArg = 1.0f;
- float floatResult = 2.0f;
- MboxListener mboxListener = new MboxListener(serMbox, floatResult);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- float testResult = mboxReference.sendArgs(floatArg);
- assertEquals(floatArg, ((OtpErlangDouble) mboxListener.getMsg())
- .doubleValue(), 0);
- assertEquals(floatResult, testResult, 0);
- }
-
- /**
- * Tests passing doubles
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testDoubles() throws Exception {
- double doubleArg = 1.0f;
- double doubleResult = 2.0f;
- MboxListener mboxListener = new MboxListener(serMbox, doubleResult);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- double testResult = mboxReference.sendArgs(doubleArg);
- assertEquals(doubleArg, ((OtpErlangDouble) mboxListener.getMsg())
- .doubleValue(), 0);
- assertEquals(doubleResult, testResult, 0);
- }
-
- /**
- * Tests passing long values
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testLongs() throws Exception {
- long longArg = 1;
- long longResult = 2;
- MboxListener mboxListener = new MboxListener(serMbox, longResult);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- long testResult = mboxReference.sendArgs(longArg);
- assertEquals(longArg, ((OtpErlangLong) mboxListener.getMsg())
- .longValue(), 0);
- assertEquals(longResult, testResult, 0);
- }
-
- /**
- * Tests passing integers
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testInts() throws Exception {
- int intArg = 1;
- int intResult = 2;
- MboxListener mboxListener = new MboxListener(serMbox, intResult);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- int testResult = mboxReference.sendArgs(intArg);
- assertEquals(intArg,
- ((OtpErlangLong) mboxListener.getMsg()).intValue(), 0);
- assertEquals(intResult, testResult, 0);
- }
-
- /**
- * Tests passing chars
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testChars() throws Exception {
- char charArg = 1;
- char charResult = 2;
- MboxListener mboxListener = new MboxListener(serMbox, charResult);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- char testResult = mboxReference.sendArgs(charArg);
- assertEquals(charArg, ((OtpErlangLong) mboxListener.getMsg())
- .charValue(), 0);
- assertEquals(charResult, testResult, 0);
- }
-
- /**
- * Tests passing shorts
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testShorts() throws Exception {
- short shortArg = 1;
- short shortResult = 2;
- MboxListener mboxListener = new MboxListener(serMbox, shortResult);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- short testResult = mboxReference.sendArgs(shortArg);
- assertEquals(shortArg, ((OtpErlangLong) mboxListener.getMsg())
- .shortValue(), 0);
- assertEquals(shortResult, testResult, 0);
- }
-
- /**
- * Tests passing bytes
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testBytes() throws Exception {
- byte byteArg = 1;
- byte byteResult = 2;
- MboxListener mboxListener = new MboxListener(serMbox, byteResult);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- byte testResult = mboxReference.sendArgs(byteArg);
- assertEquals(byteArg, ((OtpErlangLong) mboxListener.getMsg())
- .byteValue(), 0);
- assertEquals(byteResult, testResult, 0);
- }
-
- /**
- * Tests passing multiple arguments
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testMultipleArguments() throws Exception {
- MboxListener mboxListener = new MboxListener(serMbox, true);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- String testString = "TupleString";
- int testInt = 10;
- mboxReference.sendArgs(testInt, testString);
- // FIXME:
- // without following sleep an exception occurs:
- // com.ericsson.otp.erlang.OtpErlangDecodeException: Cannot read from
- // input stream
- Thread.sleep(100);
- assertEquals(testInt, ((OtpErlangLong) ((OtpErlangTuple) mboxListener
- .getMsg()).elementAt(0)).longValue());
- assertEquals(testString,
- ((OtpErlangString) ((OtpErlangTuple) mboxListener.getMsg())
- .elementAt(1)).stringValue());
- }
-
- /**
- * Tests passing tuples
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testTuples() throws Exception {
- StructuredTuple tupleResult = new StructuredTuple();
- tupleResult.arg1.arg1 = 1;
- tupleResult.arg1.arg2 = "Tuple inside tuple";
- tupleResult.arg2 = "Tuple!";
- tupleResult.arg3 = true;
- MboxListener mboxListener = new MboxListener(serMbox, tupleResult);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- StructuredTuple testArg = new StructuredTuple();
- testArg.arg2 = "Arg2a";
- testArg.arg3 = true;
- testArg.arg1.arg1 = 10;
- testArg.arg1.arg2 = "Arg2b";
- StructuredTuple testResult = mboxReference.sendArgs(testArg);
- assertEquals(tupleResult, testResult);
- OtpErlangTuple received = (OtpErlangTuple) mboxListener.getMsg();
- assertEquals(testArg.arg1.arg1,
- ((OtpErlangLong) ((OtpErlangTuple) received.elementAt(0))
- .elementAt(0)).longValue());
- assertEquals(testArg.arg1.arg2,
- ((OtpErlangString) ((OtpErlangTuple) received.elementAt(0))
- .elementAt(1)).stringValue());
- assertEquals(testArg.arg2, ((OtpErlangString) received.elementAt(1))
- .stringValue());
- assertEquals(testArg.arg3, ((OtpErlangAtom) received.elementAt(2))
- .booleanValue());
- }
-
- /**
- * Test passing Erlang binaries
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testBinaries() throws Exception {
- byte[] testArg = { 0, 1 };
- MboxListener mboxListener = new MboxListener(serMbox, testArg);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- byte[] testResult = mboxReference.sendArgs(testArg);
- assertEquals(testArg.length, testResult.length);
- for (int i = 0; i < testArg.length; i++) {
- assertEquals(testArg[i], testResult[i]);
- }
- OtpErlangBinary received = (OtpErlangBinary) mboxListener.getMsg();
- assertEquals(testArg.length, received.size());
- for (int i = 0; i < testArg.length; i++) {
- assertEquals(testArg[i], received.binaryValue()[i]);
- }
- }
-
- /**
- * Tests passing lists
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testLists() throws Exception {
- String[] testArg = new String[] { "One", "Two", "Three" };
- MboxListener mboxListener = new MboxListener(serMbox, testArg);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- String[] testResult = mboxReference.sendArgs(testArg);
- assertEquals(testArg.length, testResult.length);
- for (int i = 0; i < testArg.length; i++) {
- assertEquals(testArg[i], testResult[i]);
- }
- OtpErlangList received = (OtpErlangList) mboxListener.getMsg();
- assertEquals(testArg.length, received.arity());
- for (int i = 0; i < testArg.length; i++) {
- assertEquals(testArg[i], ((OtpErlangString) received.elementAt(i))
- .stringValue());
- }
- }
-
- /**
- * Tests passing multidimensional lists
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testMultiDimLists() throws Exception {
- String[][] testArg = new String[][] { { "One", "Two" },
- { "Three", "Four", "Five" }, { "Six" } };
- MboxListener mboxListener = new MboxListener(serMbox, testArg);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- String[][] testResult = mboxReference.sendArgs(testArg);
- assertEquals(testArg.length, testResult.length);
- for (int i = 0; i < testArg.length; i++) {
- for (int j = 0; j < testArg[i].length; j++) {
- assertEquals(testArg[i][j], testResult[i][j]);
- }
- }
- OtpErlangList received = (OtpErlangList) mboxListener.getMsg();
- assertEquals(testArg.length, received.arity());
- for (int i = 0; i < testArg.length; i++) {
- for (int j = 0; j < testArg[i].length; j++) {
- assertEquals(testArg[i][j],
- (((OtpErlangString) ((OtpErlangList) received
- .elementAt(i)).elementAt(j)).stringValue()));
- }
- }
- }
-
- /**
- * Tests passing Erlang atoms. It provides cases for annotating result
- * types, parameters and fields in java classes - tuples.
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testAtoms() throws Exception {
- AtomTuple arg2 = new AtomTuple();
- arg2.field1 = "test";
- String arg1 = "First arg";
- String[] strResult = { "Hello", "World" };
- MboxListener mboxListener = new MboxListener(serMbox, strResult);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- String[] testResult = mboxReference.sendArgs(arg1, arg2);
- assertEquals(strResult[0], testResult[0]);
- assertEquals(strResult[1], testResult[1]);
-
- assertEquals(arg1, ((OtpErlangAtom) ((OtpErlangTuple) mboxListener
- .getMsg()).elementAt(0)).atomValue());
-
- assertEquals(
- arg2.field1,
- ((OtpErlangAtom) ((OtpErlangTuple) ((OtpErlangTuple) mboxListener
- .getMsg()).elementAt(1)).elementAt(0)).atomValue());
-
- // test multi dimensional arrays
- String[][] arg = { { "this", "is" }, { "a" }, { "test" } };
- mboxListener = new MboxListener(serMbox, arg);
- mboxThread = new Thread(mboxListener);
- mboxThread.start();
- String[][] multiDimRes = mboxReference.sendArgs(arg, 1);
- for (int i = 0; i < arg.length; i++) {
- for (int j = 0; j < arg[i].length; j++) {
- assertEquals(arg[i][j], multiDimRes[i][j]);
- assertEquals(
- arg[i][j],
- ((OtpErlangAtom) ((OtpErlangList) ((OtpErlangList) ((OtpErlangTuple) mboxListener
- .getMsg()).elementAt(0)).elementAt(i))
- .elementAt(j)).atomValue());
- }
- }
-
- }
-
- /**
- * Tests mismatched interface
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void typeMismatch() throws Exception {
- try {
- StructuredTuple arg = new StructuredTuple();
- MboxListener mboxListener = new MboxListener(serMbox, true);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- mboxReference.sendArgs(arg);
- } catch (Exception e) {
- assertEquals(TypeMismatchException.class, e.getClass());
- System.out.println(e.getMessage());
- }
-
- try {
- String[] arg = new String[] { "test" };
- MboxListener mboxListener = new MboxListener(serMbox, true);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- mboxReference.sendArgs(arg);
- } catch (Exception e) {
- assertEquals(TypeMismatchException.class, e.getClass());
- System.out.println(e.getMessage());
- }
-
- try {
- long arg = 1;
- MboxListener mboxListener = new MboxListener(serMbox, true);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- mboxReference.sendArgs(arg);
- } catch (Exception e) {
- assertEquals(TypeMismatchException.class, e.getClass());
- System.out.println(e.getMessage());
- }
-
- try {
- int arg = 1;
- MboxListener mboxListener = new MboxListener(serMbox, true);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- mboxReference.sendArgs(arg);
- } catch (Exception e) {
- assertEquals(TypeMismatchException.class, e.getClass());
- System.out.println(e.getMessage());
- }
-
- try {
- short arg = 1;
- MboxListener mboxListener = new MboxListener(serMbox, true);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- mboxReference.sendArgs(arg);
- } catch (Exception e) {
- assertEquals(TypeMismatchException.class, e.getClass());
- System.out.println(e.getMessage());
- }
-
- try {
- char arg = 1;
- MboxListener mboxListener = new MboxListener(serMbox, true);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- mboxReference.sendArgs(arg);
- } catch (Exception e) {
- assertEquals(TypeMismatchException.class, e.getClass());
- System.out.println(e.getMessage());
- }
-
- try {
- byte arg = 1;
- MboxListener mboxListener = new MboxListener(serMbox, true);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- mboxReference.sendArgs(arg);
- } catch (Exception e) {
- assertEquals(TypeMismatchException.class, e.getClass());
- System.out.println(e.getMessage());
- }
-
- try {
- double arg = 1;
- MboxListener mboxListener = new MboxListener(serMbox, true);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- mboxReference.sendArgs(arg);
- } catch (Exception e) {
- assertEquals(TypeMismatchException.class, e.getClass());
- System.out.println(e.getMessage());
- }
-
- try {
- float arg = 1;
- MboxListener mboxListener = new MboxListener(serMbox, true);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- mboxReference.sendArgs(arg);
- } catch (Exception e) {
- assertEquals(TypeMismatchException.class, e.getClass());
- System.out.println(e.getMessage());
- }
-
- try {
- String arg = "1";
- MboxListener mboxListener = new MboxListener(serMbox, true);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- mboxReference.sendArgs(arg);
- } catch (Exception e) {
- assertEquals(TypeMismatchException.class, e.getClass());
- System.out.println(e.getMessage());
- }
-
- try {
- boolean arg = true;
- MboxListener mboxListener = new MboxListener(serMbox, 1);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- mboxReference.sendArgs(arg);
- } catch (Exception e) {
- assertEquals(TypeMismatchException.class, e.getClass());
- System.out.println(e.getMessage());
- }
- }
-
- /**
- * Basic RPC test, without arguments
- *
- * @throws Exception
- */
- @Test(timeout = 10000000)
- public void testRPC() throws Exception {
- String[] result = moduleReference.sayHellos();
- assertEquals(2, result.length);
- assertEquals("1", result[0]);
- assertEquals("2", result[1]);
- }
-
- /**
- * Tests RPC with arguments
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testRPCWithArgs() throws Exception {
- String arg1 = "One";
- String arg2 = "Two";
- String testResult = moduleReference.sayHello(arg1, arg2);
- assertEquals("Hello " + arg1 + " " + arg2, testResult);
- }
-
- /**
- * Tests RPC with structured arguments
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testRPCWithComplexArgs() throws Exception {
- StructuredTuple arg = new StructuredTuple();
- arg.arg1.arg2 = "Not empty";
- arg.arg2 = "Not empty";
- StructuredTuple testResult = moduleReference.passComplexArgs(arg,
- new String[] { "some", "array" });
- assertEquals(arg, testResult);
- }
-
- /**
- * Tests RPC with no result
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testRPCWithVoidResult() throws Exception {
- moduleReference.doNothing();
- }
-
- /**
- * Tests handling requests pointing to unknown functions
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testUnknownFunction() throws Exception {
-
- // following functions differs by parameters
-
- try {
- moduleReference.sayHello();
- } catch (Exception e) {
- assertEquals(ErlangException.class, e.getClass());
- }
-
- try {
- moduleReference.sayHello("1");
- } catch (Exception e) {
- assertEquals(ErlangException.class, e.getClass());
- }
-
- try {
- moduleReference.sayHello(1, 2);
- } catch (Exception e) {
- assertEquals(ErlangException.class, e.getClass());
- }
-
- // for following ones name not exists
-
- moduleReference.notExist();
-
- try {
- moduleReference.notExistWithException();
- } catch (Exception e) {
- assertEquals(ErlangException.class, e.getClass());
- }
- }
-
- /**
- * Tests mbox with retrieving and answering with basic arguments
- *
- * @throws Exception
- */
- @Test(timeout = 2000)
- public void testMbox() throws Exception {
- OtpErlangObject[] args = new OtpErlangObject[2];
- args[0] = new OtpErlangString("world");
- args[1] = new OtpErlangString("!");
- OtpErlangTuple tuple = new OtpErlangTuple(args);
- OtpErlangObject[] argsWithSender = new OtpErlangObject[2];
- argsWithSender[0] = refMbox.self();
- argsWithSender[1] = tuple;
- refMbox.send("sayHello", "RPCServerMbox", new OtpErlangTuple(
- argsWithSender));
- OtpErlangString result = (OtpErlangString) refMbox.receiveMsg()
- .getMsg();
- assertEquals("Hello world !", result.stringValue());
- }
-
- /**
- * Tests receiving reply without sending self PID
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testMsgWithoutPid() throws Exception {
- OtpErlangObject[] args = new OtpErlangObject[2];
- args[0] = new OtpErlangString("world");
- args[1] = new OtpErlangString("!");
- refMbox.send("sayHello", "RPCServerMbox", new OtpErlangTuple(args));
- OtpErlangString result = (OtpErlangString) refMbox.receiveMsg()
- .getMsg();
- assertEquals("Hello world !", result.stringValue());
- }
-
- /**
- * Tests service mbox receiving complex message
- *
- * @throws Exception
- */
- @Test(timeout = 2000)
- public void testMboxWithComplexArgs() throws Exception {
- int arg1 = 1;
- String arg2 = "arg2";
- String arg3 = "arg3";
- boolean arg4 = true;
-
- OtpErlangObject[] smallTupleContent = new OtpErlangObject[2];
- smallTupleContent[0] = new OtpErlangInt(arg1);
- smallTupleContent[1] = new OtpErlangString(arg2);
- OtpErlangTuple smallTuple = new OtpErlangTuple(smallTupleContent);
- OtpErlangObject[] structuredTupleContent = new OtpErlangObject[3];
- structuredTupleContent[0] = smallTuple;
- structuredTupleContent[1] = new OtpErlangString(arg3);
- structuredTupleContent[2] = new OtpErlangBoolean(arg4);
- OtpErlangTuple structuredTuple = new OtpErlangTuple(
- structuredTupleContent);
- OtpErlangObject[] secondArg = new OtpErlangObject[2];
- secondArg[0] = new OtpErlangString("in");
- secondArg[1] = new OtpErlangString("array");
- OtpErlangList list = new OtpErlangList(secondArg);
- OtpErlangObject[] argsContent = new OtpErlangObject[2];
- argsContent[0] = structuredTuple;
- argsContent[1] = list;
- OtpErlangTuple args = new OtpErlangTuple(argsContent);
- OtpErlangObject[] withSender = new OtpErlangObject[2];
- withSender[0] = refMbox.self();
- withSender[1] = args;
- refMbox.send("passComplexArgs", "RPCServerMbox", new OtpErlangTuple(
- withSender));
- OtpErlangObject result = refMbox.receiveMsg().getMsg();
- assertEquals(arg1,
- ((OtpErlangLong) ((OtpErlangTuple) ((OtpErlangTuple) result)
- .elementAt(0)).elementAt(0)).intValue());
- assertEquals(arg2,
- ((OtpErlangString) ((OtpErlangTuple) ((OtpErlangTuple) result)
- .elementAt(0)).elementAt(1)).stringValue());
- assertEquals(arg3, ((OtpErlangString) ((OtpErlangTuple) result)
- .elementAt(1)).stringValue());
- assertEquals(arg4, ((OtpErlangAtom) ((OtpErlangTuple) result)
- .elementAt(2)).booleanValue());
- }
-
- /**
- * Tests timeout feature for reference binding messaging
- *
- * @throws Exception
- */
- @Test(timeout = 4000)
- public void testMboxReferenceTimeouts() throws Exception {
- long timeBiggerThanTimeout = 1000;
- String stringResult = "result";
-
- // doing test for response time bigger than declared timeout (500)
- MboxListener mboxListener = new MboxListener(serMbox, stringResult,
- timeBiggerThanTimeout);
- Thread mboxThread = new Thread(mboxListener);
- mboxThread.start();
- try {
- // timeout exception expected
- timeoutMboxReference.sendArgs("");
- fail("Exception expected");
- } catch (Exception e) {
- assertEquals(ErlangException.class, e.getClass());
- assertEquals(e.getCause().getClass(), InterruptedException.class);
- }
-
- // doing test for response time smaller than declared timeout (500)
- mboxListener = new MboxListener(serMbox, stringResult, 0);
- mboxThread = new Thread(mboxListener);
- mboxThread.start();
- // expecting no timeout exception
- String testResult = timeoutMboxReference.sendArgs("");
- assertEquals(stringResult, testResult);
-
- // doing test for response time which will cause timeout. This time
- // there is no declared exception in users operation so we expect no
- // exception and null result
- mboxListener = new MboxListener(serMbox, new byte[1],
- timeBiggerThanTimeout);
- mboxThread = new Thread(mboxListener);
- mboxThread.start();
- // expecting no timeout exception
- byte[] result = timeoutMboxReference.sendArgs(new byte[1]);
- assertEquals(null, result);
- }
-
- /**
- * Tests timeout feature for reference binding RPC
- *
- * @throws Exception
- */
- @Test(timeout = 4000)
- public void testRpcReferenceTimeouts() throws Exception {
-
- // doing test for response time which will cause timeout. Method does
- // not
- // declare exception so only null value will be returned
- String result1 = timeoutModuleReference.sayHello("hello", "world");
- assertEquals(null, result1);
-
- // doing test for response time which will cause timeout. Method declare
- // exception, so expecting one
- try {
- timeoutModuleReference.sayHellos();
- fail("Exception expected");
- } catch (Exception e) {
- assertEquals(ErlangException.class, e.getClass());
- }
-
- // doing test for response time shorter than timeout
- timeoutModuleReference.doNothing();
- }
-
- /**
- * Tests timeout feature for service side bindings
- *
- * @throws Exception
- */
- @Test(timeout = 4000)
- public void testServiceTimeouts() throws Exception {
- OtpSelf self = new OtpSelf("tmp_connector_"
- + System.currentTimeMillis());
- OtpPeer peer = new OtpPeer("RPCServerTimeout");
- OtpConnection connection = self.connect(peer);
- // delay message sending after connecting
- Thread.sleep(1000);
- // service binding timeout set to 500 so after that time it will give up
- // and close connection
- try {
- connection.send("rex", new OtpErlangString("test"));
- fail("Exception expected");
- } catch (Exception e) {
- assertEquals(IOException.class, e.getClass());
- }
-
- connection = self.connect(peer);
- // sending message immediately and encountering no connection close
- connection.send("rex", new OtpErlangString("test"));
-
- }
-
- /**
- * Tests cookie feature for both reference and service bindings RPC
- *
- * @throws Exception
- */
- @Test(timeout = 1000)
- public void testReferenceCookies() throws Exception {
- // testing wrong cookie
- try {
- invalidCookieModuleReference.sayHellos();
- fail("Exception expected");
- } catch (Exception e) {
- assertEquals(ErlangException.class, e.getClass());
- assertEquals(OtpAuthException.class, e.getCause().getClass());
- }
-
- // testing correct cookie
- cookieModuleReference.sayHellos();
- }
-
- @Test(timeout = 1000)
- @Ignore("Nothing to test yet")
- public void testMboxNoArgs() throws Exception {
- // FIXME: decide what to do while invoking mbox reference with no params
- // exception? log?
- mboxReference.sendArgs();
- }
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceTestComponent.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceTestComponent.java
deleted file mode 100644
index be43820b0b..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceTestComponent.java
+++ /dev/null
@@ -1,27 +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.testing;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface ReferenceTestComponent {
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceTestComponentImpl.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceTestComponentImpl.java
deleted file mode 100644
index 7bcc378b78..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ReferenceTestComponentImpl.java
+++ /dev/null
@@ -1,110 +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.testing;
-
-import org.osoa.sca.annotations.Reference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ReferenceTestComponentImpl implements ReferenceTestComponent {
-
- private MboxInterface mboxReference;
- private MboxInterface timeoutMboxReference;
- private MboxInterface cookieMboxReference;
- private ServiceInterface moduleReference;
- private ServiceInterface cookieModuleReference;
- private ServiceInterface invalidCookieModuleReference;
- private ServiceInterface timeoutModuleReference;
- private ServiceInterface clonedModuleReference;
-
- @Reference
- public void setMboxReference(MboxInterface mboxReference) {
- this.mboxReference = mboxReference;
- }
-
- @Reference
- public void setTimeoutMboxReference(MboxInterface timeoutMboxReference) {
- this.timeoutMboxReference = timeoutMboxReference;
- }
-
- @Reference
- public void setCookieMboxReference(MboxInterface cookieMboxReference) {
- this.cookieMboxReference = cookieMboxReference;
- }
-
- @Reference
- public void setModuleReference(ServiceInterface timeoutModuleReference) {
- this.moduleReference = timeoutModuleReference;
- }
-
- @Reference
- public void setCookieModuleReference(ServiceInterface cookieModuleReference) {
- this.cookieModuleReference = cookieModuleReference;
- }
-
- @Reference
- public void setInvalidCookieModuleReference(ServiceInterface invalidCookieModuleReference) {
- this.invalidCookieModuleReference = invalidCookieModuleReference;
- }
-
- @Reference
- public void setTimeoutModuleReference(ServiceInterface timeoutModuleReference) {
- this.timeoutModuleReference = timeoutModuleReference;
- }
-
- @Reference
- public void setClonedModuleReference(ServiceInterface clonedModuleReference) {
- this.clonedModuleReference = clonedModuleReference;
- }
-
- public MboxInterface getMboxReference() {
- return mboxReference;
- }
-
- public MboxInterface getTimeoutMboxReference() {
- return timeoutMboxReference;
- }
-
- public MboxInterface getCookieMboxReference() {
- return cookieMboxReference;
- }
-
- public ServiceInterface getModuleReference() {
- return moduleReference;
- }
-
- public ServiceInterface getCookieModuleReference() {
- return cookieModuleReference;
- }
-
- public ServiceInterface getInvalidCookieModuleReference() {
- return invalidCookieModuleReference;
- }
-
- public ServiceInterface getTimeoutModuleReference() {
- return timeoutModuleReference;
- }
-
- public ServiceInterface getClonedModuleReference() {
- return clonedModuleReference;
- }
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceInterface.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceInterface.java
deleted file mode 100644
index 76ff3fdbe0..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceInterface.java
+++ /dev/null
@@ -1,45 +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.testing;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface ServiceInterface {
-
- void doNothing();
-
- String sayHello(String arg1, String arg2);
-
- String[] sayHellos() throws Exception;
-
- StructuredTuple passComplexArgs(StructuredTuple arg1, String[] arg2);
-
- String sayHello() throws Exception;
-
- String sayHello(String arg) throws Exception;
-
- String sayHello(int arg1, int arg2);
-
- void notExistWithException() throws Exception;
-
- void notExist();
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponent.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponent.java
deleted file mode 100644
index 60650188bc..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponent.java
+++ /dev/null
@@ -1,35 +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.testing;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface ServiceTestComponent {
-
- String sayHello(String arg1, String arg2);
-
- String[] sayHellos() throws Exception;
-
- StructuredTuple passComplexArgs(StructuredTuple arg1, String[] arg2);
-
- void doNothing();
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImpl.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImpl.java
deleted file mode 100644
index 551ad3d063..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImpl.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.testing;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ServiceTestComponentImpl implements ServiceTestComponent {
-
- public String sayHello(String arg1, String arg2) {
- return "Hello " + arg1 + " " + arg2;
- }
-
- public String[] sayHellos() {
- String[] result = new String[] { "1", "2" };
- return result;
- }
-
- public StructuredTuple passComplexArgs(StructuredTuple arg1, String[] arg2) {
- return arg1;
- }
-
- public void doNothing() {
- // doing nothing
- }
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImplClone.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImplClone.java
deleted file mode 100644
index b59662551c..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImplClone.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.testing;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ServiceTestComponentImplClone implements ServiceTestComponent {
-
- public String sayHello(String arg1, String arg2) {
- return "Bye " + arg1 + " " + arg2;
- }
-
- public String[] sayHellos() {
- String[] result = new String[] { "-1", "-2" };
- return result;
- }
-
- public StructuredTuple passComplexArgs(StructuredTuple arg1, String[] arg2) {
- return arg1;
- }
-
- public void doNothing() {
-
- }
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImplTimeout.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImplTimeout.java
deleted file mode 100644
index bcf454837e..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/ServiceTestComponentImplTimeout.java
+++ /dev/null
@@ -1,61 +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.testing;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ServiceTestComponentImplTimeout implements ServiceTestComponent {
-
- private long duration = 1000;
-
- public String sayHello(String arg1, String arg2) {
- try {
- Thread.sleep(duration);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- return "Bye " + arg1 + " " + arg2;
- }
-
- public String[] sayHellos() {
- try {
- Thread.sleep(duration);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- String[] result = new String[] { "-1", "-2" };
- return result;
- }
-
- public StructuredTuple passComplexArgs(StructuredTuple arg1, String[] arg2) {
- try {
- Thread.sleep(duration);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- return arg1;
- }
-
- public void doNothing() {
-
- }
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/SmallTuple.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/SmallTuple.java
deleted file mode 100644
index ac8b9e426a..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/SmallTuple.java
+++ /dev/null
@@ -1,35 +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.testing;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SmallTuple {
-
- public int arg1;
- public String arg2 = "";
-
- public boolean equals(Object o) {
- SmallTuple comp = (SmallTuple) o;
- return arg1 == comp.arg1 && arg2.equals(arg2);
- }
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/StructuredTuple.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/StructuredTuple.java
deleted file mode 100644
index 193654172f..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/StructuredTuple.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.testing;
-
-/**
- * @version $Rev$ $Date$
- */
-public class StructuredTuple {
-
- public SmallTuple arg1 = new SmallTuple();
- public String arg2 = "";
- public boolean arg3;
-
- public boolean equals(Object o) {
- StructuredTuple comp = (StructuredTuple) o;
- return arg2.equals(comp.arg2) && arg3 == comp.arg3
- && arg1.equals(comp.arg1);
- }
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/dynaignore/IgnorableRunner.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/dynaignore/IgnorableRunner.java
deleted file mode 100644
index 33e6d4862b..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/dynaignore/IgnorableRunner.java
+++ /dev/null
@@ -1,139 +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.testing.dynaignore;
-
-import org.junit.runner.Description;
-import org.junit.runner.Result;
-import org.junit.runner.Runner;
-import org.junit.runner.notification.Failure;
-import org.junit.runner.notification.RunListener;
-import org.junit.runner.notification.RunNotifier;
-import org.junit.runner.notification.StoppedByUserException;
-import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.model.InitializationError;
-
-/**
- * @version $Rev$ $Date$
- */
-public class IgnorableRunner extends Runner {
-
- private static final class Notifier extends RunNotifier {
- private final RunNotifier notifier;
-
- public Notifier(final RunNotifier notifier) {
- this.notifier = notifier;
- }
-
- public void addFirstListener(final RunListener listener) {
- notifier.addFirstListener(listener);
- }
-
- public void addListener(final RunListener listener) {
- notifier.addListener(listener);
- }
-
- @Override
- public boolean equals(final Object obj) {
- return notifier.equals(obj);
- }
-
- @Override
- public void fireTestFailure(final Failure failure) {
- if (failure.getException().getClass() == IgnoreTest.class) {
- notifier.fireTestIgnored(failure.getDescription());
- } else {
- notifier.fireTestFailure(failure);
- }
- }
-
- @Override
- public void fireTestFinished(final Description description) {
- notifier.fireTestFinished(description);
- }
-
- @Override
- public void fireTestIgnored(final Description description) {
- notifier.fireTestIgnored(description);
- }
-
- @Override
- public void fireTestRunFinished(final Result result) {
- notifier.fireTestRunFinished(result);
- }
-
- @Override
- public void fireTestRunStarted(final Description description) {
- notifier.fireTestRunStarted(description);
- }
-
- @Override
- public void fireTestStarted(final Description description)
- throws StoppedByUserException {
- notifier.fireTestStarted(description);
- }
-
- @Override
- public int hashCode() {
- return notifier.hashCode();
- }
-
- @Override
- public void pleaseStop() {
- notifier.pleaseStop();
- }
-
- @Override
- public void removeListener(final RunListener listener) {
- notifier.removeListener(listener);
- }
-
- public void testAborted(final Description description,
- final Throwable cause) {
- ((Notifier) notifier).testAborted(description, cause);
- }
-
- @Override
- public String toString() {
- return notifier.toString();
- }
-
- }
-
- Runner runner = null;
-
- public IgnorableRunner(Class<?> testClass) {
- try {
- runner = new BlockJUnit4ClassRunner(testClass);
- } catch (InitializationError e) {
- e.printStackTrace();
- }
- }
-
- @Override
- public Description getDescription() {
- return runner.getDescription();
- }
-
- @Override
- public void run(RunNotifier notifier) {
- runner.run(new Notifier(notifier));
- }
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/dynaignore/IgnoreTest.java b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/dynaignore/IgnoreTest.java
deleted file mode 100644
index 3d736da19d..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/java/org/apache/tuscany/sca/binding/erlang/testing/dynaignore/IgnoreTest.java
+++ /dev/null
@@ -1,29 +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.testing.dynaignore;
-
-/**
- * @version $Rev$ $Date$
- */
-public final class IgnoreTest extends Error {
-
- private static final long serialVersionUID = 1L;
-
-}
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangReference.composite b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangReference.composite
deleted file mode 100644
index aa9d9f973e..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangReference.composite
+++ /dev/null
@@ -1,39 +0,0 @@
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="ErlangReferenceBinding">
-
- <component name="ReferenceTest">
- <implementation.java class="org.apache.tuscany.sca.binding.erlang.testing.ReferenceTestComponentImpl" />
- <reference name="mboxReference">
- <tuscany:binding.erlang node="MboxServer" mbox="true"/>
- </reference>
-
- <reference name="timeoutMboxReference">
- <tuscany:binding.erlang node="MboxServer" mbox="true" timeout="500"/>
- </reference>
-
- <reference name="cookieMboxReference">
- <tuscany:binding.erlang node="MboxServer" mbox="true" cookie="cookie"/>
- </reference>
-
- <reference name="moduleReference">
- <tuscany:binding.erlang node="RPCServer" module="hello"/>
- </reference>
-
- <reference name="cookieModuleReference">
- <tuscany:binding.erlang node="RPCServerCookie" module="hello_cookie" cookie="cookie"/>
- </reference>
-
- <reference name="invalidCookieModuleReference">
- <tuscany:binding.erlang node="RPCServerCookie" module="hello_cookie" cookie="invalid_cookie"/>
- </reference>
-
- <reference name="timeoutModuleReference">
- <tuscany:binding.erlang node="RPCServerTimeout" module="hello_timeout" timeout="500"/>
- </reference>
-
- </component>
-
-</composite> \ No newline at end of file
diff --git a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangService.composite b/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangService.composite
deleted file mode 100644
index 6da602cffd..0000000000
--- a/branches/sca-java-1.5/modules/binding-erlang-runtime/src/test/resources/ErlangService.composite
+++ /dev/null
@@ -1,35 +0,0 @@
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="ErlangServiceBinding">
-
- <component name="ServiceTest">
- <implementation.java class="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponentImpl" />
- </component>
- <service name="ServiceTest" promote="ServiceTest">
- <interface.java interface="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponent" />
- <tuscany:binding.erlang node="RPCServer" module="hello"/>
- </service>
- <service name="ServiceTestMbox" promote="ServiceTest">
- <interface.java interface="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponent" />
- <tuscany:binding.erlang node="RPCServerMbox" mbox="true"/>
- </service>
-
- <component name="ServiceTestTimeout">
- <implementation.java class="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponentImplTimeout" />
- </component>
- <service name="ServiceTestTimeout" promote="ServiceTestTimeout">
- <interface.java interface="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponent" />
- <tuscany:binding.erlang node="RPCServerTimeout" module="hello_timeout" timeout="500"/>
- </service>
-
- <component name="ServiceTestCookie">
- <implementation.java class="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponentImpl" />
- </component>
- <service name="ServiceTestCookie" promote="ServiceTestCookie">
- <interface.java interface="org.apache.tuscany.sca.binding.erlang.testing.ServiceTestComponent" />
- <tuscany:binding.erlang node="RPCServerCookie" module="hello_cookie" cookie="cookie"/>
- </service>
-
-</composite> \ No newline at end of file