188 files changed, 0 insertions, 0 deletions

diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/DISCLAIMER b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/DISCLAIMER
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/DISCLAIMER
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/LICENSE b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/LICENSE
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/LICENSE
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/NOTICE b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/NOTICE
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/NOTICE
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/pom.xml b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/pom.xml
index 930a535f59..930a535f59 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/pom.xml
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/pom.xml
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java
index 28a5ecdc24..28a5ecdc24 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/AssemblyBuilder.java
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java
index 98f247e5cc..98f247e5cc 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentBuilder.java
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java
index 7f3c89fd2f..7f3c89fd2f 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentPropertyBuilder.java
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java
index 8966a4be9d..8966a4be9d 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentReferenceBuilder.java
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java
index f3e36e8c38..f3e36e8c38 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/ComponentServiceBuilder.java
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java
index e2108b5ef8..e2108b5ef8 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/CompositeBuilder.java
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java
index 0968310548..0968310548 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/AssemblyBuilderImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java
index 9022b9d9e6..9022b9d9e6 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentBuilderImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java
index 49f7cd46b2..49f7cd46b2 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentPropertyBuilderImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java
index d9aab9de22..d9aab9de22 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentReferenceBuilderImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java
index 379429d17e..379429d17e 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/ComponentServiceBuilderImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java
index 709562cd72..709562cd72 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/main/java/org/apache/tuscany/sca/assembly/dsl/impl/CompositeBuilderImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java
index ba91fd2168..ba91fd2168 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataService.java
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java
index 4e239d03d3..4e239d03d3 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountDataServiceImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java
index 030c820ed2..030c820ed2 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountService.java
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java
index 92f448ec87..92f448ec87 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/AccountServiceImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java
index b856201551..b856201551 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilder.java
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java
index 90a4292546..90a4292546 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/BigBankBuilderTestCase.java
diff --git a/tags/java/sca/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java
index a0580095a0..a0580095a0 100644
--- a/tags/java/sca/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-java-dsl/src/test/java/org/apache/tuscany/sca/assembly/dsl/StockQuoteService.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/DISCLAIMER b/sca-java-1.x/tags/1.1/modules/assembly-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/DISCLAIMER
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/DISCLAIMER
diff --git a/tags/java/sca/1.1/modules/assembly-xml/LICENSE b/sca-java-1.x/tags/1.1/modules/assembly-xml/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/LICENSE
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/LICENSE
diff --git a/tags/java/sca/1.1/modules/assembly-xml/NOTICE b/sca-java-1.x/tags/1.1/modules/assembly-xml/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/NOTICE
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/NOTICE
diff --git a/tags/java/sca/1.1/modules/assembly-xml/pom.xml b/sca-java-1.x/tags/1.1/modules/assembly-xml/pom.xml
index 3af67794bf..3af67794bf 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/pom.xml
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/pom.xml
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
index 1490c71441..1490c71441 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
index 5eb057d65e..5eb057d65e 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeDocumentProcessor.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
index 24e41a3177..24e41a3177 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeModelResolver.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
index 4915ae2906..4915ae2906 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
index 725d1d8bc8..725d1d8bc8 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeDocumentProcessor.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
index 72744259f6..72744259f6 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeModelResolver.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index f65ca67372..f65ca67372 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
index 43e0242b7e..43e0242b7e 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConfiguredOperationProcessor.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
index 421cf5f12c..421cf5f12c 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
index 7fc14765b1..7fc14765b1 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
index 7dd95e3944..7dd95e3944 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
index d82327b9dd..d82327b9dd 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
index 6bc190aaf5..6bc190aaf5 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
index 711283088e..711283088e 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/PolicyAttachPointProcessor.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index ecc34942f1..ecc34942f1 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
index 0077a56b2a..0077a56b2a 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/BuildPolicyTestCase.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java
index e435f7ce0a..e435f7ce0a 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/MockPolicyProcessor.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
index 8b42bd03db..8b42bd03db 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadAllTestCase.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
index c9d83d056b..c9d83d056b 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadDocumentTestCase.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
index 81c244a6d5..81c244a6d5 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ReadTestCase.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
index 24824954c1..24824954c1 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolvePolicyTestCase.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
index ddd26169e8..ddd26169e8 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ResolveTestCase.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
index 3224176d6e..3224176d6e 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestModelResolver.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
index c423df6f7d..c423df6f7d 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingFactoryImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
index c8f2b1a5bf..c8f2b1a5bf 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/TestSCABindingImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
index 09e8456bf3..09e8456bf3 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WireTestCase.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
index 9c36b51530..9c36b51530 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/WriteAllTestCase.java
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
index 4546fddb2d..4546fddb2d 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/Calculator.composite
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
index 072fe8fde1..072fe8fde1 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorComponent.constrainingType
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
index d67ba3ec2b..d67ba3ec2b 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/CalculatorImpl.componentType
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
index a313dd1e6d..a313dd1e6d 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/JavaScriptReference.composite
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
index d29fe85586..d29fe85586 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/RMIBindingTest.composite
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
index 5091ff700b..5091ff700b 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllCalculator.composite
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
index d59e69209d..d59e69209d 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllDivide.composite
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
index 77166c9ac2..77166c9ac2 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/TestAllPolicyCalculator.composite
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
index bcc8c54dc8..bcc8c54dc8 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/another_test_definitions.xml
diff --git a/tags/java/sca/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
index acda6ab296..acda6ab296 100644
--- a/tags/java/sca/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xml/test_definitions.xml
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/DISCLAIMER b/sca-java-1.x/tags/1.1/modules/assembly-xsd/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/DISCLAIMER
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/DISCLAIMER
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/LICENSE b/sca-java-1.x/tags/1.1/modules/assembly-xsd/LICENSE
index bfded7c6a9..bfded7c6a9 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/LICENSE
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/LICENSE
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/NOTICE b/sca-java-1.x/tags/1.1/modules/assembly-xsd/NOTICE
index b21d823553..b21d823553 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/NOTICE
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/NOTICE
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/pom.xml b/sca-java-1.x/tags/1.1/modules/assembly-xsd/pom.xml
index acc7661a96..acc7661a96 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/pom.xml
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/pom.xml
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-all.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-all.xsd
index 89279510d5..89279510d5 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-all.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-all.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
index 26bedfcce5..26bedfcce5 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-binding-ejb.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
index 850f32b56a..850f32b56a 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-binding-jms.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
index 02703402ef..02703402ef 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-binding-sca.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
index 3e92de193b..3e92de193b 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-core.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-core.xsd
index 1c6291792b..1c6291792b 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-core.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-core.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-definitions.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
index 0249882a92..0249882a92 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-definitions.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
index 87b443fb36..87b443fb36 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-bpel.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
index 99669bc672..99669bc672 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-composite.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
index 6f1cf14a4b..6f1cf14a4b 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-cpp.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
index a7e781b18f..a7e781b18f 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-ejb.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
index f9d8171b8e..f9d8171b8e 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-java.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
index 1cf9fb3ea9..1cf9fb3ea9 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-implementation-spring.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
index 44f14e5ed5..44f14e5ed5 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-interface-cpp.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
index 81f939bdb4..81f939bdb4 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-interface-java.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
index c1fdfd8f3c..c1fdfd8f3c 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-interface-wsdl.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-policy.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-policy.xsd
index c22ffd6618..c22ffd6618 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca-policy.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca-policy.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca.xsd
index 10f54275d0..10f54275d0 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/sca.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/sca.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
index 1d25e9faf9..1d25e9faf9 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-atom.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
index d0da5421ec..d0da5421ec 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-dwr.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
index ff48b97d7a..ff48b97d7a 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-http.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
index 7c79738898..7c79738898 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-jsonrpc.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
index 6d5468b2f9..6d5468b2f9 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-notification.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
index 2697a1ea98..2697a1ea98 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rmi.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
index 79215617eb..79215617eb 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-binding-rss.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
index f972e498b2..f972e498b2 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-node.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
index f8d437310e..f8d437310e 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-notification.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
index f8ece54a07..f8ece54a07 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-osgi.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
index dd596821ea..dd596821ea 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-resource.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
index e1723d65f0..e1723d65f0 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-script.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
index 0c0998595f..0c0998595f 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-widget.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
index cdabb697aa..cdabb697aa 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca-implementation-xquery.xsd
diff --git a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
index da5e696e01..da5e696e01 100644
--- a/tags/java/sca/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
+++ b/sca-java-1.x/tags/1.1/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd
diff --git a/tags/java/sca/1.1/modules/assembly/DISCLAIMER b/sca-java-1.x/tags/1.1/modules/assembly/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/tags/java/sca/1.1/modules/assembly/DISCLAIMER
+++ b/sca-java-1.x/tags/1.1/modules/assembly/DISCLAIMER
diff --git a/tags/java/sca/1.1/modules/assembly/LICENSE b/sca-java-1.x/tags/1.1/modules/assembly/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/tags/java/sca/1.1/modules/assembly/LICENSE
+++ b/sca-java-1.x/tags/1.1/modules/assembly/LICENSE
diff --git a/tags/java/sca/1.1/modules/assembly/NOTICE b/sca-java-1.x/tags/1.1/modules/assembly/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/tags/java/sca/1.1/modules/assembly/NOTICE
+++ b/sca-java-1.x/tags/1.1/modules/assembly/NOTICE
diff --git a/tags/java/sca/1.1/modules/assembly/pom.xml b/sca-java-1.x/tags/1.1/modules/assembly/pom.xml
index c08db6ec72..c08db6ec72 100644
--- a/tags/java/sca/1.1/modules/assembly/pom.xml
+++ b/sca-java-1.x/tags/1.1/modules/assembly/pom.xml
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
index b8487d95c5..b8487d95c5 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractContract.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
index 029b1326b9..029b1326b9 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractProperty.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
index a9ef26bbb9..a9ef26bbb9 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractReference.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
index 9ae511c07b..9ae511c07b 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AbstractService.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
index 513e83da4a..513e83da4a 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/AssemblyFactory.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
index 76511d351d..76511d351d 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Base.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
index 514456f86a..514456f86a 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Binding.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
index f49a653aa9..f49a653aa9 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Callback.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
index 7fa906dca6..7fa906dca6 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Component.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
index f944d52794..f944d52794 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentProperty.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
index 7f121ac124..7f121ac124 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentReference.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
index 65945692f1..65945692f1 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentService.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
index e1ea65ea39..e1ea65ea39 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ComponentType.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
index a1a16dea91..a1a16dea91 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Composite.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
index d3fa80ba74..d3fa80ba74 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeReference.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
index 7143f571f9..7143f571f9 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/CompositeService.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
index a412bcee24..a412bcee24 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConfiguredOperation.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
index 9890bfed68..9890bfed68 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/ConstrainingType.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
index 25d35d38f5..25d35d38f5 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Contract.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
index 5dd256e3c4..5dd256e3c4 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/DefaultAssemblyFactory.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
index 3577a94d1e..3577a94d1e 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Extensible.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
index 720a6801a2..720a6801a2 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Implementation.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
index 5d15ce9938..5d15ce9938 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Multiplicity.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
index 2ca8589b1a..2ca8589b1a 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OperationsConfigurator.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
index 98ff92f15b..98ff92f15b 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/OptimizableBinding.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
index 683920da58..683920da58 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Property.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
index f38346663a..f38346663a 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Reference.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
index 2cf04277cd..2cf04277cd 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABinding.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
index 0abfd13d10..0abfd13d10 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/SCABindingFactory.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
index 020870cd34..020870cd34 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Service.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
index ee65e5746e..ee65e5746e 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/Wire.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
index 5f5856d051..5f5856d051 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/ComponentPreProcessor.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
index 26bdc3cffa..26bdc3cffa 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilder.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
index 5a2015f55e..5a2015f55e 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderException.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
index aecdf417f2..aecdf417f2 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/CompositeBuilderMonitor.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
index 88468938fd..88468938fd 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/DomainBuilder.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
index 8965410438..8965410438 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/Problem.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java
index 6bac10da8f..6bac10da8f 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingPolicyComputer.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
index c1a4605f83..c1a4605f83 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BindingUtil.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
index 164e039cc6..164e039cc6 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
index fee8e02f4e..fee8e02f4e 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeCloneBuilderImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
index 28441132aa..28441132aa 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeConfigurationBuilderImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
index ced482dbf6..ced482dbf6 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeIncludeBuilderImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
index 9132718df3..9132718df3 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeWireBuilderImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java
index 559af20ce2..559af20ce2 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/DomainWireBuilderImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java
index 72620e111f..72620e111f 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ImplementationPolicyComputer.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java
index ae9ed87035..ae9ed87035 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputationException.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java
index aea030a1de..aea030a1de 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PolicyComputer.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
index efd10bfe9a..efd10bfe9a 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtil.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
index b572b67ced..b572b67ced 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ProblemImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
index c883073a4b..c883073a4b 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/PropertyUtil.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
index a4599e96f6..a4599e96f6 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/ReferenceUtil.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
index b7c63dc2b4..b7c63dc2b4 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractPropertyImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
index d0ee3832c5..d0ee3832c5 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractReferenceImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
index 346764b1b4..346764b1b4 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AbstractServiceImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
index e54e443331..e54e443331 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/AssemblyFactoryImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
index 553e600bc9..553e600bc9 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/BaseImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
index 8c48b31323..8c48b31323 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CallbackImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
index 18161bca17..18161bca17 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
index 512ab0d2d0..512ab0d2d0 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentPropertyImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
index 63a4def855..63a4def855 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentReferenceImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
index 0c78a2505f..0c78a2505f 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentServiceImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
index b232fd8446..b232fd8446 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ComponentTypeImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
index 49815fceb9..49815fceb9 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
index 4348e08fcb..4348e08fcb 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeReferenceImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
index 6777a96982..6777a96982 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/CompositeServiceImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
index ab0a18cea2..ab0a18cea2 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConfiguredOperationImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
index d5701df74e..d5701df74e 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ConstrainingTypeImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
index ea7ecfc30b..ea7ecfc30b 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ContractImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
index 9a7ca09e43..9a7ca09e43 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ExtensibleImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
index 9dcad68eeb..9dcad68eeb 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/PropertyImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
index 6daa38a668..6daa38a668 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ReferenceImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
index ca2413d1f7..ca2413d1f7 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/ServiceImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
index 695d307ac3..695d307ac3 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/impl/WireImpl.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory b/sca-java-1.x/tags/1.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
index 859c4bde4b..859c4bde4b 100644
--- a/tags/java/sca/1.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/main/resources/META-INF/services/org.apache.tuscany.sca.assembly.AssemblyFactory
diff --git a/tags/java/sca/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java b/sca-java-1.x/tags/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
index 767b152624..767b152624 100644
--- a/tags/java/sca/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/AssemblyFactoryTestCase.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java b/sca-java-1.x/tags/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
index 40d5f4e63f..40d5f4e63f 100644
--- a/tags/java/sca/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestBinding.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java b/sca-java-1.x/tags/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
index 61ca3945ea..61ca3945ea 100644
--- a/tags/java/sca/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestImplementation.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java b/sca-java-1.x/tags/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
index dbe0cb8225..dbe0cb8225 100644
--- a/tags/java/sca/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterface.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java b/sca-java-1.x/tags/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
index ee6b95edc9..ee6b95edc9 100644
--- a/tags/java/sca/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestInterfaceContract.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java b/sca-java-1.x/tags/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
index d94a7e93a3..d94a7e93a3 100644
--- a/tags/java/sca/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/TestOperation.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java b/sca-java-1.x/tags/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
index 854d15f546..854d15f546 100644
--- a/tags/java/sca/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/CompositeBuilderTestCase.java
diff --git a/tags/java/sca/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java b/sca-java-1.x/tags/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
index c8694966fe..c8694966fe 100644
--- a/tags/java/sca/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java
+++ b/sca-java-1.x/tags/1.1/modules/assembly/src/test/java/org/apache/tuscany/sca/assembly/builder/impl/PrintUtilTestCase.java