From 9f395ebf3ec27f89c8dc63137bc99c8d6b0cff6d Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:07:37 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835125 13f79535-47bb-0310-9956-ffa450edef68 --- .../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 --------------------- 22 files changed, 984 deletions(-) delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/java/calculator/AddService.java delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/java/calculator/AddServiceImpl.java delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/java/calculator/CalculatorService.java delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/java/calculator/DivideService.java delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/java/calculator/DivideServiceImpl.java delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/java/calculator/MultiplyService.java delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/java/calculator/SubtractService.java delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/java/calculator/SubtractServiceImpl.java delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/resources/contributionA/Calculator.composite delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/resources/contributionBupdate/META-INF/sca-deployables/Calculator.composite delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/resources/contributionD/META-INF/sca-deployables/Calculator.composite delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/resources/contributionDependent/Calculator.composite delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/resources/contributionPrimary/Calculator.composite delete mode 100644 branches/sca-java-1.2/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml delete mode 100644 branches/sca-java-1.2/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/DomainAPITestCase.java (limited to 'branches/sca-java-1.2/itest/domain/src') diff --git a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/AddService.java b/branches/sca-java-1.2/itest/domain/src/main/java/calculator/AddService.java deleted file mode 100644 index d7dc4473ad..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -import org.osoa.sca.annotations.Remotable; - -/** - * The Add service interface - */ -@Remotable -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/AddServiceImpl.java b/branches/sca-java-1.2/itest/domain/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index e9b7e254e5..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/AddServiceImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * An implementation of the Add service - */ -public class AddServiceImpl implements AddService { - - public double add(double n1, double n2) { - System.out.println("AddService - add " + n1 + " and " + n2); - return n1 + n2; - } - -} diff --git a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java b/branches/sca-java-1.2/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java deleted file mode 100644 index 5b63ad5a17..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * An implementation of the Add service - */ -public class AddServiceUpdateImpl implements AddService { - - public double add(double n1, double n2) { - System.out.println("AddService Update - add " + n1 + " and " + n2); - return n1 + n2; - } - -} diff --git a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/CalculatorService.java b/branches/sca-java-1.2/itest/domain/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index 5fbd3a3f6b..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/CalculatorService.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -import org.osoa.sca.annotations.Remotable; - - -/** - * The Calculator service interface. - */ -@Remotable -public interface CalculatorService { - - double add(double n1, double n2); - - double subtract(double n1, double n2); - - double multiply(double n1, double n2); - - double divide(double n1, double n2); - -} diff --git a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-1.2/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index da869e00fd..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -import org.osoa.sca.annotations.Reference; - - -/** - * An implementation of the Calculator service. - */ -public class CalculatorServiceImpl implements CalculatorService { - - private AddService addService; - private SubtractService subtractService; - private MultiplyService multiplyService; - private DivideService divideService; - - @Reference - public void setAddService(AddService addService) { - this.addService = addService; - } - - @Reference - public void setSubtractService(SubtractService subtractService) { - this.subtractService = subtractService; - } - - @Reference - public void setMultiplyService(MultiplyService multiplyService) { - this.multiplyService = multiplyService; - } - - @Reference - public void setDivideService(DivideService divideService) { - this.divideService = divideService; - } - - public double add(double n1, double n2) { - System.out.println("CalculatorService - add " + n1 + " and " + n2); - return addService.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/branches/sca-java-1.2/itest/domain/src/main/java/calculator/DivideService.java b/branches/sca-java-1.2/itest/domain/src/main/java/calculator/DivideService.java deleted file mode 100644 index 30d248208b..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/DivideService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * The divide service interface - */ -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/DivideServiceImpl.java b/branches/sca-java-1.2/itest/domain/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index f7ac0b7287..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/DivideServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * An implementation of the Divide service. - */ -public class DivideServiceImpl implements DivideService { - - public double divide(double n1, double n2) { - return n1 / n2; - } - -} diff --git a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/MultiplyService.java b/branches/sca-java-1.2/itest/domain/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index 5290605938..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/MultiplyService.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * The interface for the multiply service - */ -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java b/branches/sca-java-1.2/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index b7dca792b2..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * An implementation of the Multiply service. - */ -public class MultiplyServiceImpl implements MultiplyService { - - public double multiply(double n1, double n2) { - return n1 * n2; - } - -} diff --git a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/SubtractService.java b/branches/sca-java-1.2/itest/domain/src/main/java/calculator/SubtractService.java deleted file mode 100644 index 78ab9c6ee0..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/SubtractService.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -import org.osoa.sca.annotations.Remotable; - -/** - * The interface for the multiply service - */ -@Remotable -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/SubtractServiceImpl.java b/branches/sca-java-1.2/itest/domain/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 1010207154..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/java/calculator/SubtractServiceImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package calculator; - -/** - * An implementation of the subtract service. - */ -public class SubtractServiceImpl implements SubtractService { - - public double subtract(double n1, double n2) { - System.out.println("SubtractService - subtract " + n1 + " and " + n2); - return n1 - n2; - } - -} diff --git a/branches/sca-java-1.2/itest/domain/src/main/resources/contributionA/Calculator.composite b/branches/sca-java-1.2/itest/domain/src/main/resources/contributionA/Calculator.composite deleted file mode 100644 index 534e1a29af..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/resources/contributionA/Calculator.composite +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.2/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml b/branches/sca-java-1.2/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml deleted file mode 100644 index db255e0232..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.2/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite b/branches/sca-java-1.2/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite deleted file mode 100644 index bdb89803d1..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.2/itest/domain/src/main/resources/contributionBupdate/META-INF/sca-deployables/Calculator.composite b/branches/sca-java-1.2/itest/domain/src/main/resources/contributionBupdate/META-INF/sca-deployables/Calculator.composite deleted file mode 100644 index 0c8d3e2858..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/resources/contributionBupdate/META-INF/sca-deployables/Calculator.composite +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.2/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite b/branches/sca-java-1.2/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite deleted file mode 100644 index c5af8dd3cc..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/branches/sca-java-1.2/itest/domain/src/main/resources/contributionD/META-INF/sca-deployables/Calculator.composite b/branches/sca-java-1.2/itest/domain/src/main/resources/contributionD/META-INF/sca-deployables/Calculator.composite deleted file mode 100644 index 119c52cbf8..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/resources/contributionD/META-INF/sca-deployables/Calculator.composite +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.2/itest/domain/src/main/resources/contributionDependent/Calculator.composite b/branches/sca-java-1.2/itest/domain/src/main/resources/contributionDependent/Calculator.composite deleted file mode 100644 index 538ad2e4c8..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/resources/contributionDependent/Calculator.composite +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-java-1.2/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml b/branches/sca-java-1.2/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml deleted file mode 100644 index 673de80c44..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.2/itest/domain/src/main/resources/contributionPrimary/Calculator.composite b/branches/sca-java-1.2/itest/domain/src/main/resources/contributionPrimary/Calculator.composite deleted file mode 100644 index c120fed3ca..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/resources/contributionPrimary/Calculator.composite +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-java-1.2/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml b/branches/sca-java-1.2/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml deleted file mode 100644 index 392310da11..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/branches/sca-java-1.2/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/DomainAPITestCase.java b/branches/sca-java-1.2/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/DomainAPITestCase.java deleted file mode 100644 index 0fe2cf53d6..0000000000 --- a/branches/sca-java-1.2/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/DomainAPITestCase.java +++ /dev/null @@ -1,233 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.itest.domain; - - -import 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