From fdd5b43d3c139cf2cbd1655d2efbfaf9032a5b5e Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:14:18 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835145 13f79535-47bb-0310-9956-ffa450edef68 --- .../modules/binding-sca-axis2/LICENSE | 205 ------------------ .../modules/binding-sca-axis2/NOTICE | 6 - .../modules/binding-sca-axis2/pom.xml | 103 --------- .../sca/axis2/impl/Axis2SCABindingInvoker.java | 100 --------- .../axis2/impl/Axis2SCABindingProviderFactory.java | 67 ------ .../impl/Axis2SCAReferenceBindingProvider.java | 184 ---------------- .../axis2/impl/Axis2SCAServiceBindingProvider.java | 127 ----------- .../sca/axis2/impl/Axis2SCAServiceProvider.java | 88 -------- ...che.tuscany.sca.provider.BindingProviderFactory | 19 -- .../sca/binding/sca/axis2/AsynchTestCase.java | 73 ------- .../BindingScaEndpointResolverFactoryImpl.java | 50 ----- .../sca/axis2/BindingScaEndpointResolverImpl.java | 69 ------ .../sca/binding/sca/axis2/CallbackTestCase.java | 77 ------- .../sca/binding/sca/axis2/PromotionTestCase.java | 66 ------ .../sca/binding/sca/axis2/SimpleTestCase.java | 105 ---------- .../tuscany/sca/binding/sca/axis2/TestNode.java | 232 --------------------- .../axis2/helloworld/HelloWorldCallbackRemote.java | 29 --- .../sca/axis2/helloworld/HelloWorldClient.java | 27 --- .../HelloWorldServiceCallbackOnewayRemote.java | 33 --- .../HelloWorldServiceCallbackRemote.java | 31 --- .../axis2/helloworld/HelloWorldServiceLocal.java | 27 --- .../axis2/helloworld/HelloWorldServiceRemote.java | 29 --- .../axis2/helloworld/HelloWorldServiceRemote2.java | 29 --- .../HelloWorldClientCallbackOnewayRemoteImpl.java | 43 ---- .../impl/HelloWorldClientCallbackRemoteImpl.java | 42 ---- .../helloworld/impl/HelloWorldClientLocalImpl.java | 35 ---- .../impl/HelloWorldClientRemote2Impl.java | 35 ---- .../impl/HelloWorldClientRemoteImpl.java | 35 ---- .../HelloWorldServiceCallbackOnewayRemoteImpl.java | 36 ---- .../impl/HelloWorldServiceCallbackRemoteImpl.java | 35 ---- .../impl/HelloWorldServiceLocalImpl.java | 30 --- .../HelloWorldServiceMultipleServicesImpl.java | 41 ---- .../impl/HelloWorldServiceRemoteImpl.java | 30 --- ...ny.sca.endpointresolver.EndpointResolverFactory | 19 -- .../src/test/resources/nodeA/HelloWorld.composite | 75 ------- .../resources/nodeA/META-INF/sca-contribution.xml | 24 --- .../src/test/resources/nodeB/HelloWorld.composite | 84 -------- .../resources/nodeB/META-INF/sca-contribution.xml | 24 --- .../src/test/resources/nodeC/HelloWorld.composite | 35 ---- .../resources/nodeC/HelloWorldComponent.composite | 37 ---- .../resources/nodeC/META-INF/sca-contribution.xml | 24 --- .../src/test/resources/nodeD/HelloWorld.composite | 35 ---- .../resources/nodeD/HelloWorldComponent.composite | 37 ---- .../resources/nodeD/META-INF/sca-contribution.xml | 24 --- .../src/test/resources/nodeE/HelloWorld.composite | 36 ---- .../resources/nodeE/META-INF/sca-contribution.xml | 24 --- .../src/test/resources/nodeF/HelloWorld.composite | 43 ---- .../resources/nodeF/META-INF/sca-contribution.xml | 24 --- .../src/test/resources/nodeG/HelloWorld.composite | 36 ---- .../resources/nodeG/META-INF/sca-contribution.xml | 23 -- .../src/test/resources/nodeH/HelloWorld.composite | 38 ---- .../resources/nodeH/META-INF/sca-contribution.xml | 23 -- 52 files changed, 2803 deletions(-) delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/LICENSE delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/NOTICE delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/pom.xml delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite delete mode 100644 branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml (limited to 'branches/sca-java-1.5.1/modules/binding-sca-axis2') diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/LICENSE b/branches/sca-java-1.5.1/modules/binding-sca-axis2/LICENSE deleted file mode 100644 index 6e529a25c4..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/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.1/modules/binding-sca-axis2/NOTICE b/branches/sca-java-1.5.1/modules/binding-sca-axis2/NOTICE deleted file mode 100644 index 25bb89c9b2..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/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/branches/sca-java-1.5.1/modules/binding-sca-axis2/pom.xml b/branches/sca-java-1.5.1/modules/binding-sca-axis2/pom.xml deleted file mode 100644 index 1a261cf97a..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/pom.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-modules - 1.5.1-SNAPSHOT - ../pom.xml - - - tuscany-binding-sca-axis2 - Apache Tuscany SCA Axis2-based Default Binding Extension - - - - - org.apache.tuscany.sca - tuscany-binding-sca - 1.5.1-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.5.1-SNAPSHOT - - - - javax.servlet - servlet-api - 2.4 - provided - - - - org.apache.tuscany.sca - tuscany-host-jetty - 1.5.1-SNAPSHOT - test - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5.1-SNAPSHOT - test - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5.1-SNAPSHOT - test - - - - org.apache.tuscany.sca - tuscany-endpoint - 1.5.1-SNAPSHOT - test - - - - - - - - - org.apache.felix - maven-bundle-plugin - - - - ${tuscany.version} - org.apache.tuscany.sca.binding.sca.axis2 - ${pom.name} - org.apache.tuscany.sca.binding.sca.axis2* - - - - - - - diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java deleted file mode 100644 index e4bb708a01..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java +++ /dev/null @@ -1,100 +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.axis2.impl; - -import java.util.logging.Logger; - -import org.apache.tuscany.sca.invocation.Interceptor; -import org.apache.tuscany.sca.invocation.Invoker; -import org.apache.tuscany.sca.invocation.Message; -import org.apache.tuscany.sca.runtime.EndpointReference; -import org.osoa.sca.ServiceUnavailableException; - - -/** - * A wrapper for the Axis2BindingInvoker that ensures that the URL of the target - * service is correct by looking it up in the service registry if it is not provided - * - * @version $Rev: 563772 $ $Date: 2007-08-08 07:50:49 +0100 (Wed, 08 Aug 2007) $ - */ -public class Axis2SCABindingInvoker implements Interceptor { - - private static final Logger logger = Logger.getLogger(Axis2SCABindingInvoker.class.getName()); - - private Invoker axis2Invoker; - private Axis2SCAReferenceBindingProvider provider; - - public Axis2SCABindingInvoker(Axis2SCAReferenceBindingProvider provider, Invoker axis2Invoker) { - this.axis2Invoker = axis2Invoker; - this.provider = provider; - } - - public void setNext(Invoker next) { - } - - public Invoker getNext() { - return null; - } - - /** - * Fix up the URL for the message. The "to" EndPoint comes from the wire - * target and needs to be replaced with the endpoint from the registry. - * The default URL for an Endpoint URI where there is no - * target component or service information, as in the case of a - * wire crossing a node boundary, is "/" - */ - public Message invoke(Message msg) { - - // make sure that the epr of the target service is set in the TO - // field of the message - EndpointReference to = msg.getTo(); - - // check to see if we either don't have an endpoint set or if the URI - // is dynamic or the target service is marked as unresolved - if ((to == null) || (to.getURI().equals("/") || (to.getContract() == null) || (to.getContract().isUnresolved()))) { - - EndpointReference eprTo = provider.getServiceEndpoint(); - - if ( (eprTo == null) || (eprTo.getURI() == null)) { - throw new ServiceUnavailableException("Endpoint for service: " + provider.getSCABinding().getURI() - + " can't be found for component: " - + provider.getComponent().getName() - + " reference: " - + provider.getComponentReference().getName()); - } - msg.setTo(eprTo); - } - - // make sure that the epr of the callback service (if there is one) is set - // in the callbackReference field of the message. - EndpointReference callbackEPR = msg.getFrom().getReferenceParameters().getCallbackReference(); - - if ((callbackEPR == null) || (callbackEPR.getURI().equals("/"))) { - - callbackEPR = provider.getCallbackEndpoint(); - - if (callbackEPR != null) { - msg.getFrom().getReferenceParameters().setCallbackReference(callbackEPR); - } - } - - // do the axis2 stuff - return axis2Invoker.invoke(msg); - } -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java deleted file mode 100644 index b105696b5d..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingProviderFactory.java +++ /dev/null @@ -1,67 +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.axis2.impl; - -import java.util.List; - -import org.apache.tuscany.sca.binding.sca.DistributedSCABinding; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.policy.util.PolicyHandlerDefinitionsLoader; -import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple; -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 the Axis2 based implementation of the distributed sca binding - * - * @version $Rev: 563772 $ $Date: 2007-08-08 07:50:49 +0100 (Wed, 08 Aug 2007) $ - */ -public class Axis2SCABindingProviderFactory implements BindingProviderFactory { - - private ExtensionPointRegistry extensionPoints; - private List policyHandlerClassnames = null; - - public Axis2SCABindingProviderFactory(ExtensionPointRegistry extensionPoints) { - this.extensionPoints = extensionPoints; - policyHandlerClassnames = PolicyHandlerDefinitionsLoader.loadPolicyHandlerClassnames(); - } - - public ReferenceBindingProvider createReferenceBindingProvider(RuntimeComponent component, - RuntimeComponentReference reference, - DistributedSCABinding binding) { - return new Axis2SCAReferenceBindingProvider(component, reference, binding, - extensionPoints, policyHandlerClassnames); - } - - public ServiceBindingProvider createServiceBindingProvider(RuntimeComponent component, - RuntimeComponentService service, - DistributedSCABinding binding) { - return new Axis2SCAServiceBindingProvider(component, service, binding, - extensionPoints, policyHandlerClassnames); - } - - public Class getModelType() { - return DistributedSCABinding.class; - } -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java deleted file mode 100644 index 48d65cb735..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java +++ /dev/null @@ -1,184 +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.axis2.impl; - -import java.net.URI; -import java.util.List; -import java.util.logging.Logger; - -import org.apache.axiom.om.OMElement; -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.binding.sca.DistributedSCABinding; -import org.apache.tuscany.sca.binding.ws.WebServiceBinding; -import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory; -import org.apache.tuscany.sca.binding.ws.axis2.Axis2ReferenceBindingProvider; -import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator; -import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.assembly.EndpointReferenceImpl; -import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint; -import org.apache.tuscany.sca.host.http.ServletHost; -import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; -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.policy.util.PolicyHandlerTuple; -import org.apache.tuscany.sca.provider.ReferenceBindingProvider; -import org.apache.tuscany.sca.runtime.EndpointReference; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentReference; - -/** - * The reference binding provider for the remote sca binding implementation. Relies on the - * binding-ws-axis implementation for sending messages to remote services to this provider - * just uses the ws-axis provider. - * - * @version $Rev: 563772 $ $Date: 2007-08-08 07:50:49 +0100 (Wed, 08 Aug 2007) $ - */ -public class Axis2SCAReferenceBindingProvider implements ReferenceBindingProvider { - - private static final Logger logger = Logger.getLogger(Axis2SCAReferenceBindingProvider.class.getName()); - - private RuntimeComponent component; - private RuntimeComponentReference reference; - private SCABinding binding; - private Axis2ReferenceBindingProvider axisReferenceBindingProvider; - private WebServiceBinding wsBinding; - - private EndpointReference serviceEPR = null; - private EndpointReference callbackEPR = null; - - public Axis2SCAReferenceBindingProvider(RuntimeComponent component, - RuntimeComponentReference reference, - DistributedSCABinding binding, - ExtensionPointRegistry extensionPoints, - List policyHandlerClassnames) { - - ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class); - ServletHost servletHost = servletHosts.getServletHosts().get(0); - ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class); - DataBindingExtensionPoint dataBindings = extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class); - - this.component = component; - this.reference = reference; - this.binding = binding.getSCABinding(); - wsBinding = modelFactories.getFactory(WebServiceBindingFactory.class).createWebServiceBinding(); - wsBinding.setName(this.binding.getName()); - - // Turn the java interface contract into a WSDL interface contract - BindingWSDLGenerator.generateWSDL(component, reference, wsBinding, extensionPoints, null); - - // Set to use the Axiom data binding - InterfaceContract contract = wsBinding.getBindingInterfaceContract(); - contract.getInterface().resetDataBinding(OMElement.class.getName()); - - axisReferenceBindingProvider = new Axis2ReferenceBindingProvider(component, - reference, - wsBinding, - modelFactories, - policyHandlerClassnames, - dataBindings); - } - - public InterfaceContract getBindingInterfaceContract() { - return wsBinding.getBindingInterfaceContract(); - } - - public boolean supportsOneWayInvocation() { - return false; - } - - public Invoker createInvoker(Operation operation) { - return new Axis2SCABindingInvoker(this, axisReferenceBindingProvider.createInvoker(operation)); - } - - /** - * Uses the distributed domain service discovery feature to locate remote - * service endpoints - * - * @return An EPR for the target service that this reference refers to - */ - public EndpointReference getServiceEndpoint(){ - - if (serviceEPR == null){ - String endpointURL = null; - - if (binding.getURI() != null) { - // check if the binding URI is already resolved if it is use is if not - try { - URI uri = new URI(binding.getURI()); - if (uri.isAbsolute()) { - endpointURL = binding.getURI(); - } - } catch(Exception ex) { - // do nothing - } - } - - serviceEPR = new EndpointReferenceImpl(endpointURL); - } - - return serviceEPR; - } - - - /** - * Retrieves the URI of the callback service (that this reference has created) - * returns null if there is no callback service for the sca binding - * - * @return the callback endpoint - */ - public EndpointReference getCallbackEndpoint(){ - if (callbackEPR == null) { - if (reference.getCallbackService() != null) { - for (Binding callbackBinding : reference.getCallbackService().getBindings()) { - if (callbackBinding instanceof SCABinding) { - callbackEPR = new EndpointReferenceImpl(reference.getName() + "/" + callbackBinding.getName()); - continue; - } - } - } - } - return callbackEPR; - } - - - public SCABinding getSCABinding () { - return binding; - } - - public RuntimeComponent getComponent () { - return component; - } - - public RuntimeComponentReference getComponentReference () { - return reference; - } - - public void start() { - axisReferenceBindingProvider.start(); - } - - public void stop() { - axisReferenceBindingProvider.stop(); - } - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java deleted file mode 100644 index 0450d07071..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceBindingProvider.java +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.sca.axis2.impl; - -import java.util.List; -import java.util.logging.Logger; - -import org.apache.axiom.om.OMElement; -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.binding.sca.DistributedSCABinding; -import org.apache.tuscany.sca.binding.ws.WebServiceBinding; -import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory; -import org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceProvider; -import org.apache.tuscany.sca.binding.ws.wsdlgen.BindingWSDLGenerator; -import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.databinding.DataBindingExtensionPoint; -import org.apache.tuscany.sca.host.http.ServletHost; -import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; -import org.apache.tuscany.sca.interfacedef.InterfaceContract; -import org.apache.tuscany.sca.invocation.MessageFactory; -import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple; -import org.apache.tuscany.sca.provider.ServiceBindingProvider; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.apache.tuscany.sca.work.WorkScheduler; - -/** - * The service binding provider for the remote sca binding implementation. Relies on the - * binding-ws-axis implementation for providing a remote message endpoint for this service - * - * @version $Rev: 563772 $ $Date: 2007-08-08 07:50:49 +0100 (Wed, 08 Aug 2007) $ - */ -public class Axis2SCAServiceBindingProvider implements ServiceBindingProvider { - - private static final Logger logger = Logger.getLogger(Axis2SCAServiceBindingProvider.class.getName()); - - private SCABinding binding; - private Axis2ServiceProvider axisProvider; - private WebServiceBinding wsBinding; - - private boolean started = false; - - - public Axis2SCAServiceBindingProvider(RuntimeComponent component, - RuntimeComponentService service, - DistributedSCABinding binding, - ExtensionPointRegistry extensionPoints, - List policyHandlerClassnames) { - - ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class); - ServletHost servletHost = servletHosts.getServletHosts().get(0); - ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class); - MessageFactory messageFactory = modelFactories.getFactory(MessageFactory.class); - DataBindingExtensionPoint dataBindings = extensionPoints.getExtensionPoint(DataBindingExtensionPoint.class); - UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); - WorkScheduler workScheduler = utilities.getUtility(WorkScheduler.class); - - this.binding = binding.getSCABinding(); - wsBinding = modelFactories.getFactory(WebServiceBindingFactory.class).createWebServiceBinding(); - wsBinding.setName(this.binding.getName()); - wsBinding.setURI(this.binding.getURI()); - - // Turn the java interface contract into a WSDL interface contract - BindingWSDLGenerator.generateWSDL(component, service, wsBinding, extensionPoints, null); - - // Set to use the Axiom data binding - InterfaceContract contract = wsBinding.getBindingInterfaceContract(); - contract.getInterface().resetDataBinding(OMElement.class.getName()); - - axisProvider = new Axis2SCAServiceProvider(component, - service, - this.binding, - wsBinding, - servletHost, - messageFactory, - policyHandlerClassnames, - workScheduler); - } - - public InterfaceContract getBindingInterfaceContract() { - return wsBinding.getBindingInterfaceContract(); - } - - public boolean supportsOneWayInvocation() { - return false; - } - - public void start() { - if (started) { - return; - } else { - started = true; - } - - axisProvider.start(); - } - - public void stop() { - if (!started) { - return; - } else { - started = false; - } - - axisProvider.stop(); - } - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.java deleted file mode 100644 index dd66415cca..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAServiceProvider.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.apache.tuscany.sca.binding.sca.axis2.impl; - -import java.util.List; - -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.binding.ws.WebServiceBinding; -import org.apache.tuscany.sca.binding.ws.axis2.Axis2ServiceProvider; -import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.host.http.ServletHost; -import org.apache.tuscany.sca.invocation.MessageFactory; -import org.apache.tuscany.sca.policy.util.PolicyHandlerTuple; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentService; -import org.apache.tuscany.sca.work.WorkScheduler; - -/** - * A specialization of the Axis2BindingProvider that just switches in the SCABinding model - * element when it is required. The SCABinding is required as the service binding provider - * finds the service wire based in the binding - * - * @version $Rev: 563772 $ $Date: 2007-08-08 07:50:49 +0100 (Wed, 08 Aug 2007) $ - */ -public class Axis2SCAServiceProvider extends Axis2ServiceProvider { - - private SCABinding binding; - - /** - * Switch in the fake ws binding - * - * @param component - * @param service - * @param binding - * @param wsBinding - * @param servletHost - * @param messageFactory - */ - public Axis2SCAServiceProvider(RuntimeComponent component, - RuntimeComponentService service, - SCABinding binding, - WebServiceBinding wsBinding, - ServletHost servletHost, - MessageFactory messageFactory, - List policyHandlerClassnames, - WorkScheduler workScheduler) { - - super(component, - service, - wsBinding, - servletHost, - messageFactory, - policyHandlerClassnames, - workScheduler); - - this.binding = binding; - } - - /** - * Return the sca binding as wires will be registered against this rather - * than against the wsBinding that the Axis2SCAServiceProvider is - * expecting - * - * @return the binding - */ - @Override - protected Binding getBinding(){ - return binding; - } -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory deleted file mode 100644 index 1b369cde06..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/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.axis2.impl.Axis2SCABindingProviderFactory;model=org.apache.tuscany.sca.binding.sca.DistributedSCABinding diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java deleted file mode 100644 index 40d64be9b1..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java +++ /dev/null @@ -1,73 +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.axis2; - - -import junit.framework.Assert; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl.HelloWorldClientCallbackOnewayRemoteImpl; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class AsynchTestCase { - - public static TestNode nodeA; - public static TestNode nodeB; - - @BeforeClass - public static void init() throws Exception { - System.out.println("Setting up nodes"); - - try { - // create and start domains - nodeA = new TestNode("nodeG"); - nodeB = new TestNode("nodeH"); - - nodeA.start(); - nodeB.start(); - - } catch (Exception ex) { - System.err.println("Exception when creating domain " + ex.getMessage()); - ex.printStackTrace(System.err); - throw ex; - } - } - - @AfterClass - public static void destroy() throws Exception { - nodeA.stop(); - nodeB.stop(); - } - - @Test - public void testHelloWorldAsynch() throws Exception { - HelloWorldClient helloWorldClientB; - helloWorldClientB = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientCallbackRemote"); - helloWorldClientB.getGreetings("fred"); - System.out.println("Sleeping ..."); - Thread.sleep(2000); - System.out.println("... Done"); - Assert.assertEquals("callback fred", HelloWorldClientCallbackOnewayRemoteImpl.result ); - - } - - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java deleted file mode 100644 index b345e563e3..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverFactoryImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.sca.axis2; - -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.assembly.Endpoint; -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.endpointresolver.EndpointResolver; -import org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory; - -/** - * The factory for creating endpoint Binding providers - * - * @version $Rev$ $Date$ - */ -public class BindingScaEndpointResolverFactoryImpl implements EndpointResolverFactory { - - private ExtensionPointRegistry extensionPoints; - - public BindingScaEndpointResolverFactoryImpl(ExtensionPointRegistry extensionPoints) { - this.extensionPoints = extensionPoints; - } - - public EndpointResolver createEndpointResolver(Endpoint endpoint, Binding binding) { - - return new BindingScaEndpointResolverImpl(extensionPoints, endpoint, binding); - } - - public Class getModelType() { - return SCABinding.class; - } -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java deleted file mode 100644 index 472e85116e..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BindingScaEndpointResolverImpl.java +++ /dev/null @@ -1,69 +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.axis2; - - -import java.util.logging.Logger; - -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.assembly.Endpoint; -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.endpointresolver.EndpointResolver; - -/** - * The endpoint resolver allows unresolved endpoints to be plumbed into - * the runtime start and message send processing as a hook to late resolution - * of target services - * - * @version $Rev$ $Date$ - */ -public class BindingScaEndpointResolverImpl implements EndpointResolver { - - private final static Logger logger = Logger.getLogger(BindingScaEndpointResolverImpl.class.getName()); - - private Endpoint endpoint; - private SCABinding binding; - - public BindingScaEndpointResolverImpl(ExtensionPointRegistry extensionPoints, - Endpoint endpoint, - Binding binding) { - this.endpoint = endpoint; - this.binding = (SCABinding)binding; - } - - public void start(){ - // do nothing - } - - public void resolve() { - if (endpoint.isUnresolved()){ - // pretend to resolve the endpoint. In this test case to what we know - // it should be - logger.info("Fixing up endpoint soure binding"); - endpoint.setSourceBinding(endpoint.getCandidateBindings().get(0)); - endpoint.getSourceBinding().setURI("http://localhost:8085/BHelloWorldServiceRemote"); - } - } - - public void stop(){ - // do nothing - } -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java deleted file mode 100644 index 76dbc5a5c7..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java +++ /dev/null @@ -1,77 +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.axis2; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class CallbackTestCase { - - public static TestNode nodeA; - public static TestNode nodeB; - - @BeforeClass - public static void init() throws Exception { - System.out.println("Setting up nodes"); - - try { - // create and start domains - nodeA = new TestNode("nodeE"); - nodeB = new TestNode("nodeF"); - - nodeA.start(); - nodeB.start(); - - } catch (Exception ex) { - System.err.println("Exception when creating domain " + ex.getMessage()); - ex.printStackTrace(System.err); - throw ex; - } - } - - @AfterClass - public static void destroy() throws Exception { - nodeA.stop(); - nodeB.stop(); - } - - //@Test - public void testKeepServerRunning() throws Exception { - System.out.println("press enter to continue"); - System.in.read(); - } - - @Test - public void testHelloWorldCallbackLocal() throws Exception { - HelloWorldClient helloWorldClientB; - helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientCallbackLocal"); - Assert.assertEquals("Hello callback fred", helloWorldClientB.getGreetings("fred")); - } - - @Test - public void testHelloWorldCallbackRemote() throws Exception { - HelloWorldClient helloWorldClientA; - helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientCallbackRemote"); - Assert.assertEquals("Hello callback fred", helloWorldClientA.getGreetings("fred")); - } -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java deleted file mode 100644 index 2deb62e6c4..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java +++ /dev/null @@ -1,66 +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.axis2; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class PromotionTestCase { - - public static TestNode nodeA; - public static TestNode nodeB; - - @BeforeClass - public static void init() throws Exception { - System.out.println("Setting up nodes"); - - try { - // create and start domains - nodeA = new TestNode("nodeC"); - nodeB = new TestNode("nodeD"); - - nodeA.start(); - nodeB.start(); - - } catch (Exception ex) { - System.err.println("Exception when creating domain " + ex.getMessage()); - ex.printStackTrace(System.err); - throw ex; - } - } - - @AfterClass - public static void destroy() throws Exception { - nodeA.stop(); - nodeB.stop(); - } - - @Test - public void testHelloWorldPromotion() throws Exception { - HelloWorldClient helloWorldClientA; - helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientRemotePromotion"); - Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred"); - - } - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java deleted file mode 100644 index 2d2a23d7df..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java +++ /dev/null @@ -1,105 +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.axis2; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.osoa.sca.ServiceUnavailableException; - -public class SimpleTestCase { - - public static TestNode nodeA; - public static TestNode nodeB; - - @BeforeClass - public static void init() throws Exception { - System.out.println("Setting up nodes"); - - try { - // create and start domains - nodeA = new TestNode("nodeA"); - nodeB = new TestNode("nodeB"); - - nodeA.start(); - nodeB.start(); - - } catch (Exception ex) { - System.err.println("Exception when creating domain " + ex.getMessage()); - ex.printStackTrace(System.err); - throw ex; - } - } - - @AfterClass - public static void destroy() throws Exception { - nodeA.stop(); - nodeB.stop(); - } - - @Test - public void testHelloWorldLocal() throws Exception { - HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientLocal"); - Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred"); - - } - - @Test - public void testHelloWorldRemote() throws Exception { - - HelloWorldClient helloWorldClientA; - helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientRemote"); - - try { - helloWorldClientA.getGreetings("fred"); - } catch (ServiceUnavailableException ex){ - Assert.fail(); - } - } - - @Test - public void testHelloWorldLocalAndRemote() throws Exception { - HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientLocalAndRemote"); - HelloWorldClient helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientLocalAndRemote"); - Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred"); - Assert.assertEquals(helloWorldClientB.getGreetings("fred"), "Hello fred"); - } - - @Test - public void testHelloWorldMultipleServices() throws Exception { - HelloWorldClient helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleServices"); - HelloWorldClient helloWorldClientA2 = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleServices2"); - HelloWorldClient helloWorldClientB = nodeB.getService(HelloWorldClient.class, "BHelloWorldClientMultipleServices"); - Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred"); - Assert.assertEquals(helloWorldClientA2.getGreetings("fred"), "Hello fred"); - Assert.assertEquals(helloWorldClientB.getGreetings("fred"), "Hello fred"); - } - - @Test - public void testHelloWorldMultipleBindings() throws Exception { - HelloWorldClient helloWorldClientA; - helloWorldClientA = nodeA.getService(HelloWorldClient.class, "AHelloWorldClientMultipleBindings"); - Assert.assertEquals(helloWorldClientA.getGreetings("fred"), "Hello fred"); - - } - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java deleted file mode 100644 index e788526069..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java +++ /dev/null @@ -1,232 +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.axis2; - -import java.net.URL; -import java.util.logging.Logger; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.assembly.AssemblyFactory; -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.ComponentService; -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.assembly.CompositeService; -import org.apache.tuscany.sca.assembly.SCABinding; -import org.apache.tuscany.sca.assembly.SCABindingFactory; -import org.apache.tuscany.sca.assembly.xml.Constants; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; -import org.apache.tuscany.sca.contribution.service.ContributionService; -import org.apache.tuscany.sca.core.context.ServiceReferenceImpl; -import org.apache.tuscany.sca.host.embedded.impl.ReallySmallRuntime; -import org.apache.tuscany.sca.interfacedef.InterfaceContract; -import org.apache.tuscany.sca.interfacedef.java.JavaInterfaceFactory; -import org.apache.tuscany.sca.runtime.RuntimeComponent; -import org.apache.tuscany.sca.runtime.RuntimeComponentContext; -import org.apache.tuscany.sca.runtime.RuntimeComponentReference; -import org.osoa.sca.ServiceReference; -import org.osoa.sca.ServiceRuntimeException; - -/** - * The very minimum node implementation to get these tests going without creating a dependency on - * any runtime/hosting implementation - * - * @version $Rev: 552343 $ $Date: 2007-09-20 14:53:40 +0100 (Thu, 20 Sep 2007) $ - */ -public class TestNode { - - private static final Logger logger = Logger.getLogger(TestNode.class.getName()); - - private String nodeName; - private ReallySmallRuntime nodeRuntime; - - private ClassLoader cl = TestNode.class.getClassLoader(); - - private Composite nodeComposite = null; - private Composite appComposite = null; - - public TestNode(String nodeName) - throws Exception { - this.nodeName = nodeName; - - try { - - // create and start domainA - nodeRuntime = new ReallySmallRuntime(cl); - nodeRuntime.start(); - - // Create an in-memory domain level composite - AssemblyFactory assemblyFactory = nodeRuntime.getAssemblyFactory(); - nodeComposite = assemblyFactory.createComposite(); - nodeComposite.setName(new QName(Constants.SCA10_NS, "domain")); - nodeComposite.setURI("http://localhost"); - - // add the top level composite into the composite activator - nodeRuntime.getCompositeActivator().setDomainComposite(nodeComposite); - - // add a contribution to the domain - ContributionService contributionService = nodeRuntime.getContributionService(); - - // find the current directory as a URL. This is where our contribution - // will come from - URL contributionURL = Thread.currentThread().getContextClassLoader().getResource(nodeName + "/"); - - // Contribute the SCA application - Contribution contribution = contributionService.contribute("http://calculator", contributionURL, null, false); - appComposite = contribution.getDeployables().get(0); - - // Add the deployable composite to the domain - nodeComposite.getIncludes().add(appComposite); - nodeRuntime.buildComposite(appComposite); - nodeRuntime.getCompositeActivator().activate(appComposite); - - - } catch (Exception ex) { - System.err.println("Exception when creating node " + ex.getMessage()); - ex.printStackTrace(System.err); - throw ex; - } - } - - public void start() { - - try { - nodeRuntime.getCompositeActivator().start(appComposite); - } catch (Exception ex) { - System.err.println("Exception when creating domain " + ex.getMessage()); - ex.printStackTrace(System.err); - } - - } - - public void stop() { - try { - nodeRuntime.stop(); - } catch (Exception ex) { - System.err.println("Exception when creating domain " + ex.getMessage()); - ex.printStackTrace(System.err); - } - } - - public B getService(Class businessInterface, String serviceName) { - ServiceReference serviceReference = getServiceReference(businessInterface, serviceName); - if (serviceReference == null) { - throw new ServiceRuntimeException("Service not found: " + serviceName); - } - return serviceReference.getService(); - } - - private ServiceReference createServiceReference(Class businessInterface, String targetURI) { - try { - AssemblyFactory assemblyFactory = nodeRuntime.getAssemblyFactory(); - Composite composite = assemblyFactory.createComposite(); - composite.setName(new QName(Constants.SCA10_TUSCANY_NS, "default")); - RuntimeComponent component = (RuntimeComponent)assemblyFactory.createComponent(); - component.setName("default"); - component.setURI("default"); - nodeRuntime.getCompositeActivator().configureComponentContext(component); - composite.getComponents().add(component); - RuntimeComponentReference reference = (RuntimeComponentReference)assemblyFactory.createComponentReference(); - reference.setName("default"); - ModelFactoryExtensionPoint factories = - nodeRuntime.getExtensionPointRegistry().getExtensionPoint(ModelFactoryExtensionPoint.class); - JavaInterfaceFactory javaInterfaceFactory = factories.getFactory(JavaInterfaceFactory.class); - InterfaceContract interfaceContract = javaInterfaceFactory.createJavaInterfaceContract(); - interfaceContract.setInterface(javaInterfaceFactory.createJavaInterface(businessInterface)); - reference.setInterfaceContract(interfaceContract); - component.getReferences().add(reference); - reference.setComponent(component); - SCABindingFactory scaBindingFactory = factories.getFactory(SCABindingFactory.class); - SCABinding binding = scaBindingFactory.createSCABinding(); - binding.setURI(targetURI); - reference.getBindings().add(binding); - return new ServiceReferenceImpl(businessInterface, component, reference, binding, nodeRuntime - .getProxyFactory(), nodeRuntime.getCompositeActivator()); - } catch (Exception e) { - throw new ServiceRuntimeException(e); - } - } - - public ServiceReference getServiceReference(Class businessInterface, String name) { - - // Extract the component name - String componentName; - String serviceName; - int i = name.indexOf('/'); - if (i != -1) { - componentName = name.substring(0, i); - serviceName = name.substring(i + 1); - - } else { - componentName = name; - serviceName = null; - } - - // Lookup the component in the domain - - Component component = null; - - for (Composite composite: nodeComposite.getIncludes()) { - for (Component componentLoop: composite.getComponents()) { - if (componentLoop.getName().equals(componentName)) { - component = componentLoop; - break; - } - } - } - if (component == null) { - // The component is not local in the partition, try to create a remote service ref - return createServiceReference(businessInterface, name); - } - RuntimeComponentContext componentContext = null; - - // If the component is a composite, then we need to find the - // non-composite component that provides the requested service - if (component.getImplementation() instanceof Composite) { - for (ComponentService componentService : component.getServices()) { - if (serviceName == null || serviceName.equals(componentService.getName())) { - CompositeService compositeService = (CompositeService)componentService.getService(); - if (compositeService != null) { - if (serviceName != null) { - serviceName = "$promoted$" + component.getName() + "$slash$" + serviceName; - } - componentContext = - ((RuntimeComponent)compositeService.getPromotedComponent()).getComponentContext(); - return componentContext.createSelfReference(businessInterface, compositeService - .getPromotedService()); - } - break; - } - } - // No matching service is found - throw new ServiceRuntimeException("Composite service not found: " + name); - } else { - componentContext = ((RuntimeComponent)component).getComponentContext(); - if (serviceName != null) { - return componentContext.createSelfReference(businessInterface, serviceName); - } else { - return componentContext.createSelfReference(businessInterface); - } - } - } - -} - diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java deleted file mode 100644 index 1a2788ac74..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldCallbackRemote.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.sca.axis2.helloworld; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface HelloWorldCallbackRemote { - - String getGreetingsCallbackRemote(String s); - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java deleted file mode 100644 index e4d36ac78b..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldClient.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.sca.axis2.helloworld; - - -public interface HelloWorldClient { - - String getGreetings(String s); - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java deleted file mode 100644 index a83fcb3069..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackOnewayRemote.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.sca.axis2.helloworld; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.OneWay; -import org.osoa.sca.annotations.Remotable; - -@Remotable -@Callback(HelloWorldCallbackRemote.class) -public interface HelloWorldServiceCallbackOnewayRemote { - - @OneWay - void getGreetingsRemote(String s); - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java deleted file mode 100644 index c41548ec51..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceCallbackRemote.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.sca.axis2.helloworld; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; - -@Remotable -@Callback(HelloWorldCallbackRemote.class) -public interface HelloWorldServiceCallbackRemote { - - String getGreetingsRemote(String s); - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java deleted file mode 100644 index 7b8e00eb2a..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceLocal.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.sca.axis2.helloworld; - - -public interface HelloWorldServiceLocal { - - String getGreetingsLocal(String s); - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java deleted file mode 100644 index 62d61e4fff..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.sca.axis2.helloworld; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface HelloWorldServiceRemote { - - String getGreetingsRemote(String s); - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java deleted file mode 100644 index 2dcc8cc64b..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/HelloWorldServiceRemote2.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.sca.axis2.helloworld; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface HelloWorldServiceRemote2 { - - String getGreetingsRemote2(String s); - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.java deleted file mode 100644 index 8e7d2f8023..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackOnewayRemoteImpl.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.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackOnewayRemote; -import org.osoa.sca.annotations.Reference; - -public class HelloWorldClientCallbackOnewayRemoteImpl implements HelloWorldClient { - - public static String result; - - @Reference - public HelloWorldServiceCallbackOnewayRemote helloWorldService; - - public String getGreetings(String s) { - helloWorldService.getGreetingsRemote(s); - return null; - } - - public String getGreetingsCallbackRemote(String s) { - result = "callback " + s; - return result; - } - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java deleted file mode 100644 index 7d07c4ff43..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientCallbackRemoteImpl.java +++ /dev/null @@ -1,42 +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.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackRemote; -import org.osoa.sca.annotations.Reference; - -public class HelloWorldClientCallbackRemoteImpl implements HelloWorldClient { - - public static String result; - - @Reference - public HelloWorldServiceCallbackRemote helloWorldService; - - public String getGreetings(String s) { - return helloWorldService.getGreetingsRemote(s); - } - - public String getGreetingsCallbackRemote(String s) { - result = "callback " + s; - return result; - } - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java deleted file mode 100644 index 7098f10622..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientLocalImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceLocal; -import org.osoa.sca.annotations.Reference; - -public class HelloWorldClientLocalImpl implements HelloWorldClient { - - @Reference - public HelloWorldServiceLocal helloWorldService; - - public String getGreetings(String s) { - return helloWorldService.getGreetingsLocal(s); - } - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java deleted file mode 100644 index 07ae00bd31..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemote2Impl.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote2; -import org.osoa.sca.annotations.Reference; - -public class HelloWorldClientRemote2Impl implements HelloWorldClient { - - @Reference - public HelloWorldServiceRemote2 helloWorldService; - - public String getGreetings(String s) { - return helloWorldService.getGreetingsRemote2(s); - } - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java deleted file mode 100644 index 36854cb7b8..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldClientRemoteImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldClient; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote; -import org.osoa.sca.annotations.Reference; - -public class HelloWorldClientRemoteImpl implements HelloWorldClient { - - @Reference - public HelloWorldServiceRemote helloWorldService; - - public String getGreetings(String s) { - return helloWorldService.getGreetingsRemote(s); - } - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java deleted file mode 100644 index fd3e3a1158..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackOnewayRemoteImpl.java +++ /dev/null @@ -1,36 +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.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldCallbackRemote; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackOnewayRemote; -import org.osoa.sca.annotations.Callback; - - -public class HelloWorldServiceCallbackOnewayRemoteImpl implements HelloWorldServiceCallbackOnewayRemote { - - @Callback - protected HelloWorldCallbackRemote theCallback; - - public void getGreetingsRemote(String s) { - theCallback.getGreetingsCallbackRemote(s); - } - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java deleted file mode 100644 index 3400e97447..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceCallbackRemoteImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldCallbackRemote; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceCallbackRemote; -import org.osoa.sca.annotations.Callback; - -public class HelloWorldServiceCallbackRemoteImpl implements HelloWorldServiceCallbackRemote { - - @Callback - protected HelloWorldCallbackRemote theCallback; - - public String getGreetingsRemote(String s) { - return "Hello " + theCallback.getGreetingsCallbackRemote(s); - } - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java deleted file mode 100644 index 20dd97b74a..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceLocalImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceLocal; - -public class HelloWorldServiceLocalImpl implements HelloWorldServiceLocal { - - public String getGreetingsLocal(String s) { - return "Hello " + s; - } - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java deleted file mode 100644 index 5f8ccf9466..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceMultipleServicesImpl.java +++ /dev/null @@ -1,41 +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.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceLocal; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote; -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote2; -import org.osoa.sca.annotations.Service; - -@Service(interfaces={HelloWorldServiceRemote.class, HelloWorldServiceRemote2.class, HelloWorldServiceLocal.class} ) -public class HelloWorldServiceMultipleServicesImpl implements HelloWorldServiceLocal, HelloWorldServiceRemote, HelloWorldServiceRemote2 { - - public String getGreetingsLocal(String s) { - return "Hello " + s; - } - - public String getGreetingsRemote(String s) { - return "Hello " + s; - } - - public String getGreetingsRemote2(String s) { - return "Hello " + s; - } -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java deleted file mode 100644 index b25aebd9df..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/helloworld/impl/HelloWorldServiceRemoteImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.binding.sca.axis2.helloworld.impl; - -import org.apache.tuscany.sca.binding.sca.axis2.helloworld.HelloWorldServiceRemote; - -public class HelloWorldServiceRemoteImpl implements HelloWorldServiceRemote { - - public String getGreetingsRemote(String s) { - return "Hello " + s; - } - -} diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory deleted file mode 100644 index 5e4fd566c3..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/META-INF/services/org.apache.tuscany.sca.endpointresolver.EndpointResolverFactory +++ /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.axis2.BindingScaEndpointResolverFactoryImpl;model=org.apache.tuscany.sca.assembly.SCABinding diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite deleted file mode 100644 index 093258051e..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml deleted file mode 100644 index d6b9e82250..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeA/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite deleted file mode 100644 index 8cf7230ed5..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml deleted file mode 100644 index d6b9e82250..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeB/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite deleted file mode 100644 index 066727f76d..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite deleted file mode 100644 index 485e0815d2..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorldComponent.composite +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml deleted file mode 100644 index d6b9e82250..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeC/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite deleted file mode 100644 index a5a4f04cb5..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite deleted file mode 100644 index bf30bdf42d..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorldComponent.composite +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml deleted file mode 100644 index d6b9e82250..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeD/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite deleted file mode 100644 index b519793290..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml deleted file mode 100644 index d6b9e82250..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeE/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite deleted file mode 100644 index 20a6c54e6e..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml deleted file mode 100644 index d6b9e82250..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeF/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite deleted file mode 100644 index a76008d0c5..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml deleted file mode 100644 index d670354a28..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeG/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite deleted file mode 100644 index 0c22af22ab..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml b/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml deleted file mode 100644 index d670354a28..0000000000 --- a/branches/sca-java-1.5.1/modules/binding-sca-axis2/src/test/resources/nodeH/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file -- cgit v1.2.3