From 0d6d7922ed17cca55ec36ff2626d1080e76d6d13 Mon Sep 17 00:00:00 2001 From: antelder Date: Tue, 26 Oct 2010 07:11:27 +0000 Subject: Remove old beta1 branch git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1027389 13f79535-47bb-0310-9956-ffa450edef68 --- .../contribution-calculator-reference/README | 34 ---------- .../contribution-calculator-reference/build.xml | 59 ----------------- .../contribution-calculator-reference/pom.xml | 74 ---------------------- .../src/main/java/calculator/AddService.java | 28 -------- .../main/java/calculator/CalculatorService.java | 39 ------------ .../java/calculator/CalculatorServiceImpl.java | 68 -------------------- .../src/main/java/calculator/DivideService.java | 28 -------- .../src/main/java/calculator/MultiplyService.java | 28 -------- .../src/main/java/calculator/SubtractService.java | 28 -------- .../resources/CalculatorRMIReference.composite | 42 ------------ .../calculator/CalculatorRMIReferenceTestCase.java | 70 -------------------- .../java/calculator/CalculatorRMIServiceImpl.java | 52 --------------- 12 files changed, 550 deletions(-) delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/README delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/build.xml delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/pom.xml delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java delete mode 100644 sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java (limited to 'sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference') diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/README b/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/README deleted file mode 100644 index 2f169419ba..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/README +++ /dev/null @@ -1,34 +0,0 @@ -Calculator RMI Reference Sample Contribution -============================================ - -This sample illustrates the use of Tuscany RMI Binding to call reference -services that are hosted as Java RMI services. - -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 ---------------- -This sample extends the calculator sample by replacing the local wired -connections with RMI bindings. Instead of local add, subtract, multiply and -divide components, an RMI service implementation now provides the -add, subtract, multiply and divide interfaces and is hosted as an RMI server. -References specified in the .composite file include an RMI binding which targets -this RMI server. -Note. As this test creates and uses local network connections you may need to -configure your firewall, if you are running one, to allow the test to run -successfully. - -Amongst the other output created by the launcher/contribution combination, you should see the following output ... - - - [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/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/build.xml b/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/build.xml deleted file mode 100644 index fe28a46b7c..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/build.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - ${tuscany.home} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/pom.xml b/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/pom.xml deleted file mode 100644 index b2bfd17012..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/pom.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-samples - 2.0-Beta1-SNAPSHOT - ../pom.xml - - sample-contribution-binding-rmi-calculator-reference - Apache Tuscany SCA Sample Contribution binding-rmi Calculator Reference - - - - org.apache.tuscany.sca - tuscany-node-api - 2.0-Beta1-SNAPSHOT - - - org.apache.tuscany.sca - tuscany-node-impl - 2.0-Beta1-SNAPSHOT - test - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 2.0-Beta1-SNAPSHOT - runtime - - - org.apache.tuscany.sca - tuscany-binding-rmi-runtime - 2.0-Beta1-SNAPSHOT - runtime - - - junit - junit - 4.8.1 - test - - - - - ${artifactId} - - - org.apache.tuscany.maven.plugins - maven-tuscany-plugin - 2.0-Beta1-SNAPSHOT - - - - - diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java b/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/AddService.java deleted file mode 100644 index a235e648c7..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/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 interface for the add service - */ -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index 0f7dec116f..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorService.java +++ /dev/null @@ -1,39 +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.rmi.Remote; -import java.rmi.RemoteException; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The Calculator service interface. - */ -@Remotable -public interface CalculatorService extends Remote { - - double add(double n1, double n2) throws RemoteException; - - double subtract(double n1, double n2) throws RemoteException; - - double multiply(double n1, double n2) throws RemoteException; - - double divide(double n1, double n2) throws RemoteException; -} diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index bcfd8871b6..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,68 +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; - -/** - * An implementation of the Calculator service. - */ -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/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java b/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/DivideService.java deleted file mode 100644 index 497dafd4fd..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/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 interface for the divide service - */ -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index 5290605938..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/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/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java b/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/java/calculator/SubtractService.java deleted file mode 100644 index 376b3e5bb9..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/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 subtract service - */ -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite b/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite deleted file mode 100644 index 7455dc7d38..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/main/resources/CalculatorRMIReference.composite +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java deleted file mode 100644 index 39d4b2fd28..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIReferenceTestCase.java +++ /dev/null @@ -1,70 +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 java.rmi.registry.LocateRegistry; -import java.rmi.registry.Registry; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - - -/** - * This shows how to test the Calculator service component. - */ -public class CalculatorRMIReferenceTestCase { - - private static Node node; - private static CalculatorService calculatorService; - - @BeforeClass - public static void setUp() throws Exception { - CalculatorRMIServiceImpl rmiCalculatorImpl = new CalculatorRMIServiceImpl(); - Registry rmiRegistry = LocateRegistry.createRegistry(8099); - rmiRegistry.bind("CalculatorRMIService", rmiCalculatorImpl); - - String uri = ContributionLocationHelper.getContributionLocation(CalculatorService.class); - Contribution contribution = new Contribution("c1", uri); - node = NodeFactory.newInstance().createNode("CalculatorRMIReference.composite", contribution); - node.start(); - calculatorService = node.getService(CalculatorService.class, "CalculatorServiceComponent"); - } - - @AfterClass - public static void tearDown() throws Exception { - node.stop(); - LocateRegistry.getRegistry(8099).unbind("CalculatorRMIService"); - } - - @Test - public void testCalculator() throws Exception { - // Calculate - assertEquals(calculatorService.add(3, 2), 5.0, 0.0); - assertEquals(calculatorService.subtract(3, 2), 1.0, 0.0); - assertEquals(calculatorService.multiply(3, 2), 6.0, 0.0); - assertEquals(calculatorService.divide(3, 2), 1.5, 0.0); - } -} diff --git a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.java deleted file mode 100644 index d8ded42cb2..0000000000 --- a/sca-java-2.x/branches/2.0-Beta1/samples/binding-rmi/contribution-calculator-reference/src/test/java/calculator/CalculatorRMIServiceImpl.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 java.rmi.RemoteException; -import java.rmi.server.UnicastRemoteObject; - - - -/** - * An implementation of the Calculator service. - */ -public class CalculatorRMIServiceImpl extends UnicastRemoteObject implements CalculatorService { - - private static final long serialVersionUID = -1543948944662001428L; - - public CalculatorRMIServiceImpl() throws RemoteException { - super(); - } - - public double add(double n1, double n2) throws RemoteException { - return n1 + n2; - } - - public double subtract(double n1, double n2) { - return n1 - n2; - } - - public double multiply(double n1, double n2) { - return n1 * n2; - } - - public double divide(double n1, double n2) { - return n1 / n2; - } -} -- cgit v1.2.3