summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultSCABindingFactory.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultSCABindingFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitable.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitable.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitor.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/util/PrintUtil.java (renamed from branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/util/PrintUtil.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java (renamed from branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java (renamed from branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java (renamed from branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java (renamed from branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java (renamed from branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java (renamed from branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java (renamed from branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java)0
69 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
index 8f371defde..8f371defde 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
index 35c5da4123..35c5da4123 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
index a9ef26bbb9..a9ef26bbb9 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
index 9ae511c07b..9ae511c07b 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
index 3937d34f92..3937d34f92 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
index 9681ff0c40..9681ff0c40 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
index 8d7d6958be..8d7d6958be 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
index b50e4ec06b..b50e4ec06b 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
index 72ee71de8c..72ee71de8c 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
index 9a344afb09..9a344afb09 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
index 1f4b4f0801..1f4b4f0801 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
index c0e42dbb93..c0e42dbb93 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
index ffdef42aed..ffdef42aed 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
index 1fe402d829..1fe402d829 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
index d3fa80ba74..d3fa80ba74 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
index 757e2bda2e..757e2bda2e 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
index 4119d0a268..4119d0a268 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
index 830ede478a..830ede478a 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
index 5dd256e3c4..5dd256e3c4 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultSCABindingFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultSCABindingFactory.java
index 793a8f960b..793a8f960b 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultSCABindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultSCABindingFactory.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
index e79f9bccdb..e79f9bccdb 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
index 5d15ce9938..5d15ce9938 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
index 98089d66cb..98089d66cb 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
index 3b2d2b124c..3b2d2b124c 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
index eaf60aa6d9..eaf60aa6d9 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
index 0abfd13d10..0abfd13d10 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
index ea32efb769..ea32efb769 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitable.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitable.java
index 6d3998b79e..6d3998b79e 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitable.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitable.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitor.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitor.java
index a15354e401..a15354e401 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitor.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Visitor.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
index 58562eb5ad..58562eb5ad 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
index 5f5856d051..5f5856d051 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
index 26bdc3cffa..26bdc3cffa 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
index 5a2015f55e..5a2015f55e 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
index aecdf417f2..aecdf417f2 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
index 8965410438..8965410438 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
index 6234aed284..6234aed284 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
index 2b85cec9fa..2b85cec9fa 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
index 71be058795..71be058795 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
index 9802e9ba63..9802e9ba63 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
index 989aea1237..989aea1237 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
index d0ee3832c5..d0ee3832c5 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
index 346764b1b4..346764b1b4 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
index 1e623d35f2..1e623d35f2 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
index 40c07d2e4f..40c07d2e4f 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
index 87ef907a80..87ef907a80 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
index ec837c060c..ec837c060c 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
index 8a9b8e446d..8a9b8e446d 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
index bd593f7502..bd593f7502 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
index 66883133d7..66883133d7 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
index e57f25551a..e57f25551a 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
index 5c40f9445b..5c40f9445b 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
index 4348e08fcb..4348e08fcb 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
index 19a6ed56c2..19a6ed56c2 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
index f9fbae6659..f9fbae6659 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
index d295384305..d295384305 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
index ebdcdf580b..ebdcdf580b 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
index 5ceb5bb950..5ceb5bb950 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
index 402b90706d..402b90706d 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingFactoryImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
index 93b7d7a88f..93b7d7a88f 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/SCABindingImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
index c5bf3a10d0..c5bf3a10d0 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
index 06db488fba..06db488fba 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/util/PrintUtil.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/util/PrintUtil.java
index 08b39f976b..08b39f976b 100644
--- a/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/util/PrintUtil.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/util/PrintUtil.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
index cde42cbc62..cde42cbc62 100644
--- a/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
index 9b3ac4c2d4..9b3ac4c2d4 100644
--- a/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
index 9e34fafb05..9e34fafb05 100644
--- a/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
index dbe0cb8225..dbe0cb8225 100644
--- a/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
index ee6b95edc9..ee6b95edc9 100644
--- a/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
index 460672c1ef..460672c1ef 100644
--- a/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
diff --git a/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
index aeb076a392..aeb076a392 100644
--- a/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java