From dcd5c7400a9b668ad64e5376788facc6dbda8fc8 Mon Sep 17 00:00:00 2001 From: slaws Date: Wed, 19 May 2010 10:52:38 +0000 Subject: Moved to binding-sca sub-directory git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@946118 13f79535-47bb-0310-9956-ffa450edef68 --- .../contribution-binding-sca-calculator/README | 109 --------------------- .../contribution-binding-sca-calculator/build.xml | 57 ----------- .../contribution-binding-sca-calculator/pom.xml | 58 ----------- .../src/main/java/calculator/AddService.java | 28 ------ .../src/main/java/calculator/AddServiceImpl.java | 38 ------- .../src/main/java/calculator/CalculatorClient.java | 52 ---------- .../main/java/calculator/CalculatorService.java | 37 ------- .../java/calculator/CalculatorServiceImpl.java | 72 -------------- .../src/main/java/calculator/DivideService.java | 28 ------ .../main/java/calculator/DivideServiceImpl.java | 38 ------- .../src/main/java/calculator/MultiplyService.java | 28 ------ .../main/java/calculator/MultiplyServiceImpl.java | 38 ------- .../src/main/java/calculator/SubtractService.java | 28 ------ .../main/java/calculator/SubtractServiceImpl.java | 38 ------- .../src/main/resources/Calculator.composite | 49 --------- .../src/main/resources/CalculatorClient.composite | 30 ------ .../main/resources/META-INF/sca-contribution.xml | 24 ----- .../test/java/calculator/CalculatorTestCase.java | 50 ---------- .../contribution-binding-ws-calculator/build.xml | 2 +- 19 files changed, 1 insertion(+), 803 deletions(-) delete mode 100644 sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/README delete mode 100644 sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/build.xml delete mode 100644 sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/pom.xml delete mode 100644 sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/AddService.java delete mode 100644 sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/AddServiceImpl.java delete mode 100644 sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/CalculatorClient.java delete mode 100644 sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/CalculatorService.java delete mode 100644 sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/CalculatorServiceImpl.java delete mode 100644 sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/DivideService.java delete mode 100644 sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/DivideServiceImpl.java delete mode 100644 sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/MultiplyService.java delete mode 100644 sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/MultiplyServiceImpl.java delete mode 100644 sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/SubtractService.java delete mode 100644 sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/SubtractServiceImpl.java delete mode 100644 sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/resources/Calculator.composite delete mode 100644 sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/resources/CalculatorClient.composite delete mode 100644 sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/test/java/calculator/CalculatorTestCase.java (limited to 'sca-java-2.x/trunk/samples') diff --git a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/README b/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/README deleted file mode 100644 index 20a913075c..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/README +++ /dev/null @@ -1,109 +0,0 @@ -Calculator Sample -================= -This sample implements a simple calculator using SCA components. It also optionally demonstrates tracing Tuscany code. - -The README in the samples directory (the directory above this) provides -general instructions about building and running samples. Take a look there -first. - -If you just want to run it to see what happens open a command prompt, navigate -to this sample directory and do: - -ant run - -OR if you don't have ant, on Windows do - -java -cp ..\..\features\tuscany-sca-manifest.jar;target\sample-calculator.jar calculator.CalculatorClient - -and on *nix do - -java -cp ../../features/tuscany-sca-manifest.jar:target/sample-calculator.jar calculator.CalculatorClient - -If you want to see an example of tracing the Tuscany code ... then try the command ---------------------------------------------------------- -ant runtraced - -or on Windows run the command - -java -javaagent:..\..\bin/aspectjweaver.jar -cp ..\..\features\tuscany-sca-manifest.jar;target\sample-calculator.jar calculator.CalculatorClient - -or on *nix run the command - -java -javaagent:../../bin/aspectjweaver.jar -cp ../../features/tuscany-sca-manifest.jar:target/sample-calculator.jar calculator.CalculatorClient - -Sample Overview ---------------- -The sample provides a single calculator service with a default SCA (java) -binding. The CalculatorClient exercises this interface by calling add, -subtract, multiply and divide operations. This results in messages passing to -the appropriate components in the composite across the local wires. - -calculator/ - src/ - main/ - java/ - calculator/ - CalculatorService.java - the first component, calls +-/* as - appropriate - CalculatorServiceImpl.java - AddService.java - adds two numbers - AddServiceImpl.java - SubtractService.java - subtracts one number from another - SubtractServiceImpl.java - MultiplyService.java - multiplies two numbers - MultiplyServiceImpl.java - DivideService.java - divides one number by another - DivideServiceImpl.java - CalculatorClient.java - starts the SCA Runtime and - deploys the Calculator.composite. - It then calls the deployed Calculator - Components services - resources/ - Calculator.composite - the SCA assembly for this sample - test/ - java/ - calculator/ - CalculatorTestCase.java - JUnit test case - calculator.png - a pictorial representation of the sample - .composite file - build.xml - the Ant build file - pom.xml - the Maven build file - -Building And Running The Sample Using Ant ------------------------------------------ -With the binary distribution the sample can be built and run using Ant as -follows - -cd calculator -ant compile -ant run - -You should see the following output from the run target. - -run: - [java] 3 + 2=5.0 - [java] 3 - 2=1.0 - [java] 3 * 2=6.0 - [java] 3 / 2=1.5 - -Building And Running The Sample Using Maven -------------------------------------------- -With either the binary or source distributions the sample can be built and run -using Maven as follows. - -cd calculator -mvn - -You should see the following output from the test phase. - -------------------------------------------------------- - T E S T S -------------------------------------------------------- -Running calculator.CalculatorTestCase -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.272 sec - -Results : - -Tests run: 1, Failures: 0, Errors: 0, Skipped: 0 - -This shows that the Junit test cases have run successfully. diff --git a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/build.xml b/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/build.xml deleted file mode 100644 index 47475add02..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/build.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - ${tuscany.home} - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/pom.xml b/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/pom.xml deleted file mode 100644 index 3fa16f4c2c..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - 2.0-SNAPSHOT - ../../pom.xml - - sample-contribution-binding-sca-calculator - Apache Tuscany SCA Sample Contribution binding-sca Calculator - - - - org.apache.tuscany.sca - tuscany-feature-api - pom - 2.0-SNAPSHOT - - - - junit - junit - 4.8.1 - test - - - - - - ${artifactId} - - - org.apache.tuscany.maven.plugins - maven-tuscany-plugin - 2.0-SNAPSHOT - - - - diff --git a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/AddService.java deleted file mode 100644 index 188451ebac..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * The Add service interface - */ -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index bb75bb2337..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/AddServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of the Add service - */ -@Service(AddService.class) -public class AddServiceImpl implements AddService { - - public double add(double n1, double n2) { - Logger logger = Logger.getLogger("calculator"); - logger.log(Level.FINEST, "Adding " + n1 + " and " + n2); - return n1 + n2; - } - -} diff --git a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/CalculatorClient.java deleted file mode 100644 index afd5ea48fc..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/CalculatorClient.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package calculator; - -import org.oasisopen.sca.annotation.EagerInit; -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Scope; - -/** - * This client program shows how to create an SCA runtime, start it, - * and locate and invoke a SCA component - */ -@Scope("COMPOSITE") -@EagerInit -public class CalculatorClient { - - private CalculatorService calculatorService; - - @Reference - public void setCalculatorService(CalculatorService calculatorService) { - this.calculatorService = calculatorService; - } - - @Init - public void calculate() { - // Calculate - System.out.println("SCA API ClassLoader: " + Reference.class.getClassLoader()); - 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)); - } - -} diff --git a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index ce1cdaae5a..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/CalculatorService.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; - -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/contribution-binding-sca-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index fc53393d23..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,72 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.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/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/DivideService.java deleted file mode 100644 index 30d248208b..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/DivideService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * The divide service interface - */ -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index b1250ed9f2..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/DivideServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of the Divide service. - */ -@Service(DivideService.class) -public class DivideServiceImpl implements DivideService { - - public double divide(double n1, double n2) { - Logger logger = Logger.getLogger("calculator"); - logger.log(Level.FINEST, "Dividing " + n1 + " with " + n2); - return n1 / n2; - } - -} diff --git a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index 5290605938..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/MultiplyService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * The interface for the multiply service - */ -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index 11f68c66e3..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/MultiplyServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of the Multiply service. - */ -@Service(MultiplyService.class) -public class MultiplyServiceImpl implements MultiplyService { - - public double multiply(double n1, double n2) { - Logger logger = Logger.getLogger("calculator"); - logger.log(Level.FINEST, "Multiplying " + n1 + " with " + n2); - return n1 * n2; - } - -} diff --git a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/SubtractService.java deleted file mode 100644 index bf0d1882b6..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/SubtractService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * The interface for the multiply service - */ -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 30e59bf668..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/java/calculator/SubtractServiceImpl.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of the subtract service. - */ -@Service(SubtractService.class) -public class SubtractServiceImpl implements SubtractService { - - public double subtract(double n1, double n2) { - Logger logger = Logger.getLogger("calculator"); - logger.log(Level.FINEST, "Subtracting " + n1 + " from " + n2); - return n1 - n2; - } - -} diff --git a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/resources/Calculator.composite deleted file mode 100644 index 05bea57944..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/resources/Calculator.composite +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/resources/CalculatorClient.composite deleted file mode 100644 index dfd32761be..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/resources/CalculatorClient.composite +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 3e64787ce4..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/test/java/calculator/CalculatorTestCase.java deleted file mode 100644 index 9d3024f451..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-sca-calculator/src/test/java/calculator/CalculatorTestCase.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -/** - * A unit test of the basic Java implementation classes in this contribution - * without using SCA - */ -public class CalculatorTestCase { - - @Test - public void testCalculator() throws Exception { - AddService add = new AddServiceImpl(); - SubtractService subtract = new SubtractServiceImpl(); - MultiplyService multiply = new MultiplyServiceImpl(); - DivideService divide = new DivideServiceImpl(); - - CalculatorServiceImpl calculator = new CalculatorServiceImpl(); - - calculator.setAddService(add); - calculator.setSubtractService(subtract); - calculator.setMultiplyService(multiply); - calculator.setDivideService(divide); - - assertEquals(calculator.add(3, 2), 5.0, 0); - assertEquals(calculator.subtract(3, 2), 1.0, 0); - assertEquals(calculator.multiply(3, 2), 6.0, 0); - assertEquals(calculator.divide(3, 2), 1.5, 0); - } -} diff --git a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/build.xml b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/build.xml index c5d4957688..b0401d755e 100644 --- a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/build.xml +++ b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/build.xml @@ -18,7 +18,7 @@ --> - + ${tuscany.home} -- cgit v1.2.3