24 files changed, 0 insertions, 1886 deletions
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/README b/branches/sca-java-1.1/samples/calculator-distributed/README
deleted file mode 100644
index d0629903de..0000000000
--- a/branches/sca-java-1.1/samples/calculator-distributed/README
+++ /dev/null
@@ -1,476 +0,0 @@
-Calculator Distributed Sample
-=============================
-This sample implements a simple calculator using SCA components.  It uses 
-exactly the same calculator application classes as the calculator sample but 
-runs the application distributed across three nodes.
-
-A node in this sample means an instance of the Tuscany SCA java runtime running
-in a Java virtual machine. 
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you just want to run it to see what happens open four command prompts and 
-navigate to this sample directory in each one. There is one command to be run 
-in each command prompt:
-
-ant runDomain
-ant runNodeB
-ant runNodeC
-ant runNodeA
-
-Please run the commands in this order. 
-
-OR if you don't have ant, on Windows use
-
-java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.DomainNode
-java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.CalculatorNode mydomain nodeB
-java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.CalculatorNode mydomain nodeC
-java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.CalculatorNode mydomain nodeA
-
-and on *nix do
-
-java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.DomainNode
-java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.CalculatorNode mydomain nodeB
-java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.CalculatorNode mydomain nodeC
-java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.CalculatorNode mydomain nodeA
-
-
-The processes started on each of these command prompts can be ended by pressing 
-the <Enter> key.
-
-
-Sample Overview
----------------
-The sample provides a single calculator service with a default SCA (java) 
-binding. NodeA exercises this interface by calling add, subtract, multiply and 
-divide operations. 
-
-In the case of add and subtract the runtime recognises that
-it can't find these services locally and, using the remote (web services) 
-version of the default SCA binding contacts the add service running in NodeB 
-and the subtract service running in NodeC. 
-
-On the command prompt where you started NodeA, you would see output of invoking the 
-calculator functions distributed over NodeB and and NodeC.  On the command prompts 
-where you have started NodeB and NodeC, you would see log messages that indicate that
-the add and substract services where called on these nodes respectively.
-
-The sample demonstrates that the calculator application can be distributed
-across multiple nodes with no change to the application or to the SCA description
-files. 
-
-
-calculator/
-  src/
-    main/
-      java/
-        calculator/
-          CalculatorService.java  - the first component, calls +-/* as 
-                                    appropriate
-          AddService.java         - adds two numbers
-          AddServiceImpl.java
-          SubtractService.java    - subtracts one number from another
-          SubtractServiceImpl.java
-          MultiplyService.java    - multiplies two numbers
-          MultiplyServiceImpl.java
-          DivideService.java      - divides one number by another
-          DivideServiceImpl.java
-        node/
-          CalculatorNode.java     - runs up an sca application based on 
-                                    configuration given on the command 
-                                    line in the form
-                                    
-                                    CalculatorNode <domain name> <node name>
-                                    
-                                    it looks for a directory name the same
-                                    as <node name> and loads the composites
-                                    there
-                                    
-                                    if <node name> = nodeA it calls the 
-                                    +-/* operations otherwise it behaves
-                                    like a server and waits for service 
-                                    requests
-           DomainNode.java        - the node that provides the service 
-                                    discovery mechanism to the distributed
-                                    domain
-      resources/
-        nodeA                     - the SCA assembly for nodeA's part of the 
-                                    calculator application
-        nodeB                     - the SCA assembly for nodeB's part of the 
-                                    calculator application
-        nodeC                     - the SCA assembly for nodeB's part of the 
-                                    calculator application
-    test/
-      java/
-        calculator/
-          DomainInMemoryTestCase.java - JUnit test case which runs all of the
-                                    separate ndes in a single VM for test
-                                    purposes
-  calculator-distributed.png      - a pictorial representation of the sample 
-                                    .composite files
-  build.xml                       - the Ant build file
-  pom.xml                         - the Maven build file        
-
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as 
-follows
-
-cd calculator-distributed
-ant compile
-ant runDomain
-ant runNodeB
-ant runNodeC
-ant runNodeA
-
-You should see the following output from the four separate command prompt:
-
-runDomain:
-     [java] 14-Jan-2008 10:49:34 org.apache.tuscany.sca.domain.impl.SCADomainImp
-l init
-     [java] INFO: Domain management configured from file:/C:/simon/tuscany/relea
-se/sca-r1.1-rc2/tuscany-sca-1.1-incubating-SNAPSHOT/lib/tuscany-sca-all-1.1-incu
-bating-SNAPSHOT.jar
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] 14-Jan-2008 10:49:43 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:8877/domain/*
-     [java] 14-Jan-2008 10:49:43 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:8877/SCADomainManagerCom
-ponent/SCADomainManagerService/*
-     [java] 14-Jan-2008 10:49:43 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:8877/SCADomainManagerCom
-ponent/SCADomainManagerService
-     [java] 14-Jan-2008 10:49:43 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:8877/SCADomain/scaDomain
-.js
-     [java] 14-Jan-2008 10:49:43 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:8877/SCADomainManagerCom
-ponent/SCADomainEventService
-     [java] 14-Jan-2008 10:49:43 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:8877/SCADomainManagerCom
-ponent/SCADomainAPIService
-     [java] Domain started (press enter to shutdown)
-
-
-
-runNodeB:
-     [java] 14-Jan-2008 10:50:41 org.apache.tuscany.sca.domain.impl.SCADomainImp
-l registerNode
-     [java] INFO: Registered node: http://L3AW203:2047 at endpoint http://L3AW20
-3:2047
-     [java] 14-Jan-2008 10:50:41 org.apache.tuscany.sca.node.impl.SCADomainProxy
-Impl createRuntime
-     [java] INFO: Domain management configured from file:/C:/simon/tuscany/relea
-se/sca-r1.1-rc2/tuscany-sca-1.1-incubating-SNAPSHOT/lib/tuscany-sca-all-1.1-incu
-bating-SNAPSHOT.jar
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] 14-Jan-2008 10:50:51 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:2047/SCADomainEventServi
-ceProxyComponent
-     [java] 14-Jan-2008 10:50:51 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:2047/SCADomainAPIService
-ProxyComponent
-     [java] 14-Jan-2008 10:50:51 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:2047/SCANodeManagerCompo
-nent/SCANodeManagerService
-     [java] 14-Jan-2008 10:50:51 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:2047/SCANodeManagerCompo
-nent/ComponentManagerService/*
-     [java] 14-Jan-2008 10:50:51 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:2047/SCANodeManagerCompo
-nent/ComponentManagerService
-     [java] 14-Jan-2008 10:50:51 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:2047/SCADomain/scaDomain
-.js
-     [java] 14-Jan-2008 10:50:53 org.apache.tuscany.sca.node.impl.SCANodeImpl ac
-tivateComposite
-     [java] INFO: Building composite: {http://sample}CalculatorB
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] Node started (press enter to shutdown)
-     [java] 14-Jan-2008 10:51:38 org.apache.tuscany.sca.node.impl.SCANodeImpl st
-artComposite
-     [java] INFO: Starting composite: {http://sample}CalculatorB
-     [java] 14-Jan-2008 10:51:38 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:2047/AddServiceComponent
-B
-     [java] AddService - add 3.0 and 2.0
-     [java] 14-Jan-2008 10:51:39 org.apache.tuscany.sca.node.impl.SCANodeImpl st
-opComposite
-     [java] INFO: Stopping composite: {http://sample}CalculatorB
-     
-runNodeC:
-     [java] 14-Jan-2008 10:51:06 org.apache.tuscany.sca.domain.impl.SCADomainImp
-l registerNode
-     [java] INFO: Registered node: http://L3AW203:2053 at endpoint http://L3AW20
-3:2053
-     [java] 14-Jan-2008 10:51:07 org.apache.tuscany.sca.node.impl.SCADomainProxy
-Impl createRuntime
-     [java] INFO: Domain management configured from file:/C:/simon/tuscany/relea
-se/sca-r1.1-rc2/tuscany-sca-1.1-incubating-SNAPSHOT/lib/tuscany-sca-all-1.1-incu
-bating-SNAPSHOT.jar
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] 14-Jan-2008 10:51:16 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:2053/SCADomainEventServi
-ceProxyComponent
-     [java] 14-Jan-2008 10:51:16 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:2053/SCADomainAPIService
-ProxyComponent
-     [java] 14-Jan-2008 10:51:16 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:2053/SCANodeManagerCompo
-nent/SCANodeManagerService
-     [java] 14-Jan-2008 10:51:16 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:2053/SCANodeManagerCompo
-nent/ComponentManagerService/*
-     [java] 14-Jan-2008 10:51:16 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:2053/SCANodeManagerCompo
-nent/ComponentManagerService
-     [java] 14-Jan-2008 10:51:16 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:2053/SCADomain/scaDomain
-.js
-     [java] 14-Jan-2008 10:51:18 org.apache.tuscany.sca.node.impl.SCANodeImpl ac
-tivateComposite
-     [java] INFO: Building composite: {http://sample}CalculatorC
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] Node started (press enter to shutdown)
-     [java] 14-Jan-2008 10:51:38 org.apache.tuscany.sca.node.impl.SCANodeImpl st
-artComposite
-     [java] INFO: Starting composite: {http://sample}CalculatorC
-     [java] 14-Jan-2008 10:51:38 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:2053/SubtractServiceComp
-onentC
-     [java] SubtractService - subtract 3.0 and 2.0
-     [java] 14-Jan-2008 10:51:39 org.apache.tuscany.sca.node.impl.SCANodeImpl st
-opComposite
-     [java] INFO: Stopping composite: {http://sample}CalculatorC
-
-
-runNodeA:
-     [java] 14-Jan-2008 10:51:26 org.apache.tuscany.sca.domain.impl.SCADomainImp
-l registerNode
-     [java] INFO: Registered node: http://L3AW203:2057 at endpoint http://L3AW20
-3:2057
-     [java] 14-Jan-2008 10:51:26 org.apache.tuscany.sca.node.impl.SCADomainProxy
-Impl createRuntime
-     [java] INFO: Domain management configured from file:/C:/simon/tuscany/relea
-se/sca-r1.1-rc2/tuscany-sca-1.1-incubating-SNAPSHOT/lib/tuscany-sca-all-1.1-incu
-bating-SNAPSHOT.jar
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] 14-Jan-2008 10:51:36 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:2057/SCADomainEventServi
-ceProxyComponent
-     [java] 14-Jan-2008 10:51:36 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:2057/SCADomainAPIService
-ProxyComponent
-     [java] 14-Jan-2008 10:51:36 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:2057/SCANodeManagerCompo
-nent/SCANodeManagerService
-     [java] 14-Jan-2008 10:51:36 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:2057/SCANodeManagerCompo
-nent/ComponentManagerService/*
-     [java] 14-Jan-2008 10:51:36 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:2057/SCANodeManagerCompo
-nent/ComponentManagerService
-     [java] 14-Jan-2008 10:51:36 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:2057/SCADomain/scaDomain
-.js
-     [java] 14-Jan-2008 10:51:37 org.apache.tuscany.sca.node.impl.SCANodeImpl ac
-tivateComposite
-     [java] INFO: Building composite: {http://sample}CalculatorA
-     [java] 14-Jan-2008 10:51:37 org.apache.tuscany.sca.assembly.builder.impl.Co
-mpositeBuilderImpl$1 problem
-     [java] WARNING: Component reference target not found, it might be a remote
-service: SubtractServiceComponentC
-     [java] 14-Jan-2008 10:51:37 org.apache.tuscany.sca.assembly.builder.impl.Co
-mpositeBuilderImpl$1 problem
-     [java] WARNING: Component reference target not found, it might be a remote
-service: AddServiceComponentB
-     [java] 14-Jan-2008 10:51:38 org.apache.tuscany.sca.node.impl.SCANodeImpl up
-dateComposite
-     [java] INFO: Updating composite {http://sample}CalculatorA at node http://L
-3AW203:2057
-     [java] 14-Jan-2008 10:51:38 org.apache.tuscany.sca.node.impl.SCANodeImpl up
-dateComposite
-     [java] INFO: Adding binding CalculatorServiceComponentA reference addServic
-e binding org.apache.tuscany.sca.binding.sca.impl.SCABindingImpl URI AddServiceC
-omponentB
-     [java] 14-Jan-2008 10:51:38 org.apache.tuscany.sca.node.impl.SCANodeImpl up
-dateComposite
-     [java] INFO: Adding binding CalculatorServiceComponentA reference subtractS
-ervice binding org.apache.tuscany.sca.binding.sca.impl.SCABindingImpl URI Subtra
-ctServiceComponentC
-     [java] 14-Jan-2008 10:51:38 org.apache.tuscany.sca.node.impl.SCANodeImpl st
-artComposite
-     [java] INFO: Starting composite: {http://sample}CalculatorA
-     [java] 14-Jan-2008 10:51:38 org.apache.tuscany.sca.domain.impl.SCADomainImp
-l findServiceEndpoint
-     [java] INFO: Finding service: [http://localhost:8877 SubtractServiceCompone
-ntC org.apache.tuscany.sca.binding.sca.impl.SCABindingImpl]
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] 14-Jan-2008 10:51:38 org.apache.tuscany.sca.domain.impl.SCADomainImp
-l findServiceEndpoint
-     [java] INFO: Finding service: [http://localhost:8877 SubtractServiceCompone
-ntC org.apache.tuscany.sca.binding.sca.impl.SCABindingImpl]
-     [java] 14-Jan-2008 10:51:38 org.apache.tuscany.sca.domain.impl.SCADomainImp
-l findServiceEndpoint
-     [java] INFO: Finding service: [http://localhost:8877 SubtractServiceCompone
-ntC org.apache.tuscany.sca.binding.sca.impl.SCABindingImpl]
-     [java] 14-Jan-2008 10:51:38 org.apache.tuscany.sca.domain.impl.SCADomainImp
-l findServiceEndpoint
-     [java] INFO: Finding service: [http://localhost:8877 AddServiceComponentB o
-rg.apache.tuscany.sca.binding.sca.impl.SCABindingImpl]
-     [java] Warning: Running an XSLT 1.0 stylesheet with an XSLT 2.0 processor
-     [java] 14-Jan-2008 10:51:38 org.apache.tuscany.sca.domain.impl.SCADomainImp
-l findServiceEndpoint
-     [java] INFO: Finding service: [http://localhost:8877 AddServiceComponentB o
-rg.apache.tuscany.sca.binding.sca.impl.SCABindingImpl]
-     [java] 14-Jan-2008 10:51:38 org.apache.tuscany.sca.domain.impl.SCADomainImp
-l findServiceEndpoint
-     [java] INFO: Finding service: [http://localhost:8877 AddServiceComponentB o
-rg.apache.tuscany.sca.binding.sca.impl.SCABindingImpl]
-     [java] CalculatorService - add 3.0 and 2.0
-     [java] 14-Jan-2008 10:51:38 org.apache.tuscany.sca.domain.impl.SCADomainImp
-l findServiceEndpoint
-     [java] INFO: Finding service: [http://localhost:8877 AddServiceComponentB o
-rg.apache.tuscany.sca.binding.sca.impl.SCABindingImpl]
-     [java] 14-Jan-2008 10:51:38 org.apache.tuscany.sca.domain.impl.SCADomainImp
-l findServiceEndpoint
-     [java] INFO: Finding service: [http://localhost:8877 AddServiceComponentB o
-rg.apache.tuscany.sca.binding.sca.impl.SCABindingImpl]
-     [java] 14-Jan-2008 10:51:38 org.apache.tuscany.sca.domain.impl.SCADomainImp
-l findServiceEndpoint
-     [java] INFO: Finding service: [http://localhost:8877 AddServiceComponentB o
-rg.apache.tuscany.sca.binding.sca.impl.SCABindingImpl]
-     [java] 3 + 2=5.0
-     [java] CalculatorService - subtract 3.0 and 2.0
-     [java] 14-Jan-2008 10:51:38 org.apache.tuscany.sca.domain.impl.SCADomainImp
-l findServiceEndpoint
-     [java] INFO: Finding service: [http://localhost:8877 SubtractServiceCompone
-ntC org.apache.tuscany.sca.binding.sca.impl.SCABindingImpl]
-     [java] 14-Jan-2008 10:51:38 org.apache.tuscany.sca.domain.impl.SCADomainImp
-l findServiceEndpoint
-     [java] INFO: Finding service: [http://localhost:8877 SubtractServiceCompone
-ntC org.apache.tuscany.sca.binding.sca.impl.SCABindingImpl]
-     [java] 14-Jan-2008 10:51:38 org.apache.tuscany.sca.domain.impl.SCADomainImp
-l findServiceEndpoint
-     [java] INFO: Finding service: [http://localhost:8877 SubtractServiceCompone
-ntC org.apache.tuscany.sca.binding.sca.impl.SCABindingImpl]
-     [java] 3 - 2=1.0
-     [java] CalculatorService - multiply 3.0 and 2.0
-     [java] 3 * 2=6.0
-     [java] CalculatorService - divide 3.0 and 2.0
-     [java] 3 / 2=1.5
-     [java] 14-Jan-2008 10:51:39 org.apache.tuscany.sca.node.impl.SCANodeImpl st
-opComposite
-     [java] INFO: Stopping composite: {http://sample}CalculatorA
-
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. When running from Maven the four nodes all run within 
-Java virtual machine. 
-
-cd calculator-distributed
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running calculator.DomainInMemoryTestCase
-Setting up distributed nodes
-file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/target/class
-es/management/
-log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX
-Utils).
-log4j:WARN Please initialize the log4j system properly.
-23-Aug-2007 18:18:41 org.apache.tuscany.sca.assembly.builder.impl.CompositeBuild
-erImpl$1 problem
-WARNING: [WARNING] Component reference target not found, it might be a remote se
-rvice: AddServiceComponent null
-
-23-Aug-2007 18:18:41 org.apache.tuscany.sca.assembly.builder.impl.CompositeBuild
-erImpl$1 problem
-WARNING: [WARNING] Component reference target not found, it might be a remote se
-rvice: SubtractServiceComponent null
-
-file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/target/class
-es/management/
-Registering service: [mydomain nodeB AddServiceComponent org.apache.tuscany.sca.
-assembly.SCABinding http://localhost:8085/AddServiceComponent]
-file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/target/class
-es/management/
-Registering service: [mydomain nodeC SubtractServiceComponent org.apache.tuscany
-.sca.assembly.SCABinding http://localhost:8086/SubtractServiceComponent]
-Finding service: [mydomain SubtractServiceComponent org.apache.tuscany.sca.assem
-bly.SCABinding]
-Matching service url: http://localhost:8086/SubtractServiceComponent
-Finding service: [mydomain AddServiceComponent org.apache.tuscany.sca.assembly.S
-CABinding]
-Matching service url: http://localhost:8085/AddServiceComponent
-23-Aug-2007 18:18:45 org.apache.tuscany.sca.http.jetty.JettyServer addServletMap
-ping
-INFO: Added Servlet mapping: http://localhost:8085/AddServiceComponent
-23-Aug-2007 18:18:47 org.apache.tuscany.sca.http.jetty.JettyServer addServletMap
-ping
-INFO: Added Servlet mapping: http://localhost:8086/SubtractServiceComponent
-CalculatorService - add 3.0 and 2.0
-AddService - add 3.0 and 2.0
-CalculatorService - subtract 3.0 and 2.0
-SubtractService - subtract 3.0 and 2.0
-CalculatorService - multiply 3.0 and 2.0
-CalculatorService - divide 3.0 and 2.0
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.14 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-
-This shows that the Junit test cases have run successfully. 
-
-
-
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/build.xml b/branches/sca-java-1.1/samples/calculator-distributed/build.xml
deleted file mode 100644
index 59f704f4a2..0000000000
--- a/branches/sca-java-1.1/samples/calculator-distributed/build.xml
+++ /dev/null
@@ -1,109 +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.    
--->
-<project name="calculator" default="runDomain">
-    <property name="node.class" value="node.CalculatorNode" />
-	<property name="domain.class" value="node.DomainNode" />
-	<property name="test.jar"   value="sample-calculator-distributed.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </copy>
-        <jar destfile="target/${test.jar}" basedir="target/classes">
-            <manifest>
-                <attribute name="Main-Class" value="${test.class}" /> 
-            </manifest>
-        </jar>    	
-    </target>
-	
-    <target name="runDomain">
-        <java classname="${domain.class}"
-              fork="true">
-            <classpath>
-            	<pathelement path="src/main/resources"/>
-                <pathelement path="target/classes"/>
-            	<pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>    	        	
-        </java>
-    </target>
-	
-    <target name="runNodeA">
-        <java classname="${node.class}"
-              fork="true">
-            <classpath>
-            	<pathelement path="src/main/resources"/>
-                <pathelement path="target/classes"/>
-            	<pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        	<arg value="http://localhost:8877"/>
-        	<arg value="nodeA"/>        	        	
-        </java>
-    </target>
-	
-    <target name="runNodeB">
-        <java classname="${node.class}"
-              fork="true">
-            <classpath>
-            	<pathelement path="src/main/resources"/>
-                <pathelement path="target/classes"/>
-            	<pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        	<arg value="http://localhost:8877"/>
-        	<arg value="nodeB"/>        	
-        </java>
-    </target>	
-	
-    <target name="runNodeC">
-        <java classname="${node.class}"
-              fork="true">
-            <classpath>
-            	<pathelement path="src/main/resources"/>
-                <pathelement path="target/classes"/>
-            	<pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        	<arg value="http://localhost:8877"/>
-        	<arg value="nodeC"/>        	
-        </java>
-    </target>	
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>	
-	
-	
-</project>
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/calculator-distributed.png b/branches/sca-java-1.1/samples/calculator-distributed/calculator-distributed.png
deleted file mode 100644
index 7c0e175664..0000000000
--- a/branches/sca-java-1.1/samples/calculator-distributed/calculator-distributed.png
+++ /dev/null
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/calculator-distributed.svg b/branches/sca-java-1.1/samples/calculator-distributed/calculator-distributed.svg
deleted file mode 100644
index be5a4b8185..0000000000
--- a/branches/sca-java-1.1/samples/calculator-distributed/calculator-distributed.svg
+++ /dev/null
@@ -1,383 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="1052.3622"
-   height="744.09448"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-distributed"
-   sodipodi:docname="calculator-distributed.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\calculator-distributed\calculator-distributed.png"
-   inkscape:export-xdpi="104.05"
-   inkscape:export-ydpi="104.05">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
-     inkscape:cx="555.3085"
-     inkscape:cy="454.41561"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     inkscape:window-width="1171"
-     inkscape:window-height="871"
-     inkscape:window-x="18"
-     inkscape:window-y="27" />
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g2997"
-       transform="matrix(1,0,0,1.144214,0,-27.53557)">
-      <rect
-         rx="15.307091"
-         ry="16.178549"
-         y="156.41957"
-         x="258.31146"
-         height="382.40201"
-         width="495.71429"
-         id="rect2067"
-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.86971927;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <flowRoot
-         id="flowRoot2954"
-         xml:space="preserve"
-         transform="translate(-3.571429,-41.82534)"><flowRegion
-           id="flowRegion2956"><rect
-             y="212.66591"
-             x="281.42856"
-             height="61.42857"
-             width="170"
-             id="rect2958" /></flowRegion><flowPara
-           id="flowPara2960">Calculator</flowPara></flowRoot>    </g>
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.9999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2988"
-       width="115.66247"
-       height="191.57716"
-       x="339.91632"
-       y="262.1673"
-       rx="6.9961648"
-       ry="15.892869" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(79.61125,62.65764)"><flowRegion
-         id="flowRegion2968"><rect
-           id="rect2970"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2972">Calculator</flowPara><flowPara
-         id="flowPara1895">Service</flowPara><flowPara
-         id="flowPara1897">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 431.01809,321.46204 L 471.00147,321.46204 L 478.27117,334.59402 L 469.78986,346.71586 L 431.01809,346.71586 L 440.10523,334.59402 L 431.01809,321.46204 z "
-       id="path3019" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 223.15923,328.61046 L 282.4833,328.61046 L 293.26948,355.48529 L 280.68561,380.29286 L 223.15923,380.29286 L 236.64198,355.48529 L 223.15923,328.61046 z "
-       id="path1883" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1885"
-       transform="translate(-46.16225,128.7269)"
-       style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"><flowRegion
-         id="flowRegion1887"><rect
-           id="rect1889"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%" /></flowRegion><flowPara
-         id="flowPara1891">Calculator</flowPara><flowPara
-         id="flowPara1893">Service</flowPara></flowRoot>    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1899"
-       width="115.66247"
-       height="70.148659"
-       x="594.75488"
-       y="167.73451"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1901"
-       transform="translate(334.4498,-31.77519)"><flowRegion
-         id="flowRegion1903"><rect
-           id="rect1905"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1907">Add</flowPara><flowPara
-         id="flowPara1909">Service</flowPara><flowPara
-         id="flowPara1911">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 573.31867,190.29606 L 606.65371,190.29606 L 612.71462,203.42804 L 605.64356,215.54988 L 573.31867,215.54988 L 580.89482,203.42804 L 573.31867,190.29606 z "
-       id="path1913" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1917"
-       width="115.66247"
-       height="70.148659"
-       x="594.06543"
-       y="280.59158"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1919"
-       transform="translate(333.7604,81.08188)"><flowRegion
-         id="flowRegion1921"><rect
-           id="rect1923"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1925">Subtract</flowPara><flowPara
-         id="flowPara1927">Service</flowPara><flowPara
-         id="flowPara1929">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 572.62924,303.15313 L 605.96428,303.15313 L 612.02519,316.28511 L 604.95413,328.40695 L 572.62924,328.40695 L 580.20539,316.28511 L 572.62924,303.15313 z "
-       id="path1931" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1933"
-       width="115.66247"
-       height="70.148659"
-       x="594.77979"
-       y="391.87729"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1935"
-       transform="translate(334.4747,192.3676)"><flowRegion
-         id="flowRegion1937"><rect
-           id="rect1939"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1941">Multiply</flowPara><flowPara
-         id="flowPara1943">Service</flowPara><flowPara
-         id="flowPara1945">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 573.34352,414.43884 L 606.67856,414.43884 L 612.73947,427.57082 L 605.66841,439.69266 L 573.34352,439.69266 L 580.91967,427.57082 L 573.34352,414.43884 z "
-       id="path1947" />
-    <rect
-       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect1949"
-       width="115.66247"
-       height="70.148659"
-       x="596.20831"
-       y="502.59158"
-       rx="6.9961648"
-       ry="5.8193965" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1951"
-       transform="translate(335.9032,303.0819)"><flowRegion
-         id="flowRegion1953"><rect
-           id="rect1955"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara1957">Divide</flowPara><flowPara
-         id="flowPara1959">Service</flowPara><flowPara
-         id="flowPara1961">Component</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 574.77209,525.15313 L 608.10713,525.15313 L 614.16804,538.28511 L 607.09698,550.40695 L 574.77209,550.40695 L 582.34824,538.28511 L 574.77209,525.15313 z "
-       id="path1963" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1965"
-       transform="translate(161.0221,114.967)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1967"><rect
-           id="rect1969"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1973">add</flowPara><flowPara
-         id="flowPara1977">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 430.65917,357.18186 L 470.64255,357.18186 L 477.91225,370.31384 L 469.43094,382.43568 L 430.65917,382.43568 L 439.74631,370.31384 L 430.65917,357.18186 z "
-       id="path1979" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1981"
-       transform="translate(160.6632,150.6868)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1983"><rect
-           id="rect1985"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1987">subtract</flowPara><flowPara
-         id="flowPara1989">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 431.37346,390.75329 L 471.35684,390.75329 L 478.62654,403.88527 L 470.14523,416.00711 L 431.37346,416.00711 L 440.4606,403.88527 L 431.37346,390.75329 z "
-       id="path1991" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot1993"
-       transform="translate(161.3775,184.2583)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion1995"><rect
-           id="rect1997"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara1999">multiply</flowPara><flowPara
-         id="flowPara2001">Service</flowPara></flowRoot>    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 429.94489,422.18186 L 469.92827,422.18186 L 477.19797,435.31384 L 468.71666,447.43568 L 429.94489,447.43568 L 439.03203,435.31384 L 429.94489,422.18186 z "
-       id="path2003" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2005"
-       transform="translate(159.9489,215.6868)"
-       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
-         id="flowRegion2007"><rect
-           id="rect2009"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591"
-           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
-         id="flowPara2011">divide</flowPara><flowPara
-         id="flowPara2013">Service</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.99999988px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 477.85714,335.52287 L 511.42857,335.52287 L 510.71429,202.66577 L 579.28571,202.66577"
-       id="path2015" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 477.85714,369.80878 L 528.57143,369.80878 L 528.57143,315.52306 L 580,315.52306"
-       id="path2017" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 475.71429,435.52318 L 509.28571,435.52318 L 510,539.09463 L 582.14286,537.65613"
-       id="path2021" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 292.85714,355.52305 L 330,354.80877"
-       id="path2023" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 477.14286,404.09448 L 527.85714,404.09448 L 527.85714,427.66591 L 580,426.95163"
-       id="path1950" />
-    <rect
-       style="opacity:0.32777776;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1.99999964;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:5.99999869, 1.99999955;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2844"
-       width="328.57144"
-       height="117.85712"
-       x="532.85712"
-       y="140.8802"
-       rx="6.9961648"
-       ry="2.4683809" />
-    <rect
-       style="opacity:0.32777776;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1.99999976;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:5.99999958, 1.99999985;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2846"
-       width="328.57144"
-       height="98.571434"
-       x="533.57147"
-       y="268.73746"
-       rx="6.9961648"
-       ry="2.0644646" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2860"
-       transform="translate(614.3034,-75.00004)"><flowRegion
-         id="flowRegion2862"><rect
-           id="rect2864"
-           width="75"
-           height="32.857143"
-           x="173.57143"
-           y="231.95163" /></flowRegion><flowPara
-         id="flowPara2866">nodeB</flowPara></flowRoot>    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2868"
-       transform="translate(616.0952,47.8571)"><flowRegion
-         id="flowRegion2870"><rect
-           id="rect2872"
-           width="75"
-           height="32.857143"
-           x="173.57143"
-           y="231.95163" /></flowRegion><flowPara
-         id="flowPara2874">nodeC</flowPara></flowRoot>    <path
-       style="opacity:0.35555558;fill:#efacac;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:3,3;stroke-dashoffset:0"
-       d="M 172.73609,222.85576 L 495.9849,223.86592 L 498.00521,384.48017 L 863.68043,383.47002 L 862.67028,606.71373 L 173.74624,605.70358 L 172.73609,222.85576 z "
-       id="path1975"
-       sodipodi:nodetypes="ccccccc" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2852"
-       transform="translate(8,0)"><flowRegion
-         id="flowRegion2854"><rect
-           id="rect2856"
-           width="75"
-           height="32.857143"
-           x="173.57143"
-           y="231.95163" /></flowRegion><flowPara
-         id="flowPara2858">nodeA</flowPara></flowRoot>  </g>
-</svg>
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/pom.xml b/branches/sca-java-1.1/samples/calculator-distributed/pom.xml
deleted file mode 100644
index b1f6b14ca9..0000000000
--- a/branches/sca-java-1.1/samples/calculator-distributed/pom.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>1.1-incubating-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-calculator-distributed</artifactId>
-    <name>Apache Tuscany SCA Distributed Calculator Sample</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <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-node-api</artifactId>
-            <version>1.1-incubating-SNAPSHOT</version>
-        </dependency>  
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-api</artifactId>
-            <version>1.1-incubating-SNAPSHOT</version>
-        </dependency>                                
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-axis2</artifactId>
-            <version>1.1-incubating-SNAPSHOT</version>
-        </dependency>   
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc</artifactId>
-            <version>1.1-incubating-SNAPSHOT</version>
-        </dependency>   
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http</artifactId>
-            <version>1.1-incubating-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>        
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource</artifactId>
-            <version>1.1-incubating-SNAPSHOT</version>
-            <scope>runtime</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-domain-impl</artifactId>
-            <version>1.1-incubating-SNAPSHOT</version>
-            <scope>test</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>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>
-                
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-</project>
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/AddService.java b/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/AddService.java
deleted file mode 100644
index d7dc4473ad..0000000000
--- a/branches/sca-java-1.1/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-1.1/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java b/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9b7e254e5..0000000000
--- a/branches/sca-java-1.1/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-1.1/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java b/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/branches/sca-java-1.1/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-1.1/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java b/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index da869e00fd..0000000000
--- a/branches/sca-java-1.1/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-1.1/samples/calculator-distributed/src/main/java/calculator/DivideService.java b/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/branches/sca-java-1.1/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-1.1/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java b/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index f7ac0b7287..0000000000
--- a/branches/sca-java-1.1/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-1.1/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java b/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/branches/sca-java-1.1/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-1.1/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java b/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index b7dca792b2..0000000000
--- a/branches/sca-java-1.1/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-1.1/samples/calculator-distributed/src/main/java/calculator/SubtractService.java b/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 78ab9c6ee0..0000000000
--- a/branches/sca-java-1.1/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-1.1/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java b/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1010207154..0000000000
--- a/branches/sca-java-1.1/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-1.1/samples/calculator-distributed/src/main/java/node/CalculatorNode.java b/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/node/CalculatorNode.java
deleted file mode 100644
index 5dd64fc920..0000000000
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/node/CalculatorNode.java
+++ /dev/null
@@ -1,108 +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 javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.domain.SCADomain;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-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];
-            
-            ClassLoader cl = CalculatorNode.class.getClassLoader();
-             
-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-            SCANode node = nodeFactory.createSCANode(null, domainName);
-            node.addContribution(nodeName, cl.getResource(nodeName + "/"));
-            node.addToDomainLevelComposite((QName)null);           
-                                         
-            // nodeA is the head node and runs some tests while all other nodes
-            // simply listen for incoming messages
-            if ( nodeName.equals("nodeA") ) {  
-                
-                // start the domain 
-                node.getDomain().start();
-                
-                // do some application stuff
-                CalculatorService calculatorService = 
-                    node.getDomain().getService(CalculatorService.class, "CalculatorServiceComponentA");
-                
-                // 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));
-                
-                // a little hidden loop test to put some load on the nodes
-                if (args.length > 2){
-                    for (int i=0; i < 1000; i++){
-                        // 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));
-                    }
-                }
-                
-                // stop all the nodes
-                node.getDomain().stop(); 
-            } 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();
-                }  
-            }
-            
-            node.destroy();
-        
-        } catch(Exception ex) {
-            System.err.println("Exception in node - " + ex.getMessage());
-            ex.printStackTrace(System.err);
-        }
-    }
-}
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/node/DomainNode.java b/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/node/DomainNode.java
deleted file mode 100644
index a900cb72f8..0000000000
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/java/node/DomainNode.java
+++ /dev/null
@@ -1,51 +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 org.apache.tuscany.sca.domain.SCADomain;
-import org.apache.tuscany.sca.domain.SCADomainFactory;
-
-
-/**
- * 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 {
-
-    private static String DEFAULT_DOMAIN_URI = "http://localhost:8877";
-    
-    public static void main(String[] args) {
-
-        try {
-            SCADomainFactory domainFactory = SCADomainFactory.newInstance();
-            SCADomain domain = domainFactory.createSCADomain(DEFAULT_DOMAIN_URI); 
-        
-            System.out.println("Domain started (press enter to shutdown)");
-            System.in.read();
-            
-            domain.destroy();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        System.out.println("Domain stopped");
-    }
-
-}
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite b/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeA/Calculator.composite
deleted file mode 100644
index 172676a3c7..0000000000
--- a/branches/sca-java-1.1/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="CalculatorA">
-
-    <component name="CalculatorServiceComponentA">
-		<implementation.java class="calculator.CalculatorServiceImpl"/>
-        <reference name="addService" target="AddServiceComponentB" />     
-        <reference name="subtractService" target="SubtractServiceComponentC" />
-        <reference name="multiplyService" target="MultiplyServiceComponentA"/>     
-        <reference name="divideService" target="DivideServiceComponentA" />
-    </component>    
-
-    <component name="MultiplyServiceComponentA">
-        <implementation.java class="calculator.MultiplyServiceImpl" />
-    </component>   
-    
-    <component name="DivideServiceComponentA">
-        <implementation.java class="calculator.DivideServiceImpl" />
-    </component>
-
-</composite>
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml b/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeA/META-INF/sca-contribution.xml
deleted file mode 100644
index 1b1c0291e2..0000000000
--- a/branches/sca-java-1.1/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:CalculatorA"/>
-</contribution>
-\ No newline at end of file
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite b/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeB/Calculator.composite
deleted file mode 100644
index b770dbe8d4..0000000000
--- a/branches/sca-java-1.1/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="CalculatorB">
-
-    <component name="AddServiceComponentB">
-        <implementation.java class="calculator.AddServiceImpl" />
-    </component>
-    
-</composite>
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml b/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeB/META-INF/sca-contribution.xml
deleted file mode 100644
index 6c0ffe4ac0..0000000000
--- a/branches/sca-java-1.1/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:CalculatorB"/>
-</contribution>
-\ No newline at end of file
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite b/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeC/Calculator.composite
deleted file mode 100644
index 66caf0d17b..0000000000
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeC/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="CalculatorC">
-
-    <component name="SubtractServiceComponentC">
-        <implementation.java class="calculator.SubtractServiceImpl" />
-    </component>
-
-</composite>
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml b/branches/sca-java-1.1/samples/calculator-distributed/src/main/resources/nodeC/META-INF/sca-contribution.xml
deleted file mode 100644
index 8c311553c3..0000000000
--- a/branches/sca-java-1.1/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:CalculatorC"/>
-</contribution>
-\ No newline at end of file
diff --git a/branches/sca-java-1.1/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java b/branches/sca-java-1.1/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java
deleted file mode 100644
index 8dc6ffb2bd..0000000000
--- a/branches/sca-java-1.1/samples/calculator-distributed/src/test/java/calculator/DomainInMemoryTestCase.java
+++ /dev/null
@@ -1,123 +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 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.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.CalculatorService;
-
-/**
- * Runs a distributed domain in a single VM by using and in memory 
- * implementation of the distributed domain
- */
-public class DomainInMemoryTestCase {
-    
-    private static SCADomain domainManager;
-    private static SCANode   nodeA;
-    private static SCANode   nodeB;
-    private static SCANode   nodeC;
-    private static SCADomain domain;
-    private static CalculatorService calculatorServiceA;
-    private static CalculatorService calculatorServiceB;
-    private static AddService addServiceB;
-
-    @BeforeClass
-    public static void init() throws Exception {
-             
-        try {
-            System.out.println("Setting up domain manager");
-            
-            SCADomainFactory domainFactory = SCADomainFactory.newInstance();
-            domainManager = domainFactory.createSCADomain("http://localhost:9999");
-            
-            System.out.println("Setting up calculator nodes");
-            
-            ClassLoader cl = DomainInMemoryTestCase.class.getClassLoader();
-            
-            SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
-            
-            nodeA = nodeFactory.createSCANode("http://localhost:8085/nodeA", "http://localhost:9999");
-            nodeA.addContribution("nodeA", cl.getResource("nodeA/"));
-            nodeA.addToDomainLevelComposite(new QName("http://sample", "CalculatorA"));
-
-            
-            nodeB = nodeFactory.createSCANode("http://localhost:8086/nodeB", "http://localhost:9999");
-            nodeB.addContribution("nodeB", cl.getResource("nodeB/"));
-            nodeB.addToDomainLevelComposite(new QName("http://sample", "CalculatorB"));
-
-            
-            nodeC = nodeFactory.createSCANode("http://localhost:8087/nodeC", "http://localhost:9999");
-            nodeC.addContribution("nodeC", cl.getResource("nodeC/"));
-            nodeC.addToDomainLevelComposite(new QName("http://sample", "CalculatorC"));
-
-            
-            SCADomainFinder domainFinder = SCADomainFinder.newInstance();
-            domain = domainFinder.getSCADomain("http://localhost:9999");
-            
-            domain.start();
-            
-            // get a reference to various services in the domain
-            calculatorServiceA = nodeA.getDomain().getService(CalculatorService.class, "CalculatorServiceComponentA");
-            //calculatorServiceB = nodeB.getDomain().getService(CalculatorService.class, "CalculatorServiceComponentB");
-            
-            //addServiceB = domain.getService(AddService.class, "AddServiceComponentB");
-            //addServiceB = nodeA.getDomain().getService(AddService.class, "AddServiceComponentB");
-            
-        } catch(Exception ex){
-            System.err.println(ex.toString());
-        }  
-        
-   }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        // stop the domain
-        domain.stop();
-        
-        // destory the nodes       
-        nodeA.destroy();
-        nodeB.destroy();
-        nodeC.destroy();
-        
-        // destroy the domain
-        domain.destroy();
-    }    
-
-    @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);
-    }
-}