diff options
Diffstat (limited to 'branches/sca-java-1.2/itest/domain')
23 files changed, 0 insertions, 1065 deletions
diff --git a/branches/sca-java-1.2/itest/domain/pom.xml b/branches/sca-java-1.2/itest/domain/pom.xml deleted file mode 100644 index 5696402180..0000000000 --- a/branches/sca-java-1.2/itest/domain/pom.xml +++ /dev/null @@ -1,81 +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-itest</artifactId> - <version>1.2-incubating-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>itest-domain</artifactId> - <name>Apache Tuscany SCA Domain Integration Tests</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-embedded</artifactId> - <version>1.2-incubating-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>1.2-incubating-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>1.2-incubating-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-domain-impl</artifactId> - <version>1.2-incubating-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-tomcat</artifactId> - <version>1.2-incubating-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-axis2</artifactId> - <version>1.2-incubating-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-sca-axis2</artifactId> - <version>1.2-incubating-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> -</project> 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 @@ -<?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://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="CalculatorA">
-
- <component name="CalculatorServiceComponentA">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <service name="CalculatorService">
- <binding.sca/>
- </service>
- <reference name="addService" target="AddServiceComponentB" />
- <reference name="subtractService" target="SubtractServiceComponentC" />
- <reference name="multiplyService" target="MultiplyServiceComponentA"/>
- <reference name="divideService" target="DivideServiceComponentA" />
- </component>
-
- <component name="MultiplyServiceComponentA">
- <implementation.java class="calculator.MultiplyServiceImpl" />
- </component>
-
- <component name="DivideServiceComponentA">
- <implementation.java class="calculator.DivideServiceImpl" />
- </component>
-
-</composite>
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 @@ -<?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://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://sample" - xmlns:sample="http://sample"> - <deployable composite="sample:CalculatorA"/> -</contribution>
\ 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 @@ -<?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://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="CalculatorB">
-
- <component name="CalculatorServiceComponentB">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService" target="AddServiceComponentB" />
- <reference name="subtractService" target="SubtractServiceComponentC" />
- <reference name="multiplyService" target="MultiplyServiceComponentB"/>
- <reference name="divideService" target="DivideServiceComponentB" />
- </component>
-
- <component name="MultiplyServiceComponentB">
- <implementation.java class="calculator.MultiplyServiceImpl" />
- </component>
-
- <component name="DivideServiceComponentB">
- <implementation.java class="calculator.DivideServiceImpl" />
- </component>
-
- <component name="AddServiceComponentB">
- <implementation.java class="calculator.AddServiceImpl" />
- </component>
-
-</composite>
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 @@ -<?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://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="CalculatorB">
-
- <component name="CalculatorServiceComponentB">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService" target="AddServiceComponentB" />
- <reference name="subtractService" target="SubtractServiceComponentC" />
- <reference name="multiplyService" target="MultiplyServiceComponentB"/>
- <reference name="divideService" target="DivideServiceComponentB" />
- </component>
-
- <component name="MultiplyServiceComponentB">
- <implementation.java class="calculator.MultiplyServiceImpl" />
- </component>
-
- <component name="DivideServiceComponentB">
- <implementation.java class="calculator.DivideServiceImpl" />
- </component>
-
- <component name="AddServiceComponentB">
- <implementation.java class="calculator.AddServiceUpdateImpl" />
- </component>
-
-</composite>
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 @@ -<?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://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="CalculatorC">
-
- <component name="SubtractServiceComponentC">
- <implementation.java class="calculator.SubtractServiceImpl" />
- <service name="SubtractService">
- <binding.sca/>
- </service>
- </component>
-
-</composite>
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 @@ -<?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://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="CalculatorD">
-
- <component name="CalculatorServiceComponentD">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService" target="AddServiceComponentD" />
- <reference name="subtractService" target="SubtractServiceComponentD" />
- <reference name="multiplyService" target="MultiplyServiceComponentD"/>
- <reference name="divideService" target="DivideServiceComponentD" />
- </component>
-
- <component name="MultiplyServiceComponentD">
- <implementation.java class="calculator.MultiplyServiceImpl" />
- </component>
-
- <component name="DivideServiceComponentD">
- <implementation.java class="calculator.DivideServiceImpl" />
- </component>
-
- <component name="AddServiceComponentD">
- <implementation.java class="calculator.AddServiceImpl" />
- </component>
-
- <component name="SubtractServiceComponentD">
- <implementation.java class="calculator.SubtractServiceImpl" />
- </component>
-
-</composite>
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 @@ -<?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://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://dependent"
- xmlns:dependent="http://dependent"
- name="CalculatorB">
-
- <component name="AddServiceComponentB">
- <implementation.java class="calculator.AddServiceImpl" />
- </component>
-
- <component name="SubtractServiceComponentB">
- <implementation.java class="calculator.SubtractServiceImpl" />
- </component>
-
-</composite>
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 @@ -<?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://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://dependent" - xmlns:sample="http://dependent"> - <export namespace="http://dependent"/> -</contribution>
\ 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 @@ -<?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://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://primary"
- xmlns:primary="http://primary"
- xmlns:dependent="http://dependent"
- name="CalculatorA">
-
- <include name="dependent:CalculatorB"/>
-
- <component name="CalculatorServiceComponentA">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <service name="CalculatorService">
- <binding.sca/>
- </service>
- <reference name="addService" target="AddServiceComponentB" />
- <reference name="subtractService" target="SubtractServiceComponentB" />
- <reference name="multiplyService" target="MultiplyServiceComponentA"/>
- <reference name="divideService" target="DivideServiceComponentA" />
- </component>
-
- <component name="MultiplyServiceComponentA">
- <implementation.java class="calculator.MultiplyServiceImpl" />
- </component>
-
- <component name="DivideServiceComponentA">
- <implementation.java class="calculator.DivideServiceImpl" />
- </component>
-
-</composite>
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 @@ -<?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://www.osoa.org/xmlns/sca/1.0" - targetNamespace="http://primary" - xmlns:sample="http://primary"> - <deployable composite="sample:CalculatorA"/> - <import namespace="http://dependent"/> -</contribution>
\ 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("<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://tuscany.apache.org/domain\" xmlns:domain=\"http://tuscany.apache.org/domain\" xmlns:include0=\"http://sample\" xmlns:include1=\"http://sample\" name=\"DomainLevelComposite\"><include name=\"include0:CalculatorB\"/><include name=\"include1:CalculatorA\"/></composite>", - // 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("<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\" targetNamespace=\"http://tuscany.apache.org/domain\" xmlns:domain=\"http://tuscany.apache.org/domain\" xmlns:include0=\"http://sample\" xmlns:include1=\"http://sample\" name=\"DomainLevelComposite\"><include name=\"include0:CalculatorB\"/><include name=\"include1:CalculatorA\"/></composite>", - // 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(); - } - } - -} |