179 files changed, 0 insertions, 0 deletions

diff --git a/branches/java-post-M1/das/pom.xml b/sca-java-1.x/branches/java-post-M1/das/pom.xml
index 98da287328..98da287328 100644
--- a/branches/java-post-M1/das/pom.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/pom.xml
diff --git a/branches/java-post-M1/das/rdb/pom.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/pom.xml
index 92ae7c42ef..92ae7c42ef 100644
--- a/branches/java-post-M1/das/rdb/pom.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/pom.xml
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java
index 9987b7634d..9987b7634d 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
index 3cacd28a69..3cacd28a69 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java
index eb1ed24230..eb1ed24230 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/DAS.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/DAS.java
index 24c39f5add..24c39f5add 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/DAS.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/DAS.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java
index 32e9b065ab..32e9b065ab 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java
index 4edb447e31..4edb447e31 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
index b1495be4da..b1495be4da 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
index 6babe0c349..6babe0c349 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java
index 14403367d8..14403367d8 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java
index 764a0851a0..764a0851a0 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/BaseGenerator.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/BaseGenerator.java
index 50beec06d7..50beec06d7 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/BaseGenerator.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/BaseGenerator.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java
index c83032698a..c83032698a 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java
index 183d1800d5..183d1800d5 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
index 3aeb47c4a7..3aeb47c4a7 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java
index 9279aea2c7..9279aea2c7 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java
index 54c536d95c..54c536d95c 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
index 0a3bba0c57..0a3bba0c57 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java
index 142aee5c60..142aee5c60 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java
index a455ed348a..a455ed348a 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java
index 6d68162dee..6d68162dee 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java
index f68f48fc06..f68f48fc06 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java
index 5c366a1898..5c366a1898 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java
index f00ef2770d..f00ef2770d 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java
index 48b6dc0187..48b6dc0187 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java
index 4b5a3677ae..4b5a3677ae 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java
index 170b597134..170b597134 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ESchemaMaker.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java
index 832cfeac7e..832cfeac7e 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
index 610adf3ff6..610adf3ff6 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/BaseCommandImpl.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/BaseCommandImpl.java
index 1b9ac360e5..1b9ac360e5 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/BaseCommandImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/BaseCommandImpl.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java
index 24fca8fe10..24fca8fe10 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java
index 5db52bf2be..5db52bf2be 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java
index 78addfb72c..78addfb72c 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java
index 77198fe589..77198fe589 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java
index 0a2cc7a5f1..0a2cc7a5f1 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java
index d6ef150d6d..d6ef150d6d 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java
index 5c70dc1e6f..5c70dc1e6f 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASFactoryImpl.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASFactoryImpl.java
index dded0aa46e..dded0aa46e 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASFactoryImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASFactoryImpl.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java
index ee38c04faa..ee38c04faa 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java
index e49ece3050..e49ece3050 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java
index 8c39dcac87..8c39dcac87 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java
index 8650c6119c..8650c6119c 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java
index 7b71e0ace9..7b71e0ace9 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java
index ce09c748f4..ce09c748f4 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java
index 59e88c2f6c..59e88c2f6c 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java
index dee6546cfe..dee6546cfe 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java
index 96a064b8e4..96a064b8e4 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java
index 666e1186b5..666e1186b5 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java
index 32b17ef3e7..32b17ef3e7 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java
index f5c5d01375..f5c5d01375 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java
index 506d7285fe..506d7285fe 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/QueryString.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/QueryString.java
index d8a26057d1..d8a26057d1 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/QueryString.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/QueryString.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
index d70f1e5693..d70f1e5693 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java
index 2f1567c1cf..2f1567c1cf 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java
index 49a06a358d..49a06a358d 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypes.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypes.java
index 1a9e2143ff..1a9e2143ff 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypes.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypes.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java
index 999cd0f267..999cd0f267 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
index f40f04489a..f40f04489a 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java
index 963cb4d847..963cb4d847 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java
index 1ab2f16fca..1ab2f16fca 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java
index cbe73a16e4..cbe73a16e4 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
index 386af87141..386af87141 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
index b032fb6926..b032fb6926 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java
index 46db6ca728..46db6ca728 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java
index 7f96f9aef4..7f96f9aef4 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DebugFormatter.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DebugFormatter.java
index ed2e1063d6..ed2e1063d6 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DebugFormatter.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DebugFormatter.java
diff --git a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DebugUtil.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DebugUtil.java
index 745fe8cb7e..745fe8cb7e 100644
--- a/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DebugUtil.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DebugUtil.java
diff --git a/branches/java-post-M1/das/rdb/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/java-post-M1/das/rdb/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/java-post-M1/das/rdb/src/main/resources/META-INF/MANIFEST.MF b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/resources/META-INF/MANIFEST.MF
index cfdce9ed00..cfdce9ed00 100644
--- a/branches/java-post-M1/das/rdb/src/main/resources/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/resources/META-INF/MANIFEST.MF
diff --git a/branches/java-post-M1/das/rdb/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/java-post-M1/das/rdb/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/resources/META-INF/NOTICE
diff --git a/branches/java-post-M1/das/rdb/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/java-post-M1/das/rdb/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/resources/META-INF/README.txt
diff --git a/branches/java-post-M1/das/rdb/src/main/resources/config.xsd b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/resources/config.xsd
index 726f573e79..726f573e79 100644
--- a/branches/java-post-M1/das/rdb/src/main/resources/config.xsd
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/resources/config.xsd
diff --git a/branches/java-post-M1/das/rdb/src/main/resources/dasmodel4.mdl b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/resources/dasmodel4.mdl
index 476974975b..476974975b 100644
--- a/branches/java-post-M1/das/rdb/src/main/resources/dasmodel4.mdl
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/main/resources/dasmodel4.mdl
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java
index 9ae8ab71c8..9ae8ab71c8 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java
index 8d9d2ada77..8d9d2ada77 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java
index c7545723ad..c7545723ad 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java
index 029816686a..029816686a 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java
index 9ac492d2bb..9ac492d2bb 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java
index 450933928e..450933928e 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java
index fe7c87a0da..fe7c87a0da 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
index 492e70352c..492e70352c 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java
index 71b6da3f52..71b6da3f52 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java
index 4f8982a140..4f8982a140 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java
index 677cfecae9..677cfecae9 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.java
index 278c4de1ee..278c4de1ee 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java
index 4ecb166a10..4ecb166a10 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
index e1acf327f3..e1acf327f3 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/NameMappingTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/NameMappingTests.java
index fed25abdb9..fed25abdb9 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/NameMappingTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/NameMappingTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java
index 5ff387ed8b..5ff387ed8b 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
index 3039f4778e..3039f4778e 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java
index 7c2d15efe7..7c2d15efe7 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java
index 3358344f71..3358344f71 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java
index 84e2813c22..84e2813c22 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java
index a9fdaa1467..a9fdaa1467 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
index b61f871614..b61f871614 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java
index 5a0be1d6da..5a0be1d6da 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java
index e851a4d925..e851a4d925 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
index 679bdabd38..679bdabd38 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java
index bf10e0f379..bf10e0f379 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java
index 0089e6b569..0089e6b569 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java
index 0f6ce5c2c8..0f6ce5c2c8 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java
index 4f8dbbe60c..4f8dbbe60c 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
index 49f093c36d..49f093c36d 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java
index 33d8fed6fb..33d8fed6fb 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java
index 21a7427ace..21a7427ace 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java
index 2b58e29aa1..2b58e29aa1 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
index be678bbce6..be678bbce6 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java
index 6566544c39..6566544c39 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java
index ac9dba6aa9..ac9dba6aa9 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java
index e696c8dd6b..e696c8dd6b 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java
index 0ebbd6c5af..0ebbd6c5af 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java
index 9c49004ba5..9c49004ba5 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java
index 66d0c25369..66d0c25369 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java
index 300bf57260..300bf57260 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java
index 149bcfc71b..149bcfc71b 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java
index fbd9cf7cab..fbd9cf7cab 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java
index d3c10affdd..d3c10affdd 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java
index f9dffc9360..f9dffc9360 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java
index e6a52204f8..e6a52204f8 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java
index 9193f7c6d5..9193f7c6d5 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java
index dd78b1be35..dd78b1be35 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java
index 0c6d41d096..0c6d41d096 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java
index 1097b07cc5..1097b07cc5 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DB2Setup.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DB2Setup.java
index 75df028490..75df028490 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DB2Setup.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DB2Setup.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java
index bd195866be..bd195866be 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
index f0c5223cf0..f0c5223cf0 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java
index 082b1ec50a..082b1ec50a 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/JavaStoredProcs.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/JavaStoredProcs.java
index cd314e0fce..cd314e0fce 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/JavaStoredProcs.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/JavaStoredProcs.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java
index 5cec322e70..5cec322e70 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java
index 330320656e..330320656e 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java
index 686433bfc8..686433bfc8 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java
index 8ded99af9b..8ded99af9b 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java
index e25d2c4c95..e25d2c4c95 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/SillyDateStringConverter.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/SillyDateStringConverter.java
index 7c164bd675..7c164bd675 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/SillyDateStringConverter.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/SillyDateStringConverter.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToIntegerConverter.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToIntegerConverter.java
index 8ff57aef6d..8ff57aef6d 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToIntegerConverter.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToIntegerConverter.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToLongConverter.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToLongConverter.java
index 74a5e2917f..74a5e2917f 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToLongConverter.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToLongConverter.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
index 14849b8650..14849b8650 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java
index 6c102743a5..6c102743a5 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java
index c6ea850e76..c6ea850e76 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java
index 20cc727afb..20cc727afb 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java
diff --git a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
index 26dbffe8f7..26dbffe8f7 100644
--- a/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/1xM_mapping_no_cud.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/1xM_mapping_no_cud.xml
index e1fdc93078..e1fdc93078 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/1xM_mapping_no_cud.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/1xM_mapping_no_cud.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/BooksConfig.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/BooksConfig.xml
index 3f65e2beb9..3f65e2beb9 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/BooksConfig.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/BooksConfig.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/BooksConfigWithAlias.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/BooksConfigWithAlias.xml
index 8eea4194d4..8eea4194d4 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/BooksConfigWithAlias.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/BooksConfigWithAlias.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/CompanyConfig.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/CompanyConfig.xml
index 425ff02df7..425ff02df7 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/CompanyConfig.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/CompanyConfig.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/CompanyEmployeeConfig.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/CompanyEmployeeConfig.xml
index 8fd75441b1..8fd75441b1 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/CompanyEmployeeConfig.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/CompanyEmployeeConfig.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/CustOrdersConnectionProps.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/CustOrdersConnectionProps.xml
index 22de7ad66f..22de7ad66f 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/CustOrdersConnectionProps.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/CustOrdersConnectionProps.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/CustomerConfigWithConverter.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/CustomerConfigWithConverter.xml
index 67941aef83..67941aef83 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/CustomerConfigWithConverter.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/CustomerConfigWithConverter.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/CustomerConfigWithIDConverter.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/CustomerConfigWithIDConverter.xml
index 10e17d94df..10e17d94df 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/CustomerConfigWithIDConverter.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/CustomerConfigWithIDConverter.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/CustomersOrdersConfig.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/CustomersOrdersConfig.xml
index 4ec809416d..4ec809416d 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/CustomersOrdersConfig.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/CustomersOrdersConfig.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/InvalidConfig1.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/InvalidConfig1.xml
index b68ef105c7..b68ef105c7 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/InvalidConfig1.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/InvalidConfig1.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/ManagedBooksConfig.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/ManagedBooksConfig.xml
index c8cd1a4421..c8cd1a4421 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/ManagedBooksConfig.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/ManagedBooksConfig.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/OrdersOrderDetailsConfig.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
index 7403e3e30d..7403e3e30d 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/PartsConfig.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/PartsConfig.xml
index b51b111841..b51b111841 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/PartsConfig.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/PartsConfig.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
index f6d760386b..f6d760386b 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/basicCompanyMapping.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/basicCompanyMapping.xml
index 0455ad8445..0455ad8445 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/basicCompanyMapping.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/basicCompanyMapping.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/basicCustomerMapping.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/basicCustomerMapping.xml
index 1713026a62..1713026a62 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/basicCustomerMapping.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/basicCustomerMapping.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
index 8cb5137728..8cb5137728 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml
index bc6b8c278b..bc6b8c278b 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
index 4b66281489..4b66281489 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/basicCustomerOrderMapping.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/basicCustomerOrderMapping.xml
index f7bb65934c..f7bb65934c 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/basicCustomerOrderMapping.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/basicCustomerOrderMapping.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/basicStaticCustomer.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/basicStaticCustomer.xml
index 65e5bea7da..65e5bea7da 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/basicStaticCustomer.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/basicStaticCustomer.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/cityStates.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/cityStates.xml
index d8fe1261ab..d8fe1261ab 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/cityStates.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/cityStates.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/company.ecore b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/company.ecore
index 888acdf1c3..888acdf1c3 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/company.ecore
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/company.ecore
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/company.genmodel b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/company.genmodel
index 0b89c2c0c8..0b89c2c0c8 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/company.genmodel
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/company.genmodel
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/company.xsd b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/company.xsd
index 42cf60c588..42cf60c588 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/company.xsd
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/company.xsd
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/companyMapping.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/companyMapping.xml
index 76ff87a095..76ff87a095 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/companyMapping.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/companyMapping.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/companyMappingWithConverters.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/companyMappingWithConverters.xml
index d51e74a824..d51e74a824 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/companyMappingWithConverters.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/companyMappingWithConverters.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/customer.ecore b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/customer.ecore
index 74786d8af4..74786d8af4 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/customer.ecore
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/customer.ecore
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/customer.genmodel b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/customer.genmodel
index 8c1cd53e57..8c1cd53e57 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/customer.genmodel
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/customer.genmodel
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/customer.xsd b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/customer.xsd
index 18a87aa299..18a87aa299 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/customer.xsd
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/customer.xsd
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/customerMapping.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/customerMapping.xml
index 93c278dbe1..93c278dbe1 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/customerMapping.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/customerMapping.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml
index a32d50dcd0..a32d50dcd0 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/customerOrderRelationshipMapping.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/passiveConnection.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/passiveConnection.xml
index d6a7d83885..d6a7d83885 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/passiveConnection.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/passiveConnection.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/staticCustomer.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/staticCustomer.xml
index 78f2409022..78f2409022 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/staticCustomer.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/staticCustomer.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/staticCustomerOrder.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/staticCustomerOrder.xml
index 13e0ae350f..13e0ae350f 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/staticCustomerOrder.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/staticCustomerOrder.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/staticInvalid.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/staticInvalid.xml
index d0571b8a14..d0571b8a14 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/staticInvalid.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/staticInvalid.xml
diff --git a/branches/java-post-M1/das/rdb/src/test/resources/storedProcTest.xml b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/storedProcTest.xml
index 1412aedf7f..1412aedf7f 100644
--- a/branches/java-post-M1/das/rdb/src/test/resources/storedProcTest.xml
+++ b/sca-java-1.x/branches/java-post-M1/das/rdb/src/test/resources/storedProcTest.xml