Moving 1.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835121 13f79535-47bb-0310-9956-ffa450edef68

23 files changed, 0 insertions, 931 deletions

diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/AddService.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/AddService.java
deleted file mode 100644
index d7dc4473ad..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/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-0.99/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9b7e254e5..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/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-0.99/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package calculator;
-
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index da869e00fd..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/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-0.99/samples/calculator-distributed/src/main/java/calculator/DivideService.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/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-0.99/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index f7ac0b7287..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/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-0.99/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/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-0.99/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index b7dca792b2..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/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-0.99/samples/calculator-distributed/src/main/java/calculator/SubtractService.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 78ab9c6ee0..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/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-0.99/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1010207154..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/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-0.99/samples/calculator-distributed/src/main/java/node/CalculatorNode.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/CalculatorNode.java
deleted file mode 100644
index bb939816bb..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/CalculatorNode.java
+++ /dev/null
@@ -1,114 +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 node;

-

-import java.io.File;

-import java.io.IOException;

-import java.net.URL;

-

-import org.apache.tuscany.sca.assembly.Binding;

-import org.apache.tuscany.sca.assembly.Component;

-import org.apache.tuscany.sca.assembly.ComponentReference;

-import org.apache.tuscany.sca.assembly.ComponentService;

-import org.apache.tuscany.sca.assembly.Composite;

-import org.apache.tuscany.sca.assembly.SCABinding;

-import org.apache.tuscany.sca.binding.sca.impl.SCABindingImpl;

-import org.apache.tuscany.sca.contribution.Contribution;

-import org.apache.tuscany.sca.contribution.service.ContributionService;

-import org.apache.tuscany.sca.distributed.domain.DistributedSCADomain;

-import org.apache.tuscany.sca.distributed.domain.impl.DistributedSCADomainMemoryImpl;

-import org.apache.tuscany.sca.distributed.domain.impl.DistributedSCADomainNetworkImpl;

-import org.apache.tuscany.sca.distributed.node.impl.EmbeddedNode;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;

-

-import calculator.CalculatorService;

-

-/**

- * This client program shows how to run a distributed SCA node. In this case a 

- * calculator node has been constructed specifically for running the calculator 

- * composite. Internally it creates a representation of a node and associates a 

- * distributed domain with the node. This separation is made different implementations

- * of the distributed domain can be provided. 

- */

-public class CalculatorNode {

-     

-    

-    public static void main(String[] args) throws Exception {

-        

-        // Check that the correct arguments have been provided

-        if (null == args || args.length != 2) {

-             System.err.println("Useage: java CalculatorNode domainname nodename");   

-             System.exit(1);

-        }    

-        

-        try {

-            String domainName = args[0];

-            String nodeName   = args[1];  

-            

-            // Create the distributed domain representation. We use the network implementation 

-            // here so that the node contacts a registry running somewhere out on the 

-            // network. 

-            DistributedSCADomain distributedDomain = new DistributedSCADomainNetworkImpl(domainName);

-       

-            // create the node that runs the calculator component

-            EmbeddedNode node = new EmbeddedNode(nodeName);

-            SCADomain domain = node.attachDomain(distributedDomain);

-                

-            // the application components are added. The null here just gets the node

-            // implementation to read a directory from the classpath with the node name

-            // TODO - should be done as a management action.       

-            node.addContribution(domainName, null);  

-            

-            // start the node

-            // TODO - should be done as a management action.

-            node.start();

-                    

-            // nodeA is the head node and runs some tests while all other nodes

-            // simply listen for incoming messages

-            if ( nodeName.equals("nodeA") ) {            

-                // do some application stuff

-                CalculatorService calculatorService = 

-                    domain.getService(CalculatorService.class, "CalculatorServiceComponent");

-        

-                // Calculate

-                System.out.println("3 + 2=" + calculatorService.add(3, 2));

-                System.out.println("3 - 2=" + calculatorService.subtract(3, 2));

-                System.out.println("3 * 2=" + calculatorService.multiply(3, 2));

-                System.out.println("3 / 2=" + calculatorService.divide(3, 2));

-            } else {

-                // start up and wait for messages

-                try {

-                    System.out.println("Node started (press enter to shutdown)");

-                    System.in.read();

-                } catch (IOException e) {

-                    e.printStackTrace();

-                }  

-            }

-            

-            // stop the node and all the domains in it 

-            domain.close(); 

-        

-        } catch(Exception ex) {

-            System.err.println("Exception in node - " + ex.getMessage());

-            ex.printStackTrace(System.err);

-        }

-    }

-}

diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/DomainNode.java b/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/DomainNode.java
deleted file mode 100644
index 9abfc03606..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/java/node/DomainNode.java
+++ /dev/null
@@ -1,47 +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 node;

-

-import java.io.IOException;

-

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-

-/**

- * This server program that loads a composite to provide simple registry function.

- * This server can be replaced with any registry that is appropriate but the components

- * in each node that talk to the registry should be replaced also. 

- */

-public class DomainNode {

-

-    public static void main(String[] args) {

-

-        SCADomain scaDomain = SCADomain.newInstance("domain/domain.composite");

-

-        try {

-            System.out.println("Domain node started (press enter to shutdown)");

-            System.in.read();

-        } catch (IOException e) {

-            e.printStackTrace();

-        }

-

-        scaDomain.close();

-        System.out.println("Domain node stopped");

-    }

-

-}

diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/META-INF/sca-contribution.xml b/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/META-INF/sca-contribution.xml
deleted file mode 100644
index 3f9ed8024b..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/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:Calculator"/>

-</contribution>
\ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/domain.composite b/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/domain.composite
deleted file mode 100644
index a11d94aa93..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/domain/domain.composite
+++ /dev/null
@@ -1,43 +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="Domain">

-           

-    <!--component name="DistributedDomainManagerComponent">

-        <implementation.java class="org.apache.tuscany.sca.distributed.management.impl.DistributedDomainManagerMemoryImpl"/>

-        <service name="DistributedDomainManager">

-            <interface.java interface="org.apache.tuscany.sca.distributed.management.DistributedDomainManager"/>

-            <binding.ws uri="http://localhost:8080/DistributedDomainManagerComponent/DistributedDomainManager"/>

-        </service>

-    </component-->

-    

-    <component name="ServiceDiscoveryComponent">

-        <implementation.java class="org.apache.tuscany.sca.distributed.management.impl.ServiceDiscoveryMemoryImpl" />

-        <service name="ServiceDiscovery">

-            <interface.java interface="org.apache.tuscany.sca.distributed.management.ServiceDiscovery"/>

-            <binding.ws uri="http://localhost:8080/ServiceDiscoveryComponent/ServiceDiscovery"/>

-        </service>

-    </component>

-    

-    

-

-</composite>

diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/META-INF/sca-contribution.xml b/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/META-INF/sca-contribution.xml
deleted file mode 100644
index b73217ebb8..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/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://management"

-              xmlns:management="http://management">

-   <deployable composite="management:Management"/>

-</contribution>
\ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/management.composite b/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/management.composite
deleted file mode 100644
index 68f466344a..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/management/management.composite
+++ /dev/null
@@ -1,41 +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://management"

-           xmlns:sample="http://management"

-           name="Management">

-    

-    <!--component name="DistributedDomainManagerComponent">

-        <implementation.java class="org.apache.tuscany.sca.distributed.management.impl.DistributedDomainManagerNetworkImpl"/>

-        <reference name="distributedDomainManager">

-            <interface.java interface="org.apache.tuscany.sca.distributed.management.DistributedDomainManager"/>

-            <binding.ws uri="http://localhost:8080/DistributedDomainManagerComponent/DistributedDomainManager"/>

-        </reference>

-    </component-->

-    

-    <component name="ServiceDiscoveryComponent">

-        <implementation.java class="org.apache.tuscany.sca.distributed.management.impl.ServiceDiscoveryNetworkImpl" />

-        <reference name="serviceDiscovery">

-            <binding.ws uri="http://localhost:8080/ServiceDiscoveryComponent/ServiceDiscovery"/>

-        </reference>

-    </component>

-    

-

-</composite>

diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite b/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
deleted file mode 100644
index a111dfd064..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
+++ /dev/null
@@ -1,41 +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="Calculator">

-

-    <component name="CalculatorServiceComponent">

-		<implementation.java class="calculator.CalculatorServiceImpl"/>

-        <reference name="addService" target="AddServiceComponent" />     

-        <reference name="subtractService" target="SubtractServiceComponent" />

-        <reference name="multiplyService" target="MultiplyServiceComponent"/>     

-        <reference name="divideService" target="DivideServiceComponent" />

-    </component>    

-

-    <component name="MultiplyServiceComponent">

-        <implementation.java class="calculator.MultiplyServiceImpl" />

-    </component>   

-    

-    <component name="DivideServiceComponent">

-        <implementation.java class="calculator.DivideServiceImpl" />

-    </component>

-

-</composite>

diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
deleted file mode 100644
index 3f9ed8024b..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeA/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:Calculator"/>

-</contribution>
\ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite b/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
deleted file mode 100644
index bf226d9109..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
+++ /dev/null
@@ -1,29 +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="Calculator">

-

-    <component name="AddServiceComponent">

-        <implementation.java class="calculator.AddServiceImpl" />

-    </component>

-    

-</composite>

diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
deleted file mode 100644
index 3f9ed8024b..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeB/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:Calculator"/>

-</contribution>
\ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite b/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
deleted file mode 100644
index 4ef4c5ddb6..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/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="Calculator">

-

-    <component name="SubtractServiceComponent">

-        <implementation.java class="calculator.SubtractServiceImpl" />

-        <service name="SubtractService">

-            <binding.sca uri="http://localhost:8086/SubtractServiceComponent"/>

-        </service>

-    </component>

-

-</composite>

diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
deleted file mode 100644
index 3f9ed8024b..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/main/resources/nodeC/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:Calculator"/>

-</contribution>
\ No newline at end of file
diff --git a/branches/sca-java-0.99/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java b/branches/sca-java-0.99/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java
deleted file mode 100644
index a6d47115a6..0000000000
--- a/branches/sca-java-0.99/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-package calculator;

-

-

-import java.io.File;

-import java.net.URL;

-

-import junit.framework.Assert;

-

-import org.apache.tuscany.sca.distributed.domain.DistributedSCADomain;

-import org.apache.tuscany.sca.distributed.domain.impl.DistributedSCADomainMemoryImpl;

-import org.apache.tuscany.sca.distributed.node.impl.EmbeddedNode;

-import org.apache.tuscany.sca.host.embedded.SCADomain;

-import org.junit.AfterClass;

-import org.junit.BeforeClass;

-import org.junit.Test;

-

-import calculator.CalculatorService;

-

-/**

- * Runs a distributed domain in a single VM by using and in memory 

- * implementation of the distributed domain

- */

-public class DomainInMemoryTestCase {

-    

-    private static String DEFULT_DOMAIN_NAME = "mydomain";

-

-    private static DistributedSCADomain distributedDomain;

-    private static EmbeddedNode nodeA;

-    private static SCADomain domainA;

-    private static EmbeddedNode nodeB;

-    private static SCADomain domainB;

-    private static EmbeddedNode nodeC;

-    private static SCADomain domainC;    

-    private static CalculatorService calculatorServiceA;

-

-    @BeforeClass

-    public static void init() throws Exception {

-        System.out.println("Setting up distributed nodes");

-        

-        File currentDirectory = new File (".");

-        URL contributionURL = null;

-

-        // Create the distributed domain representation

-        distributedDomain = new DistributedSCADomainMemoryImpl(DEFULT_DOMAIN_NAME);

-        

-        // create the node that runs the 

-        // calculator component

-        nodeA = new EmbeddedNode("nodeA");

-        domainA = nodeA.attachDomain(distributedDomain); 

-        contributionURL = Thread.currentThread().getContextClassLoader().getResource("nodeA/");

-        nodeA.addContribution(DEFULT_DOMAIN_NAME, contributionURL);

-

-        // create the node that runs the 

-        // add component

-        nodeB = new EmbeddedNode("nodeB");

-        domainB = nodeB.attachDomain(distributedDomain);

-        contributionURL = Thread.currentThread().getContextClassLoader().getResource("nodeB/");

-        nodeB.addContribution(DEFULT_DOMAIN_NAME, contributionURL);         

- 

-        // create the node that runs the 

-        // subtract component      

-        nodeC = new EmbeddedNode("nodeC");

-        domainC = nodeC.attachDomain(distributedDomain);

-        contributionURL = Thread.currentThread().getContextClassLoader().getResource("nodeC/");

-        nodeC.addContribution(DEFULT_DOMAIN_NAME, contributionURL);  

-     

-        

-        // start all of the nodes

-        nodeA.start();

-        nodeB.start();

-        nodeC.start();

-        

-        // get a reference to the calculator service from domainA

-        // which will be running this component

-        calculatorServiceA = domainA.getService(CalculatorService.class, "CalculatorServiceComponent");     

-   }

-

-    @AfterClass

-    public static void destroy() throws Exception {

-        // stop the nodes and hence the domains they contain        

-        nodeA.stop();

-        nodeB.stop();    

-        nodeC.stop();

-    }

-

-    @Test

-    public void testCalculator() throws Exception {       

-        

-        // Calculate

-        Assert.assertEquals(calculatorServiceA.add(3, 2), 5.0);

-        Assert.assertEquals(calculatorServiceA.subtract(3, 2), 1.0);

-        Assert.assertEquals(calculatorServiceA.multiply(3, 2), 6.0);

-        Assert.assertEquals(calculatorServiceA.divide(3, 2), 1.5);

-

-        

-    }

-}