From b003942c4e5046a2a480d1db7d49f1936c4e0f6c Mon Sep 17 00:00:00 2001 From: antelder Date: Fri, 30 Oct 2009 12:03:25 +0000 Subject: Delete tag and redo as it had a duff global change when updating the version from snapshot to 2.0-M4 git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@831277 13f79535-47bb-0310-9956-ffa450edef68 --- .../2.0-M4-RC1/modules/binding-sca-runtime/LICENSE | 205 ------------------ .../binding-sca-runtime/META-INF/MANIFEST.MF | 31 --- .../2.0-M4-RC1/modules/binding-sca-runtime/NOTICE | 6 - .../2.0-M4-RC1/modules/binding-sca-runtime/pom.xml | 72 ------- .../binding/sca/provider/RemoteBindingHelper.java | 43 ---- .../sca/provider/RuntimeSCABindingProvider.java | 61 ------ .../provider/RuntimeSCABindingProviderFactory.java | 59 ----- .../RuntimeSCAReferenceBindingProvider.java | 240 --------------------- .../provider/RuntimeSCAServiceBindingProvider.java | 144 ------------- .../binding/sca/provider/SCABindingInvoker.java | 72 ------- ....apache.tuscany.sca.definitions.xml.Definitions | 17 -- ...che.tuscany.sca.provider.BindingProviderFactory | 20 -- .../apache/tuscany/sca/binding/sca/definitions.xml | 26 --- .../sca/binding/sca/SCABindingTestCase.java | 103 --------- .../tuscany/sca/binding/sca/xml/ReadTestCase.java | 93 -------- .../tuscany/sca/binding/sca/xml/WriteTestCase.java | 88 -------- .../src/test/resources/Calculator.composite | 59 ----- .../resources/CalculatorServiceImpl.componentType | 33 --- 18 files changed, 1372 deletions(-) delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/LICENSE delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/META-INF/MANIFEST.MF delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/NOTICE delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/pom.xml delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProvider.java delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/test/resources/Calculator.composite delete mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType (limited to 'tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime') diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/LICENSE b/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/LICENSE deleted file mode 100644 index 8aa906c321..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-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/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/META-INF/MANIFEST.MF b/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/META-INF/MANIFEST.MF deleted file mode 100644 index 159e362c07..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/META-INF/MANIFEST.MF +++ /dev/null @@ -1,31 +0,0 @@ -Manifest-Version: 1.0 -Private-Package: org.apache.tuscany.sca.binding.sca.provider;version="2.0.0" -Tool: Bnd-0.0.255 -Bundle-Name: Apache Tuscany SCA Default Binding Model -Created-By: 1.6.0_07 (Sun Microsystems Inc.) -Bundle-Vendor: The Apache Software Foundation -Bundle-Version: 2.0.0 -Bnd-LastModified: 1225397165593 -Bundle-ManifestVersion: 2 -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-Description: Apache Tuscany SCA Default Binding Model -Import-Package: javax.xml.namespace, - javax.xml.stream;resolution:=optional, - org.apache.tuscany.sca.assembly;version="2.0.0", - org.apache.tuscany.sca.assembly.builder;version="2.0.0", - org.apache.tuscany.sca.assembly.xml;version="2.0.0";resolution:=optional, - org.apache.tuscany.sca.contribution;version="2.0.0";resolution:=optional, - org.apache.tuscany.sca.contribution.processor;version="2.0.0", - org.apache.tuscany.sca.contribution.resolver;version="2.0.0";resolution:=optional, - org.apache.tuscany.sca.core;version="2.0.0", - org.apache.tuscany.sca.definitions;version="2.0.0", - org.apache.tuscany.sca.interfacedef;version="2.0.0", - org.apache.tuscany.sca.invocation;version="2.0.0", - org.apache.tuscany.sca.monitor;version="2.0.0";resolution:=optional, - org.apache.tuscany.sca.policy;version="2.0.0", - org.apache.tuscany.sca.provider;version="2.0.0", - org.apache.tuscany.sca.runtime;version="2.0.0", - org.oasisopen.sca;version="2.0.0" -Bundle-SymbolicName: org.apache.tuscany.sca.binding.sca.runtime -Bundle-DocURL: http://www.apache.org/ -Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/NOTICE b/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/NOTICE deleted file mode 100644 index 25bb89c9b2..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2009 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/pom.xml b/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/pom.xml deleted file mode 100644 index 4691d63f8b..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-modules - 2.0-M4 - ../pom.xml - - - tuscany-binding-sca-runtime - Apache Tuscany SCA Binding SCA Model - - - - - org.apache.tuscany.sca - tuscany-assembly - 2.0-M4 - - - - org.apache.tuscany.sca - tuscany-assembly-xml - 2.0-M4 - - - - org.apache.tuscany.sca - tuscany-core-spi - 2.0-M4 - - - - org.apache.tuscany.sca - tuscany-core - 2.0-M4 - - - - org.apache.tuscany.sca - tuscany-core-spi - 2.0-M4 - - - - org.apache.tuscany.sca - tuscany-contribution - 2.0-M4 - - - - diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java b/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java deleted file mode 100644 index 331f152b50..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RemoteBindingHelper.java +++ /dev/null @@ -1,43 +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.provider; - -/** - * TODO: TUSCANY-2578, implement a pluggable mechanism so sca binding impls can - * add their own code to the decision on whether or not to use - * the remote binding provider. - */ -public class RemoteBindingHelper { - - private static boolean alwaysRemote; - static { - try { - Class.forName("org.apache.tuscany.sca.binding.sca.jms.JMSSCABindingProviderFactory"); - alwaysRemote = true; - } catch (ClassNotFoundException e) { - alwaysRemote = false; - } - } - - public static boolean isTargetRemote() { - return alwaysRemote; - } - -} diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProvider.java b/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProvider.java deleted file mode 100644 index c4daa7c727..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProvider.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.sca.provider; - -import org.apache.tuscany.sca.assembly.SCABinding; -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; - -/** - * The local SCA Binding provider implementation. It is not currently used. - * - * @version $Rev$ $Date$ - */ -public class RuntimeSCABindingProvider implements ReferenceBindingProvider { - - private RuntimeComponentReference reference; - - public RuntimeSCABindingProvider(RuntimeComponent component, RuntimeComponentReference reference, SCABinding binding) { - this.reference = reference; - } - - public InterfaceContract getBindingInterfaceContract() { - return reference.getInterfaceContract(); - } - - public Invoker createInvoker(Operation operation) { - return null; - } - - public void start() { - } - - public void stop() { - } - - public boolean supportsOneWayInvocation() { - return false; - } - -} diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java b/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java deleted file mode 100644 index 110d15a1cf..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCABindingProviderFactory.java +++ /dev/null @@ -1,59 +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.provider; - -import org.apache.tuscany.sca.assembly.Endpoint; -import org.apache.tuscany.sca.assembly.EndpointReference; -import org.apache.tuscany.sca.assembly.SCABinding; -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; - -/** - * The factory for creating SCA Binding providers - * - * @version $Rev$ $Date$ - */ -public class RuntimeSCABindingProviderFactory implements BindingProviderFactory { - - private ExtensionPointRegistry extensionPoints; - - public RuntimeSCABindingProviderFactory(ExtensionPointRegistry extensionPoints) { - this.extensionPoints = extensionPoints; - - } - - public ReferenceBindingProvider createReferenceBindingProvider(EndpointReference endpointReference) { - - return new RuntimeSCAReferenceBindingProvider(extensionPoints, endpointReference); - } - - public ServiceBindingProvider createServiceBindingProvider(Endpoint endpoint) { - return new RuntimeSCAServiceBindingProvider(extensionPoints, endpoint); - } - - public Class getModelType() { - return SCABinding.class; - } -} diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java b/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java deleted file mode 100644 index 2679b88dd1..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAReferenceBindingProvider.java +++ /dev/null @@ -1,240 +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.provider; - -import java.net.URI; -import java.util.logging.Logger; - -import org.apache.tuscany.sca.assembly.DistributedSCABinding; -import org.apache.tuscany.sca.assembly.Endpoint; -import org.apache.tuscany.sca.assembly.EndpointReference; -import org.apache.tuscany.sca.assembly.OptimizableBinding; -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.assembly.SCABindingFactory; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.interfacedef.InterfaceContract; -import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.invocation.InvocationChain; -import org.apache.tuscany.sca.invocation.Invoker; -import org.apache.tuscany.sca.provider.BindingProviderFactory; -import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint; -import org.apache.tuscany.sca.provider.ReferenceBindingProvider; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentReference; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.apache.tuscany.sca.runtime.RuntimeWire; -import org.oasisopen.sca.ServiceUnavailableException; - -/** - * The sca reference binding provider mediates between the twin requirements of - * local sca bindings and remote sca bindings. In the local case is does - * very little. When the sca binding model is set as being remote (because a - * reference target can't be resolved in the current model) this binding will - * try and create a remote connection to it - * - * @version $Rev$ $Date$ - */ -public class RuntimeSCAReferenceBindingProvider implements ReferenceBindingProvider { - - private static final Logger logger = Logger.getLogger(RuntimeSCAReferenceBindingProvider.class.getName()); - - private EndpointReference endpointReference; - private RuntimeComponent component; - private RuntimeComponentReference reference; - private SCABinding binding; - private boolean started = false; - - private BindingProviderFactory distributedProviderFactory = null; - private ReferenceBindingProvider distributedProvider = null; - private SCABindingFactory scaBindingFactory; - - public RuntimeSCAReferenceBindingProvider(ExtensionPointRegistry extensionPoints, - EndpointReference endpointReference) { - this.endpointReference = endpointReference; - this.component = (RuntimeComponent)endpointReference.getComponent(); - this.reference = (RuntimeComponentReference)endpointReference.getReference(); - this.binding = (SCABinding)endpointReference.getBinding(); - this.scaBindingFactory = - extensionPoints.getExtensionPoint(FactoryExtensionPoint.class).getFactory(SCABindingFactory.class); - - // look to see if a distributed SCA binding implementation has - // been included on the classpath. This will be needed by the - // provider itself to do it's thing - ProviderFactoryExtensionPoint factoryExtensionPoint = - extensionPoints.getExtensionPoint(ProviderFactoryExtensionPoint.class); - distributedProviderFactory = - (BindingProviderFactory)factoryExtensionPoint - .getProviderFactory(DistributedSCABinding.class); - - } - - public boolean isTargetRemote() { - boolean targetIsRemote = false; - - // The decision is based on the results of the wiring process in the assembly model - // and there are three possibilities - // 1 - target service is running in a separate node in a separate JVM - // 2 - target service is running in a separate node in the same JVM - // 3 - target service is running in the same node - - // TODO - EPR - the method needs to be able to indicate the three cases - - - if (RemoteBindingHelper.isTargetRemote()) { - // TODO - EPR - what is this RemoteBindingHelper for? - if (reference.getInterfaceContract() != null) { - targetIsRemote = reference.getInterfaceContract().getInterface().isRemotable(); - } else { - targetIsRemote = true; - } - } if ( (endpointReference.isRemote()) && - (endpointReference.getTargetEndpoint().isRemote())){ - // case 1 - targetIsRemote = true; - } else if (endpointReference.isRemote()) { - // case 2 - targetIsRemote = false; - } else { - // case 3 - targetIsRemote = false; - } - return targetIsRemote; - } - - private ReferenceBindingProvider getDistributedProvider() { - - if (isTargetRemote()) { - // initialize the remote provider if it hasn't been done already - if (distributedProvider == null) { - if (reference.getInterfaceContract() != null && !reference.getInterfaceContract().getInterface().isRemotable()) { - throw new IllegalStateException("Reference interface not remotable for component: " + component - .getName() - + " and reference: " - + reference.getName()); - } - - if (distributedProviderFactory == null) { - throw new IllegalStateException("No distributed SCA binding available for component: " + component - .getName() - + " and reference: " - + reference.getName()); - } - - // create the remote provider - DistributedSCABinding distributedBinding = scaBindingFactory.createDistributedSCABinding(); - distributedBinding.setSCABinding(binding); - - // create a copy of the endpoint reference and change the binding - EndpointReference epr = null; - try { - epr = (EndpointReference)endpointReference.clone(); - } catch (Exception ex) { - // we know we can clone endpoint references - } - epr.setBinding(distributedBinding); - - distributedProvider = - distributedProviderFactory.createReferenceBindingProvider(epr); - } - } - - return distributedProvider; - } - - public InterfaceContract getBindingInterfaceContract() { - if (isTargetRemote()) { - return getDistributedProvider().getBindingInterfaceContract(); - } else { - if (reference.getReference() != null) { - return reference.getReference().getInterfaceContract(); - } else { - return reference.getInterfaceContract(); - } - } - } - - public boolean supportsOneWayInvocation() { - if (isTargetRemote()) { - return getDistributedProvider().supportsOneWayInvocation(); - } else { - return false; - } - } - - private Invoker getInvoker(RuntimeWire wire, Operation operation) { - Endpoint target = wire.getEndpoint(); - if (target != null) { - RuntimeComponentService service = (RuntimeComponentService)target.getService(); - if (service != null) { // not a callback wire - SCABinding scaBinding = service.getBinding(SCABinding.class); - InvocationChain chain = - service.getInvocationChain(scaBinding, wire.getEndpointReference().getInterfaceContract(), operation); - return chain == null ? null : new SCABindingInvoker(chain); - } - } - return null; - } - - public Invoker createInvoker(Operation operation) { - if (isTargetRemote()) { - return getDistributedProvider().createInvoker(operation); - } else { - RuntimeWire wire = reference.getRuntimeWire(binding); - Invoker invoker = getInvoker(wire, operation); - if (invoker == null) { - throw new ServiceUnavailableException("Unable to create SCA binding invoker for local target " + component.getName() - + " reference " - + reference.getName() - + " (bindingURI=" - + binding.getURI() - + " operation=" - + operation.getName() - + ")" ); - } - return invoker; - } - } - - public void start() { - if (started) { - return; - } else { - started = true; - } - - if (getDistributedProvider() != null) { - distributedProvider.start(); - } - } - - public void stop() { - if (!started) { - return; - } else { - started = false; - } - - if (getDistributedProvider() != null) { - distributedProvider.stop(); - } - } - -} diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java b/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java deleted file mode 100644 index de21974095..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/RuntimeSCAServiceBindingProvider.java +++ /dev/null @@ -1,144 +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.provider; - -import java.net.URI; - -import org.apache.tuscany.sca.assembly.DistributedSCABinding; -import org.apache.tuscany.sca.assembly.Endpoint; -import org.apache.tuscany.sca.assembly.EndpointReference; -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.assembly.SCABindingFactory; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.apache.tuscany.sca.interfacedef.InterfaceContract; -import org.apache.tuscany.sca.provider.BindingProviderFactory; -import org.apache.tuscany.sca.provider.ProviderFactoryExtensionPoint; -import org.apache.tuscany.sca.provider.ServiceBindingProvider; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; - -/** - * The sca service binding provider mediates between the twin requirements of - * local sca bindings and remote sca bindings. In the local case is does - * very little. When the sca binding model is set as being remote this binding will - * try and create a remote service endpoint for remote references to connect to - * - * @version $Rev$ $Date$ - */ -public class RuntimeSCAServiceBindingProvider implements ServiceBindingProvider { - - private RuntimeComponent component; - private RuntimeComponentService service; - private SCABinding binding; - - - private BindingProviderFactory distributedProviderFactory; - private ServiceBindingProvider distributedProvider; - private DistributedSCABinding distributedBinding; - - - public RuntimeSCAServiceBindingProvider(ExtensionPointRegistry extensionPoints, - Endpoint endpoint) { - this.component = (RuntimeComponent)endpoint.getComponent(); - this.service = (RuntimeComponentService)endpoint.getService(); - this.binding = (SCABinding)endpoint.getBinding(); - - // if there is potentially a wire to this service that crosses the node boundary - // then we need to create a remote endpoint - if (service.getInterfaceContract().getInterface().isRemotable()) { - - // look to see if a distributed SCA binding implementation has - // been included on the classpath. This will be needed by the - // provider itself to do it's thing - ProviderFactoryExtensionPoint factoryExtensionPoint = - extensionPoints.getExtensionPoint(ProviderFactoryExtensionPoint.class); - distributedProviderFactory = - (BindingProviderFactory)factoryExtensionPoint - .getProviderFactory(DistributedSCABinding.class); - - if (distributedProviderFactory != null) { - - SCABindingFactory scaBindingFactory = - extensionPoints.getExtensionPoint(FactoryExtensionPoint.class).getFactory(SCABindingFactory.class); - - // create a nested provider to handle the remote case - distributedBinding = scaBindingFactory.createDistributedSCABinding(); - distributedBinding.setSCABinding(binding); - - // create a copy of the endpoint and change the binding - Endpoint ep = null; - try { - ep = (Endpoint)endpoint.clone(); - } catch (Exception ex) { - // we know we can clone endpoint - } - ep.setBinding(distributedBinding); - - distributedProvider = - distributedProviderFactory.createServiceBindingProvider(ep); - } - } - } - - public InterfaceContract getBindingInterfaceContract() { - if (distributedProvider != null) { - return distributedProvider.getBindingInterfaceContract(); - } else { - if (service.getService() != null) { - return service.getService().getInterfaceContract(); - } else { - return service.getInterfaceContract(); - } - } - } - - public boolean supportsOneWayInvocation() { - return false; - } - - public void start() { - if (distributedProvider != null) { - distributedProvider.start(); - } - } - - public void stop() { - if (distributedProvider != null) { - distributedProvider.stop(); - } - - if (distributedBinding != null) { - // reset the binding URI to null so that if the composite containing the component - // with the service/binding is restarted the binding will have the correct URI set - SCABinding scaBinding = distributedBinding.getSCABinding(); - try { - URI tempURI = new URI(scaBinding.getURI()); - if (!tempURI.isAbsolute()){ - scaBinding.setURI(null); - } - } catch (Exception ex){ - scaBinding.setURI(null); - } - } - - } - -} diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java b/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java deleted file mode 100644 index 4dee1b8601..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/java/org/apache/tuscany/sca/binding/sca/provider/SCABindingInvoker.java +++ /dev/null @@ -1,72 +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.provider; - -import org.apache.tuscany.sca.invocation.Interceptor; -import org.apache.tuscany.sca.invocation.InvocationChain; -import org.apache.tuscany.sca.invocation.Invoker; -import org.apache.tuscany.sca.invocation.Message; -import org.apache.tuscany.sca.invocation.DataExchangeSemantics; - -/** - * @version $Rev$ $Date$ - */ -public class SCABindingInvoker implements Interceptor, DataExchangeSemantics { - private InvocationChain chain; - - /** - * Construct a SCABindingInvoker that delegates to the service invocaiton chain - * @param chain - */ - public SCABindingInvoker(InvocationChain chain) { - super(); - this.chain = chain; - } - - /** - * @see org.apache.tuscany.sca.invocation.Interceptor#getNext() - */ - public Invoker getNext() { - return chain.getHeadInvoker(); - } - - /** - * @see org.apache.tuscany.sca.invocation.Interceptor#setNext(org.apache.tuscany.sca.invocation.Invoker) - */ - public void setNext(Invoker next) { - // NOOP - } - - /** - * @see org.apache.tuscany.sca.invocation.Invoker#invoke(org.apache.tuscany.sca.invocation.Message) - */ - public Message invoke(Message msg) { - return getNext().invoke(msg); - } - - /** - * @see org.apache.tuscany.sca.invocation.DataExchangeSemantics#allowsPassByReference() - */ - public boolean allowsPassByReference() { - return false; -// return chain.allowsPassByReference(); - } - -} diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions b/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions deleted file mode 100644 index 151c00eec8..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.xml.Definitions +++ /dev/null @@ -1,17 +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. -org/apache/tuscany/sca/binding/sca/definitions.xml diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory deleted file mode 100644 index 86e3d1e829..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory +++ /dev/null @@ -1,20 +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.provider.RuntimeSCABindingProviderFactory;model=org.apache.tuscany.sca.assembly.SCABinding - diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml b/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml deleted file mode 100644 index c00df2ef35..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/main/resources/org/apache/tuscany/sca/binding/sca/definitions.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java b/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java deleted file mode 100644 index 119d66d14d..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/SCABindingTestCase.java +++ /dev/null @@ -1,103 +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.apace.tuscany.sca.binding.sca; - -import java.io.InputStream; - -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamReader; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.assembly.SCABindingFactory; -import org.apache.tuscany.sca.assembly.xml.CompositeModelResolver; -import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.FactoryExtensionPoint; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -/** - * SCABindingTestCase - * - * @version $Rev$ $Date$ - */ -public class SCABindingTestCase { - - private XMLInputFactory inputFactory; - private StAXArtifactProcessor staxProcessor; - private CompositeModelResolver resolver; - private ExtensionPointRegistry extensionPoints; - - @Before - public void init() throws Exception { - extensionPoints = new DefaultExtensionPointRegistry(); - inputFactory = XMLInputFactory.newInstance(); - - StAXArtifactProcessorExtensionPoint staxProcessors = - extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); - staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null); - - resolver = new CompositeModelResolver(null, null); - } - - @Test - public void testSCABindingFactory() { - SCABindingFactory factory = - extensionPoints.getExtensionPoint(FactoryExtensionPoint.class).getFactory(SCABindingFactory.class); - - Assert.assertNotNull(factory.createSCABinding()); - Assert.assertNotNull(factory.createDistributedSCABinding()); - } - - @Test - @Ignore - public void testBuildModel() { - try { - InputStream is = getClass().getResourceAsStream("/Calculator.composite"); - XMLStreamReader reader = inputFactory.createXMLStreamReader(is); - ProcessorContext context = new ProcessorContext(extensionPoints); - Composite composite = (Composite)staxProcessor.read(reader, context); - - is.close(); - Assert.assertNotNull(composite); - - resolver.addModel(composite, context); - - staxProcessor.resolve(composite, resolver, new ProcessorContext()); - - SCABinding referenceSCABinding = - (SCABinding)composite.getComponents().get(0).getReferences().get(0).getBindings().get(0); - SCABinding serviceSCABinding = - (SCABinding)composite.getComponents().get(1).getServices().get(0).getBindings().get(0); - - Assert.assertNotNull(referenceSCABinding); - Assert.assertNotNull(serviceSCABinding); - } catch (Exception ex) { - Assert.fail(ex.getMessage()); - } - - } -} diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java b/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java deleted file mode 100644 index 895a551f79..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/ReadTestCase.java +++ /dev/null @@ -1,93 +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.apace.tuscany.sca.binding.sca.xml; - -import static org.junit.Assert.assertNotNull; - -import java.io.InputStream; - -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamReader; - -import org.apache.tuscany.sca.assembly.ComponentType; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Test reading WSDL interfaces. - * - * @version $Rev$ $Date$ - */ -public class ReadTestCase { - - private static XMLInputFactory inputFactory; - private static StAXArtifactProcessor staxProcessor; - private static ProcessorContext context; - - @BeforeClass - public static void setUp() throws Exception { - ExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry(); - context = new ProcessorContext(extensionPoints); - - inputFactory = XMLInputFactory.newInstance(); - StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); - staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null); - } - - @Test - public void testReadComponentType() throws Exception { - InputStream is = getClass().getResourceAsStream("/CalculatorServiceImpl.componentType"); - XMLStreamReader reader = inputFactory.createXMLStreamReader(is); - ComponentType componentType = (ComponentType)staxProcessor.read(reader, context); - assertNotNull(componentType); - - SCABinding referenceSCABinding = (SCABinding) componentType.getReferences().get(0).getBindings().get(0); - assertNotNull(referenceSCABinding); - - SCABinding serviceSCABinding = (SCABinding) componentType.getServices().get(0).getBindings().get(0); - assertNotNull(serviceSCABinding); - - //new PrintUtil(System.out).print(componentType); - } - - @Test - public void testReadComposite() throws Exception { - InputStream is = getClass().getResourceAsStream("/Calculator.composite"); - XMLStreamReader reader = inputFactory.createXMLStreamReader(is); - Composite composite = (Composite)staxProcessor.read(reader, context); - assertNotNull(composite); - - SCABinding referenceSCABinding = (SCABinding) composite.getComponents().get(0).getReferences().get(0).getBindings().get(0); - SCABinding serviceSCABinding = (SCABinding) composite.getComponents().get(1).getServices().get(0).getBindings().get(0); - - Assert.assertNotNull(referenceSCABinding); - Assert.assertNotNull(serviceSCABinding); - } - -} diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java b/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java deleted file mode 100644 index be464172ed..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/test/java/org/apace/tuscany/sca/binding/sca/xml/WriteTestCase.java +++ /dev/null @@ -1,88 +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.apace.tuscany.sca.binding.sca.xml; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.io.ByteArrayOutputStream; -import java.io.InputStream; - -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLOutputFactory; - -import org.apache.tuscany.sca.assembly.ComponentType; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.ProcessorContext; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry; -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; - -/** - * Test reading/write WSDL interfaces. - * - * @version $Rev$ $Date$ - */ -public class WriteTestCase { - - private static StAXArtifactProcessor staxProcessor; - private static XMLInputFactory inputFactory; - private static XMLOutputFactory outputFactory; - private static ProcessorContext context; - - @BeforeClass - public static void setUp() throws Exception { - DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry(); - context = new ProcessorContext(extensionPoints); - StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class); - inputFactory = XMLInputFactory.newInstance(); - outputFactory = XMLOutputFactory.newInstance(); - staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, outputFactory); - } - - @Test - @Ignore // broken in 2.0 bring up - public void testReadWriteComponentType() throws Exception { - InputStream is = getClass().getResourceAsStream("/CalculatorServiceImpl.componentType"); - ComponentType componentType = (ComponentType)staxProcessor.read(inputFactory.createXMLStreamReader(is), context); - assertNotNull(componentType); - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - staxProcessor.write(componentType, outputFactory.createXMLStreamWriter(bos), context); - assertEquals("", - bos.toString()); - } - - @Test - @Ignore // broken in 2.0 bring up - public void testReadWriteComposite() throws Exception { - InputStream is = getClass().getResourceAsStream("/Calculator.composite"); - Composite composite = (Composite)staxProcessor.read(inputFactory.createXMLStreamReader(is), context); - assertNotNull(composite); - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - staxProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), context); - assertEquals("", - bos.toString()); - } - -} diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/test/resources/Calculator.composite b/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/test/resources/Calculator.composite deleted file mode 100644 index c404b3bcd4..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/test/resources/Calculator.composite +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType b/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType deleted file mode 100644 index 85535842be..0000000000 --- a/tags/java/sca/2.0-M4-RC1/modules/binding-sca-runtime/src/test/resources/CalculatorServiceImpl.componentType +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file -- cgit v1.2.3