diff options
Diffstat (limited to '')
41 files changed, 10 insertions, 1343 deletions
diff --git a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/README b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/README deleted file mode 100644 index 14636d090e..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/README +++ /dev/null @@ -1,25 +0,0 @@ -Calculator Contribution Sample -============================== - -This directory contains code which implements a simple calculator SCA contribution. - -The contribution can be run as a tuscany application using one of the tuscany launchers -as described in the README in the root directory of the samples. - -Sample Overview ---------------- -The sample provides a single calculator service with a default SCA (java) -binding. The launcher 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. - -You should see the following output (depending on the launcher you use, this output -may be surrounded by other output). - -run: - [java] 3 + 2=5.0 - [java] 3 - 2=1.0 - [java] 3 * 2=6.0 - [java] 3 / 2=1.5 - - diff --git a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/build.xml b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/build.xml deleted file mode 100644 index b0401d755e..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/build.xml +++ /dev/null @@ -1,55 +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. ---> -<project name="binding-ws-calculator" default="compile"> - <property name="tuscany.home" value="../.."/> - <property name="jar.name" value="contribution-binding-ws-calculator.jar" /> - - <echo>${tuscany.home}</echo> - - <target name="init"> - <delete quiet="true" includeemptydirs="true"> - <fileset dir="target"/> - </delete> - <mkdir dir="target/classes"/> - </target> - - <target name="compile" depends="init"> - <javac srcdir="src/main/java" - destdir="target/classes" - debug="on" - source="1.5" - target="1.5" - failonerror="true"> - <classpath> - <fileset dir="${tuscany.home}/lib"> - <include name="tuscany-sca-api-*.jar" /> - </fileset> - </classpath> - </javac> - <copy todir="target/classes"> - <fileset dir="src/main/resources"/> - </copy> - <jar destfile="target/${jar.name}" basedir="target/classes"> - <manifest> - <attribute name="Main-Class" value="${main.class}" /> - </manifest> - </jar> - </target> - -</project> diff --git a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/calculator.odg b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/calculator.odg Binary files differdeleted file mode 100644 index c2646f7d5e..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/calculator.odg +++ /dev/null diff --git a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/calculator.png b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/calculator.png Binary files differdeleted file mode 100644 index 476306e5f0..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/calculator.png +++ /dev/null diff --git a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/pom.xml b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/pom.xml deleted file mode 100644 index 876c3a5bfc..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * 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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-samples</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>sample-contribution-binding-ws-calculator</artifactId> - <name>Apache Tuscany SCA Sample Contribution binding-ws Calculator</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-api</artifactId> - <type>pom</type> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - - <plugins> - </plugins> - </build> -</project> diff --git a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddService.java deleted file mode 100644 index dd7ecb827d..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/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.oasisopen.sca.annotation.Remotable; - -/** - * The Add service interface - */ -@Remotable -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index 7ca8fb04b5..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/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/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index 031fa8b912..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/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/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index 17fad7de6b..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/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.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/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideService.java deleted file mode 100644 index 30d248208b..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * The divide service interface - */ -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index 1323edf55a..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/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/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index 5290605938..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * The interface for the multiply service - */ -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index 91b803bc9e..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/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/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractService.java deleted file mode 100644 index bf0d1882b6..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * The interface for the multiply service - */ -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 58cc4a3547..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/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/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/resources/Calculator.composite deleted file mode 100644 index ac4d7321e7..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/resources/Calculator.composite +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * 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. ---> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="Calculator"> - - <component name="CalculatorServiceComponent"> - <implementation.java class="calculator.CalculatorServiceImpl"/> - <reference name="addService" > - <binding.ws uri="http://localhost:8085/AddServiceComponent"/> - </reference> - <reference name="subtractService" target="SubtractServiceComponent" /> - <reference name="multiplyService" target="MultiplyServiceComponent" /> - <reference name="divideService" target="DivideServiceComponent" /> - </component> - - <component name="AddServiceComponent"> - <implementation.java class="calculator.AddServiceImpl"/> - <service name="AddService"> - <binding.ws uri="http://localhost:8085/AddServiceComponent"/> - </service> - </component> - - <component name="SubtractServiceComponent"> - <implementation.java class="calculator.SubtractServiceImpl"/> - </component> - - <component name="MultiplyServiceComponent"> - <implementation.java class="calculator.MultiplyServiceImpl"/> - </component> - - <component name="DivideServiceComponent"> - <implementation.java class="calculator.DivideServiceImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 8d6012e5c4..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * 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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:Calculator"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java deleted file mode 100644 index 9d3024f451..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-binding-ws-calculator/src/test/java/calculator/CalculatorTestCase.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -/** - * A unit test of the basic Java implementation classes in this contribution - * without using SCA - */ -public class CalculatorTestCase { - - @Test - public void testCalculator() throws Exception { - AddService add = new AddServiceImpl(); - SubtractService subtract = new SubtractServiceImpl(); - MultiplyService multiply = new MultiplyServiceImpl(); - DivideService divide = new DivideServiceImpl(); - - CalculatorServiceImpl calculator = new CalculatorServiceImpl(); - - calculator.setAddService(add); - calculator.setSubtractService(subtract); - calculator.setMultiplyService(multiply); - calculator.setDivideService(divide); - - assertEquals(calculator.add(3, 2), 5.0, 0); - assertEquals(calculator.subtract(3, 2), 1.0, 0); - assertEquals(calculator.multiply(3, 2), 6.0, 0); - assertEquals(calculator.divide(3, 2), 1.5, 0); - } -} diff --git a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/README b/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/README deleted file mode 100644 index acf18ec8d9..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/README +++ /dev/null @@ -1,25 +0,0 @@ -Calculator Sample Contribution -============================== - -This sample implements a simple calculator using SCA components. - -The README in the <distribution-unpack-dir>/samples directory provides -general instructions about building and running samples. ( where -distribution-unpack-dir is the directory in which you unpacked the tuscany -binary distribution archive) Take a look there for instructions on how to launch -this sample contribution. - -Sample Overview ---------------- -The sample provides a single calculator service with a default SCA (java) -binding. The CalculatorClient exercises this interface by calling add, -subtract, multiply and divide operations. This results in messages passing to -the appropriate components in the composite across the local wires. - -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 diff --git a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/build.xml b/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/build.xml deleted file mode 100644 index c4b53cc9cf..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/build.xml +++ /dev/null @@ -1,56 +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. ---> - -<project name="implementation-java-calculator" default="compile"> - - <property name="tuscany.home" value="../.."/> - <property name="jar.name" value="contribution-implementation-java-calculator.jar" /> - - <echo>${tuscany.home}</echo> - - <target name="init"> - <delete quiet="true" includeemptydirs="true"> - <fileset dir="target"/> - </delete> - <mkdir dir="target/classes"/> - </target> - - <target name="compile" depends="init"> - <javac srcdir="src/main/java" - destdir="target/classes" - debug="on" - source="1.5" - target="1.5" - failonerror="true"> - <classpath> - <fileset dir="${tuscany.home}/lib"> - <include name="tuscany-sca-api-*.jar" /> - </fileset> - </classpath> - </javac> - <copy todir="target/classes"> - <fileset dir="src/main/resources"/> - </copy> - <jar destfile="target/${jar.name}" basedir="target/classes"> - <manifest> - <attribute name="Main-Class" value="${main.class}" /> - </manifest> - </jar> - </target> -</project> diff --git a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/pom.xml b/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/pom.xml deleted file mode 100644 index a1cf0e4f9f..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/pom.xml +++ /dev/null @@ -1,58 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * 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. ---> -<project> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-samples</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>sample-contribution-implementation-java-calculator</artifactId> - <name>Apache Tuscany SCA Sample Contribution Implementation Java Calculator</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-api</artifactId> - <type>pom</type> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <finalName>${artifactId}</finalName> - <plugins> - <plugin> - <groupId>org.apache.tuscany.maven.plugins</groupId> - <artifactId>maven-tuscany-plugin</artifactId> - <version>2.0-SNAPSHOT</version> - </plugin> - </plugins> - </build> - -</project> diff --git a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddService.java deleted file mode 100644 index 188451ebac..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * The Add service interface - */ -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index 7ca8fb04b5..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/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/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorClient.java deleted file mode 100644 index 84c98d7f70..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorClient.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package calculator; - -import org.oasisopen.sca.annotation.EagerInit; -import org.oasisopen.sca.annotation.Init; -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Scope; - -/** - * This client program shows how to create an SCA runtime, start it, - * and locate and invoke a SCA component - */ -@Scope("COMPOSITE") @EagerInit -public class CalculatorClient { - - private CalculatorService calculatorService; - - @Reference - public void setCalculatorService(CalculatorService calculatorService) { - this.calculatorService = calculatorService; - } - - @Init - public void calculate() { - - // Calculate - System.out.println("SCA API ClassLoader: " + print(Reference.class.getClassLoader())); - System.out.println("3 + 2=" + calculatorService.add(3, 2)); - System.out.println("3 - 2=" + calculatorService.subtract(3, 2)); - System.out.println("3 * 2=" + calculatorService.multiply(3, 2)); - System.out.println("3 / 2=" + calculatorService.divide(3, 2)); - } - - private static String print(ClassLoader cl) { - StringBuffer buf = new StringBuffer(); - for (; cl != null;) { - buf.append(cl.toString()); - buf.append(' '); - cl = cl.getParent(); - } - return buf.toString(); - } - -} diff --git a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index ce1cdaae5a..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorService.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The Calculator service interface. - */ -@Remotable -public interface CalculatorService { - - double add(double n1, double n2); - - double subtract(double n1, double n2); - - double multiply(double n1, double n2); - - double divide(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index 17fad7de6b..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/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.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/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideService.java deleted file mode 100644 index 30d248208b..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * The divide service interface - */ -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index 1323edf55a..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/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/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index 5290605938..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * The interface for the multiply service - */ -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index 91b803bc9e..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/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/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractService.java deleted file mode 100644 index bf0d1882b6..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * The interface for the multiply service - */ -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 58cc4a3547..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/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/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/Calculator.composite deleted file mode 100644 index 05bea57944..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/Calculator.composite +++ /dev/null @@ -1,49 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * 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. ---> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="Calculator"> - - <component name="CalculatorServiceComponent"> - <implementation.java class="calculator.CalculatorServiceImpl"/> - <reference name="addService" target="AddServiceComponent" /> - <reference name="subtractService" target="SubtractServiceComponent" /> - <reference name="multiplyService" target="MultiplyServiceComponent" /> - <reference name="divideService" target="DivideServiceComponent" /> - </component> - - <component name="AddServiceComponent"> - <implementation.java class="calculator.AddServiceImpl"/> - </component> - - <component name="SubtractServiceComponent"> - <implementation.java class="calculator.SubtractServiceImpl"/> - </component> - - <component name="MultiplyServiceComponent"> - <implementation.java class="calculator.MultiplyServiceImpl"/> - </component> - - <component name="DivideServiceComponent"> - <implementation.java class="calculator.DivideServiceImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/CalculatorClient.composite deleted file mode 100644 index dfd32761be..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/CalculatorClient.composite +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="CalculatorClient">
-
- <component name="CalculatorClient">
- <implementation.java class="calculator.CalculatorClient"/>
- <reference name="calculatorService" target="CalculatorServiceComponent" />
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 70aab0e051..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:Calculator"/>
- <deployable composite="sample:CalculatorClient"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java deleted file mode 100644 index 2e4a700156..0000000000 --- a/sca-java-2.x/trunk/samples/contribution-implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -/** - * This shows how to test the Calculator composition. - */ -public class CalculatorTestCase { - - @Test - public void testCalculator() throws Exception { - AddService add = new AddServiceImpl(); - SubtractService subtract = new SubtractServiceImpl(); - MultiplyService multiply = new MultiplyServiceImpl(); - DivideService divide = new DivideServiceImpl(); - - CalculatorServiceImpl calculator = new CalculatorServiceImpl(); - - calculator.setAddService(add); - calculator.setSubtractService(subtract); - calculator.setMultiplyService(multiply); - calculator.setDivideService(divide); - - assertEquals(calculator.add(3, 2), 5.0, 0); - assertEquals(calculator.subtract(3, 2), 1.0, 0); - assertEquals(calculator.multiply(3, 2), 6.0, 0); - assertEquals(calculator.divide(3, 2), 1.5, 0); - } -} diff --git a/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java b/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java index 3342e4a286..f23257769e 100644 --- a/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java +++ b/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherBindingWSCalculator.java @@ -41,7 +41,7 @@ public class JSELauncherBindingWSCalculator { * Using the Tuscany Node API to get a local service proxy
*/
public void launchBindingWSCalculator(){
- Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../contribution-binding-ws-calculator/target/sample-contribution-binding-ws-calculator.jar"));
+ Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../binding-ws/contribution-calculator/target/sample-contribution-binding-ws-calculator.jar"));
node.start();
CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");
diff --git a/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java b/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java index e348b5b4d1..4aebda1bcf 100644 --- a/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java +++ b/sca-java-2.x/trunk/samples/launcher-embedded-jse/src/main/java/launcher/JSELauncherImplementationJavaCalculator.java @@ -37,7 +37,7 @@ public class JSELauncherImplementationJavaCalculator { } public void launchImplementationJavaCalculator(){ - Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../contribution-implementation-java-calculator/target/classes")); + Node node = NodeFactory.newInstance().createNode(new Contribution("c1", "../implementation-java/contribution-calculator/target/classes")); node.start(); node.stop(); diff --git a/sca-java-2.x/trunk/samples/launcher-embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java b/sca-java-2.x/trunk/samples/launcher-embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java index 535488a60a..b3a0b1ce7e 100644 --- a/sca-java-2.x/trunk/samples/launcher-embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java +++ b/sca-java-2.x/trunk/samples/launcher-embedded-osgi-base/src/main/java/launcher/SampleJSELauncher.java @@ -73,7 +73,7 @@ public class SampleJSELauncher extends RuntimeIntegration { * Using a Tuscany specific mechanism for getting at local service proxies */ public void launchBindingWSCalculator() throws NoSuchDomainException, NoSuchServiceException{ - Node node = startNode(new Contribution("c1", "../contribution-binding-ws-calculator/target/sample-contribution-binding-ws-calculator.jar")); + Node node = startNode(new Contribution("c1", "../binding-ws/contribution-calculator/target/sample-contribution-binding-ws-calculator.jar")); CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent"); diff --git a/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java b/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java index e506f982de..bfc4681836 100644 --- a/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java +++ b/sca-java-2.x/trunk/samples/launcher-embedded-osgi/src/main/java/launcher/SampleJSELauncher.java @@ -73,7 +73,7 @@ public class SampleJSELauncher extends RuntimeIntegration { * Using a Tuscany specific mechanism for getting at local service proxies
*/
public void launchBindingWSCalculator() throws NoSuchDomainException, NoSuchServiceException{
- Node node = startNode(new Contribution("c1", "../contribution-binding-ws-calculator/target/sample-contribution-binding-ws-calculator.jar"));
+ Node node = startNode(new Contribution("c1", "../binding-ws/contribution-calculator/target/sample-contribution-binding-ws-calculator.jar"));
CalculatorService calculator = node.getService(CalculatorService.class, "CalculatorServiceComponent");
diff --git a/sca-java-2.x/trunk/samples/pom.xml b/sca-java-2.x/trunk/samples/pom.xml index c5aa5af97c..bf80b4a037 100644 --- a/sca-java-2.x/trunk/samples/pom.xml +++ b/sca-java-2.x/trunk/samples/pom.xml @@ -49,9 +49,7 @@ ********* --> <module>helloworld-bpel</module> - <module>helloworld-spring</module> - <module>store</module> - <module>store-webapp</module> + <module>helloworld-spring</module> <module>webapps/helloworld</module> <module>webapps/helloworld-bpel</module> <module>webapps/helloworld-jaxrs</module> @@ -66,9 +64,9 @@ <module>binding-rmi</module> <module>binding-sca</module> - <module>contribution-binding-ws-calculator</module> + <module>binding-ws</module> <module>binding-jsonrpc</module> - <module>contribution-implementation-java-calculator</module> + <module>implementation-java</module> <module>implementation-script</module> <!-- contributions - Tuscany samples --> @@ -80,6 +78,7 @@ <!-- don't need to process these as they just contain README files <module>launcher-command-line</module> <module>launcher-maven</module> + <module>launcher-webapp</module> --> <module>launcher-embedded-jse</module> <module>launcher-embedded-osgi</module> @@ -87,7 +86,8 @@ <!-- Application samples --> - <!-- TODO --> + <module>store</module> + <module>store-webapp</module> </modules> |
