summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-02 22:22:47 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-02 22:22:47 +0000
commitd0e86aec253c57f94e4ebcdb2c417a825daafe3b (patch)
tree6c7cefe221bd8ef7e7f673ad98108f2e6a4a0907
parentc6103c7c9a6b6971d2aa0b8e3997608cb5f2c36f (diff)
moving das branches
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@832145 13f79535-47bb-0310-9956-ffa450edef68
Diffstat
-rw-r--r--das-java/branches/das-java-M2/BUILDING.txt (renamed from branches/das-java-M2/BUILDING.txt)0
-rw-r--r--das-java/branches/das-java-M2/LICENSE.txt (renamed from branches/das-java-M2/LICENSE.txt)0
-rw-r--r--das-java/branches/das-java-M2/NOTICE.txt (renamed from branches/das-java-M2/NOTICE.txt)0
-rw-r--r--das-java/branches/das-java-M2/README.txt (renamed from branches/das-java-M2/README.txt)0
-rw-r--r--das-java/branches/das-java-M2/RELEASE_NOTES.txt (renamed from branches/das-java-M2/RELEASE_NOTES.txt)0
-rw-r--r--das-java/branches/das-java-M2/STATUS.txt (renamed from branches/das-java-M2/STATUS.txt)0
-rw-r--r--das-java/branches/das-java-M2/distribution/binary/LICENSE.txt (renamed from branches/das-java-M2/distribution/binary/LICENSE.txt)0
-rw-r--r--das-java/branches/das-java-M2/distribution/binary/NOTICE.txt (renamed from branches/das-java-M2/distribution/binary/NOTICE.txt)0
-rw-r--r--das-java/branches/das-java-M2/distribution/binary/README.txt (renamed from branches/das-java-M2/distribution/binary/README.txt)0
-rw-r--r--das-java/branches/das-java-M2/distribution/binary/RELEASE_NOTES.txt (renamed from branches/das-java-M2/distribution/binary/RELEASE_NOTES.txt)0
-rw-r--r--das-java/branches/das-java-M2/distribution/binary/STATUS.txt (renamed from branches/das-java-M2/distribution/binary/STATUS.txt)0
-rw-r--r--das-java/branches/das-java-M2/distribution/binary/pom.xml (renamed from branches/das-java-M2/distribution/binary/pom.xml)0
-rw-r--r--das-java/branches/das-java-M2/distribution/binary/src/main/assembly/das.xml (renamed from branches/das-java-M2/distribution/binary/src/main/assembly/das.xml)0
-rw-r--r--das-java/branches/das-java-M2/distribution/samples/LICENSE.txt (renamed from branches/das-java-M2/distribution/samples/LICENSE.txt)0
-rw-r--r--das-java/branches/das-java-M2/distribution/samples/NOTICE.txt (renamed from branches/das-java-M2/distribution/samples/NOTICE.txt)0
-rw-r--r--das-java/branches/das-java-M2/distribution/samples/RELEASE_NOTES.txt (renamed from branches/das-java-M2/distribution/samples/RELEASE_NOTES.txt)0
-rw-r--r--das-java/branches/das-java-M2/distribution/samples/STATUS.txt (renamed from branches/das-java-M2/distribution/samples/STATUS.txt)0
-rw-r--r--das-java/branches/das-java-M2/distribution/samples/pom.xml (renamed from branches/das-java-M2/distribution/samples/pom.xml)0
-rw-r--r--das-java/branches/das-java-M2/distribution/samples/src/main/assembly/das-samples.xml (renamed from branches/das-java-M2/distribution/samples/src/main/assembly/das-samples.xml)0
-rw-r--r--das-java/branches/das-java-M2/pom.xml (renamed from branches/das-java-M2/pom.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/pom.xml (renamed from branches/das-java-M2/rdb/pom.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/DAS.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/DAS.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/BaseGenerator.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/BaseGenerator.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/BaseCommandImpl.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/BaseCommandImpl.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASFactoryImpl.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASFactoryImpl.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypes.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypes.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerFactory.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerFactory.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerLayout.java (renamed from branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerLayout.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/resources/META-INF/LICENSE.txt (renamed from branches/das-java-M2/rdb/src/main/resources/META-INF/LICENSE.txt)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/resources/META-INF/MANIFEST.MF (renamed from branches/das-java-M2/rdb/src/main/resources/META-INF/MANIFEST.MF)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/resources/META-INF/NOTICE (renamed from branches/das-java-M2/rdb/src/main/resources/META-INF/NOTICE)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/resources/META-INF/README.txt (renamed from branches/das-java-M2/rdb/src/main/resources/META-INF/README.txt)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/resources/config.xsd (renamed from branches/das-java-M2/rdb/src/main/resources/config.xsd)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/main/resources/dasmodel4.mdl (renamed from branches/das-java-M2/rdb/src/main/resources/dasmodel4.mdl)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ImpliedRelationshipTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ImpliedRelationshipTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/KennelTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/KennelTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DogData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DogData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerDogData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerDogData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/VisitData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/VisitData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DB2Setup.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DB2Setup.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/JavaStoredProcs.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/JavaStoredProcs.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/SillyDateStringConverter.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/SillyDateStringConverter.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToIntegerConverter.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToIntegerConverter.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToLongConverter.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToLongConverter.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java (renamed from branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/1xM_mapping_no_cud.xml (renamed from branches/das-java-M2/rdb/src/test/resources/1xM_mapping_no_cud.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/BooksConfig.xml (renamed from branches/das-java-M2/rdb/src/test/resources/BooksConfig.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/BooksConfigWithAlias.xml (renamed from branches/das-java-M2/rdb/src/test/resources/BooksConfigWithAlias.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/CompanyConfig.xml (renamed from branches/das-java-M2/rdb/src/test/resources/CompanyConfig.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/CompanyEmployeeConfig.xml (renamed from branches/das-java-M2/rdb/src/test/resources/CompanyEmployeeConfig.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/CustomerConfigWithConverter.xml (renamed from branches/das-java-M2/rdb/src/test/resources/CustomerConfigWithConverter.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/CustomerConfigWithIDConverter.xml (renamed from branches/das-java-M2/rdb/src/test/resources/CustomerConfigWithIDConverter.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/CustomersOrdersConfig.xml (renamed from branches/das-java-M2/rdb/src/test/resources/CustomersOrdersConfig.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/InvalidConfig1.xml (renamed from branches/das-java-M2/rdb/src/test/resources/InvalidConfig1.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/InvalidConverter.xml (renamed from branches/das-java-M2/rdb/src/test/resources/InvalidConverter.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/ManagedBooksConfig.xml (renamed from branches/das-java-M2/rdb/src/test/resources/ManagedBooksConfig.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/OneToOneRestrictedConfig.xml (renamed from branches/das-java-M2/rdb/src/test/resources/OneToOneRestrictedConfig.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/OrdersOrderDetailsConfig.xml (renamed from branches/das-java-M2/rdb/src/test/resources/OrdersOrderDetailsConfig.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/PartsConfig.xml (renamed from branches/das-java-M2/rdb/src/test/resources/PartsConfig.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/basicCompanyDepartmentMapping.xml (renamed from branches/das-java-M2/rdb/src/test/resources/basicCompanyDepartmentMapping.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/basicCompanyMapping.xml (renamed from branches/das-java-M2/rdb/src/test/resources/basicCompanyMapping.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/basicCustomerMapping.xml (renamed from branches/das-java-M2/rdb/src/test/resources/basicCustomerMapping.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/basicCustomerMappingWithCUD.xml (renamed from branches/das-java-M2/rdb/src/test/resources/basicCustomerMappingWithCUD.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml (renamed from branches/das-java-M2/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml (renamed from branches/das-java-M2/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/basicCustomerOrderMapping.xml (renamed from branches/das-java-M2/rdb/src/test/resources/basicCustomerOrderMapping.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/basicStaticCustomer.xml (renamed from branches/das-java-M2/rdb/src/test/resources/basicStaticCustomer.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/cityStates.xml (renamed from branches/das-java-M2/rdb/src/test/resources/cityStates.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/company.xsd (renamed from branches/das-java-M2/rdb/src/test/resources/company.xsd)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/companyMapping.xml (renamed from branches/das-java-M2/rdb/src/test/resources/companyMapping.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/companyMappingWithConverters.xml (renamed from branches/das-java-M2/rdb/src/test/resources/companyMappingWithConverters.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/customer.xsd (renamed from branches/das-java-M2/rdb/src/test/resources/customer.xsd)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/customerMapping.xml (renamed from branches/das-java-M2/rdb/src/test/resources/customerMapping.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/customerOrderRelationshipMapping.xml (renamed from branches/das-java-M2/rdb/src/test/resources/customerOrderRelationshipMapping.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/passiveConnection.xml (renamed from branches/das-java-M2/rdb/src/test/resources/passiveConnection.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/staticCustomer.xml (renamed from branches/das-java-M2/rdb/src/test/resources/staticCustomer.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/staticCustomerOrder.xml (renamed from branches/das-java-M2/rdb/src/test/resources/staticCustomerOrder.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/staticInvalid.xml (renamed from branches/das-java-M2/rdb/src/test/resources/staticInvalid.xml)0
-rw-r--r--das-java/branches/das-java-M2/rdb/src/test/resources/storedProcTest.xml (renamed from branches/das-java-M2/rdb/src/test/resources/storedProcTest.xml)0
-rw-r--r--das-java/branches/das-java-M2/samples/build.xml (renamed from branches/das-java-M2/samples/build.xml)0
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/build.xml (renamed from branches/das-java-M2/samples/companyweb/build.xml)0
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/db.lck (renamed from branches/das-java-M2/samples/companyweb/dastest/db.lck)bin38 -> 38 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/log/log.ctrl (renamed from branches/das-java-M2/samples/companyweb/dastest/log/log.ctrl)bin48 -> 48 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/log/log1.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/log/log1.dat)bin1048576 -> 1048576 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/log/logmirror.ctrl (renamed from branches/das-java-M2/samples/companyweb/dastest/log/logmirror.ctrl)bin48 -> 48 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c10.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c10.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c101.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c101.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c111.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c111.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c121.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c121.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c130.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c130.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c141.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c141.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c150.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c150.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c161.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c161.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c171.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c171.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c180.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c180.dat)bin24576 -> 24576 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c191.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c191.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c1a1.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c1a1.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c1b1.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c1b1.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c1c0.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c1c0.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c1d1.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c1d1.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c1e0.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c1e0.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c1f1.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c1f1.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c20.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c20.dat)bin24576 -> 24576 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c200.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c200.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c211.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c211.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c221.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c221.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c230.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c230.dat)bin86016 -> 86016 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c241.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c241.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c251.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c251.dat)bin12288 -> 12288 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c260.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c260.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c271.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c271.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c281.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c281.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c290.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c290.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c2a1.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c2a1.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c2b1.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c2b1.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c2c1.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c2c1.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c2d0.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c2d0.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c2e1.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c2e1.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c2f0.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c2f0.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c300.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c300.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c31.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c31.dat)bin16384 -> 16384 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c311.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c311.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c320.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c320.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c331.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c331.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c340.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c340.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c351.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c351.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c360.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c360.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c371.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c371.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c380.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c380.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c391.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c391.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c3a0.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c3a0.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c3b1.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c3b1.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c3c0.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c3c0.dat)bin24576 -> 24576 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c3d1.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c3d1.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c3e0.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c3e0.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c3f1.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c3f1.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c400.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c400.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c41.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c41.dat)bin16384 -> 16384 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c411.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c411.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c420.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c420.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c431.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c431.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c440.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c440.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c451.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c451.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c460.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c460.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c471.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c471.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c481.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c481.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c490.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c490.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c4a1.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c4a1.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c51.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c51.dat)bin16384 -> 16384 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c60.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c60.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c71.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c71.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c81.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c81.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c90.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/c90.dat)bin20480 -> 20480 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/ca1.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/ca1.dat)bin24576 -> 24576 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/cb1.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/cb1.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/cc0.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/cc0.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/cd1.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/cd1.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/ce1.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/ce1.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/cf0.dat (renamed from branches/das-java-M2/samples/companyweb/dastest/seg0/cf0.dat)bin8192 -> 8192 bytes
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/dastest/service.properties (renamed from branches/das-java-M2/samples/companyweb/dastest/service.properties)0
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/pom.xml (renamed from branches/das-java-M2/samples/companyweb/pom.xml)0
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/readme.htm (renamed from branches/das-java-M2/samples/companyweb/readme.htm)0
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java (renamed from branches/das-java-M2/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java)0
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/src/main/resources/CompanyConfig.xml (renamed from branches/das-java-M2/samples/companyweb/src/main/resources/CompanyConfig.xml)0
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/LICENSE.txt (renamed from branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/LICENSE.txt)0
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/NOTICE (renamed from branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/NOTICE)0
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/README.txt (renamed from branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/README.txt)0
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/src/main/resources/log4j.properties (renamed from branches/das-java-M2/samples/companyweb/src/main/resources/log4j.properties)0
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/src/main/webapp/Company.jsp (renamed from branches/das-java-M2/samples/companyweb/src/main/webapp/Company.jsp)0
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/src/main/webapp/META-INF/context.xml (renamed from branches/das-java-M2/samples/companyweb/src/main/webapp/META-INF/context.xml)0
-rw-r--r--das-java/branches/das-java-M2/samples/companyweb/src/main/webapp/WEB-INF/web.xml (renamed from branches/das-java-M2/samples/companyweb/src/main/webapp/WEB-INF/web.xml)0
-rw-r--r--das-java/branches/das-java-M2/samples/pom.xml (renamed from branches/das-java-M2/samples/pom.xml)0
-rw-r--r--das-java/branches/das-java-M2/samples/testing/tomcat/build.xml (renamed from branches/das-java-M2/samples/testing/tomcat/build.xml)0
-rw-r--r--das-java/branches/das-java-M2/samples/testing/tomcat/companyweb/pom.xml (renamed from branches/das-java-M2/samples/testing/tomcat/companyweb/pom.xml)0
-rw-r--r--das-java/branches/das-java-M2/samples/testing/tomcat/companyweb/src/main/resources/META-INF/LICENSE.txt (renamed from branches/das-java-M2/samples/testing/tomcat/companyweb/src/main/resources/META-INF/LICENSE.txt)0
-rw-r--r--das-java/branches/das-java-M2/samples/testing/tomcat/companyweb/src/main/resources/META-INF/NOTICE (renamed from branches/das-java-M2/samples/testing/tomcat/companyweb/src/main/resources/META-INF/NOTICE)0
-rw-r--r--das-java/branches/das-java-M2/samples/testing/tomcat/companyweb/src/main/resources/META-INF/README.txt (renamed from branches/das-java-M2/samples/testing/tomcat/companyweb/src/main/resources/META-INF/README.txt)0
-rw-r--r--das-java/branches/das-java-M2/samples/testing/tomcat/companyweb/src/test/java/org/apache/tuscany/test/das/DasTestCase.java (renamed from branches/das-java-M2/samples/testing/tomcat/companyweb/src/test/java/org/apache/tuscany/test/das/DasTestCase.java)0
-rw-r--r--das-java/branches/das-java-M2/samples/testing/tomcat/context.xsl (renamed from branches/das-java-M2/samples/testing/tomcat/context.xsl)0
-rw-r--r--das-java/branches/das-java-M2/samples/testing/tomcat/datasource.xsl (renamed from branches/das-java-M2/samples/testing/tomcat/datasource.xsl)0
-rw-r--r--das-java/branches/das-java-M2/samples/testing/tomcat/pom.xml (renamed from branches/das-java-M2/samples/testing/tomcat/pom.xml)0
-rw-r--r--das-java/branches/das-java-M2/samples/testing/tomcat/readme.htm (renamed from branches/das-java-M2/samples/testing/tomcat/readme.htm)0
-rw-r--r--das-java/branches/das-java-M2/samples/testing/tomcat/server.xsl (renamed from branches/das-java-M2/samples/testing/tomcat/server.xsl)0
303 files changed, 0 insertions, 0 deletions
diff --git a/branches/das-java-M2/BUILDING.txt b/das-java/branches/das-java-M2/BUILDING.txt
index 934e991641..934e991641 100644
--- a/branches/das-java-M2/BUILDING.txt
+++ b/das-java/branches/das-java-M2/BUILDING.txt
diff --git a/branches/das-java-M2/LICENSE.txt b/das-java/branches/das-java-M2/LICENSE.txt
index 75b52484ea..75b52484ea 100644
--- a/branches/das-java-M2/LICENSE.txt
+++ b/das-java/branches/das-java-M2/LICENSE.txt
diff --git a/branches/das-java-M2/NOTICE.txt b/das-java/branches/das-java-M2/NOTICE.txt
index 59f0b4314f..59f0b4314f 100644
--- a/branches/das-java-M2/NOTICE.txt
+++ b/das-java/branches/das-java-M2/NOTICE.txt
diff --git a/branches/das-java-M2/README.txt b/das-java/branches/das-java-M2/README.txt
index b2634b42ed..b2634b42ed 100644
--- a/branches/das-java-M2/README.txt
+++ b/das-java/branches/das-java-M2/README.txt
diff --git a/branches/das-java-M2/RELEASE_NOTES.txt b/das-java/branches/das-java-M2/RELEASE_NOTES.txt
index a116778476..a116778476 100644
--- a/branches/das-java-M2/RELEASE_NOTES.txt
+++ b/das-java/branches/das-java-M2/RELEASE_NOTES.txt
diff --git a/branches/das-java-M2/STATUS.txt b/das-java/branches/das-java-M2/STATUS.txt
index 24a37ea606..24a37ea606 100644
--- a/branches/das-java-M2/STATUS.txt
+++ b/das-java/branches/das-java-M2/STATUS.txt
diff --git a/branches/das-java-M2/distribution/binary/LICENSE.txt b/das-java/branches/das-java-M2/distribution/binary/LICENSE.txt
index d645695673..d645695673 100644
--- a/branches/das-java-M2/distribution/binary/LICENSE.txt
+++ b/das-java/branches/das-java-M2/distribution/binary/LICENSE.txt
diff --git a/branches/das-java-M2/distribution/binary/NOTICE.txt b/das-java/branches/das-java-M2/distribution/binary/NOTICE.txt
index f1aa4f1921..f1aa4f1921 100644
--- a/branches/das-java-M2/distribution/binary/NOTICE.txt
+++ b/das-java/branches/das-java-M2/distribution/binary/NOTICE.txt
diff --git a/branches/das-java-M2/distribution/binary/README.txt b/das-java/branches/das-java-M2/distribution/binary/README.txt
index d6827f6719..d6827f6719 100644
--- a/branches/das-java-M2/distribution/binary/README.txt
+++ b/das-java/branches/das-java-M2/distribution/binary/README.txt
diff --git a/branches/das-java-M2/distribution/binary/RELEASE_NOTES.txt b/das-java/branches/das-java-M2/distribution/binary/RELEASE_NOTES.txt
index a116778476..a116778476 100644
--- a/branches/das-java-M2/distribution/binary/RELEASE_NOTES.txt
+++ b/das-java/branches/das-java-M2/distribution/binary/RELEASE_NOTES.txt
diff --git a/branches/das-java-M2/distribution/binary/STATUS.txt b/das-java/branches/das-java-M2/distribution/binary/STATUS.txt
index 24a37ea606..24a37ea606 100644
--- a/branches/das-java-M2/distribution/binary/STATUS.txt
+++ b/das-java/branches/das-java-M2/distribution/binary/STATUS.txt
diff --git a/branches/das-java-M2/distribution/binary/pom.xml b/das-java/branches/das-java-M2/distribution/binary/pom.xml
index ffd7fbd4fb..ffd7fbd4fb 100644
--- a/branches/das-java-M2/distribution/binary/pom.xml
+++ b/das-java/branches/das-java-M2/distribution/binary/pom.xml
diff --git a/branches/das-java-M2/distribution/binary/src/main/assembly/das.xml b/das-java/branches/das-java-M2/distribution/binary/src/main/assembly/das.xml
index 82b3492a7b..82b3492a7b 100644
--- a/branches/das-java-M2/distribution/binary/src/main/assembly/das.xml
+++ b/das-java/branches/das-java-M2/distribution/binary/src/main/assembly/das.xml
diff --git a/branches/das-java-M2/distribution/samples/LICENSE.txt b/das-java/branches/das-java-M2/distribution/samples/LICENSE.txt
index d645695673..d645695673 100644
--- a/branches/das-java-M2/distribution/samples/LICENSE.txt
+++ b/das-java/branches/das-java-M2/distribution/samples/LICENSE.txt
diff --git a/branches/das-java-M2/distribution/samples/NOTICE.txt b/das-java/branches/das-java-M2/distribution/samples/NOTICE.txt
index f1aa4f1921..f1aa4f1921 100644
--- a/branches/das-java-M2/distribution/samples/NOTICE.txt
+++ b/das-java/branches/das-java-M2/distribution/samples/NOTICE.txt
diff --git a/branches/das-java-M2/distribution/samples/RELEASE_NOTES.txt b/das-java/branches/das-java-M2/distribution/samples/RELEASE_NOTES.txt
index a116778476..a116778476 100644
--- a/branches/das-java-M2/distribution/samples/RELEASE_NOTES.txt
+++ b/das-java/branches/das-java-M2/distribution/samples/RELEASE_NOTES.txt
diff --git a/branches/das-java-M2/distribution/samples/STATUS.txt b/das-java/branches/das-java-M2/distribution/samples/STATUS.txt
index 24a37ea606..24a37ea606 100644
--- a/branches/das-java-M2/distribution/samples/STATUS.txt
+++ b/das-java/branches/das-java-M2/distribution/samples/STATUS.txt
diff --git a/branches/das-java-M2/distribution/samples/pom.xml b/das-java/branches/das-java-M2/distribution/samples/pom.xml
index f73645eaa6..f73645eaa6 100644
--- a/branches/das-java-M2/distribution/samples/pom.xml
+++ b/das-java/branches/das-java-M2/distribution/samples/pom.xml
diff --git a/branches/das-java-M2/distribution/samples/src/main/assembly/das-samples.xml b/das-java/branches/das-java-M2/distribution/samples/src/main/assembly/das-samples.xml
index 4cb2fabb03..4cb2fabb03 100644
--- a/branches/das-java-M2/distribution/samples/src/main/assembly/das-samples.xml
+++ b/das-java/branches/das-java-M2/distribution/samples/src/main/assembly/das-samples.xml
diff --git a/branches/das-java-M2/pom.xml b/das-java/branches/das-java-M2/pom.xml
index cfa5129504..cfa5129504 100644
--- a/branches/das-java-M2/pom.xml
+++ b/das-java/branches/das-java-M2/pom.xml
diff --git a/branches/das-java-M2/rdb/pom.xml b/das-java/branches/das-java-M2/rdb/pom.xml
index 5f93bd014d..5f93bd014d 100644
--- a/branches/das-java-M2/rdb/pom.xml
+++ b/das-java/branches/das-java-M2/rdb/pom.xml
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java
index 3c80c34b68..3c80c34b68 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/Command.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
index 04d450b020..04d450b020 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/ConfigHelper.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java
index 24f2e5ee2e..24f2e5ee2e 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/Converter.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/DAS.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/DAS.java
index 43f1e30d1a..43f1e30d1a 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/DAS.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/DAS.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java
index a0e38ab7cf..a0e38ab7cf 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/DASFactory.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java
index aa18558fce..aa18558fce 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/Pager.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
index cca0db6c07..cca0db6c07 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/MappingWrapper.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
index 19824e4e99..19824e4e99 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/QualifiedColumn.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java
index 0e4447bf8b..0e4447bf8b 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/RelationshipWrapper.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java
index 82961861e2..82961861e2 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/config/wrapper/TableWrapper.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/BaseGenerator.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/BaseGenerator.java
index 05d97723a7..05d97723a7 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/BaseGenerator.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/BaseGenerator.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java
index 30a222634b..30a222634b 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/DeleteGenerator.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java
index 5fda043253..5fda043253 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/InsertGenerator.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
index e2c62fd6ee..e2c62fd6ee 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/generator/impl/UpdateGenerator.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java
index d92da316ea..d92da316ea 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DataObjectMaker.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java
index a08f184b9a..a08f184b9a 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/DefaultConverter.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
index 54afe95168..54afe95168 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/GraphBuilderMetadata.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java
index f7de59f1a1..f7de59f1a1 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/MultiTableRegistry.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java
index 09e1a98d9d..09e1a98d9d 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultMetadata.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java
index 74a4627fa1..74a4627fa1 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetProcessor.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java
index 12a3e4b47f..12a3e4b47f 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/ResultSetRow.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java
index 64809f7996..64809f7996 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/RowObjects.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java
index 72040e9834..72040e9834 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/SingleTableRegistry.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java
index 35bfb591bd..35bfb591bd 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableData.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java
index 60759c90f4..60759c90f4 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/impl/TableRegistry.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java
index 1fb45243d0..1fb45243d0 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/graphbuilder/schema/ResultSetTypeMap.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
index c3b4617e7f..c3b4617e7f 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ApplyChangesCommandImpl.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/BaseCommandImpl.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/BaseCommandImpl.java
index d1b990d421..d1b990d421 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/BaseCommandImpl.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/BaseCommandImpl.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java
index c6628d3456..c6628d3456 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeFactory.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java
index ca44591213..ca44591213 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeOperation.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java
index 49785b423d..49785b423d 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ChangeSummarizer.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java
index 2cc5f906c9..2cc5f906c9 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Changes.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java
index 8c5658935f..8c5658935f 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CommandImpl.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java
index d3a2c77844..d3a2c77844 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ConnectionImpl.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java
index 0163f96686..0163f96686 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/CreateOperation.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASFactoryImpl.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASFactoryImpl.java
index ba80b3bcb5..ba80b3bcb5 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASFactoryImpl.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASFactoryImpl.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java
index 55f8e2c83b..55f8e2c83b 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DASImpl.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java
index de42b595b4..de42b595b4 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DatabaseObject.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java
index 78e38cee0b..78e38cee0b 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteCommandImpl.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java
index feb7e31411..feb7e31411 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteList.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java
index 52935599c1..52935599c1 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/DeleteOperation.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java
index 9e4a4b47b5..9e4a4b47b5 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/FactoryRegistry.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java
index 048ee7fef5..048ee7fef5 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertCommandImpl.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java
index dea65feb3c..dea65feb3c 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/InsertList.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java
index d91200fd03..d91200fd03 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ManagedParameterImpl.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java
index a1ced26ecf..a1ced26ecf 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/OptimisticWriteCommandImpl.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java
index 27b653763b..27b653763b 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/PagerImpl.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java
index 3e23faf069..3e23faf069 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ParameterImpl.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java
index 3f38687942..3f38687942 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Parameters.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
index 725285048d..725285048d 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ReadCommandImpl.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java
index a47b7cd7be..a47b7cd7be 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/ResultSetShape.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java
index 1038c9a99a..1038c9a99a 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypeHelper.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypes.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypes.java
index 2052950272..2052950272 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypes.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SDODataTypes.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java
index 676fb215b6..676fb215b6 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/SPCommandImpl.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
index 4740684fbc..4740684fbc 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/Statement.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java
index 11a78bb5d1..11a78bb5d1 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateCommandImpl.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java
index e7bb58698c..e7bb58698c 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateList.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java
index 1bcf3441b6..1bcf3441b6 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/UpdateOperation.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
index a1efe3afee..a1efe3afee 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/impl/WriteCommandImpl.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
index a3389b9721..a3389b9721 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/merge/impl/GraphMerger.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java
index e3ae306485..e3ae306485 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/ConfigUtil.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java
index b9649669e5..b9649669e5 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/DataObjectUtil.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerFactory.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerFactory.java
index bcd4386415..bcd4386415 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerFactory.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerFactory.java
diff --git a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerLayout.java b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerLayout.java
index f34330be48..f34330be48 100644
--- a/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerLayout.java
+++ b/das-java/branches/das-java-M2/rdb/src/main/java/org/apache/tuscany/das/rdb/util/LoggerLayout.java
diff --git a/branches/das-java-M2/rdb/src/main/resources/META-INF/LICENSE.txt b/das-java/branches/das-java-M2/rdb/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/das-java-M2/rdb/src/main/resources/META-INF/LICENSE.txt
+++ b/das-java/branches/das-java-M2/rdb/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/das-java-M2/rdb/src/main/resources/META-INF/MANIFEST.MF b/das-java/branches/das-java-M2/rdb/src/main/resources/META-INF/MANIFEST.MF
index cfdce9ed00..cfdce9ed00 100644
--- a/branches/das-java-M2/rdb/src/main/resources/META-INF/MANIFEST.MF
+++ b/das-java/branches/das-java-M2/rdb/src/main/resources/META-INF/MANIFEST.MF
diff --git a/branches/das-java-M2/rdb/src/main/resources/META-INF/NOTICE b/das-java/branches/das-java-M2/rdb/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/das-java-M2/rdb/src/main/resources/META-INF/NOTICE
+++ b/das-java/branches/das-java-M2/rdb/src/main/resources/META-INF/NOTICE
diff --git a/branches/das-java-M2/rdb/src/main/resources/META-INF/README.txt b/das-java/branches/das-java-M2/rdb/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/das-java-M2/rdb/src/main/resources/META-INF/README.txt
+++ b/das-java/branches/das-java-M2/rdb/src/main/resources/META-INF/README.txt
diff --git a/branches/das-java-M2/rdb/src/main/resources/config.xsd b/das-java/branches/das-java-M2/rdb/src/main/resources/config.xsd
index 41d440dadd..41d440dadd 100644
--- a/branches/das-java-M2/rdb/src/main/resources/config.xsd
+++ b/das-java/branches/das-java-M2/rdb/src/main/resources/config.xsd
diff --git a/branches/das-java-M2/rdb/src/main/resources/dasmodel4.mdl b/das-java/branches/das-java-M2/rdb/src/main/resources/dasmodel4.mdl
index 476974975b..476974975b 100644
--- a/branches/das-java-M2/rdb/src/main/resources/dasmodel4.mdl
+++ b/das-java/branches/das-java-M2/rdb/src/main/resources/dasmodel4.mdl
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java
index b9226e3e01..b9226e3e01 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/AliasTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java
index bb53cb65e5..bb53cb65e5 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/BestPracticeTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java
index ee42438cb1..ee42438cb1 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CUDGeneration.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java
index 076f8d9db7..076f8d9db7 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CommandGroupTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java
index 677b0d9d85..677b0d9d85 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompanyTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java
index a24ad6319e..a24ad6319e 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CompoundKeyTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java
index e8a4593602..e8a4593602 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ConverterTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
index ff2af5256c..ff2af5256c 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CorrectedDefectTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java
index a888fbd818..a888fbd818 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/CrudWithChangeHistory.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java
index 4c5f128db5..4c5f128db5 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/DefectTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java
index e66095cdd7..e66095cdd7 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ExceptionTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.java
index 45c83e6167..45c83e6167 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedCommandTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java
index f339ea2634..f339ea2634 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GeneratedId.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
index 23b530dc34..23b530dc34 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/GraphMergeTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ImpliedRelationshipTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ImpliedRelationshipTests.java
index 96a01455f5..96a01455f5 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ImpliedRelationshipTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ImpliedRelationshipTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/KennelTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/KennelTests.java
index b2aa8a8691..b2aa8a8691 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/KennelTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/KennelTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java
index 425995a68b..425995a68b 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OCCTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
index 2a58ca0fba..2a58ca0fba 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OneToOneRelationshipTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java
index ccfae70bd5..ccfae70bd5 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/OperationOrderingTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java
index f84d84c0bc..f84d84c0bc 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/Paging.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java
index e43d773ada..e43d773ada 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PartialUpdateTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java
index 270f46ddd8..270f46ddd8 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/PassiveConnectionTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
index 7f44399187..7f44399187 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ProgrammaticConfigTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java
index 6fb52ad17d..6fb52ad17d 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ReadDBSchemaTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java
index 4af085a6a5..4af085a6a5 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RecursiveTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
index 426b5fbbf0..426b5fbbf0 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/RelationshipTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java
index b259fc4e2d..b259fc4e2d 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/ResultSetShapeTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java
index ca6174956e..ca6174956e 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SerializationTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java
index 32c60a2760..32c60a2760 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/SimplestCrud.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java
index b085906bd0..b085906bd0 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/StoredProcs.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
index d9f880e92d..d9f880e92d 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TopDown.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java
index e6972357f6..e6972357f6 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/TypeTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java
index f98e014ca9..f98e014ca9 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersByLastnameCommand.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java
index 7a4b8f49dd..7a4b8f49dd 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersCommand.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
index 407a43c21f..407a43c21f 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersStaticTypesCommand.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java
index ba771ca3e5..ba771ca3e5 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/ReadCustomersWithShapeCommand.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java
index 44eea42445..44eea42445 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/commands/SimpleReadCustomersWithShapeCommand.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java
index 632a4d057d..632a4d057d 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/BookData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java
index 7ce5cf757d..7ce5cf757d 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CityData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java
index 0c28ed2caa..0c28ed2caa 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java
index 686e3243cb..686e3243cb 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyDeptData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java
index b1d3fb12b5..b1d3fb12b5 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CompanyEmpData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java
index 9ec6c8003d..9ec6c8003d 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/CustomerData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java
index ad8ff14e86..ad8ff14e86 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepEmpData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java
index 906a30cc06..906a30cc06 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DepartmentData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DogData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DogData.java
index 3c686e6fea..3c686e6fea 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DogData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/DogData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java
index 8c53dea790..8c53dea790 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/EmployeeData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java
index 01423ee40e..01423ee40e 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/KennelData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java
index 2568dd1a9f..2568dd1a9f 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java
index 9f5897b373..9f5897b373 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OrderDetailsData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerData.java
index b5198bce36..b5198bce36 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerDogData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerDogData.java
index a06a2124f3..a06a2124f3 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerDogData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/OwnerDogData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java
index ff59b03aef..ff59b03aef 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/PartData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java
index 713aecb9a3..713aecb9a3 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/StateData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java
index 0aac15fb7d..0aac15fb7d 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/TypesData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/VisitData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/VisitData.java
index c9cebc7688..c9cebc7688 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/VisitData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/data/VisitData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DB2Setup.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DB2Setup.java
index 370c1d42d7..370c1d42d7 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DB2Setup.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DB2Setup.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java
index 78b1cf19e1..78b1cf19e1 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DasTest.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
index 9cc012e830..9cc012e830 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DatabaseSetup.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java
index 300f315465..300f315465 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/DerbySetup.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/JavaStoredProcs.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/JavaStoredProcs.java
index 71a7d1c4e4..71a7d1c4e4 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/JavaStoredProcs.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/JavaStoredProcs.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java
index 5b1a205523..5b1a205523 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/MySQLSetup.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java
index 094fe13456..094fe13456 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/RelationshipData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java
index ca1eaf7f37..ca1eaf7f37 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestData.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java
index c2ddb27ffd..c2ddb27ffd 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/framework/TestDataWithExplicitColumns.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java
index 835a2f5e77..835a2f5e77 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/IntegerToBooleanConverter.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/SillyDateStringConverter.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/SillyDateStringConverter.java
index df9d2978eb..df9d2978eb 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/SillyDateStringConverter.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/SillyDateStringConverter.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToIntegerConverter.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToIntegerConverter.java
index 2be6522fcc..2be6522fcc 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToIntegerConverter.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToIntegerConverter.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToLongConverter.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToLongConverter.java
index a15cef37e6..a15cef37e6 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToLongConverter.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/mappings/StringToLongConverter.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
index 806e152c24..806e152c24 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllCommonTests.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java
index ea8a2ddbaf..ea8a2ddbaf 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDB2.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java
index 0649fa815c..0649fa815c 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsDerby.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java
index e68aaad8aa..e68aaad8aa 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/suites/AllTestsMySQL.java
diff --git a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
index 96d851b5dc..96d851b5dc 100644
--- a/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
+++ b/das-java/branches/das-java-M2/rdb/src/test/java/org/apache/tuscany/das/rdb/test/typed/SimplestStaticCrud.java
diff --git a/branches/das-java-M2/rdb/src/test/resources/1xM_mapping_no_cud.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/1xM_mapping_no_cud.xml
index 2d80da8b1a..2d80da8b1a 100644
--- a/branches/das-java-M2/rdb/src/test/resources/1xM_mapping_no_cud.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/1xM_mapping_no_cud.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/BooksConfig.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/BooksConfig.xml
index 7771d18c11..7771d18c11 100644
--- a/branches/das-java-M2/rdb/src/test/resources/BooksConfig.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/BooksConfig.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/BooksConfigWithAlias.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/BooksConfigWithAlias.xml
index a8ff03297b..a8ff03297b 100644
--- a/branches/das-java-M2/rdb/src/test/resources/BooksConfigWithAlias.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/BooksConfigWithAlias.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/CompanyConfig.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/CompanyConfig.xml
index f0a11c554d..f0a11c554d 100644
--- a/branches/das-java-M2/rdb/src/test/resources/CompanyConfig.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/CompanyConfig.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/CompanyEmployeeConfig.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/CompanyEmployeeConfig.xml
index 7de98dffbd..7de98dffbd 100644
--- a/branches/das-java-M2/rdb/src/test/resources/CompanyEmployeeConfig.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/CompanyEmployeeConfig.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/CustomerConfigWithConverter.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/CustomerConfigWithConverter.xml
index 8ba6ab3e92..8ba6ab3e92 100644
--- a/branches/das-java-M2/rdb/src/test/resources/CustomerConfigWithConverter.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/CustomerConfigWithConverter.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/CustomerConfigWithIDConverter.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/CustomerConfigWithIDConverter.xml
index 638e70101f..638e70101f 100644
--- a/branches/das-java-M2/rdb/src/test/resources/CustomerConfigWithIDConverter.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/CustomerConfigWithIDConverter.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/CustomersOrdersConfig.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/CustomersOrdersConfig.xml
index 4d3a0c87d9..4d3a0c87d9 100644
--- a/branches/das-java-M2/rdb/src/test/resources/CustomersOrdersConfig.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/CustomersOrdersConfig.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/InvalidConfig1.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/InvalidConfig1.xml
index 187609c0a0..187609c0a0 100644
--- a/branches/das-java-M2/rdb/src/test/resources/InvalidConfig1.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/InvalidConfig1.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/InvalidConverter.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/InvalidConverter.xml
index ef17c8d489..ef17c8d489 100644
--- a/branches/das-java-M2/rdb/src/test/resources/InvalidConverter.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/InvalidConverter.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/ManagedBooksConfig.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/ManagedBooksConfig.xml
index 78eb967689..78eb967689 100644
--- a/branches/das-java-M2/rdb/src/test/resources/ManagedBooksConfig.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/ManagedBooksConfig.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/OneToOneRestrictedConfig.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/OneToOneRestrictedConfig.xml
index 040b28b71b..040b28b71b 100644
--- a/branches/das-java-M2/rdb/src/test/resources/OneToOneRestrictedConfig.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/OneToOneRestrictedConfig.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/OrdersOrderDetailsConfig.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
index 971788329e..971788329e 100644
--- a/branches/das-java-M2/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/OrdersOrderDetailsConfig.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/PartsConfig.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/PartsConfig.xml
index a3477c9bf4..a3477c9bf4 100644
--- a/branches/das-java-M2/rdb/src/test/resources/PartsConfig.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/PartsConfig.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/basicCompanyDepartmentMapping.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
index ae0d691902..ae0d691902 100644
--- a/branches/das-java-M2/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/basicCompanyDepartmentMapping.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/basicCompanyMapping.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/basicCompanyMapping.xml
index 7d81e363d7..7d81e363d7 100644
--- a/branches/das-java-M2/rdb/src/test/resources/basicCompanyMapping.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/basicCompanyMapping.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/basicCustomerMapping.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/basicCustomerMapping.xml
index 191f238515..191f238515 100644
--- a/branches/das-java-M2/rdb/src/test/resources/basicCustomerMapping.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/basicCustomerMapping.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/basicCustomerMappingWithCUD.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
index ae29ff8d93..ae29ff8d93 100644
--- a/branches/das-java-M2/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/basicCustomerMappingWithCUD.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml
index 36d2ece17b..36d2ece17b 100644
--- a/branches/das-java-M2/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/basicCustomerMappingWithCUD2.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
index e610549909..e610549909 100644
--- a/branches/das-java-M2/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/basicCustomerMappingWithInvalidCUD.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/basicCustomerOrderMapping.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/basicCustomerOrderMapping.xml
index 68d842e630..68d842e630 100644
--- a/branches/das-java-M2/rdb/src/test/resources/basicCustomerOrderMapping.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/basicCustomerOrderMapping.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/basicStaticCustomer.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/basicStaticCustomer.xml
index 2706687161..2706687161 100644
--- a/branches/das-java-M2/rdb/src/test/resources/basicStaticCustomer.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/basicStaticCustomer.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/cityStates.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/cityStates.xml
index 801828f960..801828f960 100644
--- a/branches/das-java-M2/rdb/src/test/resources/cityStates.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/cityStates.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/company.xsd b/das-java/branches/das-java-M2/rdb/src/test/resources/company.xsd
index a7118ec808..a7118ec808 100644
--- a/branches/das-java-M2/rdb/src/test/resources/company.xsd
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/company.xsd
diff --git a/branches/das-java-M2/rdb/src/test/resources/companyMapping.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/companyMapping.xml
index 795c36a783..795c36a783 100644
--- a/branches/das-java-M2/rdb/src/test/resources/companyMapping.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/companyMapping.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/companyMappingWithConverters.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/companyMappingWithConverters.xml
index 93bbea5130..93bbea5130 100644
--- a/branches/das-java-M2/rdb/src/test/resources/companyMappingWithConverters.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/companyMappingWithConverters.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/customer.xsd b/das-java/branches/das-java-M2/rdb/src/test/resources/customer.xsd
index e5482ae3a0..e5482ae3a0 100644
--- a/branches/das-java-M2/rdb/src/test/resources/customer.xsd
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/customer.xsd
diff --git a/branches/das-java-M2/rdb/src/test/resources/customerMapping.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/customerMapping.xml
index 56f7c9d5b1..56f7c9d5b1 100644
--- a/branches/das-java-M2/rdb/src/test/resources/customerMapping.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/customerMapping.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/customerOrderRelationshipMapping.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/customerOrderRelationshipMapping.xml
index fb816c5628..fb816c5628 100644
--- a/branches/das-java-M2/rdb/src/test/resources/customerOrderRelationshipMapping.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/customerOrderRelationshipMapping.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/passiveConnection.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/passiveConnection.xml
index b343d52b02..b343d52b02 100644
--- a/branches/das-java-M2/rdb/src/test/resources/passiveConnection.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/passiveConnection.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/staticCustomer.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/staticCustomer.xml
index 169e9e2f8e..169e9e2f8e 100644
--- a/branches/das-java-M2/rdb/src/test/resources/staticCustomer.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/staticCustomer.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/staticCustomerOrder.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/staticCustomerOrder.xml
index 81c9628da1..81c9628da1 100644
--- a/branches/das-java-M2/rdb/src/test/resources/staticCustomerOrder.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/staticCustomerOrder.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/staticInvalid.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/staticInvalid.xml
index 6b76ae3309..6b76ae3309 100644
--- a/branches/das-java-M2/rdb/src/test/resources/staticInvalid.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/staticInvalid.xml
diff --git a/branches/das-java-M2/rdb/src/test/resources/storedProcTest.xml b/das-java/branches/das-java-M2/rdb/src/test/resources/storedProcTest.xml
index 04744dfbb9..04744dfbb9 100644
--- a/branches/das-java-M2/rdb/src/test/resources/storedProcTest.xml
+++ b/das-java/branches/das-java-M2/rdb/src/test/resources/storedProcTest.xml
diff --git a/branches/das-java-M2/samples/build.xml b/das-java/branches/das-java-M2/samples/build.xml
index f78ca9a3c8..f78ca9a3c8 100644
--- a/branches/das-java-M2/samples/build.xml
+++ b/das-java/branches/das-java-M2/samples/build.xml
diff --git a/branches/das-java-M2/samples/companyweb/build.xml b/das-java/branches/das-java-M2/samples/companyweb/build.xml
index dd269b628e..dd269b628e 100644
--- a/branches/das-java-M2/samples/companyweb/build.xml
+++ b/das-java/branches/das-java-M2/samples/companyweb/build.xml
diff --git a/branches/das-java-M2/samples/companyweb/dastest/db.lck b/das-java/branches/das-java-M2/samples/companyweb/dastest/db.lck
index 9f6b4b3d4b..9f6b4b3d4b 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/db.lck
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/db.lck
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/log/log.ctrl b/das-java/branches/das-java-M2/samples/companyweb/dastest/log/log.ctrl
index edbd775299..edbd775299 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/log/log.ctrl
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/log/log.ctrl
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/log/log1.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/log/log1.dat
index 7e85ac8e8f..7e85ac8e8f 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/log/log1.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/log/log1.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/log/logmirror.ctrl b/das-java/branches/das-java-M2/samples/companyweb/dastest/log/logmirror.ctrl
index edbd775299..edbd775299 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/log/logmirror.ctrl
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/log/logmirror.ctrl
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c10.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c10.dat
index 5d8ecaa10f..5d8ecaa10f 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c10.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c10.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c101.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c101.dat
index 0f79fa7574..0f79fa7574 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c101.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c101.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c111.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c111.dat
index 39d49e3d19..39d49e3d19 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c111.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c111.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c121.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c121.dat
index 2a4311779b..2a4311779b 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c121.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c121.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c130.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c130.dat
index 64e3c18d62..64e3c18d62 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c130.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c130.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c141.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c141.dat
index 0632d04164..0632d04164 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c141.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c141.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c150.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c150.dat
index d7541026f6..d7541026f6 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c150.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c150.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c161.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c161.dat
index 6673bf1873..6673bf1873 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c161.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c161.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c171.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c171.dat
index c2a753cc5d..c2a753cc5d 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c171.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c171.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c180.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c180.dat
index cb9391aed1..cb9391aed1 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c180.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c180.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c191.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c191.dat
index d3cf1d6364..d3cf1d6364 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c191.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c191.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c1a1.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c1a1.dat
index a7a2d536e9..a7a2d536e9 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c1a1.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c1a1.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c1b1.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c1b1.dat
index 19097e69e7..19097e69e7 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c1b1.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c1b1.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c1c0.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c1c0.dat
index 359525a31a..359525a31a 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c1c0.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c1c0.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c1d1.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c1d1.dat
index 9f257df932..9f257df932 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c1d1.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c1d1.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c1e0.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c1e0.dat
index e43e52fb7f..e43e52fb7f 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c1e0.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c1e0.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c1f1.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c1f1.dat
index 7e6ee3b1e0..7e6ee3b1e0 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c1f1.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c1f1.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c20.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c20.dat
index 1be6390f06..1be6390f06 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c20.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c20.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c200.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c200.dat
index b15d56855c..b15d56855c 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c200.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c200.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c211.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c211.dat
index 84b0022312..84b0022312 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c211.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c211.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c221.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c221.dat
index 63106a9523..63106a9523 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c221.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c221.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c230.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c230.dat
index 9975f27c1f..9975f27c1f 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c230.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c230.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c241.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c241.dat
index 835c645a16..835c645a16 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c241.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c241.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c251.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c251.dat
index d3d6adf4fb..d3d6adf4fb 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c251.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c251.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c260.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c260.dat
index 8d7333df7d..8d7333df7d 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c260.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c260.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c271.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c271.dat
index af722f7d73..af722f7d73 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c271.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c271.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c281.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c281.dat
index 3972983c2e..3972983c2e 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c281.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c281.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c290.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c290.dat
index 31577b8124..31577b8124 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c290.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c290.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c2a1.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c2a1.dat
index 0f700d13a7..0f700d13a7 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c2a1.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c2a1.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c2b1.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c2b1.dat
index 1d6382fb3d..1d6382fb3d 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c2b1.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c2b1.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c2c1.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c2c1.dat
index 3bc60d886b..3bc60d886b 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c2c1.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c2c1.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c2d0.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c2d0.dat
index c542d3c91c..c542d3c91c 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c2d0.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c2d0.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c2e1.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c2e1.dat
index 16abd20b5f..16abd20b5f 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c2e1.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c2e1.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c2f0.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c2f0.dat
index eb26be5932..eb26be5932 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c2f0.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c2f0.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c300.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c300.dat
index 1214f1df4b..1214f1df4b 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c300.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c300.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c31.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c31.dat
index 18c16f1123..18c16f1123 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c31.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c31.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c311.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c311.dat
index 926cbf25b5..926cbf25b5 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c311.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c311.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c320.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c320.dat
index 07e7bc023c..07e7bc023c 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c320.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c320.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c331.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c331.dat
index fd827f9dc2..fd827f9dc2 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c331.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c331.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c340.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c340.dat
index ca70319886..ca70319886 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c340.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c340.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c351.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c351.dat
index 8fbe2a527c..8fbe2a527c 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c351.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c351.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c360.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c360.dat
index dcf9c746e1..dcf9c746e1 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c360.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c360.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c371.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c371.dat
index 6f21a840ea..6f21a840ea 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c371.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c371.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c380.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c380.dat
index b512e8065f..b512e8065f 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c380.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c380.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c391.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c391.dat
index 27006e95a1..27006e95a1 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c391.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c391.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c3a0.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c3a0.dat
index 565dca97ac..565dca97ac 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c3a0.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c3a0.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c3b1.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c3b1.dat
index 36894c9818..36894c9818 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c3b1.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c3b1.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c3c0.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c3c0.dat
index d0c538aede..d0c538aede 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c3c0.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c3c0.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c3d1.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c3d1.dat
index 65bcec5527..65bcec5527 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c3d1.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c3d1.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c3e0.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c3e0.dat
index bdab359420..bdab359420 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c3e0.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c3e0.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c3f1.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c3f1.dat
index dc2d278b57..dc2d278b57 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c3f1.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c3f1.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c400.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c400.dat
index 3072709cec..3072709cec 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c400.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c400.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c41.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c41.dat
index 61086690f2..61086690f2 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c41.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c41.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c411.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c411.dat
index ca551d8249..ca551d8249 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c411.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c411.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c420.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c420.dat
index f04de0840e..f04de0840e 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c420.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c420.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c431.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c431.dat
index 398b1672cc..398b1672cc 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c431.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c431.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c440.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c440.dat
index af259d0872..af259d0872 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c440.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c440.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c451.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c451.dat
index 772a18c658..772a18c658 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c451.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c451.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c460.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c460.dat
index 505428362d..505428362d 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c460.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c460.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c471.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c471.dat
index 484d0df42d..484d0df42d 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c471.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c471.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c481.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c481.dat
index faac073076..faac073076 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c481.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c481.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c490.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c490.dat
index 7585319d21..7585319d21 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c490.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c490.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c4a1.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c4a1.dat
index 4fe8b786e3..4fe8b786e3 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c4a1.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c4a1.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c51.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c51.dat
index 7fc7937b15..7fc7937b15 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c51.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c51.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c60.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c60.dat
index d1fb08c946..d1fb08c946 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c60.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c60.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c71.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c71.dat
index d4c2090a3b..d4c2090a3b 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c71.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c71.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c81.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c81.dat
index 38b6ea6520..38b6ea6520 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c81.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c81.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/c90.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c90.dat
index a607a5969c..a607a5969c 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/c90.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/c90.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/ca1.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/ca1.dat
index 19b4c9e340..19b4c9e340 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/ca1.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/ca1.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/cb1.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/cb1.dat
index 73dc986572..73dc986572 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/cb1.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/cb1.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/cc0.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/cc0.dat
index d1eef3bb56..d1eef3bb56 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/cc0.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/cc0.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/cd1.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/cd1.dat
index c7e6db3ef7..c7e6db3ef7 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/cd1.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/cd1.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/ce1.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/ce1.dat
index 8fd3bf17a8..8fd3bf17a8 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/ce1.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/ce1.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/seg0/cf0.dat b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/cf0.dat
index 332b3d9a8a..332b3d9a8a 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/seg0/cf0.dat
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/seg0/cf0.dat
Binary files differ
diff --git a/branches/das-java-M2/samples/companyweb/dastest/service.properties b/das-java/branches/das-java-M2/samples/companyweb/dastest/service.properties
index 8cfe3b09a5..8cfe3b09a5 100644
--- a/branches/das-java-M2/samples/companyweb/dastest/service.properties
+++ b/das-java/branches/das-java-M2/samples/companyweb/dastest/service.properties
diff --git a/branches/das-java-M2/samples/companyweb/pom.xml b/das-java/branches/das-java-M2/samples/companyweb/pom.xml
index cfa8171171..cfa8171171 100644
--- a/branches/das-java-M2/samples/companyweb/pom.xml
+++ b/das-java/branches/das-java-M2/samples/companyweb/pom.xml
diff --git a/branches/das-java-M2/samples/companyweb/readme.htm b/das-java/branches/das-java-M2/samples/companyweb/readme.htm
index 4af782ff8d..4af782ff8d 100644
--- a/branches/das-java-M2/samples/companyweb/readme.htm
+++ b/das-java/branches/das-java-M2/samples/companyweb/readme.htm
diff --git a/branches/das-java-M2/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java b/das-java/branches/das-java-M2/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java
index d0519ecc08..d0519ecc08 100644
--- a/branches/das-java-M2/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java
+++ b/das-java/branches/das-java-M2/samples/companyweb/src/main/java/org/apache/tuscany/samples/das/companyweb/CompanyClient.java
diff --git a/branches/das-java-M2/samples/companyweb/src/main/resources/CompanyConfig.xml b/das-java/branches/das-java-M2/samples/companyweb/src/main/resources/CompanyConfig.xml
index 1992ab02cd..1992ab02cd 100644
--- a/branches/das-java-M2/samples/companyweb/src/main/resources/CompanyConfig.xml
+++ b/das-java/branches/das-java-M2/samples/companyweb/src/main/resources/CompanyConfig.xml
diff --git a/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/LICENSE.txt b/das-java/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/LICENSE.txt
index d645695673..d645695673 100644
--- a/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/LICENSE.txt
+++ b/das-java/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/NOTICE b/das-java/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/NOTICE
index f1aa4f1921..f1aa4f1921 100644
--- a/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/NOTICE
+++ b/das-java/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/NOTICE
diff --git a/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/README.txt b/das-java/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/README.txt
index 107de8c3ca..107de8c3ca 100644
--- a/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/README.txt
+++ b/das-java/branches/das-java-M2/samples/companyweb/src/main/resources/META-INF/README.txt
diff --git a/branches/das-java-M2/samples/companyweb/src/main/resources/log4j.properties b/das-java/branches/das-java-M2/samples/companyweb/src/main/resources/log4j.properties
index 5c49df303c..5c49df303c 100644
--- a/branches/das-java-M2/samples/companyweb/src/main/resources/log4j.properties
+++ b/das-java/branches/das-java-M2/samples/companyweb/src/main/resources/log4j.properties
diff --git a/branches/das-java-M2/samples/companyweb/src/main/webapp/Company.jsp b/das-java/branches/das-java-M2/samples/companyweb/src/main/webapp/Company.jsp
index 58db88c623..58db88c623 100644
--- a/branches/das-java-M2/samples/companyweb/src/main/webapp/Company.jsp
+++ b/das-java/branches/das-java-M2/samples/companyweb/src/main/webapp/Company.jsp
diff --git a/branches/das-java-M2/samples/companyweb/src/main/webapp/META-INF/context.xml b/das-java/branches/das-java-M2/samples/companyweb/src/main/webapp/META-INF/context.xml
index 5f0af32dd5..5f0af32dd5 100644
--- a/branches/das-java-M2/samples/companyweb/src/main/webapp/META-INF/context.xml
+++ b/das-java/branches/das-java-M2/samples/companyweb/src/main/webapp/META-INF/context.xml
diff --git a/branches/das-java-M2/samples/companyweb/src/main/webapp/WEB-INF/web.xml b/das-java/branches/das-java-M2/samples/companyweb/src/main/webapp/WEB-INF/web.xml
index dc7e488fef..dc7e488fef 100644
--- a/branches/das-java-M2/samples/companyweb/src/main/webapp/WEB-INF/web.xml
+++ b/das-java/branches/das-java-M2/samples/companyweb/src/main/webapp/WEB-INF/web.xml
diff --git a/branches/das-java-M2/samples/pom.xml b/das-java/branches/das-java-M2/samples/pom.xml
index ff1edb39d6..ff1edb39d6 100644
--- a/branches/das-java-M2/samples/pom.xml
+++ b/das-java/branches/das-java-M2/samples/pom.xml
diff --git a/branches/das-java-M2/samples/testing/tomcat/build.xml b/das-java/branches/das-java-M2/samples/testing/tomcat/build.xml
index af159f940a..af159f940a 100644
--- a/branches/das-java-M2/samples/testing/tomcat/build.xml
+++ b/das-java/branches/das-java-M2/samples/testing/tomcat/build.xml
diff --git a/branches/das-java-M2/samples/testing/tomcat/companyweb/pom.xml b/das-java/branches/das-java-M2/samples/testing/tomcat/companyweb/pom.xml
index 0aa3cf857a..0aa3cf857a 100644
--- a/branches/das-java-M2/samples/testing/tomcat/companyweb/pom.xml
+++ b/das-java/branches/das-java-M2/samples/testing/tomcat/companyweb/pom.xml
diff --git a/branches/das-java-M2/samples/testing/tomcat/companyweb/src/main/resources/META-INF/LICENSE.txt b/das-java/branches/das-java-M2/samples/testing/tomcat/companyweb/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/das-java-M2/samples/testing/tomcat/companyweb/src/main/resources/META-INF/LICENSE.txt
+++ b/das-java/branches/das-java-M2/samples/testing/tomcat/companyweb/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/das-java-M2/samples/testing/tomcat/companyweb/src/main/resources/META-INF/NOTICE b/das-java/branches/das-java-M2/samples/testing/tomcat/companyweb/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/das-java-M2/samples/testing/tomcat/companyweb/src/main/resources/META-INF/NOTICE
+++ b/das-java/branches/das-java-M2/samples/testing/tomcat/companyweb/src/main/resources/META-INF/NOTICE
diff --git a/branches/das-java-M2/samples/testing/tomcat/companyweb/src/main/resources/META-INF/README.txt b/das-java/branches/das-java-M2/samples/testing/tomcat/companyweb/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/das-java-M2/samples/testing/tomcat/companyweb/src/main/resources/META-INF/README.txt
+++ b/das-java/branches/das-java-M2/samples/testing/tomcat/companyweb/src/main/resources/META-INF/README.txt
diff --git a/branches/das-java-M2/samples/testing/tomcat/companyweb/src/test/java/org/apache/tuscany/test/das/DasTestCase.java b/das-java/branches/das-java-M2/samples/testing/tomcat/companyweb/src/test/java/org/apache/tuscany/test/das/DasTestCase.java
index d2f3e22b83..d2f3e22b83 100644
--- a/branches/das-java-M2/samples/testing/tomcat/companyweb/src/test/java/org/apache/tuscany/test/das/DasTestCase.java
+++ b/das-java/branches/das-java-M2/samples/testing/tomcat/companyweb/src/test/java/org/apache/tuscany/test/das/DasTestCase.java
diff --git a/branches/das-java-M2/samples/testing/tomcat/context.xsl b/das-java/branches/das-java-M2/samples/testing/tomcat/context.xsl
index 35a78a43a5..35a78a43a5 100644
--- a/branches/das-java-M2/samples/testing/tomcat/context.xsl
+++ b/das-java/branches/das-java-M2/samples/testing/tomcat/context.xsl
diff --git a/branches/das-java-M2/samples/testing/tomcat/datasource.xsl b/das-java/branches/das-java-M2/samples/testing/tomcat/datasource.xsl
index ad473e317c..ad473e317c 100644
--- a/branches/das-java-M2/samples/testing/tomcat/datasource.xsl
+++ b/das-java/branches/das-java-M2/samples/testing/tomcat/datasource.xsl
diff --git a/branches/das-java-M2/samples/testing/tomcat/pom.xml b/das-java/branches/das-java-M2/samples/testing/tomcat/pom.xml
index 8cc305e935..8cc305e935 100644
--- a/branches/das-java-M2/samples/testing/tomcat/pom.xml
+++ b/das-java/branches/das-java-M2/samples/testing/tomcat/pom.xml
diff --git a/branches/das-java-M2/samples/testing/tomcat/readme.htm b/das-java/branches/das-java-M2/samples/testing/tomcat/readme.htm
index b47a9d24c5..b47a9d24c5 100644
--- a/branches/das-java-M2/samples/testing/tomcat/readme.htm
+++ b/das-java/branches/das-java-M2/samples/testing/tomcat/readme.htm
diff --git a/branches/das-java-M2/samples/testing/tomcat/server.xsl b/das-java/branches/das-java-M2/samples/testing/tomcat/server.xsl
index b53d1d50c7..b53d1d50c7 100644
--- a/branches/das-java-M2/samples/testing/tomcat/server.xsl
+++ b/das-java/branches/das-java-M2/samples/testing/tomcat/server.xsl
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 21:33:17 +0000