From 3d3b8834b93b98cc7d7534e693e937179067eb58 Mon Sep 17 00:00:00 2001 From: antelder Date: Sat, 16 May 2009 08:44:44 +0000 Subject: Delete previous 1.5 branch thats now old and unused and will be replaced with the current 1.x trunk git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@775435 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca-java-1.5/modules/binding-sca-corba/LICENSE | 205 --------------------- .../sca-java-1.5/modules/binding-sca-corba/NOTICE | 6 - .../sca-java-1.5/modules/binding-sca-corba/pom.xml | 114 ------------ .../corba/impl/CorbaSCABindingProviderFactory.java | 64 ------- .../sca/corba/impl/CorbaSCAInvocationProxy.java | 111 ----------- .../binding/sca/corba/impl/CorbaSCAInvoker.java | 99 ---------- .../impl/CorbaSCAReferenceBindingProvider.java | 95 ---------- .../corba/impl/CorbaSCAServiceBindingProvider.java | 97 ---------- .../sca/corba/impl/WrappedSCAException.java | 56 ------ ...che.tuscany.sca.provider.BindingProviderFactory | 19 -- 10 files changed, 866 deletions(-) delete mode 100644 branches/sca-java-1.5/modules/binding-sca-corba/LICENSE delete mode 100644 branches/sca-java-1.5/modules/binding-sca-corba/NOTICE delete mode 100644 branches/sca-java-1.5/modules/binding-sca-corba/pom.xml delete mode 100644 branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java delete mode 100644 branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java delete mode 100644 branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java delete mode 100644 branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java delete mode 100644 branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java delete mode 100644 branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java delete mode 100644 branches/sca-java-1.5/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (limited to 'branches/sca-java-1.5/modules/binding-sca-corba') diff --git a/branches/sca-java-1.5/modules/binding-sca-corba/LICENSE b/branches/sca-java-1.5/modules/binding-sca-corba/LICENSE deleted file mode 100644 index 6e529a25c4..0000000000 --- a/branches/sca-java-1.5/modules/binding-sca-corba/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-sca-corba/NOTICE b/branches/sca-java-1.5/modules/binding-sca-corba/NOTICE deleted file mode 100644 index 1325efd8bf..0000000000 --- a/branches/sca-java-1.5/modules/binding-sca-corba/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-sca-corba/pom.xml b/branches/sca-java-1.5/modules/binding-sca-corba/pom.xml deleted file mode 100644 index 6198aad015..0000000000 --- a/branches/sca-java-1.5/modules/binding-sca-corba/pom.xml +++ /dev/null @@ -1,114 +0,0 @@ - - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-modules - 1.5-SNAPSHOT - ../pom.xml - - - tuscany-binding-sca-corba - - Apache Tuscany SCA CORBA-based Default Binding Extension - - - - - - org.apache.tuscany.sca - tuscany-binding-sca - 1.5-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-binding-corba - 1.5-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-binding-corba-runtime - 1.5-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-host-corba - 1.5-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-host-corba-jse - 1.5-SNAPSHOT - test - - - - org.apache.tuscany.sca - tuscany-interface-wsdl - 1.5-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-databinding-axiom - 1.5-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-binding-ws-wsdlgen - 1.5-SNAPSHOT - - - - - - - - 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/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java b/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java deleted file mode 100644 index 2eee714de6..0000000000 --- a/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCABindingProviderFactory.java +++ /dev/null @@ -1,64 +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.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; - private ExtensionPointRegistry extensions; - - public CorbaSCABindingProviderFactory(ExtensionPointRegistry extensions) { - this.extensions = extensions; - chep = extensions.getExtensionPoint(CorbaHostExtensionPoint.class); - host = new ExtensibleCorbaHost(chep); - } - - public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component, - RuntimeComponentReference reference, - DistributedSCABinding binding) { - return new CorbaSCAReferenceBindingProvider(binding.getSCABinding(), host, component, reference, extensions); - } - - public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component, - RuntimeComponentService service, - DistributedSCABinding binding) { - return new CorbaSCAServiceBindingProvider(binding.getSCABinding(), host, component, service, extensions); - } - - public Class getModelType() { - return DistributedSCABinding.class; - } -} diff --git a/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java b/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java deleted file mode 100644 index a9cc890616..0000000000 --- a/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvocationProxy.java +++ /dev/null @@ -1,111 +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.sca.corba.impl; - -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Level; -import java.util.logging.Logger; - -import javax.xml.stream.XMLStreamException; - -import org.apache.axiom.om.OMElement; -import org.apache.tuscany.sca.binding.corba.impl.exceptions.RequestConfigurationException; -import org.apache.tuscany.sca.binding.corba.impl.service.InvocationException; -import org.apache.tuscany.sca.binding.corba.impl.service.InvocationProxy; -import org.apache.tuscany.sca.binding.corba.impl.service.OperationTypes; -import org.apache.tuscany.sca.binding.corba.impl.types.TypeTree; -import org.apache.tuscany.sca.binding.corba.impl.types.TypeTreeCreator; -import org.apache.tuscany.sca.interfacedef.Interface; -import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.interfacedef.util.FaultException; -import org.apache.tuscany.sca.invocation.Message; -import org.apache.tuscany.sca.invocation.MessageFactory; -import org.apache.tuscany.sca.runtime.RuntimeWire; - -/** - * Invocation proxy for SCA default binding over CORBA binding - */ -public class CorbaSCAInvocationProxy implements InvocationProxy { - - private static final Logger logger = Logger.getLogger(CorbaSCAInvocationProxy.class.getName()); - private RuntimeWire wire; - private Interface componentInterface; - private OperationTypes types = new OperationTypes(); - private MessageFactory messageFactory; - - public CorbaSCAInvocationProxy(RuntimeWire wire, Interface componentInterface, MessageFactory messageFactory) { - this.wire = wire; - this.componentInterface = componentInterface; - this.messageFactory = messageFactory; - try { - List inputType = new ArrayList(); - inputType.add(TypeTreeCreator.createTypeTree(String.class, null)); - types.setInputType(inputType); - types.setOutputType(TypeTreeCreator.createTypeTree(String.class, null)); - } catch (RequestConfigurationException e) { - // ignore - string type should not cause this exception - } - } - - public Object invoke(String operationName, List arguments) throws InvocationException { - try { - OMElement omContent = CorbaSCAInvoker.stringToOM((String)arguments.get(0)); - String componentOperationName = omContent.getQName().getLocalPart(); - Operation componentOperation = null; - for (Operation operation : componentInterface.getOperations()) { - if (operation.getName().equals(componentOperationName)) { - componentOperation = operation; - break; - } - } - if (componentOperation != null) { - Message msg = messageFactory.createMessage(); - msg.setOperation(componentOperation); - Object[] args = new Object[1]; - args[0] = omContent; - msg.setBody(args); - OMElement omResult = (OMElement)wire.invoke(componentOperation, msg); - return omResult.toStringWithConsume(); - } - } catch (XMLStreamException e) { - logger.log(Level.WARNING, "XMLStreamException during handling invocation target exception", e); - } catch (InvocationTargetException e) { - OMElement omException = (OMElement)((FaultException)e.getCause()).getFaultInfo(); - try { - WrappedSCAException wrappedException = new WrappedSCAException(omException.toStringWithConsume()); - InvocationException exception = new InvocationException(wrappedException); - throw exception; - } catch (XMLStreamException xmle) { - logger.log(Level.WARNING, "XMLStreamException during handling invocation target exception", xmle); - } - - } - - return null; - } - - public OperationTypes getOperationTypes(String operationName) { - // ignoring operationName - only one operation for this proxy is allowed - return types; - } - -} diff --git a/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java b/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java deleted file mode 100644 index 32d5650f37..0000000000 --- a/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAInvoker.java +++ /dev/null @@ -1,99 +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.sca.corba.impl; - -import java.io.ByteArrayInputStream; -import java.lang.reflect.Method; -import java.util.Map; - -import javax.xml.stream.XMLStreamException; - -import org.apache.axiom.om.OMElement; -import org.apache.axiom.om.impl.builder.StAXOMBuilder; -import org.apache.tuscany.sca.binding.corba.impl.exceptions.RequestConfigurationException; -import org.apache.tuscany.sca.binding.corba.impl.reference.DynaCorbaRequest; -import org.apache.tuscany.sca.binding.corba.impl.reference.DynaCorbaResponse; -import org.apache.tuscany.sca.interfacedef.util.FaultException; -import org.apache.tuscany.sca.invocation.Invoker; -import org.apache.tuscany.sca.invocation.Message; -import org.omg.CORBA.Object; -import org.osoa.sca.ServiceRuntimeException; - -public class CorbaSCAInvoker implements Invoker { - - private Object remoteObject; - private Class referenceClass; - - public CorbaSCAInvoker(Object remoteObject, - Class referenceClass, - Map operationsMap, - boolean scaBindingRules) { - this.remoteObject = remoteObject; - this.referenceClass = referenceClass; - } - - /** - * @see org.apache.tuscany.sca.invocation.Invoker#invoke(org.apache.tuscany.sca.invocation.Message) - */ - public Message invoke(Message msg) { - try { - DynaCorbaRequest request = new DynaCorbaRequest(remoteObject, "scaService"); - request.setReferenceClass(referenceClass); - request.setOutputType(String.class); - request.addExceptionType(WrappedSCAException.class); - java.lang.Object[] args = msg.getBody(); - OMElement omElement = (OMElement)args[0]; - String arg = omElement.toStringWithConsume(); - request.addArgument(arg); - DynaCorbaResponse response = request.invoke(); - OMElement responseOM = stringToOM((String)response.getContent()); - msg.setBody(responseOM); - } catch (WrappedSCAException e) { - try { - OMElement exceptionOM = stringToOM(e.getFault()); - // AxisFault axisFault = new AxisFault(""); - // axisFault.setDetail(exceptionOM); - FaultException f = new FaultException(e.getMessage(), exceptionOM, e); - f.setFaultName(exceptionOM.getQName()); - msg.setFaultBody(f); - } catch (XMLStreamException e1) { - } - } catch (RequestConfigurationException e) { - throw new ServiceRuntimeException(e); - } catch (Exception e) { - msg.setFaultBody(e); - } - return msg; - } - - /** - * This will help you to create an OMElement from an xml fragment which you have as a string. - * - * @param xmlFragment - the well-formed xml fragment - * @return The OMElement created out of the string xml fragment. - * @throws XMLStreamException - */ - static OMElement stringToOM(String xmlFragment) throws XMLStreamException { - if (xmlFragment != null) { - return new StAXOMBuilder(new ByteArrayInputStream(xmlFragment.getBytes())).getDocumentElement(); - } - return null; - } -} diff --git a/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java b/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java deleted file mode 100644 index c578f8bdf4..0000000000 --- a/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAReferenceBindingProvider.java +++ /dev/null @@ -1,95 +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.sca.corba.impl; - -import java.util.logging.Logger; - -import org.apache.axiom.om.OMElement; -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.binding.ws.WebServiceBinding; -import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory; -import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -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.invocation.Invoker; -import org.apache.tuscany.sca.provider.ReferenceBindingProvider; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -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 Object remoteObject; - private Class referenceClass; - private InterfaceContract wsdlInterfaceContract; - - public CorbaSCAReferenceBindingProvider(SCABinding binding, - CorbaHost host, - RuntimeComponent component, - RuntimeComponentReference reference, - ExtensionPointRegistry extensions) { - this.binding = binding; - this.host = host; - - WebServiceBindingFactory wsFactory = extensions.getExtensionPoint(WebServiceBindingFactory.class); - WebServiceBinding wsBinding = wsFactory.createWebServiceBinding(); - BindingWSDLGenerator.generateWSDL(component, reference, wsBinding, extensions, null); - wsdlInterfaceContract = wsBinding.getBindingInterfaceContract(); - wsdlInterfaceContract.getInterface().resetDataBinding(OMElement.class.getName()); - } - - public InterfaceContract getBindingInterfaceContract() { - return wsdlInterfaceContract; - } - - public boolean supportsOneWayInvocation() { - return false; - } - - public Invoker createInvoker(Operation operation) { - try { - if (remoteObject == null) { - remoteObject = host.lookup(binding.getURI()); - } - return new CorbaSCAInvoker(remoteObject, referenceClass, null, true); - } catch (Exception e) { - logger.warning(e.getMessage()); - } - return null; - } - - public void start() { - - } - - public void stop() { - - } - -} diff --git a/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java b/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.java deleted file mode 100644 index 6e74686b61..0000000000 --- a/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/CorbaSCAServiceBindingProvider.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.sca.corba.impl; - -import org.apache.axiom.om.OMElement; -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.binding.corba.impl.service.DynaCorbaServant; -import org.apache.tuscany.sca.binding.corba.impl.service.InvocationProxy; -import org.apache.tuscany.sca.binding.ws.WebServiceBinding; -import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory; -import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.corba.CorbaHost; -import org.apache.tuscany.sca.interfacedef.InterfaceContract; -import org.apache.tuscany.sca.invocation.MessageFactory; -import org.apache.tuscany.sca.provider.ServiceBindingProvider; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -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; - private MessageFactory messageFactory; - private InterfaceContract wsdlInterfaceContract; - - public CorbaSCAServiceBindingProvider(SCABinding binding, - CorbaHost host, - RuntimeComponent component, - RuntimeComponentService service, - ExtensionPointRegistry extensions) { - this.binding = binding; - this.host = host; - this.service = service; - - messageFactory = extensions.getExtensionPoint(MessageFactory.class); - - WebServiceBindingFactory wsFactory = extensions.getExtensionPoint(WebServiceBindingFactory.class); - WebServiceBinding wsBinding = wsFactory.createWebServiceBinding(); - BindingWSDLGenerator.generateWSDL(component, service, wsBinding, extensions, null); - wsdlInterfaceContract = wsBinding.getBindingInterfaceContract(); - wsdlInterfaceContract.getInterface().resetDataBinding(OMElement.class.getName()); - } - - public InterfaceContract getBindingInterfaceContract() { - return wsdlInterfaceContract; - } - - public boolean supportsOneWayInvocation() { - return false; - } - - public void start() { - try { - InvocationProxy proxy = - new CorbaSCAInvocationProxy(service.getRuntimeWire(binding), service.getInterfaceContract() - .getInterface(), messageFactory); - servant = new DynaCorbaServant(proxy, "IDL:org/apache/tuscany/sca/binding/sca/corba/Service:1.0"); - 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/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java b/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java deleted file mode 100644 index 128d5ef159..0000000000 --- a/branches/sca-java-1.5/modules/binding-sca-corba/src/main/java/org/apache/tuscany/sca/binding/sca/corba/impl/WrappedSCAException.java +++ /dev/null @@ -1,56 +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.sca.corba.impl; - -/** - * Exception holder for SCA default binding over CORBA. Holds fault message in - * XML - */ -public class WrappedSCAException extends Exception { - - private static final long serialVersionUID = 1L; - public String fault; - - /** - * Creates exception holder with null fault message. This no argument - * constructor is needed by CORBA binding. - */ - public WrappedSCAException() { - - } - - /** - * Creates exception holder with fault message - * - * @param fault XML fault message - */ - public WrappedSCAException(String fault) { - this.fault = fault; - } - - public String getFault() { - return fault; - } - - public void setFault(String fault) { - this.fault = fault; - } - -} diff --git a/branches/sca-java-1.5/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/branches/sca-java-1.5/modules/binding-sca-corba/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory deleted file mode 100644 index e07a7cbb95..0000000000 --- a/branches/sca-java-1.5/modules/binding-sca-corba/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.sca.corba.impl.CorbaSCABindingProviderFactory;model=org.apache.tuscany.sca.binding.sca.DistributedSCABinding -- cgit v1.2.3