From d1ed18bd530351862a1ee828237840fac1269a70 Mon Sep 17 00:00:00 2001 From: rfeng Date: Fri, 9 Oct 2009 20:01:49 +0000 Subject: Remove endpoint-wrapper module as now DomainRegistryFactory utility takes over the responsibility git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@823673 13f79535-47bb-0310-9956-ffa450edef68 --- java/sca/modules/endpoint-wrapper/LICENSE | 205 --------------------- .../modules/endpoint-wrapper/META-INF/MANIFEST.MF | 19 -- java/sca/modules/endpoint-wrapper/NOTICE | 6 - java/sca/modules/endpoint-wrapper/pom.xml | 87 --------- .../endpoint/wrapper/EndpointRegistryWrapper.java | 147 --------------- ...org.apache.tuscany.sca.runtime.EndpointRegistry | 18 -- .../src/test/java/calculator/AddService.java | 28 --- .../src/test/java/calculator/AddServiceImpl.java | 35 ---- .../test/java/calculator/CalculatorService.java | 35 ---- .../java/calculator/CalculatorServiceImpl.java | 70 ------- .../src/test/java/calculator/DivideService.java | 28 --- .../test/java/calculator/DivideServiceImpl.java | 35 ---- .../src/test/java/calculator/MultiplyService.java | 28 --- .../test/java/calculator/MultiplyServiceImpl.java | 35 ---- .../src/test/java/calculator/SubtractService.java | 28 --- .../test/java/calculator/SubtractServiceImpl.java | 35 ---- .../src/test/resources/Calculator.composite | 52 ------ 17 files changed, 891 deletions(-) delete mode 100644 java/sca/modules/endpoint-wrapper/LICENSE delete mode 100644 java/sca/modules/endpoint-wrapper/META-INF/MANIFEST.MF delete mode 100644 java/sca/modules/endpoint-wrapper/NOTICE delete mode 100644 java/sca/modules/endpoint-wrapper/pom.xml delete mode 100644 java/sca/modules/endpoint-wrapper/src/main/java/org/apache/tuscany/sca/endpoint/wrapper/EndpointRegistryWrapper.java delete mode 100644 java/sca/modules/endpoint-wrapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry delete mode 100644 java/sca/modules/endpoint-wrapper/src/test/java/calculator/AddService.java delete mode 100644 java/sca/modules/endpoint-wrapper/src/test/java/calculator/AddServiceImpl.java delete mode 100644 java/sca/modules/endpoint-wrapper/src/test/java/calculator/CalculatorService.java delete mode 100644 java/sca/modules/endpoint-wrapper/src/test/java/calculator/CalculatorServiceImpl.java delete mode 100644 java/sca/modules/endpoint-wrapper/src/test/java/calculator/DivideService.java delete mode 100644 java/sca/modules/endpoint-wrapper/src/test/java/calculator/DivideServiceImpl.java delete mode 100644 java/sca/modules/endpoint-wrapper/src/test/java/calculator/MultiplyService.java delete mode 100644 java/sca/modules/endpoint-wrapper/src/test/java/calculator/MultiplyServiceImpl.java delete mode 100644 java/sca/modules/endpoint-wrapper/src/test/java/calculator/SubtractService.java delete mode 100644 java/sca/modules/endpoint-wrapper/src/test/java/calculator/SubtractServiceImpl.java delete mode 100644 java/sca/modules/endpoint-wrapper/src/test/resources/Calculator.composite diff --git a/java/sca/modules/endpoint-wrapper/LICENSE b/java/sca/modules/endpoint-wrapper/LICENSE deleted file mode 100644 index 6e529a25c4..0000000000 --- a/java/sca/modules/endpoint-wrapper/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/java/sca/modules/endpoint-wrapper/META-INF/MANIFEST.MF b/java/sca/modules/endpoint-wrapper/META-INF/MANIFEST.MF deleted file mode 100644 index fc99ede258..0000000000 --- a/java/sca/modules/endpoint-wrapper/META-INF/MANIFEST.MF +++ /dev/null @@ -1,19 +0,0 @@ -Manifest-Version: 1.0 -Private-Package: apache.tuscany.sca.endpoint.wrapper;version="2.0.0" -Tool: Bnd-0.0.255 -Bundle-Name: Apache Tuscany SCA Default Endpoint Wrapper -Created-By: 1.6.0_07 (Sun Microsystems Inc.) -Bundle-Vendor: The Apache Software Foundation -Bundle-Version: 2.0.0 -Bnd-LastModified: 1225397237968 -Bundle-ManifestVersion: 2 -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-Description: Apache Tuscany SCA Default Endpoint Wrapper -Import-Package: org.apache.tuscany.sca.assembly;version="2.0.0";resolution:=optional, - org.apache.tuscany.sca.core;version="2.0.0";resolution:=optional, - org.apache.tuscany.sca.extensibility;version="2.0.0", - org.apache.tuscany.sca.management;version="2.0.0", - org.apache.tuscany.sca.runtime;version="2.0.0" -Bundle-SymbolicName: org.apache.tuscany.sca.endpoint.wrapper -Bundle-DocURL: http://www.apache.org/ -Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 diff --git a/java/sca/modules/endpoint-wrapper/NOTICE b/java/sca/modules/endpoint-wrapper/NOTICE deleted file mode 100644 index 51042eab05..0000000000 --- a/java/sca/modules/endpoint-wrapper/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/java/sca/modules/endpoint-wrapper/pom.xml b/java/sca/modules/endpoint-wrapper/pom.xml deleted file mode 100644 index 963df87c7f..0000000000 --- a/java/sca/modules/endpoint-wrapper/pom.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-modules - 2.0-SNAPSHOT - ../pom.xml - - - tuscany-endpoint-wrapper - Apache Tuscany SCA Endpoint Wrapper - - - - - org.apache.tuscany.sca - tuscany-assembly - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-assembly-xml - 2.0-SNAPSHOT - test - - - - org.apache.tuscany.sca - tuscany-core-spi - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-monitor - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-sca-api - 2.0-SNAPSHOT - test - - - - org.apache.tuscany.sca - tuscany-core - 2.0-SNAPSHOT - test - - - - org.apache.tuscany.sca - tuscany-extensibility - 2.0-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-contribution - 2.0-SNAPSHOT - test - - - diff --git a/java/sca/modules/endpoint-wrapper/src/main/java/org/apache/tuscany/sca/endpoint/wrapper/EndpointRegistryWrapper.java b/java/sca/modules/endpoint-wrapper/src/main/java/org/apache/tuscany/sca/endpoint/wrapper/EndpointRegistryWrapper.java deleted file mode 100644 index 25330b229c..0000000000 --- a/java/sca/modules/endpoint-wrapper/src/main/java/org/apache/tuscany/sca/endpoint/wrapper/EndpointRegistryWrapper.java +++ /dev/null @@ -1,147 +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.endpoint.wrapper; - -import java.lang.reflect.Constructor; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.logging.Logger; - -import org.apache.tuscany.sca.assembly.Endpoint; -import org.apache.tuscany.sca.assembly.EndpointReference; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.core.LifeCycleListener; -import org.apache.tuscany.sca.core.UtilityExtensionPoint; -import org.apache.tuscany.sca.extensibility.ServiceDeclaration; -import org.apache.tuscany.sca.extensibility.ServiceDiscovery; -import org.apache.tuscany.sca.management.ConfigAttributes; -import org.apache.tuscany.sca.runtime.EndpointListener; -import org.apache.tuscany.sca.runtime.EndpointRegistry; - -/** - * A EndpointRegistry implementation that sees registrations from the same JVM - */ -public class EndpointRegistryWrapper implements EndpointRegistry, LifeCycleListener { - private final Logger logger = Logger.getLogger(EndpointRegistryWrapper.class.getName()); - - private ExtensionPointRegistry extensionPoints; - private EndpointRegistry delegateEndpointRegistry; - - public EndpointRegistryWrapper(ExtensionPointRegistry extensionPoints) { - this.extensionPoints = extensionPoints; - } - - public void start() { - UtilityExtensionPoint utilities = extensionPoints.getExtensionPoint(UtilityExtensionPoint.class); - ConfigAttributes domainConfig = utilities.getUtility(ConfigAttributes.class); - String scheme = null; - if (domainConfig != null) { - scheme = domainConfig.getAttributes().get("domainScheme"); - } - if (scheme == null) { - scheme = "vm"; - } - try { - Collection sds = - ServiceDiscovery.getInstance().getServiceDeclarations(EndpointRegistry.class); - for (ServiceDeclaration sd : sds) { - if (scheme.equals(sd.getAttributes().get("scheme"))) { - logger.info("EndpointRegistry found: " + sd.getClassName()); - Class implClass = sd.loadClass(); - Constructor constructor = null; - try { - constructor = implClass.getConstructor(ExtensionPointRegistry.class); - delegateEndpointRegistry = (EndpointRegistry)constructor.newInstance(extensionPoints); - } catch (NoSuchMethodException e) { - constructor = implClass.getConstructor(ExtensionPointRegistry.class, Map.class); - delegateEndpointRegistry = - (EndpointRegistry)constructor.newInstance(extensionPoints, sd.getAttributes()); - } - break; - } - } - } catch (Exception e) { - throw new IllegalStateException(e); - } - if (delegateEndpointRegistry instanceof LifeCycleListener) { - ((LifeCycleListener)delegateEndpointRegistry).start(); - } - } - - public void stop() { - if (delegateEndpointRegistry instanceof LifeCycleListener) { - ((LifeCycleListener)delegateEndpointRegistry).stop(); - } - } - - public void addEndpoint(Endpoint endpoint) { - delegateEndpointRegistry.addEndpoint(endpoint); - } - - public void addEndpointReference(EndpointReference endpointReference) { - delegateEndpointRegistry.addEndpointReference(endpointReference); - } - - public void addListener(EndpointListener listener) { - delegateEndpointRegistry.addListener(listener); - } - - public List findEndpoint(EndpointReference endpointReference) { - return delegateEndpointRegistry.findEndpoint(endpointReference); - } - - public List findEndpointReference(Endpoint endpoint) { - return delegateEndpointRegistry.findEndpointReference(endpoint); - } - - public Endpoint getEndpoint(String uri) { - return delegateEndpointRegistry.getEndpoint(uri); - } - - public List getEndpointRefereneces() { - return delegateEndpointRegistry.getEndpointRefereneces(); - } - - public List getEndpoints() { - return delegateEndpointRegistry.getEndpoints(); - } - - public List getListeners() { - return delegateEndpointRegistry.getListeners(); - } - - public void removeEndpoint(Endpoint endpoint) { - delegateEndpointRegistry.removeEndpoint(endpoint); - } - - public void removeEndpointReference(EndpointReference endpointReference) { - delegateEndpointRegistry.removeEndpointReference(endpointReference); - } - - public void removeListener(EndpointListener listener) { - delegateEndpointRegistry.removeListener(listener); - } - - public void updateEndpoint(String uri, Endpoint endpoint) { - delegateEndpointRegistry.updateEndpoint(uri, endpoint); - } - -} diff --git a/java/sca/modules/endpoint-wrapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry b/java/sca/modules/endpoint-wrapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry deleted file mode 100644 index 8ba40ef648..0000000000 --- a/java/sca/modules/endpoint-wrapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.EndpointRegistry +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -org.apache.tuscany.sca.endpoint.wrapper.EndpointRegistryWrapper;ranking=200,scheme=wrapper diff --git a/java/sca/modules/endpoint-wrapper/src/test/java/calculator/AddService.java b/java/sca/modules/endpoint-wrapper/src/test/java/calculator/AddService.java deleted file mode 100644 index 5a1e7a638a..0000000000 --- a/java/sca/modules/endpoint-wrapper/src/test/java/calculator/AddService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * The Add service interface - */ -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/java/sca/modules/endpoint-wrapper/src/test/java/calculator/AddServiceImpl.java b/java/sca/modules/endpoint-wrapper/src/test/java/calculator/AddServiceImpl.java deleted file mode 100644 index caf4d358df..0000000000 --- a/java/sca/modules/endpoint-wrapper/src/test/java/calculator/AddServiceImpl.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 calculator; - -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * An implementation of the Add service - */ -public class AddServiceImpl implements AddService { - - public double add(double n1, double n2) { - Logger logger = Logger.getLogger("calculator"); - logger.log(Level.FINEST, "Adding " + n1 + " and " + n2); - return n1 + n2; - } - -} diff --git a/java/sca/modules/endpoint-wrapper/src/test/java/calculator/CalculatorService.java b/java/sca/modules/endpoint-wrapper/src/test/java/calculator/CalculatorService.java deleted file mode 100644 index ad87375529..0000000000 --- a/java/sca/modules/endpoint-wrapper/src/test/java/calculator/CalculatorService.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 calculator; - - -/** - * The Calculator service interface. - */ -public interface CalculatorService { - - double add(double n1, double n2); - - double subtract(double n1, double n2); - - double multiply(double n1, double n2); - - double divide(double n1, double n2); - -} diff --git a/java/sca/modules/endpoint-wrapper/src/test/java/calculator/CalculatorServiceImpl.java b/java/sca/modules/endpoint-wrapper/src/test/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index d3fa7a8f41..0000000000 --- a/java/sca/modules/endpoint-wrapper/src/test/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -import org.oasisopen.sca.annotation.Reference; - - -/** - * An implementation of the Calculator service. - */ -public class CalculatorServiceImpl implements CalculatorService { - - private AddService addService; - private SubtractService subtractService; - private MultiplyService multiplyService; - private DivideService divideService; - - @Reference - public void setAddService(AddService addService) { - this.addService = addService; - } - - @Reference - public void setSubtractService(SubtractService subtractService) { - this.subtractService = subtractService; - } - - @Reference - public void setDivideService(DivideService divideService) { - this.divideService = divideService; - } - - @Reference - public void setMultiplyService(MultiplyService multiplyService) { - this.multiplyService = multiplyService; - } - - public double add(double n1, double n2) { - return addService.add(n1, n2); - } - - public double subtract(double n1, double n2) { - return subtractService.subtract(n1, n2); - } - - public double multiply(double n1, double n2) { - return multiplyService.multiply(n1, n2); - } - - public double divide(double n1, double n2) { - return divideService.divide(n1, n2); - } - -} diff --git a/java/sca/modules/endpoint-wrapper/src/test/java/calculator/DivideService.java b/java/sca/modules/endpoint-wrapper/src/test/java/calculator/DivideService.java deleted file mode 100644 index ef6a8b375b..0000000000 --- a/java/sca/modules/endpoint-wrapper/src/test/java/calculator/DivideService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * The divide service interface - */ -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/java/sca/modules/endpoint-wrapper/src/test/java/calculator/DivideServiceImpl.java b/java/sca/modules/endpoint-wrapper/src/test/java/calculator/DivideServiceImpl.java deleted file mode 100644 index cd91935f08..0000000000 --- a/java/sca/modules/endpoint-wrapper/src/test/java/calculator/DivideServiceImpl.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 calculator; - -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * An implementation of the Divide service. - */ -public class DivideServiceImpl implements DivideService { - - public double divide(double n1, double n2) { - Logger logger = Logger.getLogger("calculator"); - logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2); - return n1 / n2; - } - -} diff --git a/java/sca/modules/endpoint-wrapper/src/test/java/calculator/MultiplyService.java b/java/sca/modules/endpoint-wrapper/src/test/java/calculator/MultiplyService.java deleted file mode 100644 index db568cc762..0000000000 --- a/java/sca/modules/endpoint-wrapper/src/test/java/calculator/MultiplyService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * The interface for the multiply service - */ -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/java/sca/modules/endpoint-wrapper/src/test/java/calculator/MultiplyServiceImpl.java b/java/sca/modules/endpoint-wrapper/src/test/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index c85357fcd8..0000000000 --- a/java/sca/modules/endpoint-wrapper/src/test/java/calculator/MultiplyServiceImpl.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 calculator; - -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * An implementation of the Multiply service. - */ -public class MultiplyServiceImpl implements MultiplyService { - - public double multiply(double n1, double n2) { - Logger logger = Logger.getLogger("calculator"); - logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2); - return n1 * n2; - } - -} diff --git a/java/sca/modules/endpoint-wrapper/src/test/java/calculator/SubtractService.java b/java/sca/modules/endpoint-wrapper/src/test/java/calculator/SubtractService.java deleted file mode 100644 index 56ee372fc4..0000000000 --- a/java/sca/modules/endpoint-wrapper/src/test/java/calculator/SubtractService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * The interface for the multiply service - */ -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/java/sca/modules/endpoint-wrapper/src/test/java/calculator/SubtractServiceImpl.java b/java/sca/modules/endpoint-wrapper/src/test/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 1b669084d9..0000000000 --- a/java/sca/modules/endpoint-wrapper/src/test/java/calculator/SubtractServiceImpl.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 calculator; - -import java.util.logging.Level; -import java.util.logging.Logger; - -/** - * An implementation of the subtract service. - */ -public class SubtractServiceImpl implements SubtractService { - - public double subtract(double n1, double n2) { - Logger logger = Logger.getLogger("calculator"); - logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2); - return n1 - n2; - } - -} diff --git a/java/sca/modules/endpoint-wrapper/src/test/resources/Calculator.composite b/java/sca/modules/endpoint-wrapper/src/test/resources/Calculator.composite deleted file mode 100644 index 798d433ab8..0000000000 --- a/java/sca/modules/endpoint-wrapper/src/test/resources/Calculator.composite +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file -- cgit v1.2.3