moving das branches

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

317 files changed, 0 insertions, 0 deletions

diff --git a/branches/das-java-beta1/distribution/binary/DISCLAIMER b/das-java/branches/das-java-beta1/distribution/binary/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/das-java-beta1/distribution/binary/DISCLAIMER
+++ b/das-java/branches/das-java-beta1/distribution/binary/DISCLAIMER
diff --git a/branches/das-java-beta1/distribution/binary/LICENSE b/das-java/branches/das-java-beta1/distribution/binary/LICENSE
index 1994f84ad9..1994f84ad9 100644
--- a/branches/das-java-beta1/distribution/binary/LICENSE
+++ b/das-java/branches/das-java-beta1/distribution/binary/LICENSE
diff --git a/branches/das-java-beta1/distribution/binary/NOTICE b/das-java/branches/das-java-beta1/distribution/binary/NOTICE
index 506a55781a..506a55781a 100644
--- a/branches/das-java-beta1/distribution/binary/NOTICE
+++ b/das-java/branches/das-java-beta1/distribution/binary/NOTICE
diff --git a/branches/das-java-beta1/distribution/binary/README b/das-java/branches/das-java-beta1/distribution/binary/README
index 8d292cbb06..8d292cbb06 100644
--- a/branches/das-java-beta1/distribution/binary/README
+++ b/das-java/branches/das-java-beta1/distribution/binary/README
diff --git a/branches/das-java-beta1/distribution/binary/RELEASE_NOTES b/das-java/branches/das-java-beta1/distribution/binary/RELEASE_NOTES
index 3f109c6d4d..3f109c6d4d 100644
--- a/branches/das-java-beta1/distribution/binary/RELEASE_NOTES
+++ b/das-java/branches/das-java-beta1/distribution/binary/RELEASE_NOTES
diff --git a/branches/das-java-beta1/distribution/binary/pom.xml b/das-java/branches/das-java-beta1/distribution/binary/pom.xml
index 826f4b80a3..826f4b80a3 100644
--- a/branches/das-java-beta1/distribution/binary/pom.xml
+++ b/das-java/branches/das-java-beta1/distribution/binary/pom.xml
diff --git a/branches/das-java-beta1/distribution/binary/src/main/assembly/das.xml b/das-java/branches/das-java-beta1/distribution/binary/src/main/assembly/das.xml
index eb85cdf90a..eb85cdf90a 100644
--- a/branches/das-java-beta1/distribution/binary/src/main/assembly/das.xml
+++ b/das-java/branches/das-java-beta1/distribution/binary/src/main/assembly/das.xml
diff --git a/branches/das-java-beta1/distribution/source/BUILDING b/das-java/branches/das-java-beta1/distribution/source/BUILDING
index edc05e6cec..edc05e6cec 100644
--- a/branches/das-java-beta1/distribution/source/BUILDING
+++ b/das-java/branches/das-java-beta1/distribution/source/BUILDING
diff --git a/branches/das-java-beta1/distribution/source/DISCLAIMER b/das-java/branches/das-java-beta1/distribution/source/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/das-java-beta1/distribution/source/DISCLAIMER
+++ b/das-java/branches/das-java-beta1/distribution/source/DISCLAIMER
diff --git a/branches/das-java-beta1/distribution/source/LICENSE b/das-java/branches/das-java-beta1/distribution/source/LICENSE
index 1994f84ad9..1994f84ad9 100644
--- a/branches/das-java-beta1/distribution/source/LICENSE
+++ b/das-java/branches/das-java-beta1/distribution/source/LICENSE
diff --git a/branches/das-java-beta1/distribution/source/NOTICE b/das-java/branches/das-java-beta1/distribution/source/NOTICE
index 506a55781a..506a55781a 100644
--- a/branches/das-java-beta1/distribution/source/NOTICE
+++ b/das-java/branches/das-java-beta1/distribution/source/NOTICE
diff --git a/branches/das-java-beta1/distribution/source/README b/das-java/branches/das-java-beta1/distribution/source/README
index 8d292cbb06..8d292cbb06 100644
--- a/branches/das-java-beta1/distribution/source/README
+++ b/das-java/branches/das-java-beta1/distribution/source/README
diff --git a/branches/das-java-beta1/distribution/source/RELEASE_NOTES b/das-java/branches/das-java-beta1/distribution/source/RELEASE_NOTES
index 3f109c6d4d..3f109c6d4d 100644
--- a/branches/das-java-beta1/distribution/source/RELEASE_NOTES
+++ b/das-java/branches/das-java-beta1/distribution/source/RELEASE_NOTES
diff --git a/branches/das-java-beta1/distribution/source/pom.xml b/das-java/branches/das-java-beta1/distribution/source/pom.xml
index d57630ecc9..d57630ecc9 100644
--- a/branches/das-java-beta1/distribution/source/pom.xml
+++ b/das-java/branches/das-java-beta1/distribution/source/pom.xml
diff --git a/branches/das-java-beta1/distribution/source/src/main/assembly/src.xml b/das-java/branches/das-java-beta1/distribution/source/src/main/assembly/src.xml
index 767b76066c..767b76066c 100644
--- a/branches/das-java-beta1/distribution/source/src/main/assembly/src.xml
+++ b/das-java/branches/das-java-beta1/distribution/source/src/main/assembly/src.xml
diff --git a/branches/das-java-beta1/pom.xml b/das-java/branches/das-java-beta1/pom.xml
index 5f5463120a..5f5463120a 100644
--- a/branches/das-java-beta1/pom.xml
+++ b/das-java/branches/das-java-beta1/pom.xml
diff --git a/branches/das-java-beta1/rdb/pom.xml b/das-java/branches/das-java-beta1/rdb/pom.xml
index 3db0262e46..3db0262e46 100644
--- a/branches/das-java-beta1/rdb/pom.xml
+++ b/das-java/branches/das-java-beta1/rdb/pom.xml
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java
index 3c80c34b68..3c80c34b68 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
index 4560c9ea58..4560c9ea58 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java
index 24f2e5ee2e..24f2e5ee2e 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/DAS.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/DAS.java
index 43f1e30d1a..43f1e30d1a 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/DAS.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/DAS.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java
index 313fff225a..313fff225a 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java
index aa18558fce..aa18558fce 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
index b44f7c560f..b44f7c560f 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
index 95e5e78c54..95e5e78c54 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java
index 0e4447bf8b..0e4447bf8b 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java
index ef420eedf2..ef420eedf2 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/exception/DataSourceInitializationException.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/exception/DataSourceInitializationException.java
index 6a644b7ed9..6a644b7ed9 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/exception/DataSourceInitializationException.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/exception/DataSourceInitializationException.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/exception/OptimisticConcurrencyException.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/exception/OptimisticConcurrencyException.java
index dc64d7dc94..dc64d7dc94 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/exception/OptimisticConcurrencyException.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/exception/OptimisticConcurrencyException.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/BaseGenerator.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/BaseGenerator.java
index 05d97723a7..05d97723a7 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/BaseGenerator.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/BaseGenerator.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java
index 8032311bb7..8032311bb7 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java
index 9525f23454..9525f23454 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
index 510db5b845..510db5b845 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java
index 58e1fd3ff0..58e1fd3ff0 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java
index a08f184b9a..a08f184b9a 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
index 54afe95168..54afe95168 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java
index 7a96d7f66a..7a96d7f66a 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java
index 8d3ca88c8e..8d3ca88c8e 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java
index 0455be0c4c..0455be0c4c 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java
index 8dafa3f5e5..8dafa3f5e5 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java
index c7f200cb1e..c7f200cb1e 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java
index c83b0bbfa2..c83b0bbfa2 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java
index 7f92fcd80e..7f92fcd80e 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java
index 42d8751b03..42d8751b03 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java
index 7f3bf5b5a6..7f3bf5b5a6 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
index b19aab85e8..b19aab85e8 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/BaseCommandImpl.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/BaseCommandImpl.java
index d1b990d421..d1b990d421 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/BaseCommandImpl.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/BaseCommandImpl.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java
index c348eae54e..c348eae54e 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java
index 81562dcbd7..81562dcbd7 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java
index 52300e6c9b..52300e6c9b 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java
index 2cc5f906c9..2cc5f906c9 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CollisionParameter.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CollisionParameter.java
index a9cd9b1a40..a9cd9b1a40 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CollisionParameter.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CollisionParameter.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java
index 8c5658935f..8c5658935f 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java
index 76baa8ca0d..76baa8ca0d 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java
index 0163f96686..0163f96686 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASFactoryImpl.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASFactoryImpl.java
index ba80b3bcb5..ba80b3bcb5 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASFactoryImpl.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASFactoryImpl.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java
index 863bb5754d..863bb5754d 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java
index 110fd1bd38..110fd1bd38 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java
index 78e38cee0b..78e38cee0b 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java
index feb7e31411..feb7e31411 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java
index 52935599c1..52935599c1 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java
index bb148635c8..bb148635c8 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java
index 048ee7fef5..048ee7fef5 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java
index e61ccfe21e..e61ccfe21e 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java
index d91200fd03..d91200fd03 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java
index 0a5f6951e9..0a5f6951e9 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java
index 27b653763b..27b653763b 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java
index 3e23faf069..3e23faf069 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java
index bebfba9ce9..bebfba9ce9 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
index defebc6f3e..defebc6f3e 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java
index 861b292bef..861b292bef 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java
index 1038c9a99a..1038c9a99a 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypes.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypes.java
index 2052950272..2052950272 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypes.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypes.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java
index e34069822d..e34069822d 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
index cc637e460a..cc637e460a 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java
index 11a78bb5d1..11a78bb5d1 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java
index e7bb58698c..e7bb58698c 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java
index 1bcf3441b6..1bcf3441b6 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
index ae082976eb..ae082976eb 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
index 3a0c0ac029..3a0c0ac029 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java
index e3ae306485..e3ae306485 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java
diff --git a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java
index b9649669e5..b9649669e5 100644
--- a/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java
+++ b/das-java/branches/das-java-beta1/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java
diff --git a/branches/das-java-beta1/rdb/src/main/resources/META-INF/DISCLAIMER b/das-java/branches/das-java-beta1/rdb/src/main/resources/META-INF/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/das-java-beta1/rdb/src/main/resources/META-INF/DISCLAIMER
+++ b/das-java/branches/das-java-beta1/rdb/src/main/resources/META-INF/DISCLAIMER
diff --git a/branches/das-java-beta1/rdb/src/main/resources/META-INF/LICENSE b/das-java/branches/das-java-beta1/rdb/src/main/resources/META-INF/LICENSE
index 1994f84ad9..1994f84ad9 100644
--- a/branches/das-java-beta1/rdb/src/main/resources/META-INF/LICENSE
+++ b/das-java/branches/das-java-beta1/rdb/src/main/resources/META-INF/LICENSE
diff --git a/branches/das-java-beta1/rdb/src/main/resources/META-INF/NOTICE b/das-java/branches/das-java-beta1/rdb/src/main/resources/META-INF/NOTICE
index e9d98fc7f5..e9d98fc7f5 100644
--- a/branches/das-java-beta1/rdb/src/main/resources/META-INF/NOTICE
+++ b/das-java/branches/das-java-beta1/rdb/src/main/resources/META-INF/NOTICE
diff --git a/branches/das-java-beta1/rdb/src/main/resources/META-INF/README b/das-java/branches/das-java-beta1/rdb/src/main/resources/META-INF/README
index 853d9546db..853d9546db 100644
--- a/branches/das-java-beta1/rdb/src/main/resources/META-INF/README
+++ b/das-java/branches/das-java-beta1/rdb/src/main/resources/META-INF/README
diff --git a/branches/das-java-beta1/rdb/src/main/resources/config.xsd b/das-java/branches/das-java-beta1/rdb/src/main/resources/config.xsd
index 4fb3399310..4fb3399310 100644
--- a/branches/das-java-beta1/rdb/src/main/resources/config.xsd
+++ b/das-java/branches/das-java-beta1/rdb/src/main/resources/config.xsd
diff --git a/branches/das-java-beta1/rdb/src/main/resources/dasmodel4.mdl b/das-java/branches/das-java-beta1/rdb/src/main/resources/dasmodel4.mdl
index 476974975b..476974975b 100644
--- a/branches/das-java-beta1/rdb/src/main/resources/dasmodel4.mdl
+++ b/das-java/branches/das-java-beta1/rdb/src/main/resources/dasmodel4.mdl
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java
index b9226e3e01..b9226e3e01 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java
index bb53cb65e5..bb53cb65e5 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java
index ee42438cb1..ee42438cb1 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java
index 076f8d9db7..076f8d9db7 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java
index 677b0d9d85..677b0d9d85 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyRelationshipTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyRelationshipTests.java
index 5dbe3b697b..5dbe3b697b 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyRelationshipTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyRelationshipTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java
index a24ad6319e..a24ad6319e 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java
index 2429daa13a..2429daa13a 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
index ff2af5256c..ff2af5256c 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java
index e4e46662ee..e4e46662ee 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java
index 2660b7ed43..2660b7ed43 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java
index e66095cdd7..e66095cdd7 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.java
index 45c83e6167..45c83e6167 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java
index a7d483da38..a7d483da38 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
index 23b530dc34..23b530dc34 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ImpliedRelationshipTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ImpliedRelationshipTests.java
index 96a01455f5..96a01455f5 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ImpliedRelationshipTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ImpliedRelationshipTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/KennelTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/KennelTests.java
index b2aa8a8691..b2aa8a8691 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/KennelTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/KennelTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/MultiSchemaTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/MultiSchemaTests.java
index 73543d2bdc..73543d2bdc 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/MultiSchemaTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/MultiSchemaTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java
index 00a417da8d..00a417da8d 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
index 2a58ca0fba..2a58ca0fba 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java
index ccfae70bd5..ccfae70bd5 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java
index 859cc085f6..859cc085f6 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java
index 9f7657ca51..9f7657ca51 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java
index 270f46ddd8..270f46ddd8 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
index 25eff4a578..25eff4a578 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java
index 6fb52ad17d..6fb52ad17d 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java
index 4af085a6a5..4af085a6a5 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
index 2c2eb95e40..2c2eb95e40 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java
index 74cc753911..74cc753911 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java
index ca6174956e..ca6174956e 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java
index 32c60a2760..32c60a2760 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java
index b085906bd0..b085906bd0 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
index d9f880e92d..d9f880e92d 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TransactionTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TransactionTests.java
index 7ae9c9b701..7ae9c9b701 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TransactionTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TransactionTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java
index e6972357f6..e6972357f6 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java
index f98e014ca9..f98e014ca9 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java
index 7a4b8f49dd..7a4b8f49dd 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
index 407a43c21f..407a43c21f 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java
index ba771ca3e5..ba771ca3e5 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java
index 44eea42445..44eea42445 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java
index 632a4d057d..632a4d057d 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java
index 7ce5cf757d..7ce5cf757d 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java
index 0c28ed2caa..0c28ed2caa 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java
index 686e3243cb..686e3243cb 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java
index b1d3fb12b5..b1d3fb12b5 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java
index 9ec6c8003d..9ec6c8003d 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java
index ad8ff14e86..ad8ff14e86 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java
index 2373e9aa88..2373e9aa88 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DogData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DogData.java
index 3c686e6fea..3c686e6fea 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DogData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DogData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java
index 402d62fb67..402d62fb67 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java
index 01423ee40e..01423ee40e 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/MultiSchemaData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/MultiSchemaData.java
index bc59c09fb2..bc59c09fb2 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/MultiSchemaData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/MultiSchemaData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java
index 2568dd1a9f..2568dd1a9f 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java
index 9f5897b373..9f5897b373 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsDescriptionData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsDescriptionData.java
index 068b5a1ff4..068b5a1ff4 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsDescriptionData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsDescriptionData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerData.java
index b5198bce36..b5198bce36 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerDogData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerDogData.java
index a06a2124f3..a06a2124f3 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerDogData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerDogData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java
index ff59b03aef..ff59b03aef 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java
index 713aecb9a3..713aecb9a3 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java
index 0aac15fb7d..0aac15fb7d 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/VisitData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/VisitData.java
index c9cebc7688..c9cebc7688 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/VisitData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/VisitData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DB2Setup.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DB2Setup.java
index 370c1d42d7..370c1d42d7 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DB2Setup.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DB2Setup.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java
index 78b1cf19e1..78b1cf19e1 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
index 0045e10618..0045e10618 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java
index 300f315465..300f315465 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/JavaStoredProcs.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/JavaStoredProcs.java
index 71a7d1c4e4..71a7d1c4e4 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/JavaStoredProcs.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/JavaStoredProcs.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java
index 580f1c5f25..580f1c5f25 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java
index 094fe13456..094fe13456 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java
index 4b91cde06b..4b91cde06b 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java
index 5a329d0b74..5a329d0b74 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java
index 835a2f5e77..835a2f5e77 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/SillyDateStringConverter.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/SillyDateStringConverter.java
index df9d2978eb..df9d2978eb 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/SillyDateStringConverter.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/SillyDateStringConverter.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringObfuscationConverter.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringObfuscationConverter.java
index efea61c7de..efea61c7de 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringObfuscationConverter.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringObfuscationConverter.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToIntegerConverter.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToIntegerConverter.java
index 2be6522fcc..2be6522fcc 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToIntegerConverter.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToIntegerConverter.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToLongConverter.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToLongConverter.java
index a15cef37e6..a15cef37e6 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToLongConverter.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToLongConverter.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
index c35f8e2362..c35f8e2362 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java
index ea8a2ddbaf..ea8a2ddbaf 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java
index 0649fa815c..0649fa815c 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java
index e68aaad8aa..e68aaad8aa 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
index 96d851b5dc..96d851b5dc 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
diff --git a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/util/PrintPropertiesOfDataObject.java b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/util/PrintPropertiesOfDataObject.java
index 897e8d39b3..897e8d39b3 100644
--- a/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/util/PrintPropertiesOfDataObject.java
+++ b/das-java/branches/das-java-beta1/rdb/src/test/java/org/apache/tuscany/das/rdb/test/util/PrintPropertiesOfDataObject.java
diff --git a/branches/das-java-beta1/rdb/src/test/resources/1xM_mapping_no_cud.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/1xM_mapping_no_cud.xml
index 95267de08b..95267de08b 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/1xM_mapping_no_cud.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/1xM_mapping_no_cud.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/BooksConfig.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/BooksConfig.xml
index 2da86cbdb2..2da86cbdb2 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/BooksConfig.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/BooksConfig.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/BooksConfigWithAlias.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/BooksConfigWithAlias.xml
index 91bdccfac5..91bdccfac5 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/BooksConfigWithAlias.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/BooksConfigWithAlias.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/CompanyConfig.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/CompanyConfig.xml
index 793697c314..793697c314 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/CompanyConfig.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/CompanyConfig.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/CompanyEmployeeConfig.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/CompanyEmployeeConfig.xml
index 0e25268afa..0e25268afa 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/CompanyEmployeeConfig.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/CompanyEmployeeConfig.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/CustomerConfig.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/CustomerConfig.xml
index ed544f39dd..ed544f39dd 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/CustomerConfig.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/CustomerConfig.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/CustomerConfigWithConverter.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/CustomerConfigWithConverter.xml
index b38922b53a..b38922b53a 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/CustomerConfigWithConverter.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/CustomerConfigWithConverter.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/CustomerConfigWithConverter2.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/CustomerConfigWithConverter2.xml
index bb49a414c4..bb49a414c4 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/CustomerConfigWithConverter2.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/CustomerConfigWithConverter2.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/CustomerConfigWithIDConverter.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/CustomerConfigWithIDConverter.xml
index 9a567b7ea8..9a567b7ea8 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/CustomerConfigWithIDConverter.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/CustomerConfigWithIDConverter.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/CustomersOrdersConfig.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/CustomersOrdersConfig.xml
index 323c8cb6ba..323c8cb6ba 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/CustomersOrdersConfig.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/CustomersOrdersConfig.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/InvalidConfig1.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/InvalidConfig1.xml
index fa1e353281..fa1e353281 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/InvalidConfig1.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/InvalidConfig1.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/InvalidConverter.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/InvalidConverter.xml
index e6c15ad11f..e6c15ad11f 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/InvalidConverter.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/InvalidConverter.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/ManagedBooksConfig.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/ManagedBooksConfig.xml
index c2b833d2bf..c2b833d2bf 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/ManagedBooksConfig.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/ManagedBooksConfig.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig1.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig1.xml
index 2555a9ed64..2555a9ed64 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig1.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig1.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig12.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig12.xml
index 63ac8230ce..63ac8230ce 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig12.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig12.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig13.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig13.xml
index 6458108a63..6458108a63 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig13.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig13.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig14.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig14.xml
index 4b37a11138..4b37a11138 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig14.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig14.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig2.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig2.xml
index d055735590..d055735590 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig2.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig2.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig3.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig3.xml
index 06727c6a79..06727c6a79 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig3.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig3.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig5.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig5.xml
index 6915c69576..6915c69576 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig5.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig5.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig6.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig6.xml
index fd3d177ad4..fd3d177ad4 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig6.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig6.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig7.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig7.xml
index eab57c759e..eab57c759e 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig7.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig7.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig8.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig8.xml
index 205010c5c6..205010c5c6 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig8.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig8.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig9.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig9.xml
index 84a10531aa..84a10531aa 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig9.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaDasConfig9.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaInvalidDasConfig.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaInvalidDasConfig.xml
index 4658493dbd..4658493dbd 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaInvalidDasConfig.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/MultiSchemaInvalidDasConfig.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/OneToOneRestrictedConfig.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/OneToOneRestrictedConfig.xml
index 82956b5b1d..82956b5b1d 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/OneToOneRestrictedConfig.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/OneToOneRestrictedConfig.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/OrderDetailsAndDescription.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/OrderDetailsAndDescription.xml
index d5bc8d44a8..d5bc8d44a8 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/OrderDetailsAndDescription.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/OrderDetailsAndDescription.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/OrdersOrderDetailsConfig.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
index 2e998ee57e..2e998ee57e 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/PartsConfig.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/PartsConfig.xml
index b1809079d6..b1809079d6 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/PartsConfig.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/PartsConfig.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/basicCompanyDepartmentMapping.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
index bd648cd2ef..bd648cd2ef 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/basicCompanyMapping.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/basicCompanyMapping.xml
index b6ca4f9feb..b6ca4f9feb 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/basicCompanyMapping.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/basicCompanyMapping.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/basicCustomerMapping.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/basicCustomerMapping.xml
index a81ca90f8e..a81ca90f8e 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/basicCustomerMapping.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/basicCustomerMapping.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/basicCustomerMappingWithCUD.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
index c3e31c1d98..c3e31c1d98 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml
index 8673559b5d..8673559b5d 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
index 5d63fb2fab..5d63fb2fab 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/basicCustomerOrderMapping.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/basicCustomerOrderMapping.xml
index c03d9392ed..c03d9392ed 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/basicCustomerOrderMapping.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/basicCustomerOrderMapping.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/basicStaticCustomer.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/basicStaticCustomer.xml
index c4b4fe56af..c4b4fe56af 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/basicStaticCustomer.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/basicStaticCustomer.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/cityStates.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/cityStates.xml
index 1908ba4268..1908ba4268 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/cityStates.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/cityStates.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/company.xsd b/das-java/branches/das-java-beta1/rdb/src/test/resources/company.xsd
index a7118ec808..a7118ec808 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/company.xsd
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/company.xsd
diff --git a/branches/das-java-beta1/rdb/src/test/resources/companyMapping.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/companyMapping.xml
index 9388cf8264..9388cf8264 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/companyMapping.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/companyMapping.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/companyMappingWithConverters.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/companyMappingWithConverters.xml
index 74c6e0619f..74c6e0619f 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/companyMappingWithConverters.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/companyMappingWithConverters.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/companyMappingWithResultDescriptor.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/companyMappingWithResultDescriptor.xml
index 419f27eca3..419f27eca3 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/companyMappingWithResultDescriptor.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/companyMappingWithResultDescriptor.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/customer.xsd b/das-java/branches/das-java-beta1/rdb/src/test/resources/customer.xsd
index e5482ae3a0..e5482ae3a0 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/customer.xsd
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/customer.xsd
diff --git a/branches/das-java-beta1/rdb/src/test/resources/customerMapping.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/customerMapping.xml
index 3de367e0c6..3de367e0c6 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/customerMapping.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/customerMapping.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/customerOrderRelationshipMapping.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/customerOrderRelationshipMapping.xml
index ed931e03cd..ed931e03cd 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/customerOrderRelationshipMapping.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/customerOrderRelationshipMapping.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/passiveConnection.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/passiveConnection.xml
index 6a23200d49..6a23200d49 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/passiveConnection.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/passiveConnection.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/staticCustomer.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/staticCustomer.xml
index 705e4b34a9..705e4b34a9 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/staticCustomer.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/staticCustomer.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/staticCustomerOrder.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/staticCustomerOrder.xml
index afbe2a8cfb..afbe2a8cfb 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/staticCustomerOrder.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/staticCustomerOrder.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/staticInvalid.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/staticInvalid.xml
index 965c99717f..965c99717f 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/staticInvalid.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/staticInvalid.xml
diff --git a/branches/das-java-beta1/rdb/src/test/resources/storedProcTest.xml b/das-java/branches/das-java-beta1/rdb/src/test/resources/storedProcTest.xml
index beb1ca34ac..beb1ca34ac 100644
--- a/branches/das-java-beta1/rdb/src/test/resources/storedProcTest.xml
+++ b/das-java/branches/das-java-beta1/rdb/src/test/resources/storedProcTest.xml
diff --git a/branches/das-java-beta1/samples/Readme.htm b/das-java/branches/das-java-beta1/samples/Readme.htm
index 1c4d3ba340..1c4d3ba340 100644
--- a/branches/das-java-beta1/samples/Readme.htm
+++ b/das-java/branches/das-java-beta1/samples/Readme.htm
diff --git a/branches/das-java-beta1/samples/build.xml b/das-java/branches/das-java-beta1/samples/build.xml
index f78ca9a3c8..f78ca9a3c8 100644
--- a/branches/das-java-beta1/samples/build.xml
+++ b/das-java/branches/das-java-beta1/samples/build.xml
diff --git a/branches/das-java-beta1/samples/companyweb/build.xml b/das-java/branches/das-java-beta1/samples/companyweb/build.xml
index dd269b628e..dd269b628e 100644
--- a/branches/das-java-beta1/samples/companyweb/build.xml
+++ b/das-java/branches/das-java-beta1/samples/companyweb/build.xml
diff --git a/branches/das-java-beta1/samples/companyweb/pom.xml b/das-java/branches/das-java-beta1/samples/companyweb/pom.xml
index 77689e1536..77689e1536 100644
--- a/branches/das-java-beta1/samples/companyweb/pom.xml
+++ b/das-java/branches/das-java-beta1/samples/companyweb/pom.xml
diff --git a/branches/das-java-beta1/samples/companyweb/readme.htm b/das-java/branches/das-java-beta1/samples/companyweb/readme.htm
index c6cde3238c..c6cde3238c 100644
--- a/branches/das-java-beta1/samples/companyweb/readme.htm
+++ b/das-java/branches/das-java-beta1/samples/companyweb/readme.htm
diff --git a/branches/das-java-beta1/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java b/das-java/branches/das-java-beta1/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java
index d0519ecc08..d0519ecc08 100644
--- a/branches/das-java-beta1/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java
+++ b/das-java/branches/das-java-beta1/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java
diff --git a/branches/das-java-beta1/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyDBInit.java b/das-java/branches/das-java-beta1/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyDBInit.java
index be1ebf628f..be1ebf628f 100644
--- a/branches/das-java-beta1/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyDBInit.java
+++ b/das-java/branches/das-java-beta1/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyDBInit.java
diff --git a/branches/das-java-beta1/samples/companyweb/src/main/resources/CompanyConfig.xml b/das-java/branches/das-java-beta1/samples/companyweb/src/main/resources/CompanyConfig.xml
index a674724323..a674724323 100644
--- a/branches/das-java-beta1/samples/companyweb/src/main/resources/CompanyConfig.xml
+++ b/das-java/branches/das-java-beta1/samples/companyweb/src/main/resources/CompanyConfig.xml
diff --git a/branches/das-java-beta1/samples/companyweb/src/main/resources/CompanyWebDBConfig.xml b/das-java/branches/das-java-beta1/samples/companyweb/src/main/resources/CompanyWebDBConfig.xml
index c064045fd5..c064045fd5 100644
--- a/branches/das-java-beta1/samples/companyweb/src/main/resources/CompanyWebDBConfig.xml
+++ b/das-java/branches/das-java-beta1/samples/companyweb/src/main/resources/CompanyWebDBConfig.xml
diff --git a/branches/das-java-beta1/samples/companyweb/src/main/resources/META-INF/LICENSE b/das-java/branches/das-java-beta1/samples/companyweb/src/main/resources/META-INF/LICENSE
index 1994f84ad9..1994f84ad9 100644
--- a/branches/das-java-beta1/samples/companyweb/src/main/resources/META-INF/LICENSE
+++ b/das-java/branches/das-java-beta1/samples/companyweb/src/main/resources/META-INF/LICENSE
diff --git a/branches/das-java-beta1/samples/companyweb/src/main/resources/META-INF/NOTICE b/das-java/branches/das-java-beta1/samples/companyweb/src/main/resources/META-INF/NOTICE
index e9d98fc7f5..e9d98fc7f5 100644
--- a/branches/das-java-beta1/samples/companyweb/src/main/resources/META-INF/NOTICE
+++ b/das-java/branches/das-java-beta1/samples/companyweb/src/main/resources/META-INF/NOTICE
diff --git a/branches/das-java-beta1/samples/companyweb/src/main/resources/META-INF/README b/das-java/branches/das-java-beta1/samples/companyweb/src/main/resources/META-INF/README
index 107de8c3ca..107de8c3ca 100644
--- a/branches/das-java-beta1/samples/companyweb/src/main/resources/META-INF/README
+++ b/das-java/branches/das-java-beta1/samples/companyweb/src/main/resources/META-INF/README
diff --git a/branches/das-java-beta1/samples/companyweb/src/main/resources/log4j.properties b/das-java/branches/das-java-beta1/samples/companyweb/src/main/resources/log4j.properties
index ab4ebbb785..ab4ebbb785 100644
--- a/branches/das-java-beta1/samples/companyweb/src/main/resources/log4j.properties
+++ b/das-java/branches/das-java-beta1/samples/companyweb/src/main/resources/log4j.properties
diff --git a/branches/das-java-beta1/samples/companyweb/src/main/webapp/Company.jsp b/das-java/branches/das-java-beta1/samples/companyweb/src/main/webapp/Company.jsp
index 9b74f0a357..9b74f0a357 100644
--- a/branches/das-java-beta1/samples/companyweb/src/main/webapp/Company.jsp
+++ b/das-java/branches/das-java-beta1/samples/companyweb/src/main/webapp/Company.jsp
diff --git a/branches/das-java-beta1/samples/companyweb/src/main/webapp/META-INF/context.xml b/das-java/branches/das-java-beta1/samples/companyweb/src/main/webapp/META-INF/context.xml
index 5f0af32dd5..5f0af32dd5 100644
--- a/branches/das-java-beta1/samples/companyweb/src/main/webapp/META-INF/context.xml
+++ b/das-java/branches/das-java-beta1/samples/companyweb/src/main/webapp/META-INF/context.xml
diff --git a/branches/das-java-beta1/samples/companyweb/src/main/webapp/WEB-INF/web.xml b/das-java/branches/das-java-beta1/samples/companyweb/src/main/webapp/WEB-INF/web.xml
index a0abb6a655..a0abb6a655 100644
--- a/branches/das-java-beta1/samples/companyweb/src/main/webapp/WEB-INF/web.xml
+++ b/das-java/branches/das-java-beta1/samples/companyweb/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/das-java-beta1/samples/customer/build.xml b/das-java/branches/das-java-beta1/samples/customer/build.xml
index f1b8b68be7..f1b8b68be7 100644
--- a/branches/das-java-beta1/samples/customer/build.xml
+++ b/das-java/branches/das-java-beta1/samples/customer/build.xml
diff --git a/branches/das-java-beta1/samples/customer/pom.xml b/das-java/branches/das-java-beta1/samples/customer/pom.xml
index 321d7e7860..321d7e7860 100644
--- a/branches/das-java-beta1/samples/customer/pom.xml
+++ b/das-java/branches/das-java-beta1/samples/customer/pom.xml
diff --git a/branches/das-java-beta1/samples/customer/readme.htm b/das-java/branches/das-java-beta1/samples/customer/readme.htm
index 3e7fbe7752..3e7fbe7752 100644
--- a/branches/das-java-beta1/samples/customer/readme.htm
+++ b/das-java/branches/das-java-beta1/samples/customer/readme.htm
diff --git a/branches/das-java-beta1/samples/customer/src/main/java/org/apache/tuscany/samples/das/customer/CustomerClient.java b/das-java/branches/das-java-beta1/samples/customer/src/main/java/org/apache/tuscany/samples/das/customer/CustomerClient.java
index b9557f0f9e..b9557f0f9e 100644
--- a/branches/das-java-beta1/samples/customer/src/main/java/org/apache/tuscany/samples/das/customer/CustomerClient.java
+++ b/das-java/branches/das-java-beta1/samples/customer/src/main/java/org/apache/tuscany/samples/das/customer/CustomerClient.java
diff --git a/branches/das-java-beta1/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DB2Setup.java b/das-java/branches/das-java-beta1/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DB2Setup.java
index 97cda531bb..97cda531bb 100644
--- a/branches/das-java-beta1/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DB2Setup.java
+++ b/das-java/branches/das-java-beta1/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DB2Setup.java
diff --git a/branches/das-java-beta1/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DatabaseSetup.java b/das-java/branches/das-java-beta1/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DatabaseSetup.java
index 4195dbcac7..4195dbcac7 100644
--- a/branches/das-java-beta1/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DatabaseSetup.java
+++ b/das-java/branches/das-java-beta1/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DatabaseSetup.java
diff --git a/branches/das-java-beta1/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DerbySetup.java b/das-java/branches/das-java-beta1/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DerbySetup.java
index 18a9c4de91..18a9c4de91 100644
--- a/branches/das-java-beta1/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DerbySetup.java
+++ b/das-java/branches/das-java-beta1/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/DerbySetup.java
diff --git a/branches/das-java-beta1/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/MySQLSetup.java b/das-java/branches/das-java-beta1/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/MySQLSetup.java
index a10f2aa7c3..a10f2aa7c3 100644
--- a/branches/das-java-beta1/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/MySQLSetup.java
+++ b/das-java/branches/das-java-beta1/samples/customer/src/main/java/org/apache/tuscany/samples/das/databaseSetup/MySQLSetup.java
diff --git a/branches/das-java-beta1/samples/customer/src/main/resources/Customers.xml b/das-java/branches/das-java-beta1/samples/customer/src/main/resources/Customers.xml
index a8b1a0010e..a8b1a0010e 100644
--- a/branches/das-java-beta1/samples/customer/src/main/resources/Customers.xml
+++ b/das-java/branches/das-java-beta1/samples/customer/src/main/resources/Customers.xml
diff --git a/branches/das-java-beta1/samples/customer/src/main/resources/META-INF/LICENSE b/das-java/branches/das-java-beta1/samples/customer/src/main/resources/META-INF/LICENSE
index 93a9cd2937..93a9cd2937 100644
--- a/branches/das-java-beta1/samples/customer/src/main/resources/META-INF/LICENSE
+++ b/das-java/branches/das-java-beta1/samples/customer/src/main/resources/META-INF/LICENSE
diff --git a/branches/das-java-beta1/samples/customer/src/main/resources/META-INF/NOTICE b/das-java/branches/das-java-beta1/samples/customer/src/main/resources/META-INF/NOTICE
index c2cf1f95b4..c2cf1f95b4 100644
--- a/branches/das-java-beta1/samples/customer/src/main/resources/META-INF/NOTICE
+++ b/das-java/branches/das-java-beta1/samples/customer/src/main/resources/META-INF/NOTICE
diff --git a/branches/das-java-beta1/samples/customer/src/main/resources/META-INF/README b/das-java/branches/das-java-beta1/samples/customer/src/main/resources/META-INF/README
index d1905ee3e8..d1905ee3e8 100644
--- a/branches/das-java-beta1/samples/customer/src/main/resources/META-INF/README
+++ b/das-java/branches/das-java-beta1/samples/customer/src/main/resources/META-INF/README
diff --git a/branches/das-java-beta1/samples/dbconfig/pom.xml b/das-java/branches/das-java-beta1/samples/dbconfig/pom.xml
index ae4847ad4e..ae4847ad4e 100644
--- a/branches/das-java-beta1/samples/dbconfig/pom.xml
+++ b/das-java/branches/das-java-beta1/samples/dbconfig/pom.xml
diff --git a/branches/das-java-beta1/samples/dbconfig/readme.html b/das-java/branches/das-java-beta1/samples/dbconfig/readme.html
index 3c5d7b8b86..3c5d7b8b86 100644
--- a/branches/das-java-beta1/samples/dbconfig/readme.html
+++ b/das-java/branches/das-java-beta1/samples/dbconfig/readme.html
diff --git a/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConfigUtil.java b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConfigUtil.java
index 12e37422eb..12e37422eb 100644
--- a/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConfigUtil.java
+++ b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConfigUtil.java
diff --git a/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConnectionHelper.java b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConnectionHelper.java
index 55f54f8f69..55f54f8f69 100644
--- a/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConnectionHelper.java
+++ b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBConnectionHelper.java
diff --git a/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBDataHelper.java b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBDataHelper.java
index 2ef25bdf81..2ef25bdf81 100644
--- a/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBDataHelper.java
+++ b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBDataHelper.java
diff --git a/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBHelper.java b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBHelper.java
index d048f73245..d048f73245 100644
--- a/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBHelper.java
+++ b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBHelper.java
diff --git a/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializer.java b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializer.java
index cc6a670dfd..cc6a670dfd 100644
--- a/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializer.java
+++ b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializer.java
diff --git a/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DataSourceInitializationException.java b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DataSourceInitializationException.java
index ef5bef7761..ef5bef7761 100644
--- a/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DataSourceInitializationException.java
+++ b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DataSourceInitializationException.java
diff --git a/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DatabaseInitializerException.java b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DatabaseInitializerException.java
index 8c4fd0d71b..8c4fd0d71b 100644
--- a/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DatabaseInitializerException.java
+++ b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/java/org/apache/tuscany/das/rdb/dbconfig/DatabaseInitializerException.java
diff --git a/branches/das-java-beta1/samples/dbconfig/src/main/resources/CannedSampleDBConfig.xml b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/resources/CannedSampleDBConfig.xml
index 2b7b1ba1fd..2b7b1ba1fd 100644
--- a/branches/das-java-beta1/samples/dbconfig/src/main/resources/CannedSampleDBConfig.xml
+++ b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/resources/CannedSampleDBConfig.xml
diff --git a/branches/das-java-beta1/samples/dbconfig/src/main/resources/DBConfig.xsd b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/resources/DBConfig.xsd
index 798c88c75c..798c88c75c 100644
--- a/branches/das-java-beta1/samples/dbconfig/src/main/resources/DBConfig.xsd
+++ b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/resources/DBConfig.xsd
diff --git a/branches/das-java-beta1/samples/dbconfig/src/main/resources/META-INF/LICENSE b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/resources/META-INF/LICENSE
index 93a9cd2937..93a9cd2937 100644
--- a/branches/das-java-beta1/samples/dbconfig/src/main/resources/META-INF/LICENSE
+++ b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/resources/META-INF/LICENSE
diff --git a/branches/das-java-beta1/samples/dbconfig/src/main/resources/META-INF/NOTICE b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/resources/META-INF/NOTICE
index c2cf1f95b4..c2cf1f95b4 100644
--- a/branches/das-java-beta1/samples/dbconfig/src/main/resources/META-INF/NOTICE
+++ b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/resources/META-INF/NOTICE
diff --git a/branches/das-java-beta1/samples/dbconfig/src/main/resources/META-INF/README b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/resources/META-INF/README
index 723f3fd3ab..723f3fd3ab 100644
--- a/branches/das-java-beta1/samples/dbconfig/src/main/resources/META-INF/README
+++ b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/resources/META-INF/README
diff --git a/branches/das-java-beta1/samples/dbconfig/src/main/resources/log4j.properties b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/resources/log4j.properties
index 3b0e5074da..3b0e5074da 100644
--- a/branches/das-java-beta1/samples/dbconfig/src/main/resources/log4j.properties
+++ b/das-java/branches/das-java-beta1/samples/dbconfig/src/main/resources/log4j.properties
diff --git a/branches/das-java-beta1/samples/dbconfig/src/test/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializerTestCase.java b/das-java/branches/das-java-beta1/samples/dbconfig/src/test/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializerTestCase.java
index 3bd0bae407..3bd0bae407 100644
--- a/branches/das-java-beta1/samples/dbconfig/src/test/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializerTestCase.java
+++ b/das-java/branches/das-java-beta1/samples/dbconfig/src/test/java/org/apache/tuscany/das/rdb/dbconfig/DBInitializerTestCase.java
diff --git a/branches/das-java-beta1/samples/dbconfig/src/test/resources/dbConfig.xml b/das-java/branches/das-java-beta1/samples/dbconfig/src/test/resources/dbConfig.xml
index 18eb5b429d..18eb5b429d 100644
--- a/branches/das-java-beta1/samples/dbconfig/src/test/resources/dbConfig.xml
+++ b/das-java/branches/das-java-beta1/samples/dbconfig/src/test/resources/dbConfig.xml
diff --git a/branches/das-java-beta1/samples/pom.xml b/das-java/branches/das-java-beta1/samples/pom.xml
index 9ed4b83589..9ed4b83589 100644
--- a/branches/das-java-beta1/samples/pom.xml
+++ b/das-java/branches/das-java-beta1/samples/pom.xml
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/build.xml b/das-java/branches/das-java-beta1/samples/sample-ajax-das/build.xml
index e8d9d5fbdf..e8d9d5fbdf 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/build.xml
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/build.xml
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/pom.xml b/das-java/branches/das-java-beta1/samples/sample-ajax-das/pom.xml
index 8affbee668..8affbee668 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/pom.xml
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/pom.xml
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/readme.htm b/das-java/branches/das-java-beta1/samples/sample-ajax-das/readme.htm
index 7c9adbb0d4..7c9adbb0d4 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/readme.htm
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/readme.htm
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java
index 45809a7748..45809a7748 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/DASQueryProcessor.java
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/SillyDateStringConverter.java b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/SillyDateStringConverter.java
index f1fe21cfd4..f1fe21cfd4 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/SillyDateStringConverter.java
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/SillyDateStringConverter.java
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/StringToLongConverter.java b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/StringToLongConverter.java
index fc26164191..fc26164191 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/StringToLongConverter.java
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/StringToLongConverter.java
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/util/XmlUtil.java b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/util/XmlUtil.java
index 9a615fa33c..9a615fa33c 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/util/XmlUtil.java
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/das/util/XmlUtil.java
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/web/CommandServlet.java b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/web/CommandServlet.java
index 26a1f468a7..26a1f468a7 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/web/CommandServlet.java
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/web/CommandServlet.java
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/web/ServiceProcessor.java b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/web/ServiceProcessor.java
index aefebb8808..aefebb8808 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/web/ServiceProcessor.java
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/java/org/apache/tuscany/samples/web/ServiceProcessor.java
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/AjaxDBConfig.xml b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/AjaxDBConfig.xml
index f172c089c9..f172c089c9 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/AjaxDBConfig.xml
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/AjaxDBConfig.xml
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/CustomerConfigWithConverter.xml b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/CustomerConfigWithConverter.xml
index 0ef0c5b9b1..0ef0c5b9b1 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/CustomerConfigWithConverter.xml
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/CustomerConfigWithConverter.xml
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/CustomerConfigWithIDConverter.xml b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/CustomerConfigWithIDConverter.xml
index f26082a340..f26082a340 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/CustomerConfigWithIDConverter.xml
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/CustomerConfigWithIDConverter.xml
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/DasConfig.xml b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/DasConfig.xml
index 69ac31895c..69ac31895c 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/DasConfig.xml
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/DasConfig.xml
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/META-INF/LICENSE b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/META-INF/LICENSE
index 93a9cd2937..93a9cd2937 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/META-INF/LICENSE
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/META-INF/LICENSE
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/META-INF/NOTICE b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/META-INF/NOTICE
index c2cf1f95b4..c2cf1f95b4 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/META-INF/NOTICE
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/META-INF/NOTICE
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/META-INF/README b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/META-INF/README
index d1905ee3e8..d1905ee3e8 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/META-INF/README
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/META-INF/README
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/log4j.properties b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/log4j.properties
index 7f18e4dc72..7f18e4dc72 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/log4j.properties
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/resources/log4j.properties
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/META-INF/context.xml b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/META-INF/context.xml
index e2da613636..e2da613636 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/META-INF/context.xml
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/META-INF/context.xml
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/WEB-INF/tld/c.tld b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/WEB-INF/tld/c.tld
index 22698c97dc..22698c97dc 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/WEB-INF/tld/c.tld
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/WEB-INF/tld/c.tld
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/WEB-INF/tld/fmt.tld b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/WEB-INF/tld/fmt.tld
index 3b9a54a87d..3b9a54a87d 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/WEB-INF/tld/fmt.tld
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/WEB-INF/tld/fmt.tld
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/WEB-INF/web.xml b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/WEB-INF/web.xml
index c60d36566b..c60d36566b 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/WEB-INF/web.xml
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/html/DASWebSampleFrame.html b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/html/DASWebSampleFrame.html
index 49f913eaec..49f913eaec 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/html/DASWebSampleFrame.html
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/html/DASWebSampleFrame.html
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/html/blank.html b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/html/blank.html
index 0bc2a49864..0bc2a49864 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/html/blank.html
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/html/blank.html
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/js/ajax.js b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/js/ajax.js
index c0b0be5e54..c0b0be5e54 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/js/ajax.js
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/js/ajax.js
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/js/dasmenu.js b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/js/dasmenu.js
index 96b5d5288e..96b5d5288e 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/js/dasmenu.js
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/js/dasmenu.js
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/DASMenu.jsp b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/DASMenu.jsp
index 041e05c8bb..041e05c8bb 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/DASMenu.jsp
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/DASMenu.jsp
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/converter.jsp b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/converter.jsp
index a3610e7639..a3610e7639 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/converter.jsp
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/converter.jsp
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/default.css b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/default.css
index 5680fab9ed..5680fab9ed 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/default.css
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/default.css
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/indexAdhoc.jsp b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/indexAdhoc.jsp
index f212d744f1..f212d744f1 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/indexAdhoc.jsp
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/indexAdhoc.jsp
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/indexCommand.jsp b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/indexCommand.jsp
index 55dcb56e38..55dcb56e38 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/indexCommand.jsp
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/indexCommand.jsp
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/main.css b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/main.css
index 264facc985..264facc985 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/main.css
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/main.css
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/occ.jsp b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/occ.jsp
index ed5a7ee0c1..ed5a7ee0c1 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/occ.jsp
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/occ.jsp
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/rss.jsp b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/rss.jsp
index 2d217d68b3..2d217d68b3 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/rss.jsp
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/jsp/rss.jsp
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/xsl/company.xsl b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/xsl/company.xsl
index 2a0934cb26..2a0934cb26 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/xsl/company.xsl
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/xsl/company.xsl
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/xsl/companyDepartment.xsl b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/xsl/companyDepartment.xsl
index 173dfd5791..173dfd5791 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/xsl/companyDepartment.xsl
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/xsl/companyDepartment.xsl
diff --git a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/xsl/customer.xsl b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/xsl/customer.xsl
index b53ceb3b3f..b53ceb3b3f 100644
--- a/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/xsl/customer.xsl
+++ b/das-java/branches/das-java-beta1/samples/sample-ajax-das/src/main/webapp/xsl/customer.xsl
diff --git a/branches/das-java-beta1/samples/testing/tomcat/build.xml b/das-java/branches/das-java-beta1/samples/testing/tomcat/build.xml
index ddd7eca0cc..ddd7eca0cc 100644
--- a/branches/das-java-beta1/samples/testing/tomcat/build.xml
+++ b/das-java/branches/das-java-beta1/samples/testing/tomcat/build.xml
diff --git a/branches/das-java-beta1/samples/testing/tomcat/companyweb/pom.xml b/das-java/branches/das-java-beta1/samples/testing/tomcat/companyweb/pom.xml
index ec1c42f68d..ec1c42f68d 100644
--- a/branches/das-java-beta1/samples/testing/tomcat/companyweb/pom.xml
+++ b/das-java/branches/das-java-beta1/samples/testing/tomcat/companyweb/pom.xml
diff --git a/branches/das-java-beta1/samples/testing/tomcat/companyweb/src/main/resources/META-INF/LICENSE b/das-java/branches/das-java-beta1/samples/testing/tomcat/companyweb/src/main/resources/META-INF/LICENSE
index 1994f84ad9..1994f84ad9 100644
--- a/branches/das-java-beta1/samples/testing/tomcat/companyweb/src/main/resources/META-INF/LICENSE
+++ b/das-java/branches/das-java-beta1/samples/testing/tomcat/companyweb/src/main/resources/META-INF/LICENSE
diff --git a/branches/das-java-beta1/samples/testing/tomcat/companyweb/src/main/resources/META-INF/NOTICE b/das-java/branches/das-java-beta1/samples/testing/tomcat/companyweb/src/main/resources/META-INF/NOTICE
index e9d98fc7f5..e9d98fc7f5 100644
--- a/branches/das-java-beta1/samples/testing/tomcat/companyweb/src/main/resources/META-INF/NOTICE
+++ b/das-java/branches/das-java-beta1/samples/testing/tomcat/companyweb/src/main/resources/META-INF/NOTICE
diff --git a/branches/das-java-beta1/samples/testing/tomcat/companyweb/src/main/resources/META-INF/README b/das-java/branches/das-java-beta1/samples/testing/tomcat/companyweb/src/main/resources/META-INF/README
index 9b26d1690a..9b26d1690a 100644
--- a/branches/das-java-beta1/samples/testing/tomcat/companyweb/src/main/resources/META-INF/README
+++ b/das-java/branches/das-java-beta1/samples/testing/tomcat/companyweb/src/main/resources/META-INF/README
diff --git a/branches/das-java-beta1/samples/testing/tomcat/companyweb/src/test/java/org/apache/tuscany/test/das/DasTestCase.java b/das-java/branches/das-java-beta1/samples/testing/tomcat/companyweb/src/test/java/org/apache/tuscany/test/das/DasTestCase.java
index fe34ee9a31..fe34ee9a31 100644
--- a/branches/das-java-beta1/samples/testing/tomcat/companyweb/src/test/java/org/apache/tuscany/test/das/DasTestCase.java
+++ b/das-java/branches/das-java-beta1/samples/testing/tomcat/companyweb/src/test/java/org/apache/tuscany/test/das/DasTestCase.java
diff --git a/branches/das-java-beta1/samples/testing/tomcat/context.xsl b/das-java/branches/das-java-beta1/samples/testing/tomcat/context.xsl
index 35a78a43a5..35a78a43a5 100644
--- a/branches/das-java-beta1/samples/testing/tomcat/context.xsl
+++ b/das-java/branches/das-java-beta1/samples/testing/tomcat/context.xsl
diff --git a/branches/das-java-beta1/samples/testing/tomcat/datasource.xsl b/das-java/branches/das-java-beta1/samples/testing/tomcat/datasource.xsl
index ffd17f3271..ffd17f3271 100644
--- a/branches/das-java-beta1/samples/testing/tomcat/datasource.xsl
+++ b/das-java/branches/das-java-beta1/samples/testing/tomcat/datasource.xsl
diff --git a/branches/das-java-beta1/samples/testing/tomcat/pom.xml b/das-java/branches/das-java-beta1/samples/testing/tomcat/pom.xml
index 58f6da2c3f..58f6da2c3f 100644
--- a/branches/das-java-beta1/samples/testing/tomcat/pom.xml
+++ b/das-java/branches/das-java-beta1/samples/testing/tomcat/pom.xml
diff --git a/branches/das-java-beta1/samples/testing/tomcat/readme.htm b/das-java/branches/das-java-beta1/samples/testing/tomcat/readme.htm
index e7fd28a4ac..e7fd28a4ac 100644
--- a/branches/das-java-beta1/samples/testing/tomcat/readme.htm
+++ b/das-java/branches/das-java-beta1/samples/testing/tomcat/readme.htm
diff --git a/branches/das-java-beta1/samples/testing/tomcat/sample-ajax-das/pom.xml b/das-java/branches/das-java-beta1/samples/testing/tomcat/sample-ajax-das/pom.xml
index 26b995aa0f..26b995aa0f 100644
--- a/branches/das-java-beta1/samples/testing/tomcat/sample-ajax-das/pom.xml
+++ b/das-java/branches/das-java-beta1/samples/testing/tomcat/sample-ajax-das/pom.xml
diff --git a/branches/das-java-beta1/samples/testing/tomcat/sample-ajax-das/src/main/resources/META-INF/LICENSE b/das-java/branches/das-java-beta1/samples/testing/tomcat/sample-ajax-das/src/main/resources/META-INF/LICENSE
index 93a9cd2937..93a9cd2937 100644
--- a/branches/das-java-beta1/samples/testing/tomcat/sample-ajax-das/src/main/resources/META-INF/LICENSE
+++ b/das-java/branches/das-java-beta1/samples/testing/tomcat/sample-ajax-das/src/main/resources/META-INF/LICENSE
diff --git a/branches/das-java-beta1/samples/testing/tomcat/sample-ajax-das/src/main/resources/META-INF/NOTICE b/das-java/branches/das-java-beta1/samples/testing/tomcat/sample-ajax-das/src/main/resources/META-INF/NOTICE
index c2cf1f95b4..c2cf1f95b4 100644
--- a/branches/das-java-beta1/samples/testing/tomcat/sample-ajax-das/src/main/resources/META-INF/NOTICE
+++ b/das-java/branches/das-java-beta1/samples/testing/tomcat/sample-ajax-das/src/main/resources/META-INF/NOTICE
diff --git a/branches/das-java-beta1/samples/testing/tomcat/sample-ajax-das/src/main/resources/META-INF/README b/das-java/branches/das-java-beta1/samples/testing/tomcat/sample-ajax-das/src/main/resources/META-INF/README
index 723f3fd3ab..723f3fd3ab 100644
--- a/branches/das-java-beta1/samples/testing/tomcat/sample-ajax-das/src/main/resources/META-INF/README
+++ b/das-java/branches/das-java-beta1/samples/testing/tomcat/sample-ajax-das/src/main/resources/META-INF/README
diff --git a/branches/das-java-beta1/samples/testing/tomcat/sample-ajax-das/src/test/java/org/apache/tuscany/test/das/AjaxDasTestCase.java b/das-java/branches/das-java-beta1/samples/testing/tomcat/sample-ajax-das/src/test/java/org/apache/tuscany/test/das/AjaxDasTestCase.java
index cfe261f3dd..cfe261f3dd 100644
--- a/branches/das-java-beta1/samples/testing/tomcat/sample-ajax-das/src/test/java/org/apache/tuscany/test/das/AjaxDasTestCase.java
+++ b/das-java/branches/das-java-beta1/samples/testing/tomcat/sample-ajax-das/src/test/java/org/apache/tuscany/test/das/AjaxDasTestCase.java
diff --git a/branches/das-java-beta1/samples/testing/tomcat/server.xsl b/das-java/branches/das-java-beta1/samples/testing/tomcat/server.xsl
index b53d1d50c7..b53d1d50c7 100644
--- a/branches/das-java-beta1/samples/testing/tomcat/server.xsl
+++ b/das-java/branches/das-java-beta1/samples/testing/tomcat/server.xsl