From b6a754697c7bca2434563faa2cb86406725023ff Mon Sep 17 00:00:00 2001 From: kelvingoodson Date: Thu, 16 Sep 2010 09:50:31 +0000 Subject: TUSCANY-3677 move projects that configure osgi explicitly git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@997661 13f79535-47bb-0310-9956-ffa450edef68 --- .../trunk/samples/dosgi-calculator/LICENSE | 205 --------------------- .../samples/dosgi-calculator/META-INF/MANIFEST.MF | 20 -- sca-java-2.x/trunk/samples/dosgi-calculator/NOTICE | 6 - .../OSGI-INF/blueprint/calculator-module.xml | 43 ----- .../OSGI-INF/calculator-component.xml | 36 ---- .../OSGI-INF/sca/bundle.componentType | 64 ------- .../dosgi-calculator/OSGI-INF/sca/bundle.composite | 45 ----- sca-java-2.x/trunk/samples/dosgi-calculator/README | 143 -------------- .../samples/dosgi-calculator/dosgi-calculator.png | Bin 85103 -> 0 bytes .../trunk/samples/dosgi-calculator/pom.xml | 153 --------------- .../java/calculator/dosgi/CalculatorService.java | 36 ---- .../calculator/dosgi/impl/CalculatorActivator.java | 76 -------- .../dosgi/impl/CalculatorServiceDSImpl.java | 114 ------------ .../dosgi/impl/CalculatorServiceImpl.java | 105 ----------- .../calculator/dosgi/operations/AddService.java | 31 ---- .../calculator/dosgi/operations/DivideService.java | 31 ---- .../dosgi/operations/MultiplyService.java | 31 ---- .../dosgi/operations/SubtractService.java | 31 ---- .../java/calculator/rmi/OperationsRMIServer.java | 93 ---------- .../calculator/rmi/OperationsRMIServer_Stub.java | 132 ------------- .../main/java/calculator/rmi/OperationsRemote.java | 37 ---- .../main/resources/META-INF/sca-contribution.xml | 24 --- .../java/calculator/dosgi/test/CalculatorNode.java | 43 ----- .../dosgi/test/CalculatorOSGiNodeTestCase.java | 152 --------------- .../java/calculator/dosgi/test/OSGiTestUtils.java | 105 ----------- 25 files changed, 1756 deletions(-) delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/LICENSE delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/META-INF/MANIFEST.MF delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/NOTICE delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/OSGI-INF/calculator-component.xml delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/README delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/dosgi-calculator.png delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/pom.xml delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java delete mode 100644 sca-java-2.x/trunk/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java (limited to 'sca-java-2.x/trunk/samples/dosgi-calculator') diff --git a/sca-java-2.x/trunk/samples/dosgi-calculator/LICENSE b/sca-java-2.x/trunk/samples/dosgi-calculator/LICENSE deleted file mode 100644 index 6e529a25c4..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/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/sca-java-2.x/trunk/samples/dosgi-calculator/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/samples/dosgi-calculator/META-INF/MANIFEST.MF deleted file mode 100644 index 542b53b085..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/META-INF/MANIFEST.MF +++ /dev/null @@ -1,20 +0,0 @@ -Manifest-Version: 1.0 -Export-Package: calculator.dosgi;version="1.0.0", - calculator.dosgi.operations;version="1.0.0" -Bundle-Version: 1.0.0 -Bundle-Name: calculator.dosgi -Bundle-Activator: calculator.dosgi.impl.CalculatorActivator -Bundle-ManifestVersion: 2 -Import-Package: org.oasisopen.sca.annotation;version="2.0.0", - org.osgi.framework, - org.osgi.service.component;resolution:=optional, - org.osgi.service.packageadmin, - org.osgi.util.tracker -Bundle-SymbolicName: calculator.dosgi -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/calculator-component.xml -Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 diff --git a/sca-java-2.x/trunk/samples/dosgi-calculator/NOTICE b/sca-java-2.x/trunk/samples/dosgi-calculator/NOTICE deleted file mode 100644 index 9ddba06a32..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2010 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/sca-java-2.x/trunk/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/trunk/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml deleted file mode 100644 index fd834e12ef..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/dosgi-calculator/OSGI-INF/calculator-component.xml b/sca-java-2.x/trunk/samples/dosgi-calculator/OSGI-INF/calculator-component.xml deleted file mode 100644 index 5daaa59aae..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/OSGI-INF/calculator-component.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/trunk/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType deleted file mode 100644 index 1dff21ab6b..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/OSGI-INF/sca/bundle.componentType +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - 1 - ABC - - - - - - - - 1 - ABC - - - - - - 1 - ABC - - - - - - 1 - ABC - - - - - - 1 - ABC - - - - diff --git a/sca-java-2.x/trunk/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite b/sca-java-2.x/trunk/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite deleted file mode 100644 index c64e999fc6..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/OSGI-INF/sca/bundle.composite +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/dosgi-calculator/README b/sca-java-2.x/trunk/samples/dosgi-calculator/README deleted file mode 100644 index e2cf7cd522..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/README +++ /dev/null @@ -1,143 +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 provides -general instructions about building and running samples. (where -distribution-unpack-dir is the directory in which you unpacked the tuscany -binary distribution archive). Take a look there first (noting at you read it that this sample -is not a new style sample). - - -On Windows, run -java -jar ..\..\modules\osgi-3.5.0-v20090520.jar -configuration ..\..\features\configuration -clean -console - -On *Unix, run -java -jar ../../modules/osgi-3.5.0-v20090520.jar -configuration ../../features/configuration -clean -console - -You should see the osgi console: - -osgi> - -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.jar -Bundle id is 198 - -osgi> start 198 -Nov 4, 2009 9:40:00 AM calculator.dosgi.impl.CalculatorActivator start -INFO: Starting calculator.dosgi_1.0.0 [198] -Nov 4, 2009 9:40:01 AM calculator.dosgi.impl.CalculatorActivator start -INFO: Registering calculator.dosgi.CalculatorService -Nov 4, 2009 9:40:01 AM calculator.dosgi.impl.CalculatorActivator getBundle -INFO: calculator.dosgi.operations.AddService is loaded by bundle: calculator.dos -gi -Nov 4, 2009 9:40:01 AM org.apache.tuscany.sca.node.impl.NodeImpl start -INFO: Starting node: calculator.dosgi domain: tuscany.apache.org -Nov 4, 2009 9:40:01 AM org.apache.tuscany.sca.node.impl.NodeFactoryImpl loadCont -ributions -INFO: Loading contribution: bundleentry://198.fwk15020296/ -log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX -Utils). -log4j:WARN Please initialize the log4j system properly. -Nov 4, 2009 9:40:47 AM org.mortbay.log.Slf4jLog info -INFO: Logging to org.slf4j.impl.JDK14LoggerAdapter(org.mortbay.log) via org.mort -bay.log.Slf4jLog -Nov 4, 2009 9:40:48 AM org.apache.tuscany.sca.http.jetty.JettyLogger info -INFO: jetty-6.1.x -Nov 4, 2009 9:40:48 AM org.apache.tuscany.sca.http.jetty.JettyLogger info -INFO: Started SelectChannelConnector@0.0.0.0:8086 -Nov 4, 2009 9:40:48 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletM -apping -INFO: Added Servlet mapping: http://rfengt61p:8086/CalculatorService -Nov 4, 2009 9:40:48 AM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr -yImpl addEndpoint -INFO: Add endpoint - (@1277930)Endpoint: URI = CalculatorComponent#service-bind -ing(CalculatorService/CalculatorService) -osgi> - -You can point your browser to http://localhost:8086/CalculatorService?wsdl to see -the WSDL. - -You can also use the WebService Explorer from Eclipse WTP to test the Web Service. - -To stop the bundle: - -osgi> stop 198 -Nov 4, 2009 9:41:22 AM org.apache.tuscany.sca.node.impl.NodeImpl stop -INFO: Stopping node: calculator.dosgi -Nov 4, 2009 9:41:22 AM org.apache.tuscany.sca.core.assembly.impl.EndpointRegistr -yImpl endpointRemoved -INFO: Remove endpoint - (@1277930)Endpoint: URI = CalculatorComponent#service-b -inding(CalculatorService/CalculatorService) -Nov 4, 2009 9:41:22 AM org.apache.tuscany.sca.http.jetty.JettyServer removeServl -etMapping -INFO: Removed Servlet mapping: /CalculatorService -Nov 4, 2009 9:41:22 AM calculator.dosgi.impl.CalculatorActivator stop -INFO: Stopping calculator.dosgi_1.0.0 [198] - -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/ - src/ - main/ - java/ - calculator/ - dosgi/ - CalculatorService.java - The interface for Calculator service - impl/ - CalculatorActivator.java - OSGi bundle activator for Calculator bundle - CalculatorServiceDSImpl.java - OSGi declarative service based implementation - CalculatorServiceImpl.java - Basic OSGi implementation - operations/ - AddService.java - Interface for Add - SubtractService.java - Interface for Subtract - MultiplyService.java - Interface for Multiply - DivideService.java - Interface for Divide - rmi/ - OperationsRemote.java - RMI remote interface for operations - OperationsRMIServer_Stub.java - RMI stub - OperationsRMIServer.java - RMI server implementation of the operations - 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/ - test/ - CalculatorOSGiNodeTestCase.java - The JUNIT test case that tests this bundle against a RMI service - - META-INF/ - MANIFEST.MF - The OSGi manifest for this bundle - dosig-calculator.png - a pictorial representation of the sample - 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 -mvn - diff --git a/sca-java-2.x/trunk/samples/dosgi-calculator/dosgi-calculator.png b/sca-java-2.x/trunk/samples/dosgi-calculator/dosgi-calculator.png deleted file mode 100644 index 805baa54d2..0000000000 Binary files a/sca-java-2.x/trunk/samples/dosgi-calculator/dosgi-calculator.png and /dev/null differ diff --git a/sca-java-2.x/trunk/samples/dosgi-calculator/pom.xml b/sca-java-2.x/trunk/samples/dosgi-calculator/pom.xml deleted file mode 100644 index 2e06ff7e05..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/pom.xml +++ /dev/null @@ -1,153 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-samples - 2.0-SNAPSHOT - ../pom.xml - - - sample-dosgi-calculator - Apache Tuscany SCA OSGi Remote Services Calculator Sample - - - - org.apache.tuscany.sca - tuscany-feature-ejava - 2.0-SNAPSHOT - pom - - - org.apache.tuscany.sca - tuscany-feature-webservice - 2.0-SNAPSHOT - pom - runtime - - - org.apache.tuscany.sca - tuscany-node-launcher-equinox - 2.0-SNAPSHOT - test - - - - org.apache.tuscany.sca - tuscany-node-impl-osgi - 2.0-SNAPSHOT - runtime - - - - org.eclipse.osgi - services - 3.2.0-v20090520-1800 - - - - junit - junit - 4.8.1 - test - - - - - org.eclipse.equinox - ds - 1.1.0-v20090601 - test - - - - org.eclipse.equinox - util - 1.0.100-v20090520-1800 - 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 - - - - - osgi.configuration.area - ${project.build.directory}/equinox - - - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java deleted file mode 100644 index cc562b7c2f..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator.dosgi; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The Calculator service interface. - */ -@Remotable -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/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java deleted file mode 100644 index 6b42645f69..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java +++ /dev/null @@ -1,76 +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.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.CalculatorService; -import calculator.dosgi.operations.AddService; - -/** - * - */ -public class CalculatorActivator implements BundleActivator { - private Logger logger = Logger.getLogger(CalculatorActivator.class.getName()); - - 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; - } - - public void start(BundleContext context) throws Exception { - logger.info("Starting " + context.getBundle()); - Dictionary props = new Hashtable(); - props.put("sca.service", "CalculatorComponent#service-name(Calculator)"); - props.put("calculator", "Calculator"); - - logger.info("Registering " + CalculatorService.class.getName()); - CalculatorService calculator = new CalculatorServiceImpl(context); - context.registerService(CalculatorService.class.getName(), calculator, props); - - getBundle(context, AddService.class); - - } - - public void stop(BundleContext context) throws Exception { - logger.info("Stopping " + context.getBundle()); - // Registered services will be automatically unregistered - } - -} diff --git a/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java deleted file mode 100644 index 5f9db16ca9..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java +++ /dev/null @@ -1,114 +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.impl; - -import org.osgi.service.component.ComponentContext; - -import calculator.dosgi.CalculatorService; -import calculator.dosgi.operations.AddService; -import calculator.dosgi.operations.DivideService; -import calculator.dosgi.operations.MultiplyService; -import calculator.dosgi.operations.SubtractService; - -/** - * An implementation of the Calculator service. - */ -public class CalculatorServiceDSImpl implements CalculatorService { - private AddService addService; - private SubtractService subtractService; - private MultiplyService multiplyService; - private DivideService divideService; - - public CalculatorServiceDSImpl() { - super(); - System.out.println("CalculatorServiceDSImpl()"); - } - - protected void activate(ComponentContext context) { - System.out.println("Activating " + context); - } - - protected void deactivate(ComponentContext context) { - System.out.println("Deactivating " + context); - } - - /* - * The following setters can be used for DS injection - */ - public void setAddService(AddService addService) { - System.out.println("setAddService()"); - this.addService = addService; - } - - public void setSubtractService(SubtractService subtractService) { - this.subtractService = subtractService; - } - - public void setDivideService(DivideService divideService) { - this.divideService = divideService; - } - - public void setMultiplyService(MultiplyService multiplyService) { - this.multiplyService = multiplyService; - } - - /* - * The following setters can be used for DS injection - */ - public void unsetAddService(AddService addService) { - System.out.println("unsetAddService()"); - this.addService = null; - } - - public void unsetSubtractService(SubtractService subtractService) { - this.subtractService = null; - } - - public void unsetDivideService(DivideService divideService) { - this.divideService = null; - } - - public void unsetMultiplyService(MultiplyService multiplyService) { - this.multiplyService = null; - } - private T getService(Class cls) { - for (Object s : new Object[] {addService, subtractService, multiplyService, divideService}) { - if (cls.isInstance(s)) { - return cls.cast(s); - } - } - throw new IllegalStateException(cls.getSimpleName() + " is not available"); - } - - public double add(double n1, double n2) { - return getService(AddService.class).add(n1, n2); - } - - public double subtract(double n1, double n2) { - return getService(SubtractService.class).subtract(n1, n2); - } - - public double multiply(double n1, double n2) { - return getService(MultiplyService.class).multiply(n1, n2); - } - - public double divide(double n1, double n2) { - return getService(DivideService.class).divide(n1, n2); - } -} diff --git a/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java deleted file mode 100644 index a9ea37585a..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.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.impl; - -import static org.osgi.framework.Constants.OBJECTCLASS; - -import org.osgi.framework.BundleContext; -import org.osgi.framework.Filter; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.util.tracker.ServiceTracker; - -import calculator.dosgi.CalculatorService; -import calculator.dosgi.operations.AddService; -import calculator.dosgi.operations.DivideService; -import calculator.dosgi.operations.MultiplyService; -import calculator.dosgi.operations.SubtractService; - -/** - * An implementation of the Calculator service. - */ -public class CalculatorServiceImpl implements CalculatorService { - private ServiceTracker remoteServices; - private ServiceTracker localServices; - - public CalculatorServiceImpl() { - super(); - } - - public CalculatorServiceImpl(BundleContext context) { - super(); - Filter remoteFilter = null, localFilter = null; - try { - remoteFilter = - context.createFilter("(&(" + OBJECTCLASS + "=calculator.dosgi.operations.*) (service.imported=*))"); - localFilter = - context.createFilter("(&(" + OBJECTCLASS + "=calculator.dosgi.operations.*) (!(service.imported=*)))"); - } catch (InvalidSyntaxException e) { - e.printStackTrace(); - } - this.remoteServices = new ServiceTracker(context, remoteFilter, null); - remoteServices.open(); - this.localServices = new ServiceTracker(context, localFilter, null); - localServices.open(); - } - - private T getService(Class cls) { - try { - // Wait for 10 seconds until the remote services are imported - remoteServices.waitForService(10000); - } catch (InterruptedException e) { - throw new IllegalStateException(cls.getSimpleName() + " is not available"); - } - Object[] remoteObjects = remoteServices.getServices(); - if (remoteObjects != null) { - for (Object s : remoteObjects) { - if (cls.isInstance(s)) { - System.out.println("Remote service: " + s); - return cls.cast(s); - } - } - } - Object[] localObjects = localServices.getServices(); - if (localObjects != null) { - for (Object s : localObjects) { - if (cls.isInstance(s)) { - System.out.println("Local service: " + s); - return cls.cast(s); - } - } - } - throw new IllegalStateException(cls.getSimpleName() + " is not available"); - } - - public double add(double n1, double n2) { - return getService(AddService.class).add(n1, n2); - } - - public double subtract(double n1, double n2) { - return getService(SubtractService.class).subtract(n1, n2); - } - - public double multiply(double n1, double n2) { - return getService(MultiplyService.class).multiply(n1, n2); - } - - public double divide(double n1, double n2) { - return getService(DivideService.class).divide(n1, n2); - } -} diff --git a/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java deleted file mode 100644 index 971500782f..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/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/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java deleted file mode 100644 index 49b8a1c0bf..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/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/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java deleted file mode 100644 index f4e59d12ea..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/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/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java deleted file mode 100644 index bfb9b820f7..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/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/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java b/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java deleted file mode 100644 index a4fc52694e..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package calculator.rmi; - -import java.io.Serializable; -import java.rmi.Remote; -import java.rmi.RemoteException; -import java.rmi.registry.LocateRegistry; -import java.rmi.registry.Registry; -import java.rmi.server.UnicastRemoteObject; - -/** - * - */ -public class OperationsRMIServer implements OperationsRemote, Serializable { - - private static final long serialVersionUID = 6081008315263103012L; - private transient Registry registry; - - public OperationsRMIServer() throws RemoteException { - super(); - } - - public double add(double n1, double n2) { - return n1 + n2; - } - - public double subtract(double n1, double n2) { - return n1 - n2; - } - - public double divide(double n1, double n2) { - return n1 / n2; - } - - public double multiply(double n1, double n2) { - return n1 * n2; - } - - public void start() throws RemoteException { - Thread thread = new Thread() { - public void run() { - try { - System.out.println("Starting the RMI server for calculator operations..."); - Remote stub = UnicastRemoteObject.exportObject(OperationsRMIServer.this); - registry = LocateRegistry.createRegistry(8085); - registry.bind("AddService", stub); - registry.bind("SubtractService", stub); - registry.bind("MultiplyService", stub); - registry.bind("DivideService", stub); - System.out.println("RMI server for calculator operations is now started."); - } catch (Exception e) { - e.printStackTrace(); - } - } - }; - thread.start(); - } - - public void stop() { - if (registry != null) { - try { - registry.unbind("AddService"); - registry.unbind("SubtractService"); - registry.unbind("MultiplyService"); - registry.unbind("DivideService"); - UnicastRemoteObject.unexportObject(this, false); - UnicastRemoteObject.unexportObject(registry, false); - registry = null; - } catch (Exception e) { - e.printStackTrace(); - } - } - } - -} diff --git a/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java deleted file mode 100644 index a813dfb6f3..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java +++ /dev/null @@ -1,132 +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. - */ - -// Stub class generated by rmic, do not edit. -// Contents subject to change without notice. -package calculator.rmi; - -public final class OperationsRMIServer_Stub extends java.rmi.server.RemoteStub implements calculator.rmi.OperationsRemote { - private static final long serialVersionUID = 2; - - private static java.lang.reflect.Method $method_add_0; - private static java.lang.reflect.Method $method_divide_1; - private static java.lang.reflect.Method $method_multiply_2; - private static java.lang.reflect.Method $method_subtract_3; - - static { - try { - $method_add_0 = - calculator.rmi.OperationsRemote.class.getMethod("add", new java.lang.Class[] {double.class, double.class}); - $method_divide_1 = - calculator.rmi.OperationsRemote.class.getMethod("divide", - new java.lang.Class[] {double.class, double.class}); - $method_multiply_2 = - calculator.rmi.OperationsRemote.class.getMethod("multiply", new java.lang.Class[] {double.class, - double.class}); - $method_subtract_3 = - calculator.rmi.OperationsRemote.class.getMethod("subtract", new java.lang.Class[] {double.class, - double.class}); - } catch (java.lang.NoSuchMethodException e) { - throw new java.lang.NoSuchMethodError("stub class initialization failed"); - } - } - - // constructors - public OperationsRMIServer_Stub(java.rmi.server.RemoteRef ref) { - super(ref); - } - - // methods from remote interfaces - - // implementation of add(double, double) - public double add(double $param_double_1, double $param_double_2) throws java.rmi.RemoteException { - try { - Object $result = - ref.invoke(this, - $method_add_0, - new java.lang.Object[] {new java.lang.Double($param_double_1), - new java.lang.Double($param_double_2)}, - 864055858262779977L); - return ((java.lang.Double)$result).doubleValue(); - } catch (java.lang.RuntimeException e) { - throw e; - } catch (java.rmi.RemoteException e) { - throw e; - } catch (java.lang.Exception e) { - throw new java.rmi.UnexpectedException("undeclared checked exception", e); - } - } - - // implementation of divide(double, double) - public double divide(double $param_double_1, double $param_double_2) throws java.rmi.RemoteException { - try { - Object $result = - ref.invoke(this, - $method_divide_1, - new java.lang.Object[] {new java.lang.Double($param_double_1), - new java.lang.Double($param_double_2)}, - 8097593626497421928L); - return ((java.lang.Double)$result).doubleValue(); - } catch (java.lang.RuntimeException e) { - throw e; - } catch (java.rmi.RemoteException e) { - throw e; - } catch (java.lang.Exception e) { - throw new java.rmi.UnexpectedException("undeclared checked exception", e); - } - } - - // implementation of multiply(double, double) - public double multiply(double $param_double_1, double $param_double_2) throws java.rmi.RemoteException { - try { - Object $result = - ref.invoke(this, - $method_multiply_2, - new java.lang.Object[] {new java.lang.Double($param_double_1), - new java.lang.Double($param_double_2)}, - -346155016949350695L); - return ((java.lang.Double)$result).doubleValue(); - } catch (java.lang.RuntimeException e) { - throw e; - } catch (java.rmi.RemoteException e) { - throw e; - } catch (java.lang.Exception e) { - throw new java.rmi.UnexpectedException("undeclared checked exception", e); - } - } - - // implementation of subtract(double, double) - public double subtract(double $param_double_1, double $param_double_2) throws java.rmi.RemoteException { - try { - Object $result = - ref.invoke(this, - $method_subtract_3, - new java.lang.Object[] {new java.lang.Double($param_double_1), - new java.lang.Double($param_double_2)}, - -610707357620578750L); - return ((java.lang.Double)$result).doubleValue(); - } catch (java.lang.RuntimeException e) { - throw e; - } catch (java.rmi.RemoteException e) { - throw e; - } catch (java.lang.Exception e) { - throw new java.rmi.UnexpectedException("undeclared checked exception", e); - } - } -} diff --git a/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java b/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java deleted file mode 100644 index 955e386ad8..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.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.rmi; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * RMI Remote interface - */ -public interface OperationsRemote extends Remote { - double add(double n1, double n2) throws RemoteException; - - double subtract(double n1, double n2) throws RemoteException; - - double multiply(double n1, double n2) throws RemoteException; - - double divide(double n1, double n2) throws RemoteException; - -} diff --git a/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index b48c048000..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - diff --git a/sca-java-2.x/trunk/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sca-java-2.x/trunk/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java deleted file mode 100644 index 565a314d85..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.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.test; - -import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher; - -/** - * - */ -public class CalculatorNode { - - /** - * @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/sca-java-2.x/trunk/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/trunk/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java deleted file mode 100644 index 2f37da0707..0000000000 --- a/sca-java-2.x/trunk/samples/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java +++ /dev/null @@ -1,152 +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.test; - -import static calculator.dosgi.test.OSGiTestUtils.bundleStatus; - -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.net.URL; - -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 org.osgi.framework.ServiceReference; - -import calculator.dosgi.CalculatorService; -import calculator.rmi.OperationsRMIServer; - -/** - * - */ -public class CalculatorOSGiNodeTestCase { - private static EquinoxHost host; - private static BundleContext context; - private static Bundle calculatorBundle; - private static OperationsRMIServer rmiServer; - - /** - * @throws java.lang.Exception - */ - @BeforeClass - public static void setUpBeforeClass() throws Exception { - try { - rmiServer = new OperationsRMIServer(); - rmiServer.start(); - - host = new EquinoxHost(); - context = host.start(); - - for (Bundle b : context.getBundles()) { - System.out.println(b); - // debug to print out exported packages - // handy if you want to find aplit packages - //Object exports = b.getHeaders().get(Constants.EXPORT_PACKAGE); - //if (exports != null){ - // System.out.println(exports.toString()); - //} - 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)); - } else { - System.out.println(bundleStatus(b, false)); - } - if ("calculator.dosgi".equals(b.getSymbolicName())) { - calculatorBundle = b; - } - } - - if (calculatorBundle != null) { - calculatorBundle.start(); - System.out.println(bundleStatus(calculatorBundle, false)); - } - - } catch (Exception e) { - e.printStackTrace(); - throw e; - } - } - - @Test - public void testOSGi() { - ServiceReference ref = - calculatorBundle.getBundleContext().getServiceReference(CalculatorService.class.getName()); - Assert.assertNotNull(ref); - Object service = context.getService(ref); - Assert.assertNotNull(service); - CalculatorService calculator = OSGiTestUtils.cast(service, CalculatorService.class); - System.out.println("2.0 + 1.0 = " + calculator.add(2.0, 1.0)); - System.out.println("2.0 - 1.0 = " + calculator.subtract(2.0, 1.0)); - System.out.println("2.0 * 1.0 = " + calculator.multiply(2.0, 1.0)); - System.out.println("2.0 / 1.0 = " + calculator.divide(2.0, 1.0)); - } - - @Test - /** - * Test the Web service exposed by the Calculator - */ - public void testWS() throws Exception { - URL url = new URL("http://localhost:8086/CalculatorService?wsdl"); - InputStream is = url.openStream(); - Reader reader = new InputStreamReader(is); - char[] content = new char[10240]; // 10k - int len = 0; - while (true) { - int size = reader.read(content, len, content.length - len); - if (size < 0) { - break; - } - len += size; - } - Assert.assertTrue(len > 0); - String str = new String(content, 0, len); - System.out.println(str); - Assert.assertTrue(str.indexOf(" - * @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))); - } - } -} -- cgit v1.2.3