151 files changed, 0 insertions, 0 deletions

diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
index dca1decb76..dca1decb76 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
index 45fa05d66c..45fa05d66c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
index a9ef26bbb9..a9ef26bbb9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
index 9ae511c07b..9ae511c07b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
index 5d82b9b727..5d82b9b727 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
index b9abb90b03..b9abb90b03 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
index 9b96556173..9b96556173 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
index a220f14159..a220f14159 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
index efd8557e07..efd8557e07 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
index 1202b4d83a..1202b4d83a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
index ad72780de8..ad72780de8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
index e1e3eab90c..e1e3eab90c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
index f748828999..f748828999 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
index 2c619be680..2c619be680 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
index 88cb2f9a2c..88cb2f9a2c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
index 575d0784ce..575d0784ce 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
index 25ae82aa8f..25ae82aa8f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
index b3a1bf9b16..b3a1bf9b16 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
index 6d8350fc66..6d8350fc66 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
index 14a3e466ef..14a3e466ef 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Endpoint.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
index c70d4521ba..c70d4521ba 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/EndpointReference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
index da8d054140..da8d054140 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
index d179ce7b3b..d179ce7b3b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extension.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
index 3912896f0c..3912896f0c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
index 5b719e50bc..5b719e50bc 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
index 9df72e358d..9df72e358d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationSelector.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
index 9563d2e1cb..9563d2e1cb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
index c65b6213b0..c65b6213b0 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
index db677bdabb..db677bdabb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
index aa356e3857..aa356e3857 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
index feae980326..feae980326 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
index 9caa7563c9..9caa7563c9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
index 075b50eec1..075b50eec1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
index c622737454..c622737454 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/WireFormat.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
index 8c56385c9e..8c56385c9e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BindingBuilder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderContext.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderContext.java
index 374c36c1f5..374c36c1f5 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderContext.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderContext.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java
index 14ae2042d3..14ae2042d3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/BuilderExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
index 50bf10f54a..50bf10f54a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
index 5a2015f55e..5a2015f55e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ContractBuilder.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ContractBuilder.java
index 99a58dc1c8..99a58dc1c8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ContractBuilder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ContractBuilder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
index 8b037a7534..8b037a7534 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DefaultBuilderExtensionPoint.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ImplementationBuilder.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ImplementationBuilder.java
index d47c3d9032..d47c3d9032 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ImplementationBuilder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ImplementationBuilder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
index 4f2842c61a..4f2842c61a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Messages.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/PolicyBuilder.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/PolicyBuilder.java
index 423c856973..423c856973 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/PolicyBuilder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/PolicyBuilder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/WireBuilder.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/WireBuilder.java
index 2bfbe85664..2bfbe85664 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/WireBuilder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/WireBuilder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
index 24dc20f815..24dc20f815 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
index 3e44f5f7ae..3e44f5f7ae 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
index 24b1a0e03e..24b1a0e03e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
index 0759ff1361..0759ff1361 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
index 516b11724f..516b11724f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java
index d912606f1d..d912606f1d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BindingImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
index dec68d1413..dec68d1413 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
index 8a03df339c..8a03df339c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
index 9db522930f..9db522930f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
index 78b54668b3..78b54668b3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
index f8c9f53413..f8c9f53413 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
index b52c65ef8b..b52c65ef8b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
index c7672057dd..c7672057dd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
index ae5fad461b..ae5fad461b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
index 55b48ec578..55b48ec578 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
index 80c1c7cd21..80c1c7cd21 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
index 2b72f1f047..2b72f1f047 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
index 2ea516cd04..2ea516cd04 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
index ebcc1e3e63..ebcc1e3e63 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/EndpointReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
index 340fa2854c..340fa2854c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
index e69eb4a771..e69eb4a771 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensionImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
index f943438a9f..f943438a9f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ImplementationImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
index 263af296b1..263af296b1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
index e157b78a7c..e157b78a7c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
index 84e5825b50..84e5825b50 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
index 63e5f1e82c..63e5f1e82c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
index 618d0d6e7b..618d0d6e7b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
index a4990f6a98..a4990f6a98 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
index 156fd0af75..156fd0af75 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
index 9ae5e6f26f..9ae5e6f26f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
index 5c68c6cbff..5c68c6cbff 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
index f45be80888..f45be80888 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
index 616616ae7a..616616ae7a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java
index d87d45b27a..d87d45b27a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
index e58261cda2..e58261cda2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
index 452c3bf883..452c3bf883 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Compatibility.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Compatibility.java
index e05a05476a..e05a05476a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Compatibility.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Compatibility.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
index 386275b41b..386275b41b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/DataType.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
index 4aa5f2780a..4aa5f2780a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/FaultExceptionMapper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
index 179dc1755e..179dc1755e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/IncompatibleInterfaceContractException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
index e3103b768a..e3103b768a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Interface.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
index af8e8909a2..af8e8909a2 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContract.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
index ed7b10091b..ed7b10091b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InterfaceContractMapper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidAnnotationException.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidAnnotationException.java
index db1d5f7fd7..db1d5f7fd7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidAnnotationException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidAnnotationException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
index 392e81a8fa..392e81a8fa 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidCallbackException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
index 0cac606e1a..0cac606e1a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidInterfaceException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
index 2e82c201d9..2e82c201d9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/InvalidOperationException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
index 59a79c72d6..59a79c72d6 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
index 92ac0850e7..92ac0850e7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/OverloadedOperationException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/ParameterMode.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/ParameterMode.java
index c4244a3480..c4244a3480 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/ParameterMode.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/ParameterMode.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
index 5d084d9289..5d084d9289 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
index 692dc4743c..692dc4743c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
index b444c4bd3f..b444c4bd3f 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractMapperImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
index 1daa6baf9c..1daa6baf9c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
index b820f95fcf..b820f95fcf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/Audit.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/Audit.java
index 343d369fdb..343d369fdb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/Audit.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/Audit.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
index 61a2cd7f66..61a2cd7f66 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
index 334c826f86..334c826f86 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/FaultException.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
index 849b922285..849b922285 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/JavaXMLMapper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
index abae4e7e38..abae4e7e38 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
index dfdc85d405..dfdc85d405 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/WrapperInfo.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
index fd1b840b17..fd1b840b17 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/interfacedef/util/XMLType.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/BindingType.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
index f43c428563..f43c428563 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
index 2da41675a1..2da41675a1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
index f8f8a48b06..f8f8a48b06 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExtensionType.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExternalAttachment.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExternalAttachment.java
index 5bccf51b91..5bccf51b91 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExternalAttachment.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ExternalAttachment.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java
index d142015f57..d142015f57 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/ImplementationType.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Intent.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Intent.java
index b2578fab49..b2578fab49 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Intent.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Intent.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
index 5b401baeb3..5b401baeb3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java
index ee4f5b5236..ee4f5b5236 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyAttachment.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyContainer.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyContainer.java
index 6bb7244e05..6bb7244e05 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyContainer.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyContainer.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java
index b7de263789..b7de263789 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyExpression.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
index b23060dafb..b23060dafb 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
index 230d635e76..230d635e76 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java
index e585fcf384..e585fcf384 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/PolicySubject.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java
index c1862283c7..c1862283c7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/Qualifier.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
index 1a2a9c5bad..1a2a9c5bad 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java
index 97fbc19ced..97fbc19ced 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExtensionTypeImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExternalAttachmentImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExternalAttachmentImpl.java
index 1e90e26324..1e90e26324 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExternalAttachmentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ExternalAttachmentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
index 5c285e4d95..5c285e4d95 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
index 27a77f3ba8..27a77f3ba8 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
index 357b7afab4..357b7afab4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java
index b9f9fa5eb4..b9f9fa5eb4 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyExpressionImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
index f700f7c41a..f700f7c41a 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
index 22e6e4d4cf..22e6e4d4cf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java
index 102bea8d41..102bea8d41 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/impl/QualifierImpl.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java
index ade541b635..ade541b635 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHelper.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
index 20189eae98..20189eae98 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
index 6e24d0bcfd..6e24d0bcfd 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.SCABindingFactory
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint
index 61171ac041..61171ac041 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.builder.BuilderExtensionPoint
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.DefinitionsFactory b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.DefinitionsFactory
index c1cb41d967..c1cb41d967 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.DefinitionsFactory
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.definitions.DefinitionsFactory
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
index e2da378609..e2da378609 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.interfacedef.InterfaceContractMapper
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
index 6ff07189e1..6ff07189e1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-conformance-messages.properties b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-conformance-messages.properties
index 8ded10c9db..8ded10c9db 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-conformance-messages.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-conformance-messages.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
index 91b1721bf7..91b1721bf7 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages_it.properties b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages_it.properties
index b94d37ba2d..b94d37ba2d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages_it.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/assembly-validation-messages_it.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/definitions-validation-messages.properties b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/definitions-validation-messages.properties
index d3905035b9..d3905035b9 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/definitions-validation-messages.properties
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/main/resources/org/apache/tuscany/sca/assembly/builder/definitions-validation-messages.properties
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
index 20fd74d46e..20fd74d46e 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
index a09f7af06c..a09f7af06c 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
index 6777c33ff1..6777c33ff1 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
index dbe0cb8225..dbe0cb8225 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
index 24be8a3e7d..24be8a3e7d 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
index d94a7e93a3..d94a7e93a3 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
index 8d945038bf..8d945038bf 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/ContractCompatibilityTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
index d1faa5cf2b..d1faa5cf2b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/test/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractTestCase.java
diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
index 569366ad1b..569366ad1b 100644
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/modules/assembly/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
+++ b/sca-java-2.x/tags/2.0-Beta3/modules/assembly/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java