From 3b7a9c51b93925c567b6b84450410b2737cc565e Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 16 Feb 2012 15:41:20 +0000 Subject: Delete old RC tags git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1245037 13f79535-47bb-0310-9956-ffa450edef68 --- .../samples/learning-more/binding-jsonrpc/README | 1 - .../binding-jsonrpc/calculator-contribution/README | 26 ----- .../calculator-contribution/build.xml | 57 ---------- .../calculator-contribution/pom.xml | 58 ---------- .../src/main/java/calculator/AddBean.java | 88 -------------- .../src/main/java/calculator/AddService.java | 32 ------ .../src/main/java/calculator/AddServiceImpl.java | 43 ------- .../src/main/java/calculator/CalculatorClient.java | 52 --------- .../main/java/calculator/CalculatorService.java | 37 ------ .../java/calculator/CalculatorServiceImpl.java | 86 -------------- .../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 | 53 --------- .../src/main/resources/CalculatorClient.composite | 30 ----- .../main/resources/META-INF/sca-contribution.xml | 24 ---- .../test/java/calculator/CalculatorTestCase.java | 50 -------- .../calculator-webapp/build-dojo.xml | 64 ----------- .../binding-jsonrpc/calculator-webapp/pom.xml | 126 --------------------- .../src/main/java/calculator/AddBean.java | 90 --------------- .../src/main/java/calculator/AddService.java | 32 ------ .../src/main/java/calculator/AddServiceImpl.java | 44 ------- .../main/java/calculator/CalculatorService.java | 37 ------ .../java/calculator/CalculatorServiceImpl.java | 86 -------------- .../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/webapp/WEB-INF/web.composite | 53 --------- .../src/main/webapp/WEB-INF/web.xml | 41 ------- .../src/main/webapp/calculate.html | 62 ---------- .../test/java/calculator/CalculatorTestCase.java | 50 -------- .../samples/learning-more/binding-jsonrpc/pom.xml | 44 ------- 38 files changed, 1762 deletions(-) delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/README delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/README delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/build.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddBean.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddService.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddServiceImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorClient.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorService.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/DivideService.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/MultiplyService.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/SubtractService.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/Calculator.composite delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/CalculatorClient.composite delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/build-dojo.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddBean.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddService.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddServiceImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorService.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/DivideService.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/MultiplyService.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/SubtractService.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.composite delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.xml delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/calculate.html delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/test/java/calculator/CalculatorTestCase.java delete mode 100644 sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/pom.xml (limited to 'sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc') diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/README b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/README deleted file mode 100644 index 18ba62d494..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/README +++ /dev/null @@ -1 +0,0 @@ -Please look at the README files in the subdirectories of this directory for descriptions of the sample contributions. diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/README b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/README deleted file mode 100644 index 1e5bc9c584..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/README +++ /dev/null @@ -1,26 +0,0 @@ -Calculator Sample Contribution -============================== - -This sample contribution implements a simple calculator using SCA components. - -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 for instructions on how to launch -this sample contribution. - -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. - -Amongst the other output created by the launcher/contribution combination, you should see the following output ... - -run: - [java] 3 + 2=5.0 - [java] 3 - 2=1.0 - [java] 3 * 2=6.0 - [java] 3 / 2=1.5 - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/build.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/build.xml deleted file mode 100644 index 00abb659d6..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/build.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - ${tuscany.home} - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml deleted file mode 100644 index 0be422169b..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-samples - 2.0-Beta1 - ../pom.xml - - sample-binding-jsonrpc-calculator-contribution - Apache Tuscany SCA Sample binding.jsonrpc Calculator Contribution - - - - org.apache.tuscany.sca - tuscany-feature-api - pom - 2.0-Beta1 - - - - junit - junit - 4.8.1 - test - - - - - - ${artifactId} - - - org.apache.tuscany.maven.plugins - maven-tuscany-plugin - 2.0-Beta1 - - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddBean.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddBean.java deleted file mode 100644 index bb39e961b4..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddBean.java +++ /dev/null @@ -1,88 +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; - -public class AddBean { - - protected double n1; - protected double n2; - protected double n3; - - protected Boolean b; - protected String s; - protected int x; - protected Integer y; - - public double getN1() { - return n1; - } - - public void setN1(double n1) { - this.n1 = n1; - } - - public double getN2() { - return n2; - } - - public void setN2(double n2) { - this.n2 = n2; - } - - public double getN3() { - return n3; - } - - public void setN3(double n3) { - this.n3 = n3; - } - - public Boolean getB() { - return b; - } - - public void setB(Boolean b) { - this.b = b; - } - - public String getS() { - return s; - } - - public void setS(String s) { - this.s = s; - } - - public int getX() { - return x; - } - - public void setX(int x) { - this.x = x; - } - - public Integer getY() { - return y; - } - - public void setY(Integer y) { - this.y = y; - } -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddService.java deleted file mode 100644 index 03e844d09c..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,32 +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 Add service interface - */ -@Remotable -public interface AddService { - - double add(double n1, double n2); - AddBean addComplexParam(AddBean aBean); - -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index 8eabfa6773..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddServiceImpl.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; - -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; - } - - public AddBean addComplexParam(AddBean aBean) { - aBean.setN3(aBean.getN1() + aBean.getN2()); - return aBean; - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorClient.java deleted file mode 100644 index 1df1f31c48..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/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/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index 78eea39c71..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/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/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index d32cc73815..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,86 +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) { - AddBean aBean = new AddBean(); - // So data to test different types - aBean.setB(true); - aBean.setS("Fred"); - aBean.setX(27); - aBean.setY(58); - - // the numbers to be added - aBean.setN1(n1); - aBean.setN2(n2); - - aBean = addService.addComplexParam(aBean); - - return aBean.getN3(); - //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/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/DivideService.java deleted file mode 100644 index ef6a8b375b..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/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/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index ddd7b9cc6e..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/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/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index db568cc762..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/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/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index cc0de498d3..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/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/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/SubtractService.java deleted file mode 100644 index 56ee372fc4..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/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/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 22e95f7f54..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/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/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/Calculator.composite b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/Calculator.composite deleted file mode 100644 index 5f1add2431..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/Calculator.composite +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/CalculatorClient.composite b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/CalculatorClient.composite deleted file mode 100644 index dfd32761be..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/CalculatorClient.composite +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 70aab0e051..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/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/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java deleted file mode 100644 index 1952eb4a6e..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-contribution/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/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/build-dojo.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/build-dojo.xml deleted file mode 100644 index 36714c67fc..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/build-dojo.xml +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml deleted file mode 100644 index e4a7b4972d..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml +++ /dev/null @@ -1,126 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-samples - 2.0-Beta1 - ../pom.xml - - sample-binding-jsonrpc-calculator-webapp - Apache Tuscany SCA Sample binding.jsonrpc Calculator WebApp - war - - - - org.apache.tuscany.sca - tuscany-feature-api - pom - 2.0-Beta1 - - - - org.apache.tuscany.sca - tuscany-feature-webapp - pom - 2.0-Beta1 - - - - org.apache.tuscany.sca - tuscany-binding-jsonrpc-runtime - 2.0-Beta1 - - - - org.apache.tuscany.sca - tuscany-databinding-json - 2.0-Beta1 - - - - org.dojotoolkit - dojo - 1.3.0 - zip - - - - junit - junit - 4.8.1 - test - - - - - - ${artifactId} - - - org.apache.tuscany.maven.plugins - maven-tuscany-plugin - 2.0-Beta1 - - - org.apache.maven.plugins - maven-antrun-plugin - - - copy-dojo-files - generate-resources - - run - - - - - - - - - - - - clean-dojo-files - clean - - run - - - - - - - - - - - - - - org.mortbay.jetty - maven-jetty-plugin - 6.1.18 - - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddBean.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddBean.java deleted file mode 100644 index 71724ee7ae..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddBean.java +++ /dev/null @@ -1,90 +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; - -public class AddBean { - private static final String DEFAULT_S = "default string"; - private static final Boolean DEFAULT_B = false; - - protected double n1; - protected double n2; - protected double n3; - - protected Boolean b; - protected String s; - protected int x; - protected Integer y; - - public double getN1() { - return n1; - } - - public void setN1(double n1) { - this.n1 = n1; - } - - public double getN2() { - return n2; - } - - public void setN2(double n2) { - this.n2 = n2; - } - - public double getN3() { - return n3; - } - - public void setN3(double n3) { - this.n3 = n3; - } - - public Boolean getB() { - return b; - } - - public void setB(Boolean b) { - this.b = b; - } - - public String getS() { - return s; - } - - public void setS(String s) { - this.s = s; - } - - public int getX() { - return x; - } - - public void setX(int x) { - this.x = x; - } - - public Integer getY() { - return y; - } - - public void setY(Integer y) { - this.y = y; - } -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddService.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddService.java deleted file mode 100644 index 03e844d09c..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,32 +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 Add service interface - */ -@Remotable -public interface AddService { - - double add(double n1, double n2); - AddBean addComplexParam(AddBean aBean); - -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index e16b352021..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddServiceImpl.java +++ /dev/null @@ -1,44 +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; - } - - public AddBean addComplexParam(AddBean aBean) { - aBean.setN3(aBean.getN1() + aBean.getN2()); - System.out.println("Adding " + aBean.getN1() + " to " + aBean.getN1() + " gives " + aBean.getN3()); - return aBean; - } - -} diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index 78eea39c71..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/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/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index d32cc73815..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,86 +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) { - AddBean aBean = new AddBean(); - // So data to test different types - aBean.setB(true); - aBean.setS("Fred"); - aBean.setX(27); - aBean.setY(58); - - // the numbers to be added - aBean.setN1(n1); - aBean.setN2(n2); - - aBean = addService.addComplexParam(aBean); - - return aBean.getN3(); - //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/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/DivideService.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/DivideService.java deleted file mode 100644 index ef6a8b375b..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/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/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index ddd7b9cc6e..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/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/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index db568cc762..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/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/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index cc0de498d3..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/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/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/SubtractService.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/SubtractService.java deleted file mode 100644 index 56ee372fc4..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/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/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 22e95f7f54..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/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/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index dc0df8756c..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index b7e216baf7..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - Apache Tuscany Contribution binding-jsonrpc Calculator WebApp Sample - - - tuscany - org.apache.tuscany.sca.host.webapp.TuscanyServletFilter - - - - tuscany - /* - - - - calculate.html - - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/calculate.html b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/calculate.html deleted file mode 100644 index 6d22806e8f..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/calculate.html +++ /dev/null @@ -1,62 +0,0 @@ - - - - - Apache Tuscany binding-jsonrpc Calculator WebApp with DOJO Sample - - - - - - - - - -

Apache Tuscany binding-jsonrpc Calculator WebApp with DOJO Sample

- - 1 + 1 = - - -
- - - diff --git a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/src/test/java/calculator/CalculatorTestCase.java deleted file mode 100644 index 1952eb4a6e..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/calculator-webapp/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/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/pom.xml b/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/pom.xml deleted file mode 100644 index 2b45e22817..0000000000 --- a/sca-java-2.x/tags/2.0-Beta1-RC1/samples/learning-more/binding-jsonrpc/pom.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-samples - 2.0-Beta1 - ../pom.xml - - tuscany-sample-binding-jsonrpc - pom - Apache Tuscany SCA Sample binding.jsonrpc - - - - default - - true - - - calculator-contribution - calculator-webapp - - - - -- cgit v1.2.3