From 6a3ca6736c808c1647854e405ef379b609f276db Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:07:45 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835126 13f79535-47bb-0310-9956-ffa450edef68 --- .../branches/sca-java-1.2.1/itest/domain/pom.xml | 81 +++++++ .../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 | 45 ++++ .../META-INF/sca-deployables/Calculator.composite | 32 +++ .../META-INF/sca-deployables/Calculator.composite | 49 +++++ .../contributionDependent/Calculator.composite | 33 +++ .../META-INF/sca-contribution.xml | 24 +++ .../contributionPrimary/Calculator.composite | 47 +++++ .../META-INF/sca-contribution.xml | 25 +++ .../sca/itest/domain/DomainAPITestCase.java | 233 +++++++++++++++++++++ 23 files changed, 1065 insertions(+) create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/pom.xml create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddService.java create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddServiceImpl.java create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/CalculatorService.java create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/DivideService.java create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/DivideServiceImpl.java create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/MultiplyService.java create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/SubtractService.java create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/SubtractServiceImpl.java create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionA/Calculator.composite create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionBupdate/META-INF/sca-deployables/Calculator.composite create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionD/META-INF/sca-deployables/Calculator.composite create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionDependent/Calculator.composite create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionPrimary/Calculator.composite create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml create mode 100644 sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/DomainAPITestCase.java (limited to 'sca-java-1.x/branches/sca-java-1.2.1/itest/domain') diff --git a/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/pom.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/pom.xml new file mode 100644 index 0000000000..1e09f73972 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/pom.xml @@ -0,0 +1,81 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-itest + 1.2.1-incubating-SNAPSHOT + ../pom.xml + + itest-domain + Apache Tuscany SCA Domain Integration Tests + + + + org.apache.tuscany.sca + tuscany-host-embedded + 1.2.1-incubating-SNAPSHOT + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 1.2.1-incubating-SNAPSHOT + runtime + + + + org.apache.tuscany.sca + tuscany-node-impl + 1.2.1-incubating-SNAPSHOT + test + + + + org.apache.tuscany.sca + tuscany-domain-impl + 1.2.1-incubating-SNAPSHOT + test + + + + org.apache.tuscany.sca + tuscany-host-tomcat + 1.2.1-incubating-SNAPSHOT + test + + + + + org.apache.tuscany.sca + tuscany-binding-ws-axis2 + 1.2.1-incubating-SNAPSHOT + test + + + + org.apache.tuscany.sca + tuscany-binding-sca-axis2 + 1.2.1-incubating-SNAPSHOT + test + + + diff --git a/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddService.java new file mode 100644 index 0000000000..d7dc4473ad --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddService.java @@ -0,0 +1,31 @@ +/* + * 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/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddServiceImpl.java new file mode 100644 index 0000000000..e9b7e254e5 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddServiceImpl.java @@ -0,0 +1,31 @@ +/* + * 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/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java new file mode 100644 index 0000000000..5b63ad5a17 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java @@ -0,0 +1,31 @@ +/* + * 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/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/CalculatorService.java new file mode 100644 index 0000000000..5fbd3a3f6b --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/CalculatorService.java @@ -0,0 +1,38 @@ +/* + * 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/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java new file mode 100644 index 0000000000..da869e00fd --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java @@ -0,0 +1,74 @@ +/* + * 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.add(n1, 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/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/DivideService.java new file mode 100644 index 0000000000..30d248208b --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/DivideService.java @@ -0,0 +1,28 @@ +/* + * 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-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/DivideServiceImpl.java new file mode 100644 index 0000000000..f7ac0b7287 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/DivideServiceImpl.java @@ -0,0 +1,30 @@ +/* + * 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/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/MultiplyService.java new file mode 100644 index 0000000000..5290605938 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/MultiplyService.java @@ -0,0 +1,28 @@ +/* + * 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-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java new file mode 100644 index 0000000000..b7dca792b2 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java @@ -0,0 +1,30 @@ +/* + * 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/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/SubtractService.java new file mode 100644 index 0000000000..78ab9c6ee0 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/SubtractService.java @@ -0,0 +1,31 @@ +/* + * 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/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/SubtractServiceImpl.java new file mode 100644 index 0000000000..1010207154 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/java/calculator/SubtractServiceImpl.java @@ -0,0 +1,31 @@ +/* + * 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/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionA/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionA/Calculator.composite new file mode 100644 index 0000000000..534e1a29af --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionA/Calculator.composite @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..db255e0232 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml @@ -0,0 +1,24 @@ + + + + + \ No newline at end of file diff --git a/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite new file mode 100644 index 0000000000..bdb89803d1 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionBupdate/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionBupdate/META-INF/sca-deployables/Calculator.composite new file mode 100644 index 0000000000..0c8d3e2858 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionBupdate/META-INF/sca-deployables/Calculator.composite @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite new file mode 100644 index 0000000000..c5af8dd3cc --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite @@ -0,0 +1,32 @@ + + + + + + + + + + + + diff --git a/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionD/META-INF/sca-deployables/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionD/META-INF/sca-deployables/Calculator.composite new file mode 100644 index 0000000000..119c52cbf8 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionD/META-INF/sca-deployables/Calculator.composite @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionDependent/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionDependent/Calculator.composite new file mode 100644 index 0000000000..538ad2e4c8 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionDependent/Calculator.composite @@ -0,0 +1,33 @@ + + + + + + + + + + + + + diff --git a/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..673de80c44 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml @@ -0,0 +1,24 @@ + + + + + \ No newline at end of file diff --git a/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionPrimary/Calculator.composite b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionPrimary/Calculator.composite new file mode 100644 index 0000000000..c120fed3ca --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionPrimary/Calculator.composite @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml new file mode 100644 index 0000000000..392310da11 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml @@ -0,0 +1,25 @@ + + + + + + \ No newline at end of file diff --git a/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/DomainAPITestCase.java b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/DomainAPITestCase.java new file mode 100644 index 0000000000..0fe2cf53d6 --- /dev/null +++ b/sca-java-1.x/branches/sca-java-1.2.1/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/DomainAPITestCase.java @@ -0,0 +1,233 @@ +/* + * 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 javax.xml.namespace.QName; + +import junit.framework.Assert; + +import org.apache.tuscany.sca.domain.SCADomain; +import org.apache.tuscany.sca.domain.SCADomainFactory; +import org.apache.tuscany.sca.domain.impl.SCADomainImpl; +import org.apache.tuscany.sca.node.SCANode; +import org.apache.tuscany.sca.node.SCANodeFactory; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.osoa.sca.ServiceRuntimeException; + +import calculator.CalculatorService; + +/** + * Runs a distributed domain in a single VM by using and in memory + * implementation of the distributed domain + */ +public class DomainAPITestCase { + + private static ClassLoader cl; + private static SCADomain domain; + private static SCANode nodeA; + private static SCANode nodeB; + private static CalculatorService calculatorService; + + @BeforeClass + public static void init() throws Exception { + + try { + System.out.println("Setting up domain"); + + SCADomainFactory domainFactory = SCADomainFactory.newInstance(); + domain = domainFactory.createSCADomain("http://localhost:9999"); + + System.out.println("Setting up nodes"); + + cl = DomainAPITestCase.class.getClassLoader(); + + SCANodeFactory nodeFactory = SCANodeFactory.newInstance(); + + nodeA = nodeFactory.createSCANode("http://localhost:8100/nodeA", "http://localhost:9999"); + nodeB = nodeFactory.createSCANode("http://localhost:8200/nodeB", "http://localhost:9999"); + + } catch(Exception ex){ + ex.printStackTrace(); + } + + } + + @AfterClass + public static void destroy() throws Exception { + + // destroy the nodes + nodeA.destroy(); + nodeB.destroy(); + + // destroy the domain + domain.destroy(); + } + + @Test + public void testStartWithNoNodeContributions() throws Exception { + try { + domain.start(); + domain.stop(); + } catch (Exception ex) { + ex.printStackTrace(); + Assert.fail(); + } + } + + @Test + public void testAddContribution() throws Exception { + try { + domain.addContribution("contributionD", cl.getResource("contributionD/")); + domain.addToDomainLevelComposite(new QName("http://sample", "CalculatorD")); + //domain.startComposite(new QName("http://sample", "CalculatorD")); + domain.start(); + + calculatorService = domain.getService(CalculatorService.class, "CalculatorServiceComponentD"); + + Assert.assertEquals(calculatorService.add(3, 2), 5.0); + Assert.assertEquals(calculatorService.subtract(3, 2), 1.0); + Assert.assertEquals(calculatorService.multiply(3, 2), 6.0); + Assert.assertEquals(calculatorService.divide(3, 2), 1.5); + + domain.stop(); + + try { + calculatorService.add(3, 2); + Assert.fail(); + } catch (ServiceRuntimeException ex){ + // do nothing + } + + domain.start(); + + Assert.assertEquals(calculatorService.add(3, 2), 5.0); + + + domain.stopComposite(new QName("http://sample", "CalculatorD")); + + try { + calculatorService.add(3, 2); + Assert.fail(); + } catch (ServiceRuntimeException ex){ + // do nothing + } + + domain.startComposite(new QName("http://sample", "CalculatorD")); + + + // TODO - this hangs for some reason + //Assert.assertEquals(calculatorService.add(3, 2), 5.0); + //Assert.assertEquals(calculatorService.subtract(3, 2), 1.0); + + domain.stop(); + domain.removeContribution("contributionD"); + } catch (Exception ex) { + ex.printStackTrace(); + Assert.fail(); + } + } + + @Test + public void testAddDependentContribution() throws Exception { + try { + domain.addContribution("contributionDependent", cl.getResource("contributionDependent/")); + domain.addContribution("contributionPrimary", cl.getResource("contributionPrimary/")); + ((SCADomainImpl)domain).addToDomainLevelComposite(new QName("http://primary", "CalculatorA"), + "http://localhost:8200/nodeB"); + domain.start(); + + calculatorService = domain.getService(CalculatorService.class, "CalculatorServiceComponentA"); + + Assert.assertEquals(calculatorService.add(3, 2), 5.0); + Assert.assertEquals(calculatorService.subtract(3, 2), 1.0); + Assert.assertEquals(calculatorService.multiply(3, 2), 6.0); + Assert.assertEquals(calculatorService.divide(3, 2), 1.5); + + domain.stop(); + domain.removeContribution("contributionPrimary"); + } catch (Exception ex) { + ex.printStackTrace(); + Assert.fail(); + } + } + + @Test + public void testAddMultipleContributions() throws Exception { + try { + domain.addContribution("contributionA", cl.getResource("contributionA/")); + domain.addContribution("contributionB", cl.getResource("contributionB/")); + ((SCADomainImpl)domain).addToDomainLevelComposite(new QName("http://sample", "CalculatorA"), + "http://localhost:8100/nodeA"); + ((SCADomainImpl)domain).addToDomainLevelComposite(new QName("http://sample", "CalculatorB"), + "http://localhost:8200/nodeB"); + domain.start(); + + + //Assert.assertEquals("", + // domain.getDomainLevelComposite()); + + calculatorService = domain.getService(CalculatorService.class, "CalculatorServiceComponentA"); + + Assert.assertEquals(calculatorService.add(3, 2), 5.0); + + domain.stop(); + domain.removeContribution("contributionA"); + domain.removeContribution("contributionB"); + } catch (Exception ex) { + ex.printStackTrace(); + Assert.fail(); + } + } + + @Test + public void testAddAndUpdateContribution() throws Exception { + try { + domain.addContribution("contributionA", cl.getResource("contributionA/")); + domain.addContribution("contributionB", cl.getResource("contributionB/")); + ((SCADomainImpl)domain).addToDomainLevelComposite(new QName("http://sample", "CalculatorA"), + "http://localhost:8100/nodeA"); + ((SCADomainImpl)domain).addToDomainLevelComposite(new QName("http://sample", "CalculatorB"), + "http://localhost:8200/nodeB"); + domain.start(); + + //Assert.assertEquals("", + // domain.getDomainLevelComposite()); + + calculatorService = domain.getService(CalculatorService.class, "CalculatorServiceComponentA"); + + Assert.assertEquals(calculatorService.add(3, 2), 5.0); + + domain.updateContribution("contributionB", cl.getResource("contributionBupdate/")); + + Assert.assertEquals(calculatorService.add(3, 2), 5.0); + + domain.stop(); + domain.removeContribution("contributionA"); + domain.removeContribution("contributionB"); + } catch (Exception ex) { + ex.printStackTrace(); + Assert.fail(); + } + } + +} -- cgit v1.2.3