From 14dcb210459fb27db850aa962eb5a48a901ed65d Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Mon, 15 Sep 2008 09:31:45 +0000 Subject: Minor cleanup, removed a few unused modules. Set missing svn:ignore properties. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@695392 13f79535-47bb-0310-9956-ffa450edef68 --- branches/sca-equinox/itest/admin/README | 28 -- branches/sca-equinox/itest/admin/pom.xml | 60 ---- .../tuscany/sca/itest/admin/MyListService.java | 9 - .../sca/itest/admin/MyListServiceByYear.java | 8 - .../tuscany/sca/itest/admin/MyListServiceImpl.java | 69 ----- .../apache/tuscany/sca/itest/admin/MyLogger.java | 17 -- .../apache/tuscany/sca/itest/admin/MyService.java | 9 - .../tuscany/sca/itest/admin/MyServiceByDate.java | 10 - .../tuscany/sca/itest/admin/MyServiceImpl.java | 113 ------- .../tuscany/sca/itest/admin/MyTotalService.java | 6 - .../sca/itest/admin/MyTotalServiceImpl.java | 74 ----- .../sca/itest/admin/SCAComponentService.java | 9 - .../admin/MySimpleServiceInRecursiveTestCase.java | 61 ---- .../sca/itest/admin/MySimpleServiceTestCase.java | 57 ---- .../sca/itest/admin/MyTotalServiceTestCase.java | 48 --- .../test/resources/Iteration1Composite.composite | 43 --- .../test/resources/Iteration3Composite.composite | 68 ----- .../src/test/resources/MySimpleService.composite | 59 ---- branches/sca-equinox/itest/domain/pom.xml | 100 ------- .../src/main/java/calculator/AddService.java | 31 -- .../src/main/java/calculator/AddServiceImpl.java | 31 -- .../main/java/calculator/AddServiceUpdateImpl.java | 31 -- .../main/java/calculator/CalculatorService.java | 38 --- .../java/calculator/CalculatorServiceImpl.java | 74 ----- .../src/main/java/calculator/DivideService.java | 28 -- .../main/java/calculator/DivideServiceImpl.java | 30 -- .../src/main/java/calculator/MultiplyService.java | 28 -- .../main/java/calculator/MultiplyServiceImpl.java | 30 -- .../src/main/java/calculator/SubtractService.java | 31 -- .../main/java/calculator/SubtractServiceImpl.java | 31 -- .../resources/contributionA/Calculator.composite | 44 --- .../contributionA/META-INF/sca-contribution.xml | 24 -- .../META-INF/sca-deployables/Calculator.composite | 45 --- .../META-INF/sca-deployables/Calculator.composite | 32 -- .../contributionDependent/Calculator.composite | 36 --- .../META-INF/sca-contribution.xml | 24 -- .../contributionPrimary/Calculator.composite | 57 ---- .../META-INF/sca-contribution.xml | 25 -- .../sca/itest/domain/ContributionSPIsTestCase.java | 279 ----------------- branches/sca-equinox/itest/pom.xml | 29 +- branches/sca-equinox/samples/calculator2/README | 97 ------ branches/sca-equinox/samples/calculator2/build.xml | 72 ----- .../sca-equinox/samples/calculator2/calculator.png | Bin 20552 -> 0 bytes .../sca-equinox/samples/calculator2/calculator.svg | 329 --------------------- branches/sca-equinox/samples/calculator2/pom.xml | 65 ---- .../src/main/java/calculator/AddService.java | 28 -- .../src/main/java/calculator/AddServiceImpl.java | 35 --- .../src/main/java/calculator/CalculatorClient.java | 45 --- .../main/java/calculator/CalculatorService.java | 35 --- .../java/calculator/CalculatorServiceImpl.java | 70 ----- .../src/main/java/calculator/DivideService.java | 28 -- .../main/java/calculator/DivideServiceImpl.java | 35 --- .../src/main/java/calculator/MultiplyService.java | 28 -- .../main/java/calculator/MultiplyServiceImpl.java | 35 --- .../src/main/java/calculator/SubtractService.java | 28 -- .../main/java/calculator/SubtractServiceImpl.java | 35 --- .../src/main/resources/Calculator.composite | 49 --- .../test/java/calculator/CalculatorTestCase.java | 51 ---- branches/sca-equinox/samples/pom.xml | 1 - 59 files changed, 11 insertions(+), 2881 deletions(-) delete mode 100644 branches/sca-equinox/itest/admin/README delete mode 100644 branches/sca-equinox/itest/admin/pom.xml delete mode 100644 branches/sca-equinox/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java delete mode 100644 branches/sca-equinox/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java delete mode 100644 branches/sca-equinox/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java delete mode 100644 branches/sca-equinox/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyLogger.java delete mode 100644 branches/sca-equinox/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyService.java delete mode 100644 branches/sca-equinox/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceByDate.java delete mode 100644 branches/sca-equinox/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyServiceImpl.java delete mode 100644 branches/sca-equinox/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalService.java delete mode 100644 branches/sca-equinox/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceImpl.java delete mode 100644 branches/sca-equinox/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/SCAComponentService.java delete mode 100644 branches/sca-equinox/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceInRecursiveTestCase.java delete mode 100644 branches/sca-equinox/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MySimpleServiceTestCase.java delete mode 100644 branches/sca-equinox/itest/admin/src/test/java/org/apache/tuscany/sca/itest/admin/MyTotalServiceTestCase.java delete mode 100644 branches/sca-equinox/itest/admin/src/test/resources/Iteration1Composite.composite delete mode 100644 branches/sca-equinox/itest/admin/src/test/resources/Iteration3Composite.composite delete mode 100644 branches/sca-equinox/itest/admin/src/test/resources/MySimpleService.composite delete mode 100644 branches/sca-equinox/itest/domain/pom.xml delete mode 100644 branches/sca-equinox/itest/domain/src/main/java/calculator/AddService.java delete mode 100644 branches/sca-equinox/itest/domain/src/main/java/calculator/AddServiceImpl.java delete mode 100644 branches/sca-equinox/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java delete mode 100644 branches/sca-equinox/itest/domain/src/main/java/calculator/CalculatorService.java delete mode 100644 branches/sca-equinox/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java delete mode 100644 branches/sca-equinox/itest/domain/src/main/java/calculator/DivideService.java delete mode 100644 branches/sca-equinox/itest/domain/src/main/java/calculator/DivideServiceImpl.java delete mode 100644 branches/sca-equinox/itest/domain/src/main/java/calculator/MultiplyService.java delete mode 100644 branches/sca-equinox/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java delete mode 100644 branches/sca-equinox/itest/domain/src/main/java/calculator/SubtractService.java delete mode 100644 branches/sca-equinox/itest/domain/src/main/java/calculator/SubtractServiceImpl.java delete mode 100644 branches/sca-equinox/itest/domain/src/main/resources/contributionA/Calculator.composite delete mode 100644 branches/sca-equinox/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml delete mode 100644 branches/sca-equinox/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite delete mode 100644 branches/sca-equinox/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite delete mode 100644 branches/sca-equinox/itest/domain/src/main/resources/contributionDependent/Calculator.composite delete mode 100644 branches/sca-equinox/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml delete mode 100644 branches/sca-equinox/itest/domain/src/main/resources/contributionPrimary/Calculator.composite delete mode 100644 branches/sca-equinox/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml delete mode 100644 branches/sca-equinox/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java delete mode 100644 branches/sca-equinox/samples/calculator2/README delete mode 100644 branches/sca-equinox/samples/calculator2/build.xml delete mode 100644 branches/sca-equinox/samples/calculator2/calculator.png delete mode 100644 branches/sca-equinox/samples/calculator2/calculator.svg delete mode 100644 branches/sca-equinox/samples/calculator2/pom.xml delete mode 100644 branches/sca-equinox/samples/calculator2/src/main/java/calculator/AddService.java delete mode 100644 branches/sca-equinox/samples/calculator2/src/main/java/calculator/AddServiceImpl.java delete mode 100644 branches/sca-equinox/samples/calculator2/src/main/java/calculator/CalculatorClient.java delete mode 100644 branches/sca-equinox/samples/calculator2/src/main/java/calculator/CalculatorService.java delete mode 100644 branches/sca-equinox/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.java delete mode 100644 branches/sca-equinox/samples/calculator2/src/main/java/calculator/DivideService.java delete mode 100644 branches/sca-equinox/samples/calculator2/src/main/java/calculator/DivideServiceImpl.java delete mode 100644 branches/sca-equinox/samples/calculator2/src/main/java/calculator/MultiplyService.java delete mode 100644 branches/sca-equinox/samples/calculator2/src/main/java/calculator/MultiplyServiceImpl.java delete mode 100644 branches/sca-equinox/samples/calculator2/src/main/java/calculator/SubtractService.java delete mode 100644 branches/sca-equinox/samples/calculator2/src/main/java/calculator/SubtractServiceImpl.java delete mode 100644 branches/sca-equinox/samples/calculator2/src/main/resources/Calculator.composite delete mode 100644 branches/sca-equinox/samples/calculator2/src/test/java/calculator/CalculatorTestCase.java (limited to 'branches') diff --git a/branches/sca-equinox/itest/admin/README b/branches/sca-equinox/itest/admin/README deleted file mode 100644 index c4e96d7af0..0000000000 --- a/branches/sca-equinox/itest/admin/README +++ /dev/null @@ -1,28 +0,0 @@ -This is a simple test compiled to test simple features of SCA - -There are interfaces to different services that have been included - -1. MyListService -2. MyListServiceByYear -3. MyService -4. MyServiceByDate -5. MyTotalservice - -The service that has been used in the tests primarily is MyService/MyTotalService. -in the test cases. - -There are three test cases and three composites (MySimppleService,Iteration1,Iteration3). - -1. MySimpleServiceTestCase - Checks if the components in MySimpleService.composite are initialized properly. - It tries to call simple functions implemented in MySimpleServiceImpl. - -2. MyTotalServiceTestCase - Initializes the components in the Iteration3Composite.composite file. - tries to call simple functions implemented in MyTotalServiceImpl. - -3. MySimpleServiceInRecursiveTestCase - Initializes the components in the Iteration1Composite.composite file. - It initializes its components using implementation:composite tag in the - composite file which points to MySimpleService.composite. - The test case recursively calls functions initialized in MySimpleService.composite. - - - diff --git a/branches/sca-equinox/itest/admin/pom.xml b/branches/sca-equinox/itest/admin/pom.xml deleted file mode 100644 index 52a7bfb90a..0000000000 --- a/branches/sca-equinox/itest/admin/pom.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.4-SNAPSHOT - ../pom.xml - - tuscany-itest-admin - Apache Tuscany Admin Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.4-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.4-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-core-databinding - 1.4-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-databinding-sdo - 1.4-SNAPSHOT - compile - - - - diff --git a/branches/sca-equinox/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java b/branches/sca-equinox/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java deleted file mode 100644 index b3d2137767..0000000000 --- a/branches/sca-equinox/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListService.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.apache.tuscany.sca.itest.admin; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface MyListService { - String[] getHolidays(); - String getYear(); -} diff --git a/branches/sca-equinox/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java b/branches/sca-equinox/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java deleted file mode 100644 index 025302fb6d..0000000000 --- a/branches/sca-equinox/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceByYear.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.apache.tuscany.sca.itest.admin; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -public interface MyListServiceByYear { - String[] getHolidays(int year); -} diff --git a/branches/sca-equinox/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java b/branches/sca-equinox/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java deleted file mode 100644 index de480e6d85..0000000000 --- a/branches/sca-equinox/itest/admin/src/main/java/org/apache/tuscany/sca/itest/admin/MyListServiceImpl.java +++ /dev/null @@ -1,69 +0,0 @@ -package org.apache.tuscany.sca.itest.admin; - - -import java.util.List; - -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -import org.apache.tuscany.sca.itest.admin.MyListService; -import org.apache.tuscany.sca.itest.admin.MyListServiceByYear; - -@Service(interfaces={MyListService.class,MyListServiceByYear.class}) - -public class MyListServiceImpl implements MyListService,MyListServiceByYear -{ - - // This is multiplicity=1:n - @Reference(name="myListServiceList",required=true) - public List myListServicesList; - - // This is multiplicity=0:n - @Reference(name="myListServiceArray",required=false) - public MyListService[] myListServicesArray; - - @Property(name="serviceYear") - protected String year = "2006"; - - public String[] getHolidays() - { - return getHolidays(new Integer(year).intValue()); - } - - public String[] getHolidays(int year) - { - MyListService myService; - if (myListServicesList!=null) - { - for (int i=0; i=0 && index - - - - Raleigh - 2008 - - Durham - 2009 - - - - - - - - Durham - 2009 - - - diff --git a/branches/sca-equinox/itest/admin/src/test/resources/Iteration3Composite.composite b/branches/sca-equinox/itest/admin/src/test/resources/Iteration3Composite.composite deleted file mode 100644 index dd06d030d6..0000000000 --- a/branches/sca-equinox/itest/admin/src/test/resources/Iteration3Composite.composite +++ /dev/null @@ -1,68 +0,0 @@ - - - - - Raleigh - 2008 - - - - - - - - CARY - 2007 - - - - - - - - - - - - - - - - - - - - - Durham - 2009 - - - - - - - - Durham - 2009 - - diff --git a/branches/sca-equinox/itest/admin/src/test/resources/MySimpleService.composite b/branches/sca-equinox/itest/admin/src/test/resources/MySimpleService.composite deleted file mode 100644 index a1f8abb8da..0000000000 --- a/branches/sca-equinox/itest/admin/src/test/resources/MySimpleService.composite +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - Raleigh - 2008 - - - - - - - - CARY - 2007 - - - - - - - - - diff --git a/branches/sca-equinox/itest/domain/pom.xml b/branches/sca-equinox/itest/domain/pom.xml deleted file mode 100644 index 930bcda79d..0000000000 --- a/branches/sca-equinox/itest/domain/pom.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.4-SNAPSHOT - ../pom.xml - - itest-domain - Apache Tuscany SCA Domain Integration Tests - - - - - org.apache.tuscany.sca - tuscany-node-api - 1.4-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-node-launcher - 1.4-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-workspace-impl - 1.4-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-node-runtime - 1.4-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-binding-sca - 1.4-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-binding-sca-axis2 - 1.4-SNAPSHOT - runtime - - - - org.codehaus.woodstox - wstx-asl - 3.2.1 - runtime - - - - org.apache.tuscany.sca - tuscany-monitor-logging - 1.4-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-host-tomcat - 1.4-SNAPSHOT - test - - - - junit - junit - 4.2 - test - - - diff --git a/branches/sca-equinox/itest/domain/src/main/java/calculator/AddService.java b/branches/sca-equinox/itest/domain/src/main/java/calculator/AddService.java deleted file mode 100644 index 797ebb4024..0000000000 --- a/branches/sca-equinox/itest/domain/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -import org.osoa.sca.annotations.Remotable; - -/** - * The Add service interface - */ -@Remotable -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/branches/sca-equinox/itest/domain/src/main/java/calculator/AddServiceImpl.java b/branches/sca-equinox/itest/domain/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index 1a63d4ff77..0000000000 --- a/branches/sca-equinox/itest/domain/src/main/java/calculator/AddServiceImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * An implementation of the Add service - */ -public class AddServiceImpl implements AddService { - - public double add(double n1, double n2) { - System.out.println("AddService - add " + n1 + " and " + n2); - return n1 + n2; - } - -} diff --git a/branches/sca-equinox/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java b/branches/sca-equinox/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java deleted file mode 100644 index 93486d915e..0000000000 --- a/branches/sca-equinox/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * An implementation of the Add service - */ -public class AddServiceUpdateImpl implements AddService { - - public double add(double n1, double n2) { - System.out.println("AddService Update - add " + n1 + " and " + n2); - return n1 + n2; - } - -} diff --git a/branches/sca-equinox/itest/domain/src/main/java/calculator/CalculatorService.java b/branches/sca-equinox/itest/domain/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index 2718ab8772..0000000000 --- a/branches/sca-equinox/itest/domain/src/main/java/calculator/CalculatorService.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 org.osoa.sca.annotations.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/branches/sca-equinox/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java b/branches/sca-equinox/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index 3cb255843f..0000000000 --- a/branches/sca-equinox/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,74 +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.osoa.sca.annotations.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 setMultiplyService(MultiplyService multiplyService) { - this.multiplyService = multiplyService; - } - - @Reference - public void setDivideService(DivideService divideService) { - this.divideService = divideService; - } - - public double add(double n1, double n2) { - System.out.println("CalculatorService - add " + n1 + " and " + n2); - return addService[1].add(addService[0].add(n1, n2), n2); - } - - public double subtract(double n1, double n2) { - System.out.println("CalculatorService - subtract " + n1 + " and " + n2); - return subtractService.subtract(n1, n2); - } - - public double multiply(double n1, double n2) { - System.out.println("CalculatorService - multiply " + n1 + " and " + n2); - return multiplyService.multiply(n1, n2); - } - - public double divide(double n1, double n2) { - System.out.println("CalculatorService - divide " + n1 + " and " + n2); - return divideService.divide(n1, n2); - } - -} diff --git a/branches/sca-equinox/itest/domain/src/main/java/calculator/DivideService.java b/branches/sca-equinox/itest/domain/src/main/java/calculator/DivideService.java deleted file mode 100644 index ef6a8b375b..0000000000 --- a/branches/sca-equinox/itest/domain/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/branches/sca-equinox/itest/domain/src/main/java/calculator/DivideServiceImpl.java b/branches/sca-equinox/itest/domain/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index 8c33862f6d..0000000000 --- a/branches/sca-equinox/itest/domain/src/main/java/calculator/DivideServiceImpl.java +++ /dev/null @@ -1,30 +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; - -/** - * An implementation of the Divide service. - */ -public class DivideServiceImpl implements DivideService { - - public double divide(double n1, double n2) { - return n1 / n2; - } - -} diff --git a/branches/sca-equinox/itest/domain/src/main/java/calculator/MultiplyService.java b/branches/sca-equinox/itest/domain/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index db568cc762..0000000000 --- a/branches/sca-equinox/itest/domain/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/branches/sca-equinox/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java b/branches/sca-equinox/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index c7fbc73c00..0000000000 --- a/branches/sca-equinox/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java +++ /dev/null @@ -1,30 +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; - -/** - * An implementation of the Multiply service. - */ -public class MultiplyServiceImpl implements MultiplyService { - - public double multiply(double n1, double n2) { - return n1 * n2; - } - -} diff --git a/branches/sca-equinox/itest/domain/src/main/java/calculator/SubtractService.java b/branches/sca-equinox/itest/domain/src/main/java/calculator/SubtractService.java deleted file mode 100644 index 615320e670..0000000000 --- a/branches/sca-equinox/itest/domain/src/main/java/calculator/SubtractService.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -import org.osoa.sca.annotations.Remotable; - -/** - * The interface for the multiply service - */ -@Remotable -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/branches/sca-equinox/itest/domain/src/main/java/calculator/SubtractServiceImpl.java b/branches/sca-equinox/itest/domain/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index abf2777c7d..0000000000 --- a/branches/sca-equinox/itest/domain/src/main/java/calculator/SubtractServiceImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * An implementation of the subtract service. - */ -public class SubtractServiceImpl implements SubtractService { - - public double subtract(double n1, double n2) { - System.out.println("SubtractService - subtract " + n1 + " and " + n2); - return n1 - n2; - } - -} diff --git a/branches/sca-equinox/itest/domain/src/main/resources/contributionA/Calculator.composite b/branches/sca-equinox/itest/domain/src/main/resources/contributionA/Calculator.composite deleted file mode 100644 index 534e1a29af..0000000000 --- a/branches/sca-equinox/itest/domain/src/main/resources/contributionA/Calculator.composite +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-equinox/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml b/branches/sca-equinox/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml deleted file mode 100644 index 1b1c0291e2..0000000000 --- a/branches/sca-equinox/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/branches/sca-equinox/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite b/branches/sca-equinox/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite deleted file mode 100644 index bdb89803d1..0000000000 --- a/branches/sca-equinox/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-equinox/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite b/branches/sca-equinox/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite deleted file mode 100644 index c5af8dd3cc..0000000000 --- a/branches/sca-equinox/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-equinox/itest/domain/src/main/resources/contributionDependent/Calculator.composite b/branches/sca-equinox/itest/domain/src/main/resources/contributionDependent/Calculator.composite deleted file mode 100644 index df00387b23..0000000000 --- a/branches/sca-equinox/itest/domain/src/main/resources/contributionDependent/Calculator.composite +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/branches/sca-equinox/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml b/branches/sca-equinox/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml deleted file mode 100644 index 8264a8243f..0000000000 --- a/branches/sca-equinox/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/branches/sca-equinox/itest/domain/src/main/resources/contributionPrimary/Calculator.composite b/branches/sca-equinox/itest/domain/src/main/resources/contributionPrimary/Calculator.composite deleted file mode 100644 index 92d069c6c9..0000000000 --- a/branches/sca-equinox/itest/domain/src/main/resources/contributionPrimary/Calculator.composite +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-equinox/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml b/branches/sca-equinox/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml deleted file mode 100644 index e53c14a651..0000000000 --- a/branches/sca-equinox/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/branches/sca-equinox/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java b/branches/sca-equinox/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java deleted file mode 100644 index 98f13df774..0000000000 --- a/branches/sca-equinox/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java +++ /dev/null @@ -1,279 +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 org.apache.tuscany.sca.itest.domain; - - -import java.io.File; -import java.net.MalformedURLException; -import java.net.URI; -import java.net.URL; -import java.util.ArrayList; -import java.util.List; -import java.util.logging.Logger; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLOutputFactory; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Composite; -import org.apache.tuscany.sca.contribution.Artifact; -import org.apache.tuscany.sca.contribution.Contribution; -import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint; -import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor; -import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint; -import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolver; -import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint; -import org.apache.tuscany.sca.contribution.service.ContributionReadException; -import org.apache.tuscany.sca.contribution.service.ContributionResolveException; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.embedded.impl.ReallySmallRuntime; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.monitor.MonitorFactory; -import org.apache.tuscany.sca.node.SCAClient; -import org.apache.tuscany.sca.node.SCAContribution; -import org.apache.tuscany.sca.node.SCANode; -import org.apache.tuscany.sca.node.SCANodeFactory; -import org.apache.tuscany.sca.workspace.Workspace; -import org.apache.tuscany.sca.workspace.WorkspaceFactory; -import org.apache.tuscany.sca.workspace.builder.ContributionDependencyBuilder; -import org.apache.tuscany.sca.workspace.builder.impl.ContributionDependencyBuilderImpl; -import org.junit.BeforeClass; -import org.junit.Test; - -import calculator.CalculatorService; - -/** - * Runs a distributed domain in a single VM by using and in memory - * implementation of the distributed domain - */ -public class ContributionSPIsTestCase { - - final static Logger logger = Logger.getLogger(ContributionSPIsTestCase.class.getName()); - - private static ModelFactoryExtensionPoint modelFactories; - private static WorkspaceFactory workspaceFactory; - private static XMLOutputFactory outputFactory; - - private static ModelResolverExtensionPoint modelResolvers; - - private static URLArtifactProcessorExtensionPoint urlProcessors; - private static URLArtifactProcessor contributionProcessor; - - private static Workspace workspace; - - private static List problems = new ArrayList(); - private static ContributionDependencyBuilder dependencyBuilder; - - @BeforeClass - public static void init() throws Exception { - - try { - // Bootstrap a runtime to get a populated registry - // FIXME needs to be tidied so we can get the registry without all of the other configuration - // that is being repeated below - ReallySmallRuntime runtime = new ReallySmallRuntime(Thread.currentThread().getContextClassLoader()); - runtime.start(); - ExtensionPointRegistry registry = runtime.getExtensionPointRegistry(); - - // Create model factories - modelFactories = registry.getExtensionPoint(ModelFactoryExtensionPoint.class); - outputFactory = modelFactories.getFactory(XMLOutputFactory.class); - outputFactory.setProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES, true); - workspaceFactory = modelFactories.getFactory(WorkspaceFactory.class); - - // Create model resolvers - modelResolvers = registry.getExtensionPoint(ModelResolverExtensionPoint.class); - - // Create artifact processors - urlProcessors = registry.getExtensionPoint(URLArtifactProcessorExtensionPoint.class); - - // Create contribution processor - contributionProcessor = urlProcessors.getProcessor(Contribution.class); - - // Create workspace model to hold contribution information - workspace = workspaceFactory.createWorkspace(); - - MonitorFactory monitorFactory = registry.getExtensionPoint(MonitorFactory.class); - Monitor monitor = monitorFactory.createMonitor(); - dependencyBuilder = new ContributionDependencyBuilderImpl(monitor); - - } catch(Exception ex){ - ex.printStackTrace(); - } - - } - - @Test - public void testReadDependentContributions() throws Exception { - try { - // ==================================================================== - // The contribution management phase. I.e. where a use is adding contributions - // prior to selecting a composite to run - - // Load a contribution - // Note that this contribution is added before the contribution that it depends on - // as the contribution processing doesn't start until both have been added - URI uri = URI.create("contributionPrimary"); - File file = new File("./src/main/resources/contributionPrimary"); - URL url = file.toURI().toURL(); - Contribution contribution = (Contribution)contributionProcessor.read(null,uri, url); - workspace.getContributions().add(contribution); - System.out.println("Added contributionPrimary"); - - // Load another contribution - uri = URI.create("contributionDependent"); - file = new File("./src/main/resources/contributionDependent"); - url = file.toURI().toURL(); - contribution = (Contribution)contributionProcessor.read(null,uri, url); - workspace.getContributions().add(contribution); - System.out.println("Added contributionDependent"); - - // Choose a deployables as though a user had chosen it - List deployables = workspace.getContributions().get(0).getDeployables(); - QName chosenDeployableName = deployables.get(0).getName(); - System.out.println("Composite chosen to deploy = " + chosenDeployableName); - - - // List the dependency problems - for (int i = 0, n = problems.size(); i < n ; i++) { - System.out.println("Problem: "+ problems.get(i)); - } - - // ==================================================================== - // process the first chosen composite ready for a node to run the composite - - // find the contribution that holds our chosen composite and all its dependencies - // we are using the first deployable composite from the first contribution - // so we really know this here really but lets find it anyway - List contributionsToDeploy = null; - String chosenDeployableLocation = null; - for (Contribution tmpContribution : workspace.getContributions()){ - for (Composite deployable : tmpContribution.getDeployables()){ - if (deployable.getName().equals(chosenDeployableName)){ - contributionsToDeploy = dependencyBuilder.buildContributionDependencies(tmpContribution, workspace); - } - } - } - - // load all the contributions in the dependency chain to find the chosen - // composite - List loadedContributions = new ArrayList(); - for (Contribution tmpContribution : contributionsToDeploy){ - Contribution loadedContribution = contribution(loadedContributions, tmpContribution.getURI(), tmpContribution.getLocation()); - loadedContributions.add(loadedContribution); - - // find the chosen composite artifact location - for ( Artifact artifact :loadedContribution.getArtifacts()){ - if ( artifact.getURI().endsWith(".composite")){ - Composite model = (Composite)artifact.getModel(); - if (model.getName().equals(chosenDeployableName)){ - chosenDeployableLocation = artifact.getLocation(); - } - } - } - } - - System.out.println("Composite chosen to deploy location = " + chosenDeployableLocation); - for (Contribution dependency : contributionsToDeploy){ - System.out.println("Composite chosen to deploy dependency chain = " + dependency.getURI()); - } - -/* At this point if there is more than one composite in the domain - * we would build the domain to configure all the endpoint URIs - * and then pass the individual composites off to the separate - * nodes that are going to run the - * TODO - I've skipped this part for clarity at the moment - * - // create a domain level composite - Composite domainComposite = assemblyFactory.createComposite(); - domainComposite.setName(new QName(Constants.SCA10_TUSCANY_NS, "domain")); - - // etc. - */ - - - - // ==================================================================== - // run the chosen composite - SCAContribution [] contributions = new SCAContribution[contributionsToDeploy.size()]; - for (int i = 0; i < contributionsToDeploy.size(); i++) { - contributions[i] = new SCAContribution(contributionsToDeploy.get(i).getURI(), contributionsToDeploy.get(i).getLocation()); - } - - SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); - - SCANode node = nodeFactory.createSCANode(chosenDeployableLocation, contributions); - - node.start(); - SCAClient client = (SCAClient)node; - CalculatorService calculatorService = - client.getService(CalculatorService.class, "CalculatorServiceComponentA"); - - System.out.println("Add 2.0 + 3.0 + 3.0 = " + calculatorService.add(2.0, 3.0)); - -/* - AssemblyInspector assemblyInspector = new AssemblyInspector(); - System.out.println(assemblyInspector.assemblyAsString(node)); -*/ - - } catch (Exception ex) { - ex.printStackTrace(); - Assert.fail(); - } - } - - - private Contribution contribution(List contributions, String contributionURI, String contributionLocation) throws ContributionReadException { - try { - URI uri = URI.create(contributionURI); - URL location = locationURL(contributionLocation); - Contribution contribution = (Contribution)contributionProcessor.read(null, uri, location); - - ModelResolver modelResolver = new ExtensibleModelResolver(contribution, modelResolvers, modelFactories); - contributionProcessor.resolve(contribution, modelResolver); - - return contribution; - - } catch (ContributionReadException e) { - throw e; - } catch (ContributionResolveException e) { - throw new ContributionReadException(e); - } catch (MalformedURLException e) { - throw new ContributionReadException(e); - } - } - - private static URL locationURL(String location) throws MalformedURLException { - URI uri = URI.create(location); - String scheme = uri.getScheme(); - if (scheme == null) { - File file = new File(location); - return file.toURI().toURL(); - } else if (scheme.equals("file")) { - File file = new File(location.substring(5)); - return file.toURI().toURL(); - } else { - return uri.toURL(); - } - } - -} diff --git a/branches/sca-equinox/itest/pom.xml b/branches/sca-equinox/itest/pom.xml index b2af34b305..0f106ffd6e 100644 --- a/branches/sca-equinox/itest/pom.xml +++ b/branches/sca-equinox/itest/pom.xml @@ -72,14 +72,13 @@ callback-set-conversation component-type contribution + contribution-classloader contribution-multiple contribution-import-export - contribution-classloader conversations - corba conversations-ws + corba databindings - exceptions exceptions-cross-binding exceptions-cross-binding-ws @@ -100,27 +99,34 @@ late-reference-resolution oneway operation-overloading + policy policy-security policy-security-basicauth policy-security-jsr250 + properties recursive recursive-multi-level recursive-ws references + scopes serialization services spring - scopes transaction + wires wsdl - wsdlless wsdl2java + wsdlless wsdl-multiple ws-void-args-return @@ -164,29 +170,16 @@ callback-api callback-basic - callback-id callback-multiple-wires callback-set-callback callback-set-conversation - conversations exceptions exceptions-cross-binding extended-api oneway operation-overloading - references services component-type diff --git a/branches/sca-equinox/samples/calculator2/README b/branches/sca-equinox/samples/calculator2/README deleted file mode 100644 index ceb532faed..0000000000 --- a/branches/sca-equinox/samples/calculator2/README +++ /dev/null @@ -1,97 +0,0 @@ -Calculator Sample -================= -This sample implements a simple calculator using SCA components. - -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 ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator.jar calculator.CalculatorClient - -and on *nix do - -java -cp ../../lib/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/branches/sca-equinox/samples/calculator2/build.xml b/branches/sca-equinox/samples/calculator2/build.xml deleted file mode 100644 index c4b755ef94..0000000000 --- a/branches/sca-equinox/samples/calculator2/build.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-equinox/samples/calculator2/calculator.png b/branches/sca-equinox/samples/calculator2/calculator.png deleted file mode 100644 index 995a57b1fd..0000000000 Binary files a/branches/sca-equinox/samples/calculator2/calculator.png and /dev/null differ diff --git a/branches/sca-equinox/samples/calculator2/calculator.svg b/branches/sca-equinox/samples/calculator2/calculator.svg deleted file mode 100644 index 0615925c50..0000000000 --- a/branches/sca-equinox/samples/calculator2/calculator.svg +++ /dev/null @@ -1,329 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - Calculator - - CalculatorServiceComponent - - - CalculatorService - AddServiceComponent - - SubtractServiceComponent - - MultiplyServiceComponent - - DivideServiceComponent - addService - subtractService - multiplyService - divideService - - - - - - diff --git a/branches/sca-equinox/samples/calculator2/pom.xml b/branches/sca-equinox/samples/calculator2/pom.xml deleted file mode 100644 index fd6aaefdc7..0000000000 --- a/branches/sca-equinox/samples/calculator2/pom.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-sca - 1.4-SNAPSHOT - ../../pom.xml - - sample-calculator2 - Apache Tuscany SCA Calculator Sample - - - - - org.apache.tuscany.sca - tuscany-api - 1.4-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-scdl4j - 1.4-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-runtime2 - 1.4-SNAPSHOT - runtime - - - - junit - junit - 4.2 - test - - - - - - ${artifactId} - - diff --git a/branches/sca-equinox/samples/calculator2/src/main/java/calculator/AddService.java b/branches/sca-equinox/samples/calculator2/src/main/java/calculator/AddService.java deleted file mode 100644 index 188451ebac..0000000000 --- a/branches/sca-equinox/samples/calculator2/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/branches/sca-equinox/samples/calculator2/src/main/java/calculator/AddServiceImpl.java b/branches/sca-equinox/samples/calculator2/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index 7ca8fb04b5..0000000000 --- a/branches/sca-equinox/samples/calculator2/src/main/java/calculator/AddServiceImpl.java +++ /dev/null @@ -1,35 +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; - -/** - * An implementation of the Add service - */ -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/branches/sca-equinox/samples/calculator2/src/main/java/calculator/CalculatorClient.java b/branches/sca-equinox/samples/calculator2/src/main/java/calculator/CalculatorClient.java deleted file mode 100644 index 9d180bf52e..0000000000 --- a/branches/sca-equinox/samples/calculator2/src/main/java/calculator/CalculatorClient.java +++ /dev/null @@ -1,45 +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.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * This client program shows how to create an SCA runtime, start it, - * and locate and invoke a SCA component - */ -public class CalculatorClient { - public static void main(String[] args) throws Exception { - - SCADomain scaDomain = SCADomain.newInstance("Calculator.composite"); - - CalculatorService calculatorService = - scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent"); - - // Calculate - System.out.println("3 + 2=" + calculatorService.add(3, 2)); - System.out.println("3 - 2=" + calculatorService.subtract(3, 2)); - System.out.println("3 * 2=" + calculatorService.multiply(3, 2)); - System.out.println("3 / 2=" + calculatorService.divide(3, 2)); - - scaDomain.close(); - } - -} diff --git a/branches/sca-equinox/samples/calculator2/src/main/java/calculator/CalculatorService.java b/branches/sca-equinox/samples/calculator2/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index 031fa8b912..0000000000 --- a/branches/sca-equinox/samples/calculator2/src/main/java/calculator/CalculatorService.java +++ /dev/null @@ -1,35 +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 Calculator service interface. - */ -public interface CalculatorService { - - double add(double n1, double n2); - - double subtract(double n1, double n2); - - double multiply(double n1, double n2); - - double divide(double n1, double n2); - -} diff --git a/branches/sca-equinox/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.java b/branches/sca-equinox/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index 3d861f2018..0000000000 --- a/branches/sca-equinox/samples/calculator2/src/main/java/calculator/CalculatorServiceImpl.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 org.osoa.sca.annotations.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/branches/sca-equinox/samples/calculator2/src/main/java/calculator/DivideService.java b/branches/sca-equinox/samples/calculator2/src/main/java/calculator/DivideService.java deleted file mode 100644 index 30d248208b..0000000000 --- a/branches/sca-equinox/samples/calculator2/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/branches/sca-equinox/samples/calculator2/src/main/java/calculator/DivideServiceImpl.java b/branches/sca-equinox/samples/calculator2/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index 1323edf55a..0000000000 --- a/branches/sca-equinox/samples/calculator2/src/main/java/calculator/DivideServiceImpl.java +++ /dev/null @@ -1,35 +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; - -/** - * An implementation of the Divide service. - */ -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/branches/sca-equinox/samples/calculator2/src/main/java/calculator/MultiplyService.java b/branches/sca-equinox/samples/calculator2/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index 5290605938..0000000000 --- a/branches/sca-equinox/samples/calculator2/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/branches/sca-equinox/samples/calculator2/src/main/java/calculator/MultiplyServiceImpl.java b/branches/sca-equinox/samples/calculator2/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index 91b803bc9e..0000000000 --- a/branches/sca-equinox/samples/calculator2/src/main/java/calculator/MultiplyServiceImpl.java +++ /dev/null @@ -1,35 +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; - -/** - * An implementation of the Multiply service. - */ -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/branches/sca-equinox/samples/calculator2/src/main/java/calculator/SubtractService.java b/branches/sca-equinox/samples/calculator2/src/main/java/calculator/SubtractService.java deleted file mode 100644 index bf0d1882b6..0000000000 --- a/branches/sca-equinox/samples/calculator2/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/branches/sca-equinox/samples/calculator2/src/main/java/calculator/SubtractServiceImpl.java b/branches/sca-equinox/samples/calculator2/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 58cc4a3547..0000000000 --- a/branches/sca-equinox/samples/calculator2/src/main/java/calculator/SubtractServiceImpl.java +++ /dev/null @@ -1,35 +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; - -/** - * An implementation of the subtract service. - */ -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/branches/sca-equinox/samples/calculator2/src/main/resources/Calculator.composite b/branches/sca-equinox/samples/calculator2/src/main/resources/Calculator.composite deleted file mode 100644 index 90872041b0..0000000000 --- a/branches/sca-equinox/samples/calculator2/src/main/resources/Calculator.composite +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-equinox/samples/calculator2/src/test/java/calculator/CalculatorTestCase.java b/branches/sca-equinox/samples/calculator2/src/test/java/calculator/CalculatorTestCase.java deleted file mode 100644 index 775ad15537..0000000000 --- a/branches/sca-equinox/samples/calculator2/src/test/java/calculator/CalculatorTestCase.java +++ /dev/null @@ -1,51 +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 junit.framework.TestCase; - -import org.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * This shows how to test the Calculator service component. - */ -public class CalculatorTestCase extends TestCase { - - private CalculatorService calculatorService; - private SCADomain scaDomain; - - @Override - protected void setUp() throws Exception { - scaDomain = SCADomain.newInstance("Calculator.composite"); - calculatorService = scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent"); - } - - @Override - protected void tearDown() throws Exception { - scaDomain.close(); - } - - public void testCalculator() throws Exception { - // Calculate - assertEquals(calculatorService.add(3, 2), 5.0); - assertEquals(calculatorService.subtract(3, 2), 1.0); - assertEquals(calculatorService.multiply(3, 2), 6.0); - assertEquals(calculatorService.divide(3, 2), 1.5); - } -} diff --git a/branches/sca-equinox/samples/pom.xml b/branches/sca-equinox/samples/pom.xml index 28ed3c1048..79d46183bf 100644 --- a/branches/sca-equinox/samples/pom.xml +++ b/branches/sca-equinox/samples/pom.xml @@ -46,7 +46,6 @@ binding-echo binding-echo-extension calculator - calculator2 calculator-distributed calculator-implementation-policies calculator-lean -- cgit v1.2.3