summaryrefslogtreecommitdiffstats
path: root/tags/java-M1-20060518/java/samples/sca/calculator
diff options
context:
space:
mode:
Diffstat (limited to 'tags/java-M1-20060518/java/samples/sca/calculator')
-rw-r--r--tags/java-M1-20060518/java/samples/sca/calculator/LICENSE.txt202
-rw-r--r--tags/java-M1-20060518/java/samples/sca/calculator/README.txt35
-rw-r--r--tags/java-M1-20060518/java/samples/sca/calculator/build.xml52
-rw-r--r--tags/java-M1-20060518/java/samples/sca/calculator/pom.xml51
-rw-r--r--tags/java-M1-20060518/java/samples/sca/calculator/readme.htm53
-rw-r--r--tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/AddService.java23
-rw-r--r--tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/AddServiceImpl.java31
-rw-r--r--tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/CalculatorClient.java68
-rw-r--r--tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/CalculatorService.java33
-rw-r--r--tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/CalculatorServiceImpl.java70
-rw-r--r--tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/DivideService.java23
-rw-r--r--tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/DivideServiceImpl.java31
-rw-r--r--tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/MultiplyService.java23
-rw-r--r--tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/MultiplyServiceImpl.java31
-rw-r--r--tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/SubtractService.java23
-rw-r--r--tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/SubtractServiceImpl.java31
-rw-r--r--tags/java-M1-20060518/java/samples/sca/calculator/src/main/resources/logging.properties27
-rw-r--r--tags/java-M1-20060518/java/samples/sca/calculator/src/main/resources/sca.module46
-rw-r--r--tags/java-M1-20060518/java/samples/sca/calculator/src/test/java/calculator/CalculatorTestCase.java65
19 files changed, 0 insertions, 918 deletions
diff --git a/tags/java-M1-20060518/java/samples/sca/calculator/LICENSE.txt b/tags/java-M1-20060518/java/samples/sca/calculator/LICENSE.txt
deleted file mode 100644
index d645695673..0000000000
--- a/tags/java-M1-20060518/java/samples/sca/calculator/LICENSE.txt
+++ /dev/null
@@ -1,202 +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-M1-20060518/java/samples/sca/calculator/README.txt b/tags/java-M1-20060518/java/samples/sca/calculator/README.txt
deleted file mode 100644
index 9b26d1690a..0000000000
--- a/tags/java-M1-20060518/java/samples/sca/calculator/README.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-Apache Tuscany M1 build (May, 2006)
-===================================
-
-http://incubator.apache.org/tuscany/
-
-Tuscany is an effort undergoing incubation at the Apache Software Foundation
-(ASF), sponsored by the Web Services PMC.
-
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects.
-
-While incubation status is not necessarily a reflection of the completeness or
-stability of the code, it does indicate that the project has yet to be fully
-endorsed by the ASF.
-
-
-Support
--------
-
-Any problem with this release can be reported to the Tuscany mailing list
-or in the JIRA issue tracker.
-
-Mailing list subscription:
- tuscany-dev-subscribe@ws.apache.org
-
-Jira:
- http://issues.apache.org/jira/browse/Tuscany
-
-
-Thank you for using Tuscany!
-
-
-The Tuscany Team.
-
diff --git a/tags/java-M1-20060518/java/samples/sca/calculator/build.xml b/tags/java-M1-20060518/java/samples/sca/calculator/build.xml
deleted file mode 100644
index 91e143311b..0000000000
--- a/tags/java-M1-20060518/java/samples/sca/calculator/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
- *
- * 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.
- -->
-<project name="samples" default="compile">
- <property name="mainDir" value="../../.."/>
- <path id="javac.classpath">
- <fileset dir="${mainDir}/lib">
- <include name="tuscany-runtime-incubating-M1.jar"/>
- </fileset>
- </path>
- <path id="java.classpath">
- <fileset dir="${mainDir}/lib">
- <include name="tuscany-runtime-incubating-M1.jar"/>
- </fileset>
- <pathelement path="target/sample-calculator.jar"/>
- </path>
-
- <target name="init">
- <mkdir dir="target/classes"/>
- </target>
-
- <target name="compile" depends="init">
- <javac srcdir="src/main/java" destdir="target/classes" debug="on" source="1.5" target="1.5">
- <classpath refid="javac.classpath"/>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/sample-calculator.jar">
- <fileset dir="target/classes"/>
- </jar>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target" excludes="sample-calculator-incubating-M1.jar"/>
- </delete>
- </target>
-</project>
diff --git a/tags/java-M1-20060518/java/samples/sca/calculator/pom.xml b/tags/java-M1-20060518/java/samples/sca/calculator/pom.xml
deleted file mode 100644
index 2a6e6864d8..0000000000
--- a/tags/java-M1-20060518/java/samples/sca/calculator/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
- *
- * 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.
- -->
-<project>
- <parent>
- <groupId>org.apache.tuscany.samples.sca</groupId>
- <artifactId>tuscany-samples-sca</artifactId>
- <version>incubating-M1</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>sample-calculator</artifactId>
- <packaging>jar</packaging>
- <name>Tuscany Calculator Sample</name>
- <description>A sample Calculator made of several SCA components wired together.</description>
- <version>incubating-M1</version>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany</groupId>
- <artifactId>tuscany-core</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.containers</groupId>
- <artifactId>tuscany-container-java</artifactId>
- <version>${pom.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/tags/java-M1-20060518/java/samples/sca/calculator/readme.htm b/tags/java-M1-20060518/java/samples/sca/calculator/readme.htm
deleted file mode 100644
index 8ae5ca6488..0000000000
--- a/tags/java-M1-20060518/java/samples/sca/calculator/readme.htm
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html><head><!-- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable. 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. -->
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <meta http-equiv="Content-Style-Type" content="text/css"><title>Tuscany
-Calculator</title><!-- LINK rel="stylesheet" href="ait.css" type="text/css" -->
-<style type="text/css" media="all">
-@import url("../../../../css/maven-base.css");
-@import url("../../../../css/maven-theme.css");
-@import url("../../../../css/site.css");
-</style><link rel="stylesheet" href="./css/print.css" type="text/css" media="print"></head>
-<body><h2>Tuscany
-Calculator Sample</h2>
-<h3>Overview</h3>
-<p>The Tuscany calculator sample shows using the Tuscany SCA
-runtime in a J2SE environment &nbsp;loading several components.
-Each component provides a basic operation (add, subtract, etc).<br>The
-main component uses each of these to perrform a simple calculation.</p><h3>Location</h3>This
-sample is located &nbsp;in the samples\sca\calculator directory.<br><br>
-
-<h3>Setup</h3>This sample depends on the Tuscany runtime and the sample jar,
-
- <span style="font-weight: bold;">
- sample-calculator-incubating-M1.jar
- </span>
-
-, both of these must be available on the classpath to run the sample.
-<ol>
-</ol>
-<h3>Running</h3>
-
- In the directory samples/sca/calculator use the JDK 1.5 java command to run the class calculator.CalculatorClient
-
- <pre>Linux: java -cp ../../../lib/tuscany-runtime-incubating-M1.jar:target/sample-calculator-incubating-M1.jar calculator.CalculatorClient</pre>
- <pre>Windows: java -cp ../../../lib/tuscany-runtime-incubating-M1.jar;target/sample-calculator-incubating-M1.jar calculator.CalculatorClient</pre>
-
-<br><h3>Results</h3>
-<p>The sample when run should simply display to the standard
-output:<br> <code>Hello World</code></p>
-<h3>Code Overview</h3>
-The source files are physically organized as shown below:
-<table style="text-align: left; width: 100%;" border="1" cellpadding="2" cellspacing="2"> <tbody> <tr><td>src<br>+---main<br>&nbsp;&nbsp;&nbsp; +---java<br>&nbsp;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp; +---calculator<br>&nbsp;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; AddService.java<br>&nbsp;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; AddServiceImpl.java<br>&nbsp;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; CalculatorClient.java<br>&nbsp;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; CalculatorService.java<br>&nbsp;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; CalculatorServiceImpl.java<br>&nbsp;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DivideService.java<br>&nbsp;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; DivideServiceImpl.java<br>&nbsp;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; MultiplyService.java<br>&nbsp;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; MultiplyServiceImpl.java<br>&nbsp;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; SubtractService.java<br>&nbsp;&nbsp;&nbsp; &brvbar;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; SubtractServiceImpl.java<br>&nbsp;&nbsp;&nbsp; &brvbar;<br>&nbsp;&nbsp;&nbsp; +---resources<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; logging.properties<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; sca.module<br></td></tr></tbody></table>
-<br><table style="text-align: left; width: 879px; height: 154px;" border="0" cellpadding="2" cellspacing="2"> <tbody><tr><td style="vertical-align: top;">sca.module</td>
-<td>Defines the SCA module and component. Defines for the CalculatorServiceComponent component&nbsp; the Java class that
-implements that component. &nbsp;Wires each of the operation components to the&nbsp;CalculatorServiceComponent</td> </tr> <tr> <td style="vertical-align: top;">CalculatorService.java</td>
-<td>Defines the Java interface implemented by the cacomponent.</td>
-</tr> <tr> <td style="vertical-align: top;">CalculatorServiceImpl.java</td>
-<td>Implements the SCA component. Uses the SCA service annotation
-tag on the class to show what SCA interface is being implemented.</td>
-</tr> <tr> <td style="vertical-align: top;">CalculatorClient.java</td>
-<td>Creates a Tuscany runtime and starts it. &nbsp;Obtains
-the module context which was defined by the sca.module file. From the
-module context locates the CalculatorServiceComponent and then
-calls operations on that component to demonstrating it using the multiple components implementing the operations..</td>
-</tr> </tbody></table><br></body></html> \ No newline at end of file
diff --git a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/AddService.java b/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/AddService.java
deleted file mode 100644
index 34a3edeb0e..0000000000
--- a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * 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.
- */
-package calculator;
-
-public interface AddService {
-
- double add(double n1, double n2);
-
-}
diff --git a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/AddServiceImpl.java b/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 02cddd08db..0000000000
--- a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * 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.
- */
-package calculator;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of the Add service
- */
-@Service(AddService.class)
-public class AddServiceImpl implements AddService {
-
- public double add(double n1, double n2) {
- return n1 + n2;
- }
-
-}
diff --git a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/CalculatorClient.java b/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index ee1c138940..0000000000
--- a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * 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.
- */
-package calculator;
-
-import java.util.Properties;
-import java.util.logging.Level;
-import java.util.logging.LogManager;
-
-import org.apache.tuscany.common.monitor.MonitorFactory;
-import org.apache.tuscany.common.monitor.impl.JavaLoggingMonitorFactory;
-import org.apache.tuscany.core.client.TuscanyRuntime;
-import org.osoa.sca.CurrentModuleContext;
-import org.osoa.sca.ModuleContext;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * locate the Calculator service and invoke it.
- */
-public class CalculatorClient {
-
- public static final void main(String[] args) throws Exception {
-
- // Setup Tuscany monitoring to use java.util.logging
- LogManager.getLogManager().readConfiguration(CalculatorClient.class.getResourceAsStream("/logging.properties"));
- Properties levels = new Properties();
- MonitorFactory monitorFactory = new JavaLoggingMonitorFactory(levels, Level.FINEST, "MonitorMessages");
-
- // Create a Tuscany runtime for the sample module component
- TuscanyRuntime tuscany = new TuscanyRuntime("CalculatorModuleComponent", "http://calculator", monitorFactory);
-
- // Start the Tuscany runtime and associate it with this thread
- tuscany.start();
-
- // Get the SCA module context.
- ModuleContext moduleContext = CurrentModuleContext.getContext();
-
- // Locate the Calculator service
- CalculatorService calculatorService = (CalculatorService) moduleContext.locateService("CalculatorServiceComponent");
-
- // Calculate
- System.out.println("3 + 2="+calculatorService.add(3, 2));
- System.out.println("3 - 2="+calculatorService.subtract(3, 2));
- System.out.println("3 * 2="+calculatorService.multiply(3, 2));
- System.out.println("3 / 2="+calculatorService.divide(3, 2));
-
- System.out.flush();
-
- // Disassociate the runtime from this thread
- tuscany.stop();
-
- // Shut down the runtime
- tuscany.shutdown();
- }
-}
diff --git a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/CalculatorService.java b/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index ff39e0b57a..0000000000
--- a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * 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.
- */
-package calculator;
-
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
- double add(double n1, double n2);
-
- double subtract(double n1, double n2);
-
- double multiply(double n1, double n2);
-
- double divide(double n1, double n2);
-
-}
diff --git a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index b81a6f00fd..0000000000
--- a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * 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.
- */
-package calculator;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-
-/**
- * An implementation of the Calculator service.
- */
-@Service(CalculatorService.class)
-public class CalculatorServiceImpl implements CalculatorService {
-
- private AddService addService;
- private SubtractService subtractService;
- private MultiplyService multiplyService;
- private DivideService divideService;
-
- @Reference
- public void setAddService(AddService addService) {
- this.addService = addService;
- }
-
- @Reference
- public void setSubtractService(SubtractService subtractService) {
- this.subtractService = subtractService;
- }
-
- @Reference
- public void setDivideService(DivideService divideService) {
- this.divideService = divideService;
- }
-
- @Reference
- public void setMultiplyService(MultiplyService multiplyService) {
- this.multiplyService = multiplyService;
- }
-
- public double add(double n1, double n2) {
- return addService.add(n1, n2);
- }
-
- public double subtract(double n1, double n2) {
- return subtractService.subtract(n1, n2);
- }
-
- public double multiply(double n1, double n2) {
- return multiplyService.multiply(n1, n2);
- }
-
- public double divide(double n1, double n2) {
- return divideService.divide(n1, n2);
- }
-
-}
diff --git a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/DivideService.java b/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 664ba2ba61..0000000000
--- a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * 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.
- */
-package calculator;
-
-public interface DivideService {
-
- double divide(double n1, double n2);
-
-}
diff --git a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/DivideServiceImpl.java b/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 12d0c65ed2..0000000000
--- a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * 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.
- */
-package calculator;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of the Divide service.
- */
-@Service(DivideService.class)
-public class DivideServiceImpl implements DivideService {
-
- public double divide(double n1, double n2) {
- return n1 / n2;
- }
-
-}
diff --git a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/MultiplyService.java b/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index fcb274dc8a..0000000000
--- a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * 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.
- */
-package calculator;
-
-public interface MultiplyService {
-
- double multiply(double n1, double n2);
-
-}
diff --git a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c274d1a6d1..0000000000
--- a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * 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.
- */
-package calculator;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of the Multiply service.
- */
-@Service(MultiplyService.class)
-public class MultiplyServiceImpl implements MultiplyService {
-
- public double multiply(double n1, double n2) {
- return n1 * n2;
- }
-
-}
diff --git a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/SubtractService.java b/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 2e0fcb2b36..0000000000
--- a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * 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.
- */
-package calculator;
-
-public interface SubtractService {
-
- double subtract(double n1, double n2);
-
-}
diff --git a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/SubtractServiceImpl.java b/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 62103906fa..0000000000
--- a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * 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.
- */
-package calculator;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * An implementation of the subtract service.
- */
-@Service(SubtractService.class)
-public class SubtractServiceImpl implements SubtractService {
-
- public double subtract(double n1, double n2) {
- return n1 - n2;
- }
-
-}
diff --git a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/resources/logging.properties b/tags/java-M1-20060518/java/samples/sca/calculator/src/main/resources/logging.properties
deleted file mode 100644
index 58407bd5a9..0000000000
--- a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/resources/logging.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2006 The Apache Software Foundation or its licensors, as applicable.
-#
-# 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.
-#
-# $Rev$ $Date$
-#
-
-# Custom logging configuration for Tuscany samples
-# By default, only INFO level logging is enabled and ALL messages get sent to the console
-# For more messages from the runtime, uncomment specific settings at the end of this file
-handlers = java.util.logging.ConsoleHandler
-java.util.logging.ConsoleHandler.level = ALL
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-.level=INFO
-
-# Uncomment the next setting to get all Tuscany messages (this will be a lot)
-#org.apache.tuscany.level=FINEST \ No newline at end of file
diff --git a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/resources/sca.module b/tags/java-M1-20060518/java/samples/sca/calculator/src/main/resources/sca.module
deleted file mode 100644
index d37fc3f659..0000000000
--- a/tags/java-M1-20060518/java/samples/sca/calculator/src/main/resources/sca.module
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
- 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.
- -->
-<module xmlns="http://www.osoa.org/xmlns/sca/0.9" xmlns:v="http://www.osoa.org/xmlns/sca/values/0.9"
- name="calculator">
-
- <component name="CalculatorServiceComponent">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <references>
- <v:addService>AddServiceComponent</v:addService>
- <v:subtractService>SubtractServiceComponent</v:subtractService>
- <v:multiplyService>MultiplyServiceComponent</v:multiplyService>
- <v:divideService>DivideServiceComponent</v:divideService>
- </references>
- </component>
-
- <component name="AddServiceComponent">
- <implementation.java class="calculator.AddServiceImpl"/>
- </component>
-
- <component name="SubtractServiceComponent">
- <implementation.java class="calculator.SubtractServiceImpl"/>
- </component>
-
- <component name="MultiplyServiceComponent">
- <implementation.java class="calculator.MultiplyServiceImpl"/>
- </component>
-
- <component name="DivideServiceComponent">
- <implementation.java class="calculator.DivideServiceImpl"/>
- </component>
-
-</module>
diff --git a/tags/java-M1-20060518/java/samples/sca/calculator/src/test/java/calculator/CalculatorTestCase.java b/tags/java-M1-20060518/java/samples/sca/calculator/src/test/java/calculator/CalculatorTestCase.java
deleted file mode 100644
index f6b5d5f24d..0000000000
--- a/tags/java-M1-20060518/java/samples/sca/calculator/src/test/java/calculator/CalculatorTestCase.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * 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.
- */
-package calculator;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.core.client.TuscanyRuntime;
-import org.osoa.sca.CurrentModuleContext;
-import org.osoa.sca.ModuleContext;
-
-/**
- * This shows how to test the HelloWorld service component.
- */
-public class CalculatorTestCase extends TestCase {
-
- private TuscanyRuntime tuscany;
-
- protected void setUp() throws Exception {
- super.setUp();
-
- // Create a Tuscany runtime for the sample module component
- tuscany = new TuscanyRuntime("CalculatorModuleComponent", "http://calculator");
-
- // Start the Tuscany runtime and associate it with this thread
- tuscany.start();
- }
-
- public void testCalculator() throws Exception {
-
- // Get the SCA module context.
- ModuleContext moduleContext = CurrentModuleContext.getContext();
-
- // Locate the Calculator service
- CalculatorService calculatorService = (CalculatorService) moduleContext.locateService("CalculatorServiceComponent");
-
- // Calculate
- assertEquals(calculatorService.add(3, 2), 5.0);
- assertEquals(calculatorService.subtract(3, 2), 1.0);
- assertEquals(calculatorService.multiply(3, 2), 6.0);
- assertEquals(calculatorService.divide(3, 2), 1.5);
-
- }
-
- protected void tearDown() throws Exception {
-
- // Stop the Tuscany runtime
- tuscany.stop();
-
- super.tearDown();
- }
-}