From 71b9f42ceb8dcf0c5a510a3a5909211d75bdb145 Mon Sep 17 00:00:00 2001 From: rfeng Date: Tue, 22 Jul 2008 16:01:38 +0000 Subject: Apply the patch from Wojtek for TUSCANY-2469. Thanks. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@678786 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/binding/corba/impl/CorbaInvoker.java | 6 +- .../corba/impl/CorbaReferenceBindingProvider.java | 2 +- .../corba/impl/reference/DynaCorbaRequest.java | 22 ++- .../corba/impl/service/DynaCorbaServant.java | 30 ++- .../binding/corba/impl/types/TypeTreeCreator.java | 36 +++- java/sca/modules/binding-sca-corba/LICENSE | 205 +++++++++++++++++++++ java/sca/modules/binding-sca-corba/NOTICE | 6 + java/sca/modules/binding-sca-corba/pom.xml | 87 +++++++++ .../corba/impl/CorbaSCABindingProviderFactory.java | 62 +++++++ .../impl/CorbaSCAReferenceBindingProvider.java | 90 +++++++++ .../corba/impl/CorbaSCAServiceBindingProvider.java | 75 ++++++++ ...che.tuscany.sca.provider.BindingProviderFactory | 19 ++ java/sca/modules/pom.xml | 1 + 13 files changed, 623 insertions(+), 18 deletions(-) create mode 100644 java/sca/modules/binding-sca-corba/LICENSE create mode 100644 java/sca/modules/binding-sca-corba/NOTICE create mode 100644 java/sca/modules/binding-sca-corba/pom.xml create mode 100644 java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java create mode 100644 java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java create mode 100644 java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java create mode 100644 java/sca/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (limited to 'java/sca/modules') diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java index f1640329e8..58fda9919a 100644 --- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java +++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaInvoker.java @@ -39,11 +39,13 @@ public class CorbaInvoker implements Invoker { private Object remoteObject; private Class referenceClass; private Map operationsMap; + private boolean scaBindingRules; - public CorbaInvoker(Object remoteObject, Class referenceClass, Map operationsMap) { + public CorbaInvoker(Object remoteObject, Class referenceClass, Map operationsMap, boolean scaBindingRules) { this.remoteObject = remoteObject; this.referenceClass = referenceClass; this.operationsMap = operationsMap; + this.scaBindingRules = scaBindingRules; } /** @@ -51,7 +53,7 @@ public class CorbaInvoker implements Invoker { */ public Message invoke(Message msg) { try { - DynaCorbaRequest request = new DynaCorbaRequest(remoteObject, msg.getOperation().getName()); + DynaCorbaRequest request = new DynaCorbaRequest(remoteObject, msg.getOperation().getName(), scaBindingRules); request.setReferenceClass(referenceClass); request.setOperationsMap(operationsMap); if (msg.getOperation().getOutputType() != null) { diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java index 3eb665d599..e04eb290fd 100644 --- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java +++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/CorbaReferenceBindingProvider.java @@ -61,7 +61,7 @@ public class CorbaReferenceBindingProvider implements ReferenceBindingProvider { if (remoteObject == null) { remoteObject = host.lookup(binding.getCorbaname()); } - return new CorbaInvoker(remoteObject, referenceClass, operationsMap); + return new CorbaInvoker(remoteObject, referenceClass, operationsMap, false); } catch (Exception e) { } return null; diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java index f4f82c9b88..dba3dd7b1e 100644 --- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java +++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/reference/DynaCorbaRequest.java @@ -55,14 +55,28 @@ public class DynaCorbaRequest { private List argumentsTypes = new ArrayList(); private Class referenceClass; private Map operationsMap; + private boolean scaBindingRules; + /** + * Creates request with CORBA binding mapping rules in default + * + * @param remoteObject object reference + * @param operation operation to invoke + */ + public DynaCorbaRequest(Object remoteObject, String operation) { + // use CORBA binding rules by default + this(remoteObject, operation, false); + } + /** * Creates request. * * @param ObjectremoteObject remote object reference * @param operation operation to invoke + * @param scaBindingRules apply SCA default binding mapping rules */ - public DynaCorbaRequest(Object remoteObject, String operation) { + public DynaCorbaRequest(Object remoteObject, String operation, boolean scaBindingRules) { + this.scaBindingRules = scaBindingRules; this.remoteObject = (ObjectImpl)remoteObject; this.operation = operation; } @@ -89,7 +103,7 @@ public class DynaCorbaRequest { * @param argument */ public void addArgument(java.lang.Object argument) throws RequestConfigurationException { - TypeTree tree = TypeTreeCreator.createTypeTree(argument.getClass()); + TypeTree tree = TypeTreeCreator.createTypeTree(argument.getClass(), scaBindingRules); argumentsTypes.add(tree); arguments.add(argument); } @@ -113,7 +127,7 @@ public class DynaCorbaRequest { * @param forClass */ public void setOutputType(Class forClass) throws RequestConfigurationException { - returnTree = TypeTreeCreator.createTypeTree(forClass); + returnTree = TypeTreeCreator.createTypeTree(forClass, scaBindingRules); } /** @@ -122,7 +136,7 @@ public class DynaCorbaRequest { * @param forClass */ public void addExceptionType(Class forClass) throws RequestConfigurationException { - TypeTree tree = TypeTreeCreator.createTypeTree(forClass); + TypeTree tree = TypeTreeCreator.createTypeTree(forClass, scaBindingRules); String exceptionId = Utils.getTypeId(forClass); exceptions.put(exceptionId, tree); } diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java index 6c7e2b1238..0d9d33b198 100644 --- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java +++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/service/DynaCorbaServant.java @@ -56,8 +56,30 @@ public class DynaCorbaServant extends ObjectImpl implements InvokeHandler { private Class javaClass; private Map operationsMap; private Map methodOperationMapping; - + private boolean scaBindingRules; + + /** + * Creates servant with CORBA binding mapping rules in default + * + * @param service backed service + * @param binding binding object + * @throws RequestConfigurationException + */ public DynaCorbaServant(RuntimeComponentService service, Binding binding) throws RequestConfigurationException { + // use CORBA binding rules by default + this(service, binding, false); + } + + /** + * Creates servant object + * + * @param service backed service + * @param binding binding object + * @param scaBindingRules apply SCA default binding mapping rules + * @throws RequestConfigurationException + */ + public DynaCorbaServant(RuntimeComponentService service, Binding binding, boolean scaBindingRules) throws RequestConfigurationException { + this.scaBindingRules = scaBindingRules; this.service = service; this.binding = binding; this.javaClass = ((JavaInterface)service.getInterfaceContract().getInterface()).getJavaClass(); @@ -114,14 +136,14 @@ public class DynaCorbaServant extends ObjectImpl implements InvokeHandler { // cache output type tree if (operation.getOutputType() != null && operation.getOutputType().getPhysical() != null && !operation.getOutputType().getPhysical().equals(void.class)) { - TypeTree outputType = TypeTreeCreator.createTypeTree(operation.getOutputType().getPhysical()); + TypeTree outputType = TypeTreeCreator.createTypeTree(operation.getOutputType().getPhysical(), scaBindingRules); operationTypes.setOutputType(outputType); } // cache input types trees if (operation.getInputType() != null) { for (DataType> type : operation.getInputType().getLogical()) { Class forClass = type.getPhysical(); - TypeTree inputType = TypeTreeCreator.createTypeTree(forClass); + TypeTree inputType = TypeTreeCreator.createTypeTree(forClass, scaBindingRules); inputInstances.add(inputType); } @@ -185,7 +207,7 @@ public class DynaCorbaServant extends ObjectImpl implements InvokeHandler { try { OutputStream out = rh.createExceptionReply(); Class exceptionClass = ie.getTargetException().getClass(); - TypeTree tree = TypeTreeCreator.createTypeTree(exceptionClass); + TypeTree tree = TypeTreeCreator.createTypeTree(exceptionClass, scaBindingRules); String exceptionId = Utils.getTypeId(exceptionClass); out.write_string(exceptionId); TypeHelpersProxy.write(tree.getRootNode(), out, ie.getTargetException()); diff --git a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java index 4a24e66778..658993f486 100644 --- a/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java +++ b/java/sca/modules/binding-corba-runtime/src/main/java/org/apache/tuscany/sca/binding/corba/impl/types/TypeTreeCreator.java @@ -142,10 +142,10 @@ public class TypeTreeCreator { * @param forClass * @return type tree */ - public static TypeTree createTypeTree(Class forClass) throws RequestConfigurationException { + public static TypeTree createTypeTree(Class forClass, boolean scaBindingRules) throws RequestConfigurationException { TypeTree tree = new TypeTree(); TypeTreeNode rootNode = null; - rootNode = inspectClassHierarchy(forClass, tree); + rootNode = inspectClassHierarchy(forClass, tree, scaBindingRules); tree.setRootNode(rootNode); return tree; @@ -158,7 +158,7 @@ public class TypeTreeCreator { * @param tree * @return */ - private static TypeTreeNode inspectClassHierarchy(Class forClass, TypeTree tree) + private static TypeTreeNode inspectClassHierarchy(Class forClass, TypeTree tree, boolean scaBindingRules) throws RequestConfigurationException { // //remains of type tree caching // TypeTreeNode existingNode = tree.getNodeForType(forClass); @@ -166,7 +166,13 @@ public class TypeTreeCreator { // return existingNode; // } - TypeTreeNode node = createTypeNode(forClass); + TypeTreeNode node = null; + if (scaBindingRules) { + node = createTypeNode4ScaBinding(forClass); + } else { + node = createTypeNode4CorbaBinding(forClass); + } + NodeType nodeType = node.getNodeType(); TypeTreeNode[] children = null; @@ -182,14 +188,14 @@ public class TypeTreeCreator { // reducing sequence dimension Class reduced = reduceArrayDimension(node.getJavaClass()); children = new TypeTreeNode[1]; - children[0] = inspectClassHierarchy(reduced, tree); + children[0] = inspectClassHierarchy(reduced, tree, scaBindingRules); } else if (nodeType.equals(NodeType.struct) || nodeType.equals(NodeType.exception)) { // inspect types for every structure member Field[] fields = node.getJavaClass().getFields(); children = new TypeTreeNode[fields.length]; for (int i = 0; i < fields.length; i++) { Class field = fields[i].getType(); - TypeTreeNode child = inspectClassHierarchy(field, tree); + TypeTreeNode child = inspectClassHierarchy(field, tree, scaBindingRules); child.setName(fields[i].getName()); children[i] = child; } @@ -213,7 +219,7 @@ public class TypeTreeCreator { * @return node * @throws RequestConfigurationException */ - private static TypeTreeNode createTypeNode(Class forClass) throws RequestConfigurationException { + private static TypeTreeNode createTypeNode4CorbaBinding(Class forClass) throws RequestConfigurationException { TypeTreeNode node = new TypeTreeNode(); if (forClass.isArray()) { node.setNodeType(NodeType.sequence); @@ -243,6 +249,22 @@ public class TypeTreeCreator { } return node; } + + private static TypeTreeNode createTypeNode4ScaBinding(Class forClass) throws RequestConfigurationException { + TypeTreeNode node = new TypeTreeNode(); + if (forClass.isArray()) { + node.setNodeType(NodeType.sequence); + node.setJavaClass(forClass); + } else if (primitives.contains(forClass)) { + node.setNodeType(NodeType.primitive); + node.setJavaClass(forClass); + node.setChildren(null); + } else { + node.setNodeType(NodeType.struct); + node.setJavaClass(forClass); + } + return node; + } /** * Tells whether given class is structure diff --git a/java/sca/modules/binding-sca-corba/LICENSE b/java/sca/modules/binding-sca-corba/LICENSE new file mode 100644 index 0000000000..6e529a25c4 --- /dev/null +++ b/java/sca/modules/binding-sca-corba/LICENSE @@ -0,0 +1,205 @@ + + 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/java/sca/modules/binding-sca-corba/NOTICE b/java/sca/modules/binding-sca-corba/NOTICE new file mode 100644 index 0000000000..1325efd8bf --- /dev/null +++ b/java/sca/modules/binding-sca-corba/NOTICE @@ -0,0 +1,6 @@ +${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/java/sca/modules/binding-sca-corba/pom.xml b/java/sca/modules/binding-sca-corba/pom.xml new file mode 100644 index 0000000000..9ff1ae1003 --- /dev/null +++ b/java/sca/modules/binding-sca-corba/pom.xml @@ -0,0 +1,87 @@ + + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-modules + 1.4-SNAPSHOT + ../pom.xml + + + tuscany-binding-sca-corba + Apache Tuscany SCA CORBA-based Default Binding Extension + + + + + org.apache.tuscany.sca + tuscany-binding-sca + 1.4-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-binding-corba + 1.4-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-binding-corba-runtime + 1.4-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-host-corba + 1.4-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-host-corba-jdk + 1.4-SNAPSHOT + test + + + + + + + + + org.apache.felix + maven-bundle-plugin + + + + ${tuscany.version} + org.apache.tuscany.sca.binding.sca.corba + ${pom.name} + org.apache.tuscany.sca.binding.sca.corba* + + + + + + + diff --git a/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java b/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java new file mode 100644 index 0000000000..a8a9a3d5eb --- /dev/null +++ b/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java @@ -0,0 +1,62 @@ +/* + * 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.sca.corba.impl; + +import org.apache.tuscany.sca.binding.sca.DistributedSCABinding; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.host.corba.CorbaHost; +import org.apache.tuscany.sca.host.corba.CorbaHostExtensionPoint; +import org.apache.tuscany.sca.host.corba.ExtensibleCorbaHost; +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; + +/** + * Binding provider factory for SCA default binding over CORBA binding + */ +public class CorbaSCABindingProviderFactory implements BindingProviderFactory { + + private CorbaHostExtensionPoint chep; + private CorbaHost host; + + public CorbaSCABindingProviderFactory(ExtensionPointRegistry registry) { + chep = registry.getExtensionPoint(CorbaHostExtensionPoint.class); + host = new ExtensibleCorbaHost(chep); + } + + public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component, + RuntimeComponentReference reference, + DistributedSCABinding binding) { + return new CorbaSCAReferenceBindingProvider(binding.getSCABinding(), host, reference); + } + + public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component, + RuntimeComponentService service, + DistributedSCABinding binding) { + return new CorbaSCAServiceBindingProvider(binding.getSCABinding(), host, service); + } + + public Class getModelType() { + return DistributedSCABinding.class; + } +} diff --git a/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java b/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java new file mode 100644 index 0000000000..f20a0b1a02 --- /dev/null +++ b/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java @@ -0,0 +1,90 @@ +/* + * 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.sca.corba.impl; + +import java.lang.reflect.Method; +import java.util.Map; +import java.util.logging.Logger; + +import org.apache.tuscany.sca.assembly.SCABinding; +import org.apache.tuscany.sca.binding.corba.impl.CorbaInvoker; +import org.apache.tuscany.sca.binding.corba.impl.util.OperationMapper; +import org.apache.tuscany.sca.host.corba.CorbaHost; +import org.apache.tuscany.sca.interfacedef.InterfaceContract; +import org.apache.tuscany.sca.interfacedef.Operation; +import org.apache.tuscany.sca.interfacedef.java.JavaInterface; +import org.apache.tuscany.sca.invocation.Invoker; +import org.apache.tuscany.sca.provider.ReferenceBindingProvider; +import org.apache.tuscany.sca.runtime.RuntimeComponentReference; +import org.omg.CORBA.Object; + +/** + * Reference binding provider for SCA default binding over CORBA binding + */ +public class CorbaSCAReferenceBindingProvider implements ReferenceBindingProvider { + + private static final Logger logger = Logger.getLogger(CorbaSCAReferenceBindingProvider.class.getName()); + + private SCABinding binding; + private CorbaHost host; + private RuntimeComponentReference reference; + private Object remoteObject; + private Class referenceClass; + private Map operationsMap = null; + + public CorbaSCAReferenceBindingProvider(SCABinding binding, + CorbaHost host, + RuntimeComponentReference reference) { + this.binding = binding; + this.host = host; + this.reference = reference; + this.referenceClass = ((JavaInterface)reference.getInterfaceContract().getInterface()).getJavaClass(); + operationsMap = OperationMapper.mapMethodToOperation(referenceClass); + } + + public InterfaceContract getBindingInterfaceContract() { + return reference.getInterfaceContract(); + } + + public boolean supportsOneWayInvocation() { + return false; + } + + public Invoker createInvoker(Operation operation) { + try { + if (remoteObject == null) { + remoteObject = host.lookup(binding.getURI()); + } + return new CorbaInvoker(remoteObject, referenceClass, operationsMap, true); + } catch (Exception e) { + logger.warning(e.getMessage()); + } + return null; + } + + public void start() { + + } + + public void stop() { + + } + +} diff --git a/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java b/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java new file mode 100644 index 0000000000..88e785bd42 --- /dev/null +++ b/java/sca/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java @@ -0,0 +1,75 @@ +/* + * 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.sca.corba.impl; + +import org.apache.tuscany.sca.assembly.SCABinding; +import org.apache.tuscany.sca.binding.corba.impl.service.DynaCorbaServant; +import org.apache.tuscany.sca.host.corba.CorbaHost; +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; + +/** + * Service binding provider for SCA default binding over CORBA binding + */ +public class CorbaSCAServiceBindingProvider implements ServiceBindingProvider { + + private SCABinding binding; + private CorbaHost host; + private RuntimeComponentService service; + private DynaCorbaServant servant; + + + public CorbaSCAServiceBindingProvider(SCABinding binding, + CorbaHost host, + RuntimeComponentService service) { + this.binding = binding; + this.host = host; + this.service = service; + } + + public InterfaceContract getBindingInterfaceContract() { + return service.getInterfaceContract(); + } + + public boolean supportsOneWayInvocation() { + return false; + } + + public void start() { + try { + servant = new DynaCorbaServant(service, binding, true); + host.registerServant(binding.getURI(), servant); + } catch (Exception e) { + throw new ServiceRuntimeException(e); + } + } + + public void stop() { + try { + host.unregisterServant(binding.getURI()); + } catch (Exception e) { + throw new ServiceRuntimeException(e); + } + + } + +} diff --git a/java/sca/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/java/sca/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory new file mode 100644 index 0000000000..e07a7cbb95 --- /dev/null +++ b/java/sca/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory @@ -0,0 +1,19 @@ +# 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.sca.corba.impl.CorbaSCABindingProviderFactory;model=org.apache.tuscany.sca.binding.sca.DistributedSCABinding diff --git a/java/sca/modules/pom.xml b/java/sca/modules/pom.xml index d82d2e6881..1a5124bdb7 100644 --- a/java/sca/modules/pom.xml +++ b/java/sca/modules/pom.xml @@ -70,6 +70,7 @@ binding-rss-rome binding-sca binding-sca-axis2 + binding-sca-corba binding-sca-xml binding-ws binding-ws-axis2 -- cgit v1.2.3