From 5e78e2a84f0cfcf141f48e58404e8c21c061b079 Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:23:10 +0000 Subject: Moving 2.x tags git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835154 13f79535-47bb-0310-9956-ffa450edef68 --- .../dosgi-dynamic-calculator-operations/LICENSE | 205 --------------------- .../META-INF/MANIFEST.MF | 23 --- .../dosgi-dynamic-calculator-operations/NOTICE | 6 - .../OSGI-INF/add-component.xml | 25 --- .../OSGI-INF/blueprint/operations-module.xml | 40 ---- .../OSGI-INF/divide-component.xml | 25 --- .../OSGI-INF/multiply-component.xml | 25 --- .../OSGI-INF/sca-config/operations-config.xml | 29 --- .../OSGI-INF/subtract-component.xml | 25 --- .../dosgi-dynamic-calculator-operations/README | 183 ------------------ .../dosgi-dynamic-calculator-operations/pom.xml | 141 -------------- .../calculator/dosgi/operations/AddService.java | 31 ---- .../calculator/dosgi/operations/DivideService.java | 31 ---- .../dosgi/operations/MultiplyService.java | 31 ---- .../dosgi/operations/SubtractService.java | 31 ---- .../dosgi/operations/impl/AddServiceImpl.java | 37 ---- .../dosgi/operations/impl/DivideServiceImpl.java | 37 ---- .../dosgi/operations/impl/MultiplyServiceImpl.java | 37 ---- .../dosgi/operations/impl/OperationsActivator.java | 94 ---------- .../dosgi/operations/impl/SubtractServiceImpl.java | 37 ---- .../dosgi/operations/test/OSGiTestUtils.java | 105 ----------- .../dosgi/operations/test/OperationsNode.java | 43 ----- .../test/OperationsOSGiNodeTestCase.java | 104 ----------- 23 files changed, 1345 deletions(-) delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/LICENSE delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/NOTICE delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/README delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/pom.xml delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java delete mode 100644 tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java (limited to 'tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations') diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/LICENSE b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/LICENSE deleted file mode 100644 index 6e529a25c4..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF deleted file mode 100644 index cea4e2ff79..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF +++ /dev/null @@ -1,23 +0,0 @@ -Manifest-Version: 1.0 -Export-Package: calculator.dosgi.operations;version="1.0.1" -Bundle-Version: 1.0.0 -Bundle-Name: calculator.dosgi.dynamic.operations -Bundle-Activator: calculator.dosgi.operations.impl.OperationsActivator -Bundle-ManifestVersion: 2 -Import-Package: calculator.dosgi.operations;version="[1.0.1,1.0.1]", - org.oasisopen.sca.annotation;version="2.0.0", - org.osgi.framework, - org.osgi.service.component;resolution:=optional, - org.osgi.service.packageadmin -Bundle-SymbolicName: calculator.dosgi.dynamic.operations -Bundle-Vendor: The Apache Software Foundation -Bundle-ActivationPolicy: lazy -Eclipse-LazyStart: true -Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -Bundle-DocURL: http://www.apache.org/ -Service-Component-Disabled: OSGI-INF/add-component.xml, - OSGI-INF/subtract-component.xml, - OSGI-INF/multiply-component.xml, - OSGI-INF/divide-component.xml -Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 -SCA-Configuration: OSGI-INF/sca-config/*.xml diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/NOTICE b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/NOTICE deleted file mode 100644 index 51042eab05..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2009 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml deleted file mode 100644 index 99845257ff..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml deleted file mode 100644 index f6b5f4690e..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml deleted file mode 100644 index 322d4daf2f..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml deleted file mode 100644 index b9ca777bd8..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml deleted file mode 100644 index b00f05ad2d..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml deleted file mode 100644 index 1472f5a976..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/README b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/README deleted file mode 100644 index 9e616c1f50..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/README +++ /dev/null @@ -1,183 +0,0 @@ -Distributed OSGi Calculator Sample -================================== -This sample implements a distributed calculator using Distributed OSGi (RFC 119) over SCA. - -The README in the samples directory (the directory above this) provides -general instructions about building and running samples. Take a look there -first. - -On Windows, run -java -jar ..\..\modules\osgi-3.4.0-v20080605-1900.jar -configuration ..\..\features\configuration -clean -console - -On *Unix, run -java -jar ../../modules/osgi-3.4.0-v20080605-1900.jar -configuration ../../features/configuration -clean -console - -You should see the osgi console: - -osgi> - -osgi> Jun 22, 2009 1:32:27 PM org.apache.tuscany.sca.extensibility.equinox.EquinoxServiceDiscoveryActivator start -INFO: Equinox-based service discoverer is now configured. - -You can run "ss" command under the osgi> to see the status of the bundles. -osgi> ss - -Then you can install and start the calculator.dosgi bundle: - -osgi> install file:./target/sample-dosgi-calculator-operations.jar -Bundle id is 181 - -osgi> start 181 -Jun 22, 2009 2:09:21 PM calculator.dosgi.operations.impl.OperationsActivator sta -rt -INFO: Starting file:./target/sample-dosgi-calculator-operations.jar [181] -Jun 22, 2009 2:09:21 PM calculator.dosgi.operations.impl.OperationsActivator sta -rt -INFO: Registering calculator.dosgi.operations.AddService -Jun 22, 2009 2:09:21 PM calculator.dosgi.operations.impl.OperationsActivator sta -rt -INFO: Registering calculator.dosgi.operations.SubtractService -Jun 22, 2009 2:09:21 PM calculator.dosgi.operations.impl.OperationsActivator sta -rt -INFO: Registering calculator.dosgi.operations.MultiplyService -Jun 22, 2009 2:09:21 PM calculator.dosgi.operations.impl.OperationsActivator sta -rt -INFO: Registering calculator.dosgi.operations.DivideService -Jun 22, 2009 2:09:21 PM calculator.dosgi.operations.impl.OperationsActivator get -Bundle -INFO: calculator.dosgi.operations.AddService is loaded by bundle: calculator.dos -gi.operations -Jun 22, 2009 2:09:21 PM org.apache.tuscany.sca.node.impl.NodeImpl start -INFO: Starting node: calculator.dosgi.operations -Jun 22, 2009 2:09:21 PM org.apache.tuscany.sca.node.impl.NodeFactoryImpl configu -reNode -INFO: Loading contribution: bundleentry://181/ -Jun 22, 2009 2:09:21 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin -tRegistry addEndpoint -INFO: EndpointRegistry: Add endpoint - Endpoint: URI = OperationsComponent#serv -ice-binding(AddService/AddService) -Jun 22, 2009 2:09:21 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost registerS -ervice -INFO: RMI service registered: rmi://localhost:8085/AddService -Jun 22, 2009 2:09:21 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin -tRegistry addEndpoint -INFO: EndpointRegistry: Add endpoint - Endpoint: URI = OperationsComponent#serv -ice-binding(SubtractService/SubtractService) -Jun 22, 2009 2:09:21 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost registerS -ervice -INFO: RMI service registered: rmi://localhost:8085/SubtractService -Jun 22, 2009 2:09:21 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin -tRegistry addEndpoint -INFO: EndpointRegistry: Add endpoint - Endpoint: URI = OperationsComponent#serv -ice-binding(MultiplyService/MultiplyService) -Jun 22, 2009 2:09:21 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost registerS -ervice -INFO: RMI service registered: rmi://localhost:8085/MultiplyService -Jun 22, 2009 2:09:21 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin -tRegistry addEndpoint -INFO: EndpointRegistry: Add endpoint - Endpoint: URI = OperationsComponent#serv -ice-binding(DivideService/DivideService) -Jun 22, 2009 2:09:21 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost registerS -ervice -INFO: RMI service registered: rmi://localhost:8085/DivideService - -osgi> - -To stop the bundle: - -osgi> stop 181 -Jun 22, 2009 2:09:48 PM org.apache.tuscany.sca.node.impl.NodeImpl stop -INFO: Stopping node: calculator.dosgi.operations -Jun 22, 2009 2:09:48 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin -tRegistry removeEndpoint -INFO: EndpointRegistry: Remove endpoint - Endpoint: URI = OperationsComponent#s -ervice-binding(AddService/AddService) -Jun 22, 2009 2:09:48 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost unregiste -rService -INFO: RMI service unregistered: rmi://localhost:8085/AddService -Jun 22, 2009 2:09:48 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin -tRegistry removeEndpoint -INFO: EndpointRegistry: Remove endpoint - Endpoint: URI = OperationsComponent#s -ervice-binding(SubtractService/SubtractService) -Jun 22, 2009 2:09:48 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost unregiste -rService -INFO: RMI service unregistered: rmi://localhost:8085/SubtractService -Jun 22, 2009 2:09:48 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin -tRegistry removeEndpoint -INFO: EndpointRegistry: Remove endpoint - Endpoint: URI = OperationsComponent#s -ervice-binding(MultiplyService/MultiplyService) -Jun 22, 2009 2:09:48 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost unregiste -rService -INFO: RMI service unregistered: rmi://localhost:8085/MultiplyService -Jun 22, 2009 2:09:48 PM org.apache.tuscany.sca.endpoint.tribes.ReplicatedEndpoin -tRegistry removeEndpoint -INFO: EndpointRegistry: Remove endpoint - Endpoint: URI = OperationsComponent#s -ervice-binding(DivideService/DivideService) -Jun 22, 2009 2:09:48 PM org.apache.tuscany.sca.host.rmi.DefaultRMIHost unregiste -rService -INFO: RMI service unregistered: rmi://localhost:8085/DivideService -Jun 22, 2009 2:09:48 PM calculator.dosgi.operations.impl.OperationsActivator sto -p -INFO: Stopping file:./target/sample-dosgi-calculator-operations.jar [181] - -osgi> - -To exit the console, run: -osgi> exit - -Sample Overview ---------------- -The application consists of two OSGi bundles: - * The calculator bundle: It provides the calculator service. The service is implemented by a java class that - consumes other services to perform the “add”, “subtract”, “multiply” and “divide” operations. - * The operations bundle: It provides the add/subtract/multiply/divide services. - (See ../samples/dosgi-calculator-operations) - - -dosgi-calculator-operations/ - src/ - main/ - java/ - calculator/ - dosgi/ - operations/ - AddService.java - Interface for Add - SubtractService.java - Interface for Subtract - MultiplyService.java - Interface for Multiply - DivideService.java - Interface for Divide - impl/ - OperationsActivator.java - OSGi bundle activator - AddServiceImpl.java - Implementation for Add - SubtractServiceImpl.java - Implementation for Subtract - MultiplyServiceImpl.java - Implementation for Multiply - DivideServiceImpl.java - Implementation for Divide - resources/ - META-INF/ - sca-contribution.xml - OSGI-INF/ - sca/ - bundle.componentType - The component type for implementation.osgi of this bundle - bundle.composite - The composite file - test/ - java/ - src/ - calculator/ - dosgi/ - operations/ - test/ - OperationsOSGiNodeTestCase.java - The JUNIT test case that tests this bundle using a RMI client - - META-INF/ - MANIFEST.MF - The OSGi manifest for this bundle - pom.xml - the Maven build file - - - -Building And Running The Test Case Using Maven -------------------------------------------- -With either the binary or source distributions the sample can be built and run -using Maven as follows. - -cd dosgi-calculator-operations -mvn - diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/pom.xml b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/pom.xml deleted file mode 100644 index 71cd14113c..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/pom.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - 2.0-M4 - ../../pom.xml - - - sample-dosgi-dynamic-calculator-operations - Apache Tuscany SCA OSGi RemoteService Dynamic Caculator Operations Sample - - - - org.apache.tuscany.sca - tuscany-feature-ejava - 2.0-M4 - pom - - - - org.apache.tuscany.sca - tuscany-node-launcher-equinox - 2.0-M4 - test - - - - org.apache.tuscany.sca - tuscany-node-impl-osgi - 2.0-M4 - runtime - - - - org.eclipse.osgi - services - 3.2.0-v20090520-1800 - test - - - - - org.eclipse.equinox - ds - 1.1.0-v20090601 - test - - - - org.eclipse.equinox - util - 1.0.100-v20090520-1800 - test - - - - junit - junit - 4.5 - test - - - - - - ${artifactId} - - - maven-eclipse-plugin - 2.5.1 - - - org.eclipse.pde.ManifestBuilder - org.eclipse.jdt.core.javabuilder - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - - org.eclipse.jdt.launching.JRE_CONTAINER - - - - - - - maven-jar-plugin - - - ${basedir}/META-INF/MANIFEST.MF - - - - - - org.apache.tuscany.maven.plugins - maven-osgi-junit-plugin - 1.0 - - - org.apache.tuscany.sca - tuscany-node-launcher-equinox - ${pom.version} - - - - - osgi-test - test - - test - - - - - - - - - diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java deleted file mode 100644 index 971500782f..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.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 calculator.dosgi.operations; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the add service - */ -@Remotable -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java deleted file mode 100644 index 49b8a1c0bf..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.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 calculator.dosgi.operations; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the divide service - */ -@Remotable -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java deleted file mode 100644 index f4e59d12ea..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.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 calculator.dosgi.operations; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the multiply service - */ -@Remotable -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java deleted file mode 100644 index bfb9b820f7..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.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 calculator.dosgi.operations; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the subtract service - */ -@Remotable -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java deleted file mode 100644 index 66b2977241..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java +++ /dev/null @@ -1,37 +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.dosgi.operations.impl; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import calculator.dosgi.operations.AddService; - -/** - * 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.INFO, "Adding " + n1 + " and " + n2); - return n1 + n2; - } - -} diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java deleted file mode 100644 index a3c21b2b96..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java +++ /dev/null @@ -1,37 +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.dosgi.operations.impl; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import calculator.dosgi.operations.DivideService; - -/** - * 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.INFO, "Dividing " + n1 + " with " + n2); - return n1 / n2; - } - -} diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java deleted file mode 100644 index 7922d2d392..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java +++ /dev/null @@ -1,37 +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.dosgi.operations.impl; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import calculator.dosgi.operations.MultiplyService; - -/** - * 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.INFO, "Multiplying " + n1 + " with " + n2); - return n1 * n2; - } - -} diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java deleted file mode 100644 index f75cc6444e..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java +++ /dev/null @@ -1,94 +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.dosgi.operations.impl; - -import java.util.Dictionary; -import java.util.Hashtable; -import java.util.logging.Logger; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.service.packageadmin.PackageAdmin; - -import calculator.dosgi.operations.AddService; -import calculator.dosgi.operations.DivideService; -import calculator.dosgi.operations.MultiplyService; -import calculator.dosgi.operations.SubtractService; - -/** - * - */ -public class OperationsActivator implements BundleActivator { - private Logger logger = Logger.getLogger(OperationsActivator.class.getName()); - - public void start(BundleContext context) throws Exception { - logger.info("Starting " + context.getBundle()); - - Dictionary props = new Hashtable(); - props.put("service.exported.configs", new String[] {"org.osgi.sca"}); - props.put("service.exported.interfaces", new String[] {"*"}); - - logger.info("Registering " + AddService.class.getName()); - props.put("sca.service", "AddComponent#service-name(Add)"); - props.put("org.osgi.sca.bindings", new String[] {"{http://sample}Add"}); - context.registerService(AddService.class.getName(), new AddServiceImpl(), props); - - logger.info("Registering " + SubtractService.class.getName()); - props.put("sca.service", "SubtractComponent#service-name(Subtract)"); - props.put("org.osgi.sca.bindings", new String[] {"{http://sample}Subtract"}); - context.registerService(SubtractService.class.getName(), new SubtractServiceImpl(), props); - - logger.info("Registering " + MultiplyService.class.getName()); - props.put("sca.service", "MultiplyComponent#service-name(Multiply)"); - props.put("org.osgi.sca.bindings", new String[] {"{http://sample}Multiply"}); - context.registerService(MultiplyService.class.getName(), new MultiplyServiceImpl(), props); - - logger.info("Registering " + DivideService.class.getName()); - props.put("sca.service", "DivideComponent#service-name(Divide)"); - props.put("org.osgi.sca.bindings", new String[] {"{http://sample}Divide"}); - context.registerService(DivideService.class.getName(), new DivideServiceImpl(), props); - - getBundle(context, AddService.class); - } - - public void stop(BundleContext context) throws Exception { - logger.info("Stopping " + context.getBundle()); - // Registered services will be automatically unregistered - } - - private Bundle getBundle(BundleContext bundleContext, Class cls) { - PackageAdmin packageAdmin = null; - // PackageAdmin is used to resolve bundles - ServiceReference ref = bundleContext.getServiceReference("org.osgi.service.packageadmin.PackageAdmin"); - if (ref != null) { - packageAdmin = (PackageAdmin)bundleContext.getService(ref); - Bundle bundle = packageAdmin.getBundle(cls); - if (bundle != null) { - logger.info(cls.getName() + " is loaded by bundle: " + bundle.getSymbolicName()); - } - bundleContext.ungetService(ref); - return bundle; - } - return null; - } - -} diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java deleted file mode 100644 index 4bbe83b14f..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java +++ /dev/null @@ -1,37 +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.dosgi.operations.impl; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import calculator.dosgi.operations.SubtractService; - -/** - * 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.INFO, "Subtracting " + n1 + " from " + n2); - return n1 - n2; - } - -} diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java deleted file mode 100644 index cd92989da1..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.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 calculator.dosgi.operations.test; - -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; - -import org.osgi.framework.Bundle; - -/** - * - * Utility class to create OSGi bundles - * - * @version $Rev$ $Date$ - */ -public class OSGiTestUtils { - private static class InvocationHandlerImpl implements InvocationHandler { - private Object instance; - - public InvocationHandlerImpl(Object instance) { - super(); - this.instance = instance; - } - - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - Method m = instance.getClass().getMethod(method.getName(), method.getParameterTypes()); - return m.invoke(instance, args); - } - - } - - /** - * Returns a string representation of the given bundle. - * - * @param b - * @param verbose - * @return - */ - public static String bundleStatus(Bundle bundle, boolean verbose) { - StringBuffer sb = new StringBuffer(); - sb.append(bundle.getBundleId()).append(" ").append(bundle.getSymbolicName()); - int s = bundle.getState(); - if ((s & Bundle.UNINSTALLED) != 0) { - sb.append(" UNINSTALLED"); - } - if ((s & Bundle.INSTALLED) != 0) { - sb.append(" INSTALLED"); - } - if ((s & Bundle.RESOLVED) != 0) { - sb.append(" RESOLVED"); - } - if ((s & Bundle.STARTING) != 0) { - sb.append(" STARTING"); - } - if ((s & Bundle.STOPPING) != 0) { - sb.append(" STOPPING"); - } - if ((s & Bundle.ACTIVE) != 0) { - sb.append(" ACTIVE"); - } - - if (verbose) { - sb.append(" ").append(bundle.getLocation()); - sb.append(" ").append(bundle.getHeaders()); - } - return sb.toString(); - } - - /** - * A utility to cast the object to the given interface. If the class for the object - * is loaded by a different classloader, a proxy will be created. - * - * @param - * @param obj - * @param cls - * @return - */ - public static T cast(Object obj, Class cls) { - if (cls.isInstance(obj)) { - return cls.cast(obj); - } else { - return cls.cast(Proxy.newProxyInstance(cls.getClassLoader(), - new Class[] {cls}, - new InvocationHandlerImpl(obj))); - } - } -} diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java deleted file mode 100644 index 02007c385c..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.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 calculator.dosgi.operations.test; - -import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher; - -/** - * - */ -public class OperationsNode { - - /** - * @param args - */ - public static void main(String[] args) { - if (args.length == 0) { - args = new String[] {"-bundles"}; - } - try { - NodeLauncher.main(args); - } catch (Exception e) { - e.printStackTrace(); - } - } - -} diff --git a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java deleted file mode 100644 index eee64bf86f..0000000000 --- a/tags/java/sca/2.0-M4-RC2/samples/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java +++ /dev/null @@ -1,104 +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.dosgi.operations.test; - -import static calculator.dosgi.operations.test.OSGiTestUtils.bundleStatus; - -import java.rmi.registry.LocateRegistry; -import java.rmi.registry.Registry; - -import org.apache.tuscany.sca.node.equinox.launcher.EquinoxHost; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; - -import calculator.dosgi.operations.AddService; - -/** - * - */ -public class OperationsOSGiNodeTestCase { - private static EquinoxHost host; - private static BundleContext context; - private static Bundle operationsBundle; - - /** - * @throws java.lang.Exception - */ - @BeforeClass - public static void setUpBeforeClass() throws Exception { - try { - host = new EquinoxHost(); - context = host.start(); - - for (Bundle b : context.getBundles()) { - if (b.getSymbolicName().equals("org.eclipse.equinox.ds") || b.getSymbolicName() - .startsWith("org.apache.tuscany.sca.")) { - try { - if (b.getHeaders().get(Constants.FRAGMENT_HOST) == null) { - // Start the non-fragment bundle - b.start(); - } - } catch (Exception e) { - e.printStackTrace(); - } - System.out.println(bundleStatus(b, false)); - } - if ("calculator.dosgi.dynamic.operations".equals(b.getSymbolicName())) { - operationsBundle = b; - } - } - - if (operationsBundle != null) { - operationsBundle.start(); - System.out.println(bundleStatus(operationsBundle, false)); - } - - } catch (Exception e) { - e.printStackTrace(); - throw e; - } - } - - @Test - public void testOSGi() throws Exception { - Registry registry = LocateRegistry.getRegistry(8085); - Object add = registry.lookup("AddService"); - AddService addService = OSGiTestUtils.cast(add, AddService.class); - double sum = addService.add(1.0, 2.0); - Assert.assertEquals(3.0, sum, 0.0); - } - - /** - * @throws java.lang.Exception - */ - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (host != null) { - host.stop(); - context = null; - } - } - -} -- cgit v1.2.3