Moving 2.x branches

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

130 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
index 30e2592008..30e2592008 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
index fcad39d8cb..fcad39d8cb 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
index a9ef26bbb9..a9ef26bbb9 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
index 9ae511c07b..9ae511c07b 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
index 7c0f7cf2ce..7c0f7cf2ce 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
index 96dc906395..96dc906395 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
index 5c5827637d..5c5827637d 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java
index 35e5f148ba..35e5f148ba 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/BindingRRB.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
index d34ec7d01f..d34ec7d01f 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
index e2a68e2a4d..e2a68e2a4d 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
index 9a6ae4d35a..9a6ae4d35a 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
index b204b649fe..b204b649fe 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
index 022d829488..022d829488 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
index 2a09b5bc6f..2a09b5bc6f 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
index 64a55f1b44..64a55f1b44 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
index 88cb2f9a2c..88cb2f9a2c 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
index 690316aca4..690316aca4 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
index 9c8f6db912..9c8f6db912 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
index 731c2986b5..731c2986b5 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
index 6d8350fc66..6d8350fc66 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DistributedSCABinding.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DistributedSCABinding.java
index 5cc43d6333..5cc43d6333 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DistributedSCABinding.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DistributedSCABinding.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
index 59ab8d36fc..59ab8d36fc 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
index 7b547e70de..7b547e70de 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
index 9476251305..9476251305 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
index 4d5b1a2ecd..4d5b1a2ecd 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
index 2d918a0592..2d918a0592 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
index 5d15ce9938..5d15ce9938 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
index f72b78cc3a..f72b78cc3a 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
index 947fcd4c7c..947fcd4c7c 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
index f997d03786..f997d03786 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
index 9d1b3ac20c..9d1b3ac20c 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
index 702826d43e..702826d43e 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
index aa356e3857..aa356e3857 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
index 176770e553..176770e553 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
index 5069b92a50..5069b92a50 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
index 075b50eec1..075b50eec1 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
index fc03bfeb88..fc03bfeb88 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
index 5f10af6510..5f10af6510 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderContext.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderContext.java
index 8a16fac9e4..8a16fac9e4 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderContext.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderContext.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java
index ae526b92a1..ae526b92a1 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
index 50bf10f54a..50bf10f54a 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
index 5a2015f55e..5a2015f55e 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
index 8afe493dec..8afe493dec 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
index 6fa2d18037..6fa2d18037 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ImplementationBuilder.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ImplementationBuilder.java
index b1e22e195d..b1e22e195d 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ImplementationBuilder.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ImplementationBuilder.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
index d40d72ae98..d40d72ae98 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/PolicyBuilder.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/PolicyBuilder.java
index 2df42c2c23..2df42c2c23 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/PolicyBuilder.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/PolicyBuilder.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
index 49995f5ab8..49995f5ab8 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
index 3e44f5f7ae..3e44f5f7ae 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
index 24b1a0e03e..24b1a0e03e 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
index 0759ff1361..0759ff1361 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
index 516b11724f..516b11724f 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java
index 552d67fec6..552d67fec6 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
index dcd6c7b08a..dcd6c7b08a 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
index 8a03df339c..8a03df339c 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
index 9db522930f..9db522930f 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
index 78b54668b3..78b54668b3 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
index f8c9f53413..f8c9f53413 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
index f18c852e69..f18c852e69 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
index fba6af7e7f..fba6af7e7f 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
index ae5fad461b..ae5fad461b 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
index 55b48ec578..55b48ec578 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
index 32377faf54..32377faf54 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
index 2b72f1f047..2b72f1f047 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java
index 99d68a11bc..99d68a11bc 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/DistributedSCABindingImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
index 4b1d9e437d..4b1d9e437d 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
index 4c02be42dd..4c02be42dd 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
index 340fa2854c..340fa2854c 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
index b5018c4d43..b5018c4d43 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
index 20c7ea3206..20c7ea3206 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
index 263af296b1..263af296b1 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
index af4b3559c5..af4b3559c5 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
index cf7e744e88..cf7e744e88 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
index b67dbcbb12..b67dbcbb12 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
index 62523e5c17..62523e5c17 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
index a4990f6a98..a4990f6a98 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
index 156fd0af75..156fd0af75 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
index 7a63bbedc5..7a63bbedc5 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
index 5c68c6cbff..5c68c6cbff 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
index f45be80888..f45be80888 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
index 616616ae7a..616616ae7a 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java
index d87d45b27a..d87d45b27a 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
index 224bc0a69a..224bc0a69a 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
index ead5ecba72..ead5ecba72 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
index 247a432330..247a432330 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/ConversationSequence.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
index 1f5620c0b9..1f5620c0b9 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
index 70f6d5b403..70f6d5b403 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
index 179dc1755e..179dc1755e 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
index cab7057b57..cab7057b57 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
index 568a6c595c..568a6c595c 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
index 8dfeb29833..8dfeb29833 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidAnnotationException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidAnnotationException.java
index b24872bf96..b24872bf96 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidAnnotationException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidAnnotationException.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
index f952a86478..f952a86478 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
index 2a273c9a26..2a273c9a26 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
index b19805c5b1..b19805c5b1 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
index 55f00b82c8..55f00b82c8 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
index 6773b29088..6773b29088 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
index c1c8400b71..c1c8400b71 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
index 15581b5e04..15581b5e04 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
index 289fd25594..289fd25594 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
index 08f859fc8a..08f859fc8a 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
index 26144e92cb..26144e92cb 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
index 777fa567f1..777fa567f1 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
index 844b0af509..844b0af509 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
index 54c0a3ec11..54c0a3ec11 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
index 2598dc8545..2598dc8545 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
index 12db460959..12db460959 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
index 26ecf6e352..26ecf6e352 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/BindingType.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
index f43c428563..f43c428563 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
index 2da41675a1..2da41675a1 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
index e7a93c8907..e7a93c8907 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java
index d142015f57..d142015f57 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Intent.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Intent.java
index b79ccdab78..b79ccdab78 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Intent.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Intent.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
index 5b401baeb3..5b401baeb3 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java
index ee4f5b5236..ee4f5b5236 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java
index a29f214f98..a29f214f98 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
index 9e7de2f6da..9e7de2f6da 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
index 2b5b8458d5..2b5b8458d5 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java
index 35a86ceedf..35a86ceedf 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java
index c1862283c7..c1862283c7 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
index 1a2a9c5bad..1a2a9c5bad 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java
index 97fbc19ced..97fbc19ced 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
index 5c285e4d95..5c285e4d95 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
index 27a77f3ba8..27a77f3ba8 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
index 6e2941ff5c..6e2941ff5c 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java
index 71e5eef6a7..71e5eef6a7 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
index c67ff1eab8..c67ff1eab8 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
index 75d1229cd8..75d1229cd8 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java
index 102bea8d41..102bea8d41 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java
diff --git a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java
index f87938a5cb..f87938a5cb 100644
--- a/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java
+++ b/sca-java-2.x/branches/sca-java-2.0-M4/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java