You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2008/01/04 16:24:32 UTC

svn commit: r608886 - in /incubator/tuscany/java/sca/itest: ./ domain/ domain/src/ domain/src/main/ domain/src/main/java/ domain/src/main/java/calculator/ domain/src/main/java/org/ domain/src/main/java/org/apache/ domain/src/main/java/org/apache/tuscan...

Author: slaws
Date: Fri Jan  4 07:24:28 2008
New Revision: 608886

URL: http://svn.apache.org/viewvc?rev=608886&view=rev
Log:
Create a domain itest. Moved a test that was in node-impl

Added:
    incubator/tuscany/java/sca/itest/domain/   (with props)
    incubator/tuscany/java/sca/itest/domain/pom.xml
    incubator/tuscany/java/sca/itest/domain/src/
    incubator/tuscany/java/sca/itest/domain/src/main/
    incubator/tuscany/java/sca/itest/domain/src/main/java/
    incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/
    incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/AddService.java
    incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/AddServiceImpl.java
    incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
    incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/CalculatorService.java
    incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
    incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/DivideService.java
    incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/DivideServiceImpl.java
    incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/MultiplyService.java
    incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
    incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/SubtractService.java
    incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
    incubator/tuscany/java/sca/itest/domain/src/main/java/org/
    incubator/tuscany/java/sca/itest/domain/src/main/java/org/apache/
    incubator/tuscany/java/sca/itest/domain/src/main/java/org/apache/tuscany/
    incubator/tuscany/java/sca/itest/domain/src/main/java/org/apache/tuscany/sca/
    incubator/tuscany/java/sca/itest/domain/src/main/java/org/apache/tuscany/sca/itest/
    incubator/tuscany/java/sca/itest/domain/src/main/java/org/apache/tuscany/sca/itest/domain/
    incubator/tuscany/java/sca/itest/domain/src/main/resources/
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionA/
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionA/Calculator.composite
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionA/META-INF/
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionB/
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionB/META-INF/
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionBupdate/
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionBupdate/META-INF/
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionBupdate/META-INF/sca-deployables/
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionBupdate/META-INF/sca-deployables/Calculator.composite
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionC/
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionC/META-INF/
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionD/
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionD/META-INF/
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionD/META-INF/sca-deployables/
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionD/META-INF/sca-deployables/Calculator.composite
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionDependent/
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionDependent/Calculator.composite
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionDependent/META-INF/
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionPrimary/
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionPrimary/META-INF/
    incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
    incubator/tuscany/java/sca/itest/domain/src/test/
    incubator/tuscany/java/sca/itest/domain/src/test/java/
    incubator/tuscany/java/sca/itest/domain/src/test/java/org/
    incubator/tuscany/java/sca/itest/domain/src/test/java/org/apache/
    incubator/tuscany/java/sca/itest/domain/src/test/java/org/apache/tuscany/
    incubator/tuscany/java/sca/itest/domain/src/test/java/org/apache/tuscany/sca/
    incubator/tuscany/java/sca/itest/domain/src/test/java/org/apache/tuscany/sca/itest/
    incubator/tuscany/java/sca/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/
    incubator/tuscany/java/sca/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/DomainAPITestCase.java
Modified:
    incubator/tuscany/java/sca/itest/pom.xml

Propchange: incubator/tuscany/java/sca/itest/domain/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Jan  4 07:24:28 2008
@@ -0,0 +1,5 @@
+.classpath
+.project
+.settings
+target
+work

Added: incubator/tuscany/java/sca/itest/domain/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/pom.xml?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/pom.xml (added)
+++ incubator/tuscany/java/sca/itest/domain/pom.xml Fri Jan  4 07:24:28 2008
@@ -0,0 +1,81 @@
+<?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.1-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.1-incubating-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.1-incubating-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-impl</artifactId>
+            <version>1.1-incubating-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-impl</artifactId>
+            <version>1.1-incubating-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.1-incubating-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>  
+        
+                      
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.1-incubating-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>         
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca-axis2</artifactId>
+            <version>1.1-incubating-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

Added: incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/AddService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/AddService.java?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/AddService.java (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/AddService.java Fri Jan  4 07:24:28 2008
@@ -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);
+
+}

Added: incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/AddServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/AddServiceImpl.java?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/AddServiceImpl.java (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/AddServiceImpl.java Fri Jan  4 07:24:28 2008
@@ -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;
+    }
+
+}

Added: incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/AddServiceUpdateImpl.java Fri Jan  4 07:24:28 2008
@@ -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;
+    }
+
+}

Added: incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/CalculatorService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/CalculatorService.java?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/CalculatorService.java (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/CalculatorService.java Fri Jan  4 07:24:28 2008
@@ -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);
+
+}

Added: incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java Fri Jan  4 07:24:28 2008
@@ -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);
+    }
+
+}

Added: incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/DivideService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/DivideService.java?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/DivideService.java (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/DivideService.java Fri Jan  4 07:24:28 2008
@@ -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);
+
+}

Added: incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/DivideServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/DivideServiceImpl.java?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/DivideServiceImpl.java (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/DivideServiceImpl.java Fri Jan  4 07:24:28 2008
@@ -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;
+    }
+
+}

Added: incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/MultiplyService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/MultiplyService.java?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/MultiplyService.java (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/MultiplyService.java Fri Jan  4 07:24:28 2008
@@ -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);
+
+}

Added: incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/MultiplyServiceImpl.java Fri Jan  4 07:24:28 2008
@@ -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;
+    }
+
+}

Added: incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/SubtractService.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/SubtractService.java?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/SubtractService.java (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/SubtractService.java Fri Jan  4 07:24:28 2008
@@ -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);
+
+}

Added: incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/SubtractServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/SubtractServiceImpl.java?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/SubtractServiceImpl.java (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/SubtractServiceImpl.java Fri Jan  4 07:24:28 2008
@@ -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;
+    }
+
+}

Added: incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionA/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionA/Calculator.composite?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionA/Calculator.composite (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionA/Calculator.composite Fri Jan  4 07:24:28 2008
@@ -0,0 +1,44 @@
+<?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>

Added: incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionA/META-INF/sca-contribution.xml Fri Jan  4 07:24:28 2008
@@ -0,0 +1,24 @@
+<?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

Added: incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionB/META-INF/sca-deployables/Calculator.composite Fri Jan  4 07:24:28 2008
@@ -0,0 +1,45 @@
+<?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>

Added: incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionBupdate/META-INF/sca-deployables/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionBupdate/META-INF/sca-deployables/Calculator.composite?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionBupdate/META-INF/sca-deployables/Calculator.composite (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionBupdate/META-INF/sca-deployables/Calculator.composite Fri Jan  4 07:24:28 2008
@@ -0,0 +1,45 @@
+<?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>

Added: incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionC/META-INF/sca-deployables/Calculator.composite Fri Jan  4 07:24:28 2008
@@ -0,0 +1,32 @@
+<?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>

Added: incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionD/META-INF/sca-deployables/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionD/META-INF/sca-deployables/Calculator.composite?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionD/META-INF/sca-deployables/Calculator.composite (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionD/META-INF/sca-deployables/Calculator.composite Fri Jan  4 07:24:28 2008
@@ -0,0 +1,49 @@
+<?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>

Added: incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionDependent/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionDependent/Calculator.composite?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionDependent/Calculator.composite (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionDependent/Calculator.composite Fri Jan  4 07:24:28 2008
@@ -0,0 +1,33 @@
+<?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>

Added: incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionDependent/META-INF/sca-contribution.xml Fri Jan  4 07:24:28 2008
@@ -0,0 +1,24 @@
+<?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

Added: incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionPrimary/Calculator.composite?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionPrimary/Calculator.composite (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionPrimary/Calculator.composite Fri Jan  4 07:24:28 2008
@@ -0,0 +1,47 @@
+<?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>

Added: incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml (added)
+++ incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionPrimary/META-INF/sca-contribution.xml Fri Jan  4 07:24:28 2008
@@ -0,0 +1,25 @@
+<?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

Added: incubator/tuscany/java/sca/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/DomainAPITestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/DomainAPITestCase.java?rev=608886&view=auto
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/DomainAPITestCase.java (added)
+++ incubator/tuscany/java/sca/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/DomainAPITestCase.java Fri Jan  4 07:24:28 2008
@@ -0,0 +1,238 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.itest.domain;
+
+
+import java.lang.reflect.UndeclaredThrowableException;
+
+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.SCADomainFinder;
+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 calculator.AddService;
+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 (UndeclaredThrowableException ex){
+                // do nothing
+                
+                // TODO - can't this be a better exception than undeclared throwable
+            }
+            
+            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 (UndeclaredThrowableException 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();
+        }
+    }    
+
+}

Modified: incubator/tuscany/java/sca/itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/pom.xml?rev=608886&r1=608885&r2=608886&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/pom.xml Fri Jan  4 07:24:28 2008
@@ -52,6 +52,7 @@
                 <module>conversations</module>
                 <module>conversations-ws</module>
                 <module>databindings</module>
+                <module>domain</module>
                 <module>exceptions</module>
                 <module>exceptions-cross-binding</module>
                 <module>exceptions-cross-binding-ws</module>



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org