470 files changed, 0 insertions, 0 deletions

diff --git a/branches/sdo-1.0-incubating/distribution/pom.xml b/sdo-java/branches/sdo-1.0-incubating/distribution/pom.xml
index 9832124c72..9832124c72 100644
--- a/branches/sdo-1.0-incubating/distribution/pom.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/distribution/pom.xml
diff --git a/branches/sdo-1.0-incubating/distribution/src/main/assembly/bin.xml b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/assembly/bin.xml
index c16ffb5360..c16ffb5360 100644
--- a/branches/sdo-1.0-incubating/distribution/src/main/assembly/bin.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/assembly/bin.xml
diff --git a/branches/sdo-1.0-incubating/distribution/src/main/assembly/src.xml b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/assembly/src.xml
index 82615d77d2..82615d77d2 100644
--- a/branches/sdo-1.0-incubating/distribution/src/main/assembly/src.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/assembly/src.xml
diff --git a/branches/sdo-1.0-incubating/distribution/src/main/release/DISCLAIMER b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sdo-1.0-incubating/distribution/src/main/release/DISCLAIMER
+++ b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/DISCLAIMER
diff --git a/branches/sdo-1.0-incubating/distribution/src/main/release/README b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/README
index fedf7bb130..fedf7bb130 100644
--- a/branches/sdo-1.0-incubating/distribution/src/main/release/README
+++ b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/README
diff --git a/branches/sdo-1.0-incubating/distribution/src/main/release/RELEASE_NOTES b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/RELEASE_NOTES
index d7def1e107..d7def1e107 100644
--- a/branches/sdo-1.0-incubating/distribution/src/main/release/RELEASE_NOTES
+++ b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/RELEASE_NOTES
diff --git a/branches/sdo-1.0-incubating/distribution/src/main/release/bin/INSTALL b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/bin/INSTALL
index 7e704a9b15..7e704a9b15 100644
--- a/branches/sdo-1.0-incubating/distribution/src/main/release/bin/INSTALL
+++ b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/bin/INSTALL
diff --git a/branches/sdo-1.0-incubating/distribution/src/main/release/bin/LICENSE b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/bin/LICENSE
index 9f214e6c2e..9f214e6c2e 100644
--- a/branches/sdo-1.0-incubating/distribution/src/main/release/bin/LICENSE
+++ b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/bin/LICENSE
diff --git a/branches/sdo-1.0-incubating/distribution/src/main/release/bin/NOTICE b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/bin/NOTICE
index 18c7f71120..18c7f71120 100644
--- a/branches/sdo-1.0-incubating/distribution/src/main/release/bin/NOTICE
+++ b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/bin/NOTICE
diff --git a/branches/sdo-1.0-incubating/distribution/src/main/release/bin/README b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/bin/README
index fc82c39310..fc82c39310 100644
--- a/branches/sdo-1.0-incubating/distribution/src/main/release/bin/README
+++ b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/bin/README
diff --git a/branches/sdo-1.0-incubating/distribution/src/main/release/bin/samples/README b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/bin/samples/README
index d669e0b2b2..d669e0b2b2 100644
--- a/branches/sdo-1.0-incubating/distribution/src/main/release/bin/samples/README
+++ b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/bin/samples/README
diff --git a/branches/sdo-1.0-incubating/distribution/src/main/release/bin/samples/runsamples.bat b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/bin/samples/runsamples.bat
index f14edd36cd..f14edd36cd 100644
--- a/branches/sdo-1.0-incubating/distribution/src/main/release/bin/samples/runsamples.bat
+++ b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/bin/samples/runsamples.bat
diff --git a/branches/sdo-1.0-incubating/distribution/src/main/release/bin/samples/runsamples.sh b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/bin/samples/runsamples.sh
index 4b0695d5a6..4b0695d5a6 100644
--- a/branches/sdo-1.0-incubating/distribution/src/main/release/bin/samples/runsamples.sh
+++ b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/bin/samples/runsamples.sh
diff --git a/branches/sdo-1.0-incubating/distribution/src/main/release/bin/samples/sampleProgramContents.html b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/bin/samples/sampleProgramContents.html
index bb0af1b967..bb0af1b967 100644
--- a/branches/sdo-1.0-incubating/distribution/src/main/release/bin/samples/sampleProgramContents.html
+++ b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/bin/samples/sampleProgramContents.html
diff --git a/branches/sdo-1.0-incubating/distribution/src/main/release/src/BUILDING b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/src/BUILDING
index 87b1ed4063..87b1ed4063 100644
--- a/branches/sdo-1.0-incubating/distribution/src/main/release/src/BUILDING
+++ b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/src/BUILDING
diff --git a/branches/sdo-1.0-incubating/distribution/src/main/release/src/LICENSE b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/src/LICENSE
index 09b6cbf170..09b6cbf170 100644
--- a/branches/sdo-1.0-incubating/distribution/src/main/release/src/LICENSE
+++ b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/src/LICENSE
diff --git a/branches/sdo-1.0-incubating/distribution/src/main/release/src/NOTICE b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/src/NOTICE
index 901502f721..901502f721 100644
--- a/branches/sdo-1.0-incubating/distribution/src/main/release/src/NOTICE
+++ b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/src/NOTICE
diff --git a/branches/sdo-1.0-incubating/distribution/src/main/release/src/README b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/src/README
index a34bf2b1bc..a34bf2b1bc 100644
--- a/branches/sdo-1.0-incubating/distribution/src/main/release/src/README
+++ b/sdo-java/branches/sdo-1.0-incubating/distribution/src/main/release/src/README
diff --git a/branches/sdo-1.0-incubating/impl/model/SDO.ecore b/sdo-java/branches/sdo-1.0-incubating/impl/model/SDO.ecore
index 0dff575474..0dff575474 100644
--- a/branches/sdo-1.0-incubating/impl/model/SDO.ecore
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/model/SDO.ecore
diff --git a/branches/sdo-1.0-incubating/impl/model/SDO.genmodel b/sdo-java/branches/sdo-1.0-incubating/impl/model/SDO.genmodel
index 2005e8f042..2005e8f042 100644
--- a/branches/sdo-1.0-incubating/impl/model/SDO.genmodel
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/model/SDO.genmodel
diff --git a/branches/sdo-1.0-incubating/impl/model/SDO.mdl b/sdo-java/branches/sdo-1.0-incubating/impl/model/SDO.mdl
index 2288766bab..2288766bab 100644
--- a/branches/sdo-1.0-incubating/impl/model/SDO.mdl
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/model/SDO.mdl
diff --git a/branches/sdo-1.0-incubating/impl/pom.xml b/sdo-java/branches/sdo-1.0-incubating/impl/pom.xml
index 8c9eb626c4..8c9eb626c4 100644
--- a/branches/sdo-1.0-incubating/impl/pom.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/pom.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java
index 79deec6d29..79deec6d29 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java
index ad546cc614..ad546cc614 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java
index 04ef0d714a..04ef0d714a 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java
index a21f2308ab..a21f2308ab 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java
index 5d3640100c..5d3640100c 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java
index 93ff2ebf14..93ff2ebf14 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java
index 3fe2cd952e..3fe2cd952e 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java
index 3d645be1da..3d645be1da 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java
index dc88a0d60d..dc88a0d60d 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java
index a6253e8131..a6253e8131 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOExtendedMetaDataImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOExtendedMetaDataImpl.java
index 422f5342d8..422f5342d8 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOExtendedMetaDataImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOExtendedMetaDataImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOXSDEcoreBuilder.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOXSDEcoreBuilder.java
index b7f4d2ddcc..b7f4d2ddcc 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOXSDEcoreBuilder.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOXSDEcoreBuilder.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java
index d768076ecb..d768076ecb 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/CrossScopeCopyHelperImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/CrossScopeCopyHelperImpl.java
index b7a5534800..b7a5534800 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/CrossScopeCopyHelperImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/CrossScopeCopyHelperImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java
index e3fbf0691a..e3fbf0691a 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java
index 49c92d6093..49c92d6093 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DefaultHelperContextImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DefaultHelperContextImpl.java
index a8804e9e5d..a8804e9e5d 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DefaultHelperContextImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DefaultHelperContextImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java
index d64c58dea2..d64c58dea2 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperContextImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperContextImpl.java
index 054751911b..054751911b 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperContextImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperContextImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
index 360617bd20..360617bd20 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOAnnotations.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOAnnotations.java
index 816fb3bf9f..816fb3bf9f 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOAnnotations.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOAnnotations.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java
index d48979b0e6..d48979b0e6 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java
index 6d053b84ba..6d053b84ba 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
index 906a35a4c8..906a35a4c8 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SchemaBuilder.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SchemaBuilder.java
index 8ff7769041..8ff7769041 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SchemaBuilder.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SchemaBuilder.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
index 24760e2fb4..24760e2fb4 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeTable.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeTable.java
index a28492e28e..a28492e28e 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeTable.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeTable.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
index 8a854449c9..8a854449c9 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
index 1909a350f2..1909a350f2 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelper.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelper.java
index 851c7d93dd..851c7d93dd 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelper.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelper.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java
index 7b0c2fc597..7b0c2fc597 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
index 829acd38f4..829acd38f4 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java
index b7d22c3be0..b7d22c3be0 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
index e02977e0e8..e02977e0e8 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java
index 61b68cbc5b..61b68cbc5b 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java
index d1cd1d3e05..d1cd1d3e05 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
index cd37620f4c..cd37620f4c 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java
index d61b7fd05e..d61b7fd05e 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
index e043e2fd0d..e043e2fd0d 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java
index 7c19a8a412..7c19a8a412 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
index dee124429f..dee124429f 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java
index 153ef18444..153ef18444 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java
index d9d39bad49..d9d39bad49 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
index 54f642d8cf..54f642d8cf 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ExtensibleDataObjectImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ExtensibleDataObjectImpl.java
index 29344e7fe9..29344e7fe9 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ExtensibleDataObjectImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ExtensibleDataObjectImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
index f3333c32c0..f3333c32c0 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
index 19fb89bbd3..19fb89bbd3 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java
index bb0f5ccd2a..bb0f5ccd2a 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java
index 25bdab16fe..25bdab16fe 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java
index e257e30d27..e257e30d27 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java
index 0cf7f3586c..0cf7f3586c 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java
index e57b11474b..e57b11474b 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java
index 2c83244789..2c83244789 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java
index 9e3b2a1386..9e3b2a1386 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java
index c8fe69167e..c8fe69167e 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java
index 4159ac9dc1..4159ac9dc1 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java
index 15ee4c2f99..15ee4c2f99 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java
index 741343e5a8..741343e5a8 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java
index 26a02f7cc0..26a02f7cc0 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java
index 26fb9c57ce..26fb9c57ce 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java
index 32cde02086..32cde02086 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java
index e8824974a0..e8824974a0 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java
index ef13797850..ef13797850 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java
index 0dc673907c..0dc673907c 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
index 761efb4217..761efb4217 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java
index df043a0d10..df043a0d10 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java
index c8348ded2d..c8348ded2d 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java
index 48a310b142..48a310b142 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java
index aee2ecaaab..aee2ecaaab 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java
index 80945b289a..80945b289a 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java
index 5d0777dd1c..5d0777dd1c 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/internal/InternalFactory.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/internal/InternalFactory.java
index 4776cb958f..4776cb958f 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/internal/InternalFactory.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/internal/InternalFactory.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/internal/impl/InternalFactoryImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/internal/impl/InternalFactoryImpl.java
index 4517f4a2a9..4517f4a2a9 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/internal/impl/InternalFactoryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/internal/impl/InternalFactoryImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java
index 50be023db5..50be023db5 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java
index b5eabb0f4a..b5eabb0f4a 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java
index 515311f7ff..515311f7ff 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java
index de25db5d1e..de25db5d1e 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/XMLFactory.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/XMLFactory.java
index 84a60cf849..84a60cf849 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/XMLFactory.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/XMLFactory.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/XMLInfo.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/XMLInfo.java
index 85cad641c9..85cad641c9 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/XMLInfo.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/XMLInfo.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLFactoryImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLFactoryImpl.java
index 293a7b0398..293a7b0398 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLFactoryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLFactoryImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLInfoImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLInfoImpl.java
index a0906e32c1..a0906e32c1 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLInfoImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLInfoImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java
index e25d30e61c..e25d30e61c 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
index c3f321d9f9..c3f321d9f9 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
index 512627a09f..512627a09f 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
index 5f1a611c2a..5f1a611c2a 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java
index 69dc53cefb..69dc53cefb 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/StreamDeserializer.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/StreamDeserializer.java
index 5d7bee9c3f..5d7bee9c3f 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/StreamDeserializer.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/StreamDeserializer.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/VirtualSequence.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/VirtualSequence.java
index 2f86fa9d12..2f86fa9d12 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/VirtualSequence.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/VirtualSequence.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java
index f24b166f77..f24b166f77 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java
index 1f540afa2c..1f540afa2c 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java
index 5657f26ca5..5657f26ca5 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java
index c3d67a8318..c3d67a8318 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java
index 09bffece71..09bffece71 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java
index 8a6dce6161..8a6dce6161 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java
index a4ea322549..a4ea322549 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java
index 43746399fc..43746399fc 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java
index 66d7f8625f..66d7f8625f 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java
index 7a04d6b99c..7a04d6b99c 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/ChangeSummaryStreamDeserializer.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/ChangeSummaryStreamDeserializer.java
index 6dc461a2fe..6dc461a2fe 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/ChangeSummaryStreamDeserializer.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/ChangeSummaryStreamDeserializer.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/ChangeSummaryStreamSerializer.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/ChangeSummaryStreamSerializer.java
index bb598bea54..bb598bea54 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/ChangeSummaryStreamSerializer.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/ChangeSummaryStreamSerializer.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
index 94aaa6304e..94aaa6304e 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/RecordedEventXMLStreamReader.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/RecordedEventXMLStreamReader.java
index b2b3036692..b2b3036692 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/RecordedEventXMLStreamReader.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/RecordedEventXMLStreamReader.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDODeserializer.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDODeserializer.java
index af14f13319..af14f13319 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDODeserializer.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDODeserializer.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOURIConverterImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOURIConverterImpl.java
index 639c556c83..639c556c83 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOURIConverterImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOURIConverterImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceFactoryImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceFactoryImpl.java
index c8189f9766..c8189f9766 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceFactoryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceFactoryImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceImpl.java
index 0117686759..0117686759 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLDocumentStreamReader.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLDocumentStreamReader.java
index 64088a0366..64088a0366 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLDocumentStreamReader.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLDocumentStreamReader.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLFragmentStreamReader.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLFragmentStreamReader.java
index 66d8fbdc6a..66d8fbdc6a 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLFragmentStreamReader.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLFragmentStreamReader.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLStreamSerializer.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLStreamSerializer.java
index 2c2dc87aa4..2c2dc87aa4 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLStreamSerializer.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLStreamSerializer.java
diff --git a/branches/sdo-1.0-incubating/impl/src/main/resources/META-INF/DISCLAIMER b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/resources/META-INF/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/resources/META-INF/DISCLAIMER
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/resources/META-INF/DISCLAIMER
diff --git a/branches/sdo-1.0-incubating/impl/src/main/resources/META-INF/LICENSE.txt b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/resources/META-INF/LICENSE.txt
index 9a90d375bc..9a90d375bc 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/resources/META-INF/LICENSE.txt
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sdo-1.0-incubating/impl/src/main/resources/META-INF/NOTICE b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/resources/META-INF/NOTICE
index ba033412a9..ba033412a9 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/resources/META-INF/NOTICE
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/resources/META-INF/NOTICE
diff --git a/branches/sdo-1.0-incubating/impl/src/main/resources/META-INF/README.txt b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/resources/META-INF/README.txt
index 0ad57411e2..0ad57411e2 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/resources/META-INF/README.txt
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/resources/META-INF/README.txt
diff --git a/branches/sdo-1.0-incubating/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider
index 73693d6556..73693d6556 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider
diff --git a/branches/sdo-1.0-incubating/impl/src/main/resources/sdo-metadata.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/resources/sdo-metadata.xsd
index 6a5132ed56..6a5132ed56 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/resources/sdo-metadata.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/resources/sdo-metadata.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/main/resources/xml/sdoInternal.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/resources/xml/sdoInternal.xsd
index c1616ad7fe..c1616ad7fe 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/resources/xml/sdoInternal.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/resources/xml/sdoInternal.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/main/resources/xml/sdoModelChangeSummary.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/resources/xml/sdoModelChangeSummary.xsd
index 645b7b700a..645b7b700a 100644
--- a/branches/sdo-1.0-incubating/impl/src/main/resources/xml/sdoModelChangeSummary.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/main/resources/xml/sdoModelChangeSummary.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/ExpectedExceptionFactory.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/ExpectedExceptionFactory.java
index 0ba0d7037e..0ba0d7037e 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/ExpectedExceptionFactory.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/ExpectedExceptionFactory.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/ExpectedExceptionType.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/ExpectedExceptionType.java
index 2f3e1ba63a..2f3e1ba63a 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/ExpectedExceptionType.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/ExpectedExceptionType.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/SequenceReadOnlyType.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/SequenceReadOnlyType.java
index 2a2ae0db02..2a2ae0db02 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/SequenceReadOnlyType.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/SequenceReadOnlyType.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/impl/ExpectedExceptionFactoryImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/impl/ExpectedExceptionFactoryImpl.java
index 791c5a4604..791c5a4604 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/impl/ExpectedExceptionFactoryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/impl/ExpectedExceptionFactoryImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/impl/ExpectedExceptionTypeImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/impl/ExpectedExceptionTypeImpl.java
index 9021e52c18..9021e52c18 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/impl/ExpectedExceptionTypeImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/impl/ExpectedExceptionTypeImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/impl/SequenceReadOnlyTypeImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/impl/SequenceReadOnlyTypeImpl.java
index 4ac8a19807..4ac8a19807 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/impl/SequenceReadOnlyTypeImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/ExpectedException/impl/SequenceReadOnlyTypeImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/simple/Quote.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/simple/Quote.java
index 48dcf96d64..48dcf96d64 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/simple/Quote.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/simple/Quote.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/simple/SimpleFactory.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/simple/SimpleFactory.java
index 98dc01d69a..98dc01d69a 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/simple/SimpleFactory.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/simple/SimpleFactory.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/simple/impl/QuoteImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/simple/impl/QuoteImpl.java
index 39af3bbdb2..39af3bbdb2 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/simple/impl/QuoteImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/simple/impl/QuoteImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java
index 51099d70a7..51099d70a7 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/test/Containment/ContainmentFactory.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/test/Containment/ContainmentFactory.java
index c8ee9a96c8..c8ee9a96c8 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/test/Containment/ContainmentFactory.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/test/Containment/ContainmentFactory.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/test/Containment/ContainmentTest.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/test/Containment/ContainmentTest.java
index 64734b8862..64734b8862 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/test/Containment/ContainmentTest.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/test/Containment/ContainmentTest.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/test/Containment/impl/ContainmentFactoryImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/test/Containment/impl/ContainmentFactoryImpl.java
index 9f51d02590..9f51d02590 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/test/Containment/impl/ContainmentFactoryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/test/Containment/impl/ContainmentFactoryImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/test/Containment/impl/ContainmentTestImpl.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/test/Containment/impl/ContainmentTestImpl.java
index 14d4678d2d..14d4678d2d 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/com/example/test/Containment/impl/ContainmentTestImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/com/example/test/Containment/impl/ContainmentTestImpl.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/AllTests.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/AllTests.java
index 7d91456137..7d91456137 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/AllTests.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/AllTests.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/AllTests.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/AllTests.java
index d67b53fb7c..d67b53fb7c 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/AllTests.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/AllTests.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java
index 4a51310cd0..4a51310cd0 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java
index e9151b9d46..e9151b9d46 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java
index 218a725226..218a725226 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java
index 56bf6af9b4..56bf6af9b4 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java
index 6cc0529c5f..6cc0529c5f 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java
index 3e3e87e47b..3e3e87e47b 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java
index ec848de4fa..ec848de4fa 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/AllTests.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
index 734c1b0469..734c1b0469 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/AnyTypeTest.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/AnyTypeTest.java
index 4d085eae28..4d085eae28 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/AnyTypeTest.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/AnyTypeTest.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryOnDataObjectTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryOnDataObjectTestCase.java
index b9b9c0f2ea..b9b9c0f2ea 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryOnDataObjectTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryOnDataObjectTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryPropertyTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryPropertyTestCase.java
index 4a62ec6135..4a62ec6135 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryPropertyTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryPropertyTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java
index e956720117..e956720117 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ContainmentCycleTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ContainmentCycleTestCase.java
index 843ab9b982..843ab9b982 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ContainmentCycleTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ContainmentCycleTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ContainmentTypeUtil.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ContainmentTypeUtil.java
index f602555fa6..f602555fa6 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ContainmentTypeUtil.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ContainmentTypeUtil.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/CrossScopeCopyTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/CrossScopeCopyTestCase.java
index bba7fb4c1b..bba7fb4c1b 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/CrossScopeCopyTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/CrossScopeCopyTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DataGraphTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DataGraphTestCase.java
index 5fcc567908..5fcc567908 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DataGraphTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DataGraphTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java
index a49b165386..a49b165386 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DateConversionTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DateConversionTestCase.java
index 291842e1aa..291842e1aa 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DateConversionTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DateConversionTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DefineOpenContentPropertyTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DefineOpenContentPropertyTestCase.java
index bbbad11f53..bbbad11f53 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DefineOpenContentPropertyTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DefineOpenContentPropertyTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
index 5b3e814f69..5b3e814f69 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DeserializationNoSchemaTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DeserializationNoSchemaTestCase.java
index 5bde232a72..5bde232a72 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DeserializationNoSchemaTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DeserializationNoSchemaTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DotNameTest.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DotNameTest.java
index 476f34c328..476f34c328 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DotNameTest.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DotNameTest.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DynamicTypesComparisonTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DynamicTypesComparisonTestCase.java
index 1a9deaf775..1a9deaf775 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DynamicTypesComparisonTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/DynamicTypesComparisonTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ExpectedExceptionsTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ExpectedExceptionsTestCase.java
index 7674cda42b..7674cda42b 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ExpectedExceptionsTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/ExpectedExceptionsTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/FormTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/FormTestCase.java
index e630a8f903..e630a8f903 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/FormTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/FormTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/HelperContextTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/HelperContextTestCase.java
index 14e81b6a32..14e81b6a32 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/HelperContextTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/HelperContextTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/IsManyTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/IsManyTestCase.java
index 1eef4ea657..1eef4ea657 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/IsManyTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/IsManyTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/JavaSerializeDeserializeTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/JavaSerializeDeserializeTestCase.java
index 56a293cde0..56a293cde0 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/JavaSerializeDeserializeTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/JavaSerializeDeserializeTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/JiraTestCases.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/JiraTestCases.java
index 66138495ce..66138495ce 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/JiraTestCases.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/JiraTestCases.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/MetadataInstancePropertiesTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/MetadataInstancePropertiesTestCase.java
index 360ffe3cab..360ffe3cab 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/MetadataInstancePropertiesTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/MetadataInstancePropertiesTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java
index 806662a83c..806662a83c 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/NeverStaleChangeSummaryTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/NeverStaleChangeSummaryTestCase.java
index 69c8e447df..69c8e447df 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/NeverStaleChangeSummaryTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/NeverStaleChangeSummaryTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java
index 74570d3b43..74570d3b43 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SchemaLocationTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SchemaLocationTestCase.java
index eaec327007..eaec327007 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SchemaLocationTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SchemaLocationTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SequenceTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SequenceTestCase.java
index b547f45d1c..b547f45d1c 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SequenceTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SequenceTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SerializeTypesTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SerializeTypesTestCase.java
index 7fe1196eb6..7fe1196eb6 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SerializeTypesTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SerializeTypesTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java
index 36f038d779..36f038d779 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java
index 55aae9d396..55aae9d396 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java
index c3fffa4f10..c3fffa4f10 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SubstitutionValuesTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SubstitutionValuesTestCase.java
index b473503122..b473503122 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SubstitutionValuesTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/SubstitutionValuesTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
index a7ab3f954a..a7ab3f954a 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/TypeConversionTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/TypeConversionTestCase.java
index 98c1d3e51b..98c1d3e51b 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/TypeConversionTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/TypeConversionTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/TypeHelperTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/TypeHelperTestCase.java
index 8fad877d4b..8fad877d4b 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/TypeHelperTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/TypeHelperTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java
index f718a3f330..f718a3f330 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLDocumentTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLDocumentTestCase.java
index 1cf59757ef..1cf59757ef 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLDocumentTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLDocumentTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLHelperTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLHelperTestCase.java
index fb1cf79300..fb1cf79300 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLHelperTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLHelperTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLLoadOptionsTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLLoadOptionsTestCase.java
index ac8d04b683..ac8d04b683 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLLoadOptionsTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLLoadOptionsTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLSaveOptionsTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLSaveOptionsTestCase.java
index 50c32a8023..50c32a8023 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLSaveOptionsTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLSaveOptionsTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperPerformanceTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperPerformanceTestCase.java
index ef701059c4..ef701059c4 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperPerformanceTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperPerformanceTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperTestCase.java
index 35df4909ba..35df4909ba 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLUnknownPropertiesTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLUnknownPropertiesTestCase.java
index 63e92503c1..63e92503c1 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLUnknownPropertiesTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XMLUnknownPropertiesTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java
index 45f92a73b2..45f92a73b2 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
index b8d3402172..b8d3402172 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XSDQNameTestCase.java b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XSDQNameTestCase.java
index f369b340ed..f369b340ed 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XSDQNameTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/java/org/apache/tuscany/sdo/test/XSDQNameTestCase.java
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/SchemaLocationTestCase.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/SchemaLocationTestCase.xml
index e13f45a877..e13f45a877 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/SchemaLocationTestCase.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/SchemaLocationTestCase.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/SequenceChangeSummary.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/SequenceChangeSummary.xsd
index dd3c2bc2dc..dd3c2bc2dc 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/SequenceChangeSummary.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/SequenceChangeSummary.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/SubstitutionValues.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/SubstitutionValues.xsd
index 7aee02c032..7aee02c032 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/SubstitutionValues.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/SubstitutionValues.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/TypePropertyMetadataInfo.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/TypePropertyMetadataInfo.xsd
index b6d7841ec4..b6d7841ec4 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/TypePropertyMetadataInfo.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/TypePropertyMetadataInfo.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/XMLDocumentNoNamespaceSchemaLocation.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/XMLDocumentNoNamespaceSchemaLocation.xsd
index c2beb7708d..c2beb7708d 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/XMLDocumentNoNamespaceSchemaLocation.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/XMLDocumentNoNamespaceSchemaLocation.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/XMLDocumentSchemaLocation.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/XMLDocumentSchemaLocation.xsd
index 0561eb555b..0561eb555b 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/XMLDocumentSchemaLocation.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/XMLDocumentSchemaLocation.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/XMLDocumentTestCase.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/XMLDocumentTestCase.xml
index 88160e0b2f..88160e0b2f 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/XMLDocumentTestCase.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/XMLDocumentTestCase.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/XMLStreamHelper.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/XMLStreamHelper.xsd
index 492f61b1d2..492f61b1d2 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/XMLStreamHelper.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/XMLStreamHelper.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/anytype.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/anytype.xsd
index db10376360..db10376360 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/anytype.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/anytype.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/api_test.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/api_test.xsd
index 5238c72605..5238c72605 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/api_test.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/api_test.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/bank.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/bank.xsd
index a0cb7970b0..a0cb7970b0 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/bank.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/bank.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/company.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/company.xsd
index 18e99352be..18e99352be 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/company.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/company.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/containmenttest.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/containmenttest.xsd
index 5289b8f003..5289b8f003 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/containmenttest.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/containmenttest.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/customer1.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/customer1.xml
index 5a29e30a3c..5a29e30a3c 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/customer1.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/customer1.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/customer2.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/customer2.xml
index e9ebb92677..e9ebb92677 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/customer2.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/customer2.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/datatype.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/datatype.xsd
index 05f55e0502..05f55e0502 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/datatype.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/datatype.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/dotNames.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/dotNames.xsd
index a788b7b4f4..a788b7b4f4 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/dotNames.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/dotNames.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/expectedExceptions.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/expectedExceptions.xsd
index 79f90d311d..79f90d311d 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/expectedExceptions.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/expectedExceptions.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/foo-ext.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/foo-ext.xml
index 000909a52e..000909a52e 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/foo-ext.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/foo-ext.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/foo-ext.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/foo-ext.xsd
index 4cdfd1bcd6..4cdfd1bcd6 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/foo-ext.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/foo-ext.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/foo.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/foo.xsd
index f50002ec3d..f50002ec3d 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/foo.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/foo.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/mixed.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/mixed.xml
index 42ff3a3a5b..42ff3a3a5b 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/mixed.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/mixed.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/mixed.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/mixed.xsd
index deee92e9c1..deee92e9c1 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/mixed.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/mixed.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/mixed2.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/mixed2.xml
index d95d179478..d95d179478 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/mixed2.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/mixed2.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/mixedChangeSummary.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/mixedChangeSummary.xml
index 49dbb89f38..49dbb89f38 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/mixedChangeSummary.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/mixedChangeSummary.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/mixedChangeSummaryUndone.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/mixedChangeSummaryUndone.xml
index d8097ace8b..d8097ace8b 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/mixedChangeSummaryUndone.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/mixedChangeSummaryUndone.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/mixedopen.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/mixedopen.xml
index 21a62ef2d0..21a62ef2d0 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/mixedopen.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/mixedopen.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/names.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/names.xsd
index 9096b2d62f..9096b2d62f 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/names.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/names.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/open.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/open.xml
index d4a5b92e0c..d4a5b92e0c 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/open.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/open.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/open.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/open.xsd
index 803c0a9cee..803c0a9cee 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/open.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/open.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/open1any.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/open1any.xsd
index 00efaef5e0..00efaef5e0 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/open1any.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/open1any.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/open2.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/open2.xml
index ab992ccf74..ab992ccf74 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/open2.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/open2.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/openChangeSummary.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/openChangeSummary.xml
index 4ef2dc5948..4ef2dc5948 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/openChangeSummary.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/openChangeSummary.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/openChangeSummaryUndone.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/openChangeSummaryUndone.xml
index 9883a3824a..9883a3824a 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/openChangeSummaryUndone.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/openChangeSummaryUndone.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/openContentProperty.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/openContentProperty.xml
index 03608365c0..03608365c0 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/openContentProperty.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/openContentProperty.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/po.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/po.xsd
index 5c53ac1905..5c53ac1905 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/po.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/po.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/prefix.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/prefix.xsd
index af3d3283f5..af3d3283f5 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/prefix.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/prefix.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/quote.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/quote.xml
index d7b5969e23..d7b5969e23 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/quote.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/quote.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/quoteInSOAP.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/quoteInSOAP.xml
index 4ee083c90c..4ee083c90c 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/quoteInSOAP.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/quoteInSOAP.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/sdoModel.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/sdoModel.xsd
index 645b7b700a..645b7b700a 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/sdoModel.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/sdoModel.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/sdoannotations.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/sdoannotations.xsd
index acdde2896a..acdde2896a 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/sdoannotations.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/sdoannotations.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/sdotypes.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/sdotypes.xsd
index 09c05bb671..09c05bb671 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/sdotypes.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/sdotypes.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/shallowquote.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/shallowquote.xml
index a56f2fe2b7..a56f2fe2b7 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/shallowquote.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/shallowquote.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/shallowquote1.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/shallowquote1.xml
index 5931826628..5931826628 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/shallowquote1.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/shallowquote1.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/simple.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/simple.xsd
index 661259e57a..661259e57a 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/simple.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/simple.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/simple2.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/simple2.xsd
index 4be4bac95b..4be4bac95b 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/simple2.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/simple2.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/simple3.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/simple3.xsd
index 6ff14a85d2..6ff14a85d2 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/simple3.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/simple3.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/simpleWithChangeSummary.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/simpleWithChangeSummary.xml
index d8ecf8f398..d8ecf8f398 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/simpleWithChangeSummary.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/simpleWithChangeSummary.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/simpleWithChangeSummary.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/simpleWithChangeSummary.xsd
index 1df0f69196..1df0f69196 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/simpleWithChangeSummary.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/simpleWithChangeSummary.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/simpleWithChangeSummaryUndone.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/simpleWithChangeSummaryUndone.xml
index e2bbc56d2d..e2bbc56d2d 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/simpleWithChangeSummaryUndone.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/simpleWithChangeSummaryUndone.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/simplechangesummary.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/simplechangesummary.xml
index 134e2f7de5..134e2f7de5 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/simplechangesummary.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/simplechangesummary.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/xpath.xml b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/xpath.xml
index 3b3e2ffbb4..3b3e2ffbb4 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/xpath.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/xpath.xml
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/xpath.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/xpath.xsd
index 0b817d425d..0b817d425d 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/xpath.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/xpath.xsd
diff --git a/branches/sdo-1.0-incubating/impl/src/test/resources/xsdCorners.xsd b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/xsdCorners.xsd
index b62bfcae56..b62bfcae56 100644
--- a/branches/sdo-1.0-incubating/impl/src/test/resources/xsdCorners.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/impl/src/test/resources/xsdCorners.xsd
diff --git a/branches/sdo-1.0-incubating/lib/pom.xml b/sdo-java/branches/sdo-1.0-incubating/lib/pom.xml
index 8bd348a571..8bd348a571 100644
--- a/branches/sdo-1.0-incubating/lib/pom.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/lib/pom.xml
diff --git a/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/api/SDOHelper.java b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/api/SDOHelper.java
index 68ff118a92..68ff118a92 100644
--- a/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/api/SDOHelper.java
+++ b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/api/SDOHelper.java
diff --git a/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/api/SDOUtil.java b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/api/SDOUtil.java
index 53c00cab29..53c00cab29 100644
--- a/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/api/SDOUtil.java
+++ b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/api/SDOUtil.java
diff --git a/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/api/XMLStreamHelper.java b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/api/XMLStreamHelper.java
index 094f05a703..094f05a703 100644
--- a/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/api/XMLStreamHelper.java
+++ b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/api/XMLStreamHelper.java
diff --git a/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/api/overview.html b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/api/overview.html
index c6bd255b8f..c6bd255b8f 100644
--- a/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/api/overview.html
+++ b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/api/overview.html
diff --git a/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/lib/SDOObjectInputStream.java b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/lib/SDOObjectInputStream.java
index 44987f9d7b..44987f9d7b 100644
--- a/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/lib/SDOObjectInputStream.java
+++ b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/lib/SDOObjectInputStream.java
diff --git a/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/lib/SDOObjectOutputStream.java b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/lib/SDOObjectOutputStream.java
index 1610e1c6de..1610e1c6de 100644
--- a/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/lib/SDOObjectOutputStream.java
+++ b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/lib/SDOObjectOutputStream.java
diff --git a/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/spi/HelperProviderBase.java b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/spi/HelperProviderBase.java
index 163feb4522..163feb4522 100644
--- a/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/spi/HelperProviderBase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/spi/HelperProviderBase.java
diff --git a/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/spi/SDOHelperBase.java b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/spi/SDOHelperBase.java
index 43c379256c..43c379256c 100644
--- a/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/spi/SDOHelperBase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/java/org/apache/tuscany/sdo/spi/SDOHelperBase.java
diff --git a/branches/sdo-1.0-incubating/lib/src/main/resources/META-INF/DISCLAIMER b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/resources/META-INF/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sdo-1.0-incubating/lib/src/main/resources/META-INF/DISCLAIMER
+++ b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/resources/META-INF/DISCLAIMER
diff --git a/branches/sdo-1.0-incubating/lib/src/main/resources/META-INF/LICENSE.txt b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/resources/META-INF/LICENSE.txt
index e55ca67ba9..e55ca67ba9 100644
--- a/branches/sdo-1.0-incubating/lib/src/main/resources/META-INF/LICENSE.txt
+++ b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sdo-1.0-incubating/lib/src/main/resources/META-INF/MANIFEST.MF b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/resources/META-INF/MANIFEST.MF
index fc4233db53..fc4233db53 100644
--- a/branches/sdo-1.0-incubating/lib/src/main/resources/META-INF/MANIFEST.MF
+++ b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/resources/META-INF/MANIFEST.MF
diff --git a/branches/sdo-1.0-incubating/lib/src/main/resources/META-INF/NOTICE b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/resources/META-INF/NOTICE
index cb303cf8b5..cb303cf8b5 100644
--- a/branches/sdo-1.0-incubating/lib/src/main/resources/META-INF/NOTICE
+++ b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/resources/META-INF/NOTICE
diff --git a/branches/sdo-1.0-incubating/lib/src/main/resources/META-INF/README.txt b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/resources/META-INF/README.txt
index 43759129b7..43759129b7 100644
--- a/branches/sdo-1.0-incubating/lib/src/main/resources/META-INF/README.txt
+++ b/sdo-java/branches/sdo-1.0-incubating/lib/src/main/resources/META-INF/README.txt
diff --git a/branches/sdo-1.0-incubating/plugin/pom.xml b/sdo-java/branches/sdo-1.0-incubating/plugin/pom.xml
index 8169fe3551..8169fe3551 100644
--- a/branches/sdo-1.0-incubating/plugin/pom.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/plugin/pom.xml
diff --git a/branches/sdo-1.0-incubating/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java b/sdo-java/branches/sdo-1.0-incubating/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java
index c66d058886..c66d058886 100644
--- a/branches/sdo-1.0-incubating/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java
+++ b/sdo-java/branches/sdo-1.0-incubating/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java
diff --git a/branches/sdo-1.0-incubating/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java b/sdo-java/branches/sdo-1.0-incubating/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java
index ba2fdf7676..ba2fdf7676 100644
--- a/branches/sdo-1.0-incubating/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java
+++ b/sdo-java/branches/sdo-1.0-incubating/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java
diff --git a/branches/sdo-1.0-incubating/plugin/src/main/resources/META-INF/DISCLAIMER b/sdo-java/branches/sdo-1.0-incubating/plugin/src/main/resources/META-INF/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sdo-1.0-incubating/plugin/src/main/resources/META-INF/DISCLAIMER
+++ b/sdo-java/branches/sdo-1.0-incubating/plugin/src/main/resources/META-INF/DISCLAIMER
diff --git a/branches/sdo-1.0-incubating/plugin/src/main/resources/META-INF/LICENSE.txt b/sdo-java/branches/sdo-1.0-incubating/plugin/src/main/resources/META-INF/LICENSE.txt
index 9a90d375bc..9a90d375bc 100644
--- a/branches/sdo-1.0-incubating/plugin/src/main/resources/META-INF/LICENSE.txt
+++ b/sdo-java/branches/sdo-1.0-incubating/plugin/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sdo-1.0-incubating/plugin/src/main/resources/META-INF/NOTICE b/sdo-java/branches/sdo-1.0-incubating/plugin/src/main/resources/META-INF/NOTICE
index ba033412a9..ba033412a9 100644
--- a/branches/sdo-1.0-incubating/plugin/src/main/resources/META-INF/NOTICE
+++ b/sdo-java/branches/sdo-1.0-incubating/plugin/src/main/resources/META-INF/NOTICE
diff --git a/branches/sdo-1.0-incubating/plugin/src/main/resources/META-INF/README.txt b/sdo-java/branches/sdo-1.0-incubating/plugin/src/main/resources/META-INF/README.txt
index 0ad57411e2..0ad57411e2 100644
--- a/branches/sdo-1.0-incubating/plugin/src/main/resources/META-INF/README.txt
+++ b/sdo-java/branches/sdo-1.0-incubating/plugin/src/main/resources/META-INF/README.txt
diff --git a/branches/sdo-1.0-incubating/pom.xml b/sdo-java/branches/sdo-1.0-incubating/pom.xml
index 17b1b31d1b..17b1b31d1b 100644
--- a/branches/sdo-1.0-incubating/pom.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/pom.xml
diff --git a/branches/sdo-1.0-incubating/sample/pom.xml b/sdo-java/branches/sdo-1.0-incubating/sample/pom.xml
index b303d7df71..b303d7df71 100644
--- a/branches/sdo-1.0-incubating/sample/pom.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/pom.xml
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/ExecuteSamples.java b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/ExecuteSamples.java
index 6517cde7d8..6517cde7d8 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/ExecuteSamples.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/ExecuteSamples.java
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/SampleBase.java b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/SampleBase.java
index 8de2199b11..8de2199b11 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/SampleBase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/SampleBase.java
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/MedicalScenario.java b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/MedicalScenario.java
index 1e288ccc48..1e288ccc48 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/MedicalScenario.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/MedicalScenario.java
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/MedicalScenarioWithChangeMonitoring.java b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/MedicalScenarioWithChangeMonitoring.java
index 844184f295..844184f295 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/MedicalScenarioWithChangeMonitoring.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/MedicalScenarioWithChangeMonitoring.java
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/ObtainingDataGraphFromXml.java b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/ObtainingDataGraphFromXml.java
index 9a2a28e211..9a2a28e211 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/ObtainingDataGraphFromXml.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/ObtainingDataGraphFromXml.java
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/PrintDataGraph.java b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/PrintDataGraph.java
index be24670364..be24670364 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/PrintDataGraph.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/PrintDataGraph.java
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/package.html b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/package.html
index 4a375228f8..4a375228f8 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/package.html
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/advanced/package.html
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/AccessDataObjectPropertiesByName.java b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/AccessDataObjectPropertiesByName.java
index 2030f35017..2030f35017 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/AccessDataObjectPropertiesByName.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/AccessDataObjectPropertiesByName.java
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/AccessingTheContentsOfASequence.java b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/AccessingTheContentsOfASequence.java
index 6d62077751..6d62077751 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/AccessingTheContentsOfASequence.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/AccessingTheContentsOfASequence.java
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/CreateCompany.java b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/CreateCompany.java
index 38bafca539..38bafca539 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/CreateCompany.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/CreateCompany.java
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/CreatePurchaseOrder.java b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/CreatePurchaseOrder.java
index c41aa37397..c41aa37397 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/CreatePurchaseOrder.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/CreatePurchaseOrder.java
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/ReadPurchaseOrder.java b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/ReadPurchaseOrder.java
index e1b0dce3e6..e1b0dce3e6 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/ReadPurchaseOrder.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/ReadPurchaseOrder.java
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/package.html b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/package.html
index d926bdbf5c..d926bdbf5c 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/package.html
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/basic/package.html
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/AccessDataObjectUsingValidXPath.java b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/AccessDataObjectUsingValidXPath.java
index 5311cf0b8f..5311cf0b8f 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/AccessDataObjectUsingValidXPath.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/AccessDataObjectUsingValidXPath.java
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/AccessingDataObjectsViaPropertyIndex.java b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/AccessingDataObjectsViaPropertyIndex.java
index 2c33f1d512..2c33f1d512 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/AccessingDataObjectsViaPropertyIndex.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/AccessingDataObjectsViaPropertyIndex.java
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateCompanyTuscanyAPI.java b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateCompanyTuscanyAPI.java
index da631227d6..da631227d6 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateCompanyTuscanyAPI.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateCompanyTuscanyAPI.java
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateDataObjectFromXmlString.java b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateDataObjectFromXmlString.java
index 74ac4ebd83..74ac4ebd83 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateDataObjectFromXmlString.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/CreateDataObjectFromXmlString.java
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/DynamicCustomerTypeSample.java b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/DynamicCustomerTypeSample.java
index 970bee5550..970bee5550 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/DynamicCustomerTypeSample.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/DynamicCustomerTypeSample.java
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/SerializingDeserializingADataObject.java b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/SerializingDeserializingADataObject.java
index eaecf436bf..eaecf436bf 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/SerializingDeserializingADataObject.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/SerializingDeserializingADataObject.java
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/package.html b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/package.html
index 59ea1c39e6..59ea1c39e6 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/package.html
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/intermediate/package.html
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/DocumentSamples.java b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/DocumentSamples.java
index 08e6952d57..08e6952d57 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/DocumentSamples.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/DocumentSamples.java
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/SampleInfrastructure.java b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/SampleInfrastructure.java
index aa65cbad6d..aa65cbad6d 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/SampleInfrastructure.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/internal/SampleInfrastructure.java
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/overview.html b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/overview.html
index b4fc183800..b4fc183800 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/overview.html
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/overview.html
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/package.html b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/package.html
index c1335e6e5b..c1335e6e5b 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/package.html
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/package.html
diff --git a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/sampleProgramContents.html b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/sampleProgramContents.html
index cc646ed3a9..cc646ed3a9 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/sampleProgramContents.html
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/java/org/apache/tuscany/samples/sdo/sampleProgramContents.html
diff --git a/branches/sdo-1.0-incubating/sample/src/main/resources/META-INF/LICENSE.txt b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/META-INF/LICENSE.txt
index e55ca67ba9..e55ca67ba9 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/resources/META-INF/LICENSE.txt
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sdo-1.0-incubating/sample/src/main/resources/META-INF/NOTICE b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/META-INF/NOTICE
index cb303cf8b5..cb303cf8b5 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/resources/META-INF/NOTICE
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/META-INF/NOTICE
diff --git a/branches/sdo-1.0-incubating/sample/src/main/resources/META-INF/README.txt b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/META-INF/README.txt
index 43759129b7..43759129b7 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/resources/META-INF/README.txt
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/META-INF/README.txt
diff --git a/branches/sdo-1.0-incubating/sample/src/main/resources/MedicalTest.xsd b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/MedicalTest.xsd
index 0188fea46c..0188fea46c 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/resources/MedicalTest.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/MedicalTest.xsd
diff --git a/branches/sdo-1.0-incubating/sample/src/main/resources/MedicalTest_CS.xsd b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/MedicalTest_CS.xsd
index 62a6d2998d..62a6d2998d 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/resources/MedicalTest_CS.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/MedicalTest_CS.xsd
diff --git a/branches/sdo-1.0-incubating/sample/src/main/resources/People.xsd b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/People.xsd
index 3be50539c9..3be50539c9 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/resources/People.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/People.xsd
diff --git a/branches/sdo-1.0-incubating/sample/src/main/resources/company.xsd b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/company.xsd
index c699f89e31..c699f89e31 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/resources/company.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/company.xsd
diff --git a/branches/sdo-1.0-incubating/sample/src/main/resources/companyCompleteDataGraph.xml b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/companyCompleteDataGraph.xml
index f636f2131e..f636f2131e 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/resources/companyCompleteDataGraph.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/companyCompleteDataGraph.xml
diff --git a/branches/sdo-1.0-incubating/sample/src/main/resources/companyDataGraph.xml b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/companyDataGraph.xml
index 7114b98fdf..7114b98fdf 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/resources/companyDataGraph.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/companyDataGraph.xml
diff --git a/branches/sdo-1.0-incubating/sample/src/main/resources/companyDataGraphGenerated.xml b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/companyDataGraphGenerated.xml
index a99e71bbaa..a99e71bbaa 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/resources/companyDataGraphGenerated.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/companyDataGraphGenerated.xml
diff --git a/branches/sdo-1.0-incubating/sample/src/main/resources/companyGenerated.xml b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/companyGenerated.xml
index 0108e67a4b..0108e67a4b 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/resources/companyGenerated.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/companyGenerated.xml
diff --git a/branches/sdo-1.0-incubating/sample/src/main/resources/doc-files/cmdPrompt.GIF b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/doc-files/cmdPrompt.GIF
index ad2fbbf46f..ad2fbbf46f 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/resources/doc-files/cmdPrompt.GIF
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/doc-files/cmdPrompt.GIF
diff --git a/branches/sdo-1.0-incubating/sample/src/main/resources/letter.xml b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/letter.xml
index 85e0bd42b8..85e0bd42b8 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/resources/letter.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/letter.xml
diff --git a/branches/sdo-1.0-incubating/sample/src/main/resources/letter.xsd b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/letter.xsd
index e6e077ff75..e6e077ff75 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/resources/letter.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/letter.xsd
diff --git a/branches/sdo-1.0-incubating/sample/src/main/resources/po.xml b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/po.xml
index e44cb07720..e44cb07720 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/resources/po.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/po.xml
diff --git a/branches/sdo-1.0-incubating/sample/src/main/resources/po.xsd b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/po.xsd
index 8929775d49..8929775d49 100644
--- a/branches/sdo-1.0-incubating/sample/src/main/resources/po.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/sample/src/main/resources/po.xsd
diff --git a/branches/sdo-1.0-incubating/sdo-api/pom.xml b/sdo-java/branches/sdo-1.0-incubating/sdo-api/pom.xml
index 078dfad51d..078dfad51d 100644
--- a/branches/sdo-1.0-incubating/sdo-api/pom.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/pom.xml
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/ChangeSummary.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/ChangeSummary.java
index 72d694da45..72d694da45 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/ChangeSummary.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/ChangeSummary.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/DataGraph.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/DataGraph.java
index f583cbf0a3..f583cbf0a3 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/DataGraph.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/DataGraph.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/DataObject.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/DataObject.java
index fb592fcf58..fb592fcf58 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/DataObject.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/DataObject.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/Property.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/Property.java
index 89a3857a75..89a3857a75 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/Property.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/Property.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/Sequence.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/Sequence.java
index d015633fa5..d015633fa5 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/Sequence.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/Sequence.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/Type.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/Type.java
index c8d54a6ca0..c8d54a6ca0 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/Type.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/Type.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/CopyHelper.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/CopyHelper.java
index d185d4d420..d185d4d420 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/CopyHelper.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/CopyHelper.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/DataFactory.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/DataFactory.java
index 8507b83440..8507b83440 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/DataFactory.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/DataFactory.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/DataHelper.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/DataHelper.java
index 2b705c718e..2b705c718e 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/DataHelper.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/DataHelper.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/EqualityHelper.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/EqualityHelper.java
index 31cd9b686f..31cd9b686f 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/EqualityHelper.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/EqualityHelper.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/HelperContext.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/HelperContext.java
index 058393f727..058393f727 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/HelperContext.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/HelperContext.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/TypeHelper.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/TypeHelper.java
index 6281a257b1..6281a257b1 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/TypeHelper.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/TypeHelper.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/XMLDocument.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/XMLDocument.java
index a89ff7bd9d..a89ff7bd9d 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/XMLDocument.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/XMLDocument.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/XMLHelper.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/XMLHelper.java
index d28b017b41..d28b017b41 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/XMLHelper.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/XMLHelper.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/XSDHelper.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/XSDHelper.java
index af4f002690..af4f002690 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/XSDHelper.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/helper/XSDHelper.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/impl/ExternalizableDelegator.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/impl/ExternalizableDelegator.java
index 03220a8a32..03220a8a32 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/impl/ExternalizableDelegator.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/impl/ExternalizableDelegator.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/impl/HelperProvider.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/impl/HelperProvider.java
index b4753a0683..b4753a0683 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/impl/HelperProvider.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/impl/HelperProvider.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/impl/NoHelperProviderException.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/impl/NoHelperProviderException.java
index 83f0b21e2e..83f0b21e2e 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/impl/NoHelperProviderException.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/java/commonj/sdo/impl/NoHelperProviderException.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/META-INF/DISCLAIMER b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/META-INF/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/META-INF/DISCLAIMER
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/META-INF/DISCLAIMER
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/META-INF/LICENSE b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/META-INF/LICENSE
index 8cfc94ffd1..8cfc94ffd1 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/META-INF/LICENSE
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/META-INF/LICENSE
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/META-INF/NOTICE b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/META-INF/NOTICE
index 46d26eff94..46d26eff94 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/META-INF/NOTICE
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/META-INF/NOTICE
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/META-INF/README.txt b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/META-INF/README.txt
index 43759129b7..43759129b7 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/META-INF/README.txt
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/META-INF/README.txt
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/datagraph.xsd b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/datagraph.xsd
index e6b9697a8d..e6b9697a8d 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/datagraph.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/datagraph.xsd
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoJava.xml b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoJava.xml
index 01d3d9e1ac..01d3d9e1ac 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoJava.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoJava.xml
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoJava.xsd b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoJava.xsd
index 7387568942..7387568942 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoJava.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoJava.xsd
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoModel.xml b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoModel.xml
index 7fdf82d1be..7fdf82d1be 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoModel.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoModel.xml
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoModel.xsd b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoModel.xsd
index c5aabc9cc8..c5aabc9cc8 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoModel.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoModel.xsd
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoXML.xml b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoXML.xml
index f0fbeac49b..f0fbeac49b 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoXML.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoXML.xml
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoXML.xsd b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoXML.xsd
index 39dd3840ec..39dd3840ec 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoXML.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/main/resources/xml/sdoXML.xsd
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/test/java/commonj/sdo/impl/HelperProviderTestCase.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/test/java/commonj/sdo/impl/HelperProviderTestCase.java
index 8854e936b7..8854e936b7 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/test/java/commonj/sdo/impl/HelperProviderTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/test/java/commonj/sdo/impl/HelperProviderTestCase.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/test/java/test/DefaultHelperProvider.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/test/java/test/DefaultHelperProvider.java
index 77d6206972..77d6206972 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/test/java/test/DefaultHelperProvider.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/test/java/test/DefaultHelperProvider.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/test/java/test/TCCL1HelperProvider.java b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/test/java/test/TCCL1HelperProvider.java
index 05b1b04925..05b1b04925 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/test/java/test/TCCL1HelperProvider.java
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/test/java/test/TCCL1HelperProvider.java
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/test/resources/default/META-INF/services/commonj.sdo.impl.HelperProvider b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/test/resources/default/META-INF/services/commonj.sdo.impl.HelperProvider
index 5175e5abea..5175e5abea 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/test/resources/default/META-INF/services/commonj.sdo.impl.HelperProvider
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/test/resources/default/META-INF/services/commonj.sdo.impl.HelperProvider
diff --git a/branches/sdo-1.0-incubating/sdo-api/src/test/resources/tccl1/META-INF/services/commonj.sdo.impl.HelperProvider b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/test/resources/tccl1/META-INF/services/commonj.sdo.impl.HelperProvider
index fa88e4c705..fa88e4c705 100644
--- a/branches/sdo-1.0-incubating/sdo-api/src/test/resources/tccl1/META-INF/services/commonj.sdo.impl.HelperProvider
+++ b/sdo-java/branches/sdo-1.0-incubating/sdo-api/src/test/resources/tccl1/META-INF/services/commonj.sdo.impl.HelperProvider
diff --git a/branches/sdo-1.0-incubating/tools/pom.xml b/sdo-java/branches/sdo-1.0-incubating/tools/pom.xml
index e03f5140a9..e03f5140a9 100644
--- a/branches/sdo-1.0-incubating/tools/pom.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/pom.xml
diff --git a/branches/sdo-1.0-incubating/tools/readme.htm b/sdo-java/branches/sdo-1.0-incubating/tools/readme.htm
index e7aa8d6718..e7aa8d6718 100644
--- a/branches/sdo-1.0-incubating/tools/readme.htm
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/readme.htm
diff --git a/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java
index 9cb5d64c38..9cb5d64c38 100644
--- a/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java
diff --git a/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
index a2c2f79210..a2c2f79210 100644
--- a/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
diff --git a/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java
index 281c59ee24..281c59ee24 100644
--- a/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java
diff --git a/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java
index 80f8fe7755..80f8fe7755 100644
--- a/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java
diff --git a/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapterFactory.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapterFactory.java
index eabf90c310..eabf90c310 100644
--- a/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapterFactory.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapterFactory.java
diff --git a/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java
index 4a187674ce..4a187674ce 100644
--- a/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java
diff --git a/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
index e08123c233..e08123c233 100644
--- a/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
diff --git a/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
index 54f5251ecb..54f5251ecb 100644
--- a/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
diff --git a/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java
index bc59ec1745..bc59ec1745 100644
--- a/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java
diff --git a/branches/sdo-1.0-incubating/tools/src/main/java/org/eclipse/jdt/core/formatter/CodeFormatter.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/java/org/eclipse/jdt/core/formatter/CodeFormatter.java
index 1c1f37682f..1c1f37682f 100644
--- a/branches/sdo-1.0-incubating/tools/src/main/java/org/eclipse/jdt/core/formatter/CodeFormatter.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/java/org/eclipse/jdt/core/formatter/CodeFormatter.java
diff --git a/branches/sdo-1.0-incubating/tools/src/main/resources/META-INF/DISCLAIMER b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/resources/META-INF/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/branches/sdo-1.0-incubating/tools/src/main/resources/META-INF/DISCLAIMER
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/resources/META-INF/DISCLAIMER
diff --git a/branches/sdo-1.0-incubating/tools/src/main/resources/META-INF/LICENSE.txt b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/resources/META-INF/LICENSE.txt
index 9a90d375bc..9a90d375bc 100644
--- a/branches/sdo-1.0-incubating/tools/src/main/resources/META-INF/LICENSE.txt
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sdo-1.0-incubating/tools/src/main/resources/META-INF/MANIFEST.MF b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/resources/META-INF/MANIFEST.MF
index 8bb7dea1fe..8bb7dea1fe 100644
--- a/branches/sdo-1.0-incubating/tools/src/main/resources/META-INF/MANIFEST.MF
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/resources/META-INF/MANIFEST.MF
diff --git a/branches/sdo-1.0-incubating/tools/src/main/resources/META-INF/NOTICE b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/resources/META-INF/NOTICE
index ba033412a9..ba033412a9 100644
--- a/branches/sdo-1.0-incubating/tools/src/main/resources/META-INF/NOTICE
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/resources/META-INF/NOTICE
diff --git a/branches/sdo-1.0-incubating/tools/src/main/resources/META-INF/README.txt b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/resources/META-INF/README.txt
index 0ad57411e2..0ad57411e2 100644
--- a/branches/sdo-1.0-incubating/tools/src/main/resources/META-INF/README.txt
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/main/resources/META-INF/README.txt
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/Account.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/Account.java
index b2062121cd..b2062121cd 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/Account.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/Account.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/Customer.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/Customer.java
index 213afd0da8..213afd0da8 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/Customer.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/Customer.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/CustomerFactory.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/CustomerFactory.java
index 59f94f673a..59f94f673a 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/CustomerFactory.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/CustomerFactory.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/impl/AccountImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/impl/AccountImpl.java
index a5d03e0b25..a5d03e0b25 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/impl/AccountImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/impl/AccountImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/impl/CustomerFactoryImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/impl/CustomerFactoryImpl.java
index 271b273348..271b273348 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/impl/CustomerFactoryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/impl/CustomerFactoryImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/impl/CustomerImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/impl/CustomerImpl.java
index c3838b760d..c3838b760d 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/impl/CustomerImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/customer/impl/CustomerImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/CustomerFactory.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/CustomerFactory.java
index fbac1f8e28..fbac1f8e28 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/CustomerFactory.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/CustomerFactory.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/CustomerType.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/CustomerType.java
index 34caf80111..34caf80111 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/CustomerType.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/CustomerType.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/CustomersType.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/CustomersType.java
index 5d24e228b2..5d24e228b2 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/CustomersType.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/CustomersType.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/InfoType.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/InfoType.java
index 8bda4f74b2..8bda4f74b2 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/InfoType.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/InfoType.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/impl/CustomerFactoryImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/impl/CustomerFactoryImpl.java
index 67bc859536..67bc859536 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/impl/CustomerFactoryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/impl/CustomerFactoryImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/impl/CustomerTypeImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/impl/CustomerTypeImpl.java
index 216f1ba9ff..216f1ba9ff 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/impl/CustomerTypeImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/impl/CustomerTypeImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/impl/CustomersTypeImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/impl/CustomersTypeImpl.java
index 984fea97e9..984fea97e9 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/impl/CustomersTypeImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/impl/CustomersTypeImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/impl/InfoTypeImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/impl/InfoTypeImpl.java
index 66f3dc424a..66f3dc424a 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/impl/InfoTypeImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/extensible/customer/impl/InfoTypeImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/noInterfaces/simple/Quote.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/noInterfaces/simple/Quote.java
index f01784049f..f01784049f 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/noInterfaces/simple/Quote.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/noInterfaces/simple/Quote.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/noInterfaces/simple/SimpleFactory.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/noInterfaces/simple/SimpleFactory.java
index a3b8bd81c8..a3b8bd81c8 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/noInterfaces/simple/SimpleFactory.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/noInterfaces/simple/SimpleFactory.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/open/OneElementAndAnyAttr.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/open/OneElementAndAnyAttr.java
index 6c3beeedee..6c3beeedee 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/open/OneElementAndAnyAttr.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/open/OneElementAndAnyAttr.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/open/OpenFactory.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/open/OpenFactory.java
index cc248c1ac5..cc248c1ac5 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/open/OpenFactory.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/open/OpenFactory.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/open/impl/OneElementAndAnyAttrImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/open/impl/OneElementAndAnyAttrImpl.java
index 1746f04d5b..1746f04d5b 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/open/impl/OneElementAndAnyAttrImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/open/impl/OneElementAndAnyAttrImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/open/impl/OpenFactoryImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/open/impl/OpenFactoryImpl.java
index 461616584a..461616584a 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/open/impl/OpenFactoryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/open/impl/OpenFactoryImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/repchoice/RCType.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/repchoice/RCType.java
index 29a558b5a2..29a558b5a2 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/repchoice/RCType.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/repchoice/RCType.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/repchoice/RepchoiceFactory.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/repchoice/RepchoiceFactory.java
index 9a7c3033a5..9a7c3033a5 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/repchoice/RepchoiceFactory.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/repchoice/RepchoiceFactory.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/repchoice/impl/RCTypeImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/repchoice/impl/RCTypeImpl.java
index eb1310cc9d..eb1310cc9d 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/repchoice/impl/RCTypeImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/repchoice/impl/RCTypeImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/repchoice/impl/RepchoiceFactoryImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/repchoice/impl/RepchoiceFactoryImpl.java
index 40d3e9eeec..40d3e9eeec 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/repchoice/impl/RepchoiceFactoryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/repchoice/impl/RepchoiceFactoryImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/MixedQuote.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/MixedQuote.java
index f1882ba616..f1882ba616 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/MixedQuote.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/MixedQuote.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java
index dba64b0487..dba64b0487 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/RepeatingChoice.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/RepeatingChoice.java
index 3f0b0839f2..3f0b0839f2 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/RepeatingChoice.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/RepeatingChoice.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/SequencesFactory.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/SequencesFactory.java
index 900b51ddc3..900b51ddc3 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/SequencesFactory.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/SequencesFactory.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/TwoRCs.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/TwoRCs.java
index c6e54e6598..c6e54e6598 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/TwoRCs.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/TwoRCs.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/TwoRCsMixed.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/TwoRCsMixed.java
index 90d5f942b6..90d5f942b6 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/TwoRCsMixed.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/TwoRCsMixed.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java
index c0699e50fb..c0699e50fb 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java
index 2fb4c5ec45..2fb4c5ec45 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java
index dc6fcf6323..dc6fcf6323 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java
index 84631cb06d..84631cb06d 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java
index b1ac177cb9..b1ac177cb9 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java
index df28d645e9..df28d645e9 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/Quote.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/Quote.java
index 48dcf96d64..48dcf96d64 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/Quote.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/Quote.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/SimpleFactory.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/SimpleFactory.java
index 98dc01d69a..98dc01d69a 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/SimpleFactory.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/SimpleFactory.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/CSFactory.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/CSFactory.java
index 6a742b2cdf..6a742b2cdf 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/CSFactory.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/CSFactory.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/Quote.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/Quote.java
index f18f8117c4..f18f8117c4 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/Quote.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/Quote.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/QuoteBase.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/QuoteBase.java
index c086be2c71..c086be2c71 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/QuoteBase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/QuoteBase.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/impl/CSFactoryImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/impl/CSFactoryImpl.java
index ce63e6bfae..ce63e6bfae 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/impl/CSFactoryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/impl/CSFactoryImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/impl/QuoteBaseImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/impl/QuoteBaseImpl.java
index 77a25ca7d3..77a25ca7d3 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/impl/QuoteBaseImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/impl/QuoteBaseImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/impl/QuoteImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/impl/QuoteImpl.java
index d26af102d3..d26af102d3 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/impl/QuoteImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/cs/impl/QuoteImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/impl/QuoteImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/impl/QuoteImpl.java
index dce5259550..dce5259550 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/impl/QuoteImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/impl/QuoteImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java
index 9eedba57dd..9eedba57dd 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/A.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/A.java
index 2e5f28e00e..2e5f28e00e 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/A.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/A.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/B.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/B.java
index e306049ecb..e306049ecb 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/B.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/B.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/Bprime.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/Bprime.java
index ef7bac01c8..ef7bac01c8 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/Bprime.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/Bprime.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/SubgroupFactory.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/SubgroupFactory.java
index cee8ec1a78..cee8ec1a78 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/SubgroupFactory.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/SubgroupFactory.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/impl/AImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/impl/AImpl.java
index 604708f0fd..604708f0fd 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/impl/AImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/impl/AImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/impl/BImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/impl/BImpl.java
index ccbbfb27a0..ccbbfb27a0 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/impl/BImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/impl/BImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/impl/BprimeImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/impl/BprimeImpl.java
index 04bf5758e7..04bf5758e7 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/impl/BprimeImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/impl/BprimeImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/impl/SubgroupFactoryImpl.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/impl/SubgroupFactoryImpl.java
index 49d0e6e905..49d0e6e905 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/impl/SubgroupFactoryImpl.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/com/example/subgroup/impl/SubgroupFactoryImpl.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/AllTests.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
index f54313e9bf..f54313e9bf 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryGenTestCase.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryGenTestCase.java
index f58d607cba..f58d607cba 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryGenTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryGenTestCase.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/CreateTestClasses.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/CreateTestClasses.java
index 6d81ebaf77..6d81ebaf77 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/CreateTestClasses.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/CreateTestClasses.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/ExtensibleTestCase.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/ExtensibleTestCase.java
index be65951ba5..be65951ba5 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/ExtensibleTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/ExtensibleTestCase.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/GenPatternsTestCase.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/GenPatternsTestCase.java
index 19fbc7b10e..19fbc7b10e 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/GenPatternsTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/GenPatternsTestCase.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/GeneratedPackagesTestCase.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/GeneratedPackagesTestCase.java
index 3e6267623c..3e6267623c 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/GeneratedPackagesTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/GeneratedPackagesTestCase.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/InheritanceTestCase.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/InheritanceTestCase.java
index a971f79f0f..a971f79f0f 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/InheritanceTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/InheritanceTestCase.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/OpenContentTestCase.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/OpenContentTestCase.java
index f2b1bb08b8..f2b1bb08b8 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/OpenContentTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/OpenContentTestCase.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTestCase.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTestCase.java
index 207ccd4484..207ccd4484 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTestCase.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTestCase.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
index 0ca49b6122..0ca49b6122 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/CustomerAccount.xsd b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/CustomerAccount.xsd
index cbde98662f..cbde98662f 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/CustomerAccount.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/CustomerAccount.xsd
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/Open.xsd b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/Open.xsd
index 0f158e591a..0f158e591a 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/Open.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/Open.xsd
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/TUSCANY1050.xsd b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/TUSCANY1050.xsd
index a218eb574c..a218eb574c 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/TUSCANY1050.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/TUSCANY1050.xsd
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/enum.xsd b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/enum.xsd
index 6c906539a9..6c906539a9 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/enum.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/enum.xsd
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/customer.xsd b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/customer.xsd
index 3736ff172a..3736ff172a 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/customer.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/customer.xsd
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/customers.xml b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/customers.xml
index fd61ad468f..fd61ad468f 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/customers.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/customers.xml
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/infostreet.xml b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/infostreet.xml
index 4ee4c4df85..4ee4c4df85 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/infostreet.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/infostreet.xml
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/infostreet.xsd b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/infostreet.xsd
index 4ba71d3829..4ba71d3829 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/infostreet.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/infostreet.xsd
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/infozipcode.xml b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/infozipcode.xml
index 33d7023334..33d7023334 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/infozipcode.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/infozipcode.xml
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/infozipcode.xsd b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/infozipcode.xsd
index 7a7dda0e41..7a7dda0e41 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/infozipcode.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/infozipcode.xsd
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/nonamespace.xsd b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/nonamespace.xsd
index 088676049b..088676049b 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/nonamespace.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/extensible/nonamespace.xsd
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
index 0aa17bb50a..0aa17bb50a 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/mixedStaticTestResult.xml b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/mixedStaticTestResult.xml
index 9136f0780d..9136f0780d 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/mixedStaticTestResult.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/mixedStaticTestResult.xml
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/repeatingChoice.xsd b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/repeatingChoice.xsd
index 1d566da671..1d566da671 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/repeatingChoice.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/repeatingChoice.xsd
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/repeatingChoiceTestResult.xml b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/repeatingChoiceTestResult.xml
index 2719457b6d..2719457b6d 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/repeatingChoiceTestResult.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/repeatingChoiceTestResult.xml
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/sdoModel.xsd b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/sdoModel.xsd
index 645b7b700a..645b7b700a 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/sdoModel.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/sdoModel.xsd
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/sequences.xsd b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/sequences.xsd
index b74a56eab7..b74a56eab7 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/sequences.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/sequences.xsd
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/simple.xsd b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/simple.xsd
index f058e5b63a..f058e5b63a 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/simple.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/simple.xsd
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/simpleWithChangeSummary.xsd b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/simpleWithChangeSummary.xsd
index 35d504425d..35d504425d 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/simpleWithChangeSummary.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/simpleWithChangeSummary.xsd
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/subgroup.xsd b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/subgroup.xsd
index 798085b88d..798085b88d 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/subgroup.xsd
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/subgroup.xsd
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/subgroup1.xml b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/subgroup1.xml
index 15eed43c10..15eed43c10 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/subgroup1.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/subgroup1.xml
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
index a62cd66b58..a62cd66b58 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
diff --git a/branches/sdo-1.0-incubating/tools/src/test/resources/twoRepeatingChoicesTestResult.xml b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/twoRepeatingChoicesTestResult.xml
index 3585ad00d3..3585ad00d3 100644
--- a/branches/sdo-1.0-incubating/tools/src/test/resources/twoRepeatingChoicesTestResult.xml
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/src/test/resources/twoRepeatingChoicesTestResult.xml
diff --git a/branches/sdo-1.0-incubating/tools/templates/Header.javajetinc b/sdo-java/branches/sdo-1.0-incubating/tools/templates/Header.javajetinc
index 27becf3645..27becf3645 100644
--- a/branches/sdo-1.0-incubating/tools/templates/Header.javajetinc
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/templates/Header.javajetinc
diff --git a/branches/sdo-1.0-incubating/tools/templates/models/SDOClass.javajet b/sdo-java/branches/sdo-1.0-incubating/tools/templates/models/SDOClass.javajet
index b2727d925d..b2727d925d 100644
--- a/branches/sdo-1.0-incubating/tools/templates/models/SDOClass.javajet
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/templates/models/SDOClass.javajet
diff --git a/branches/sdo-1.0-incubating/tools/templates/models/SDOFactoryClass.javajet b/sdo-java/branches/sdo-1.0-incubating/tools/templates/models/SDOFactoryClass.javajet
index c874e28206..c874e28206 100644
--- a/branches/sdo-1.0-incubating/tools/templates/models/SDOFactoryClass.javajet
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/templates/models/SDOFactoryClass.javajet
diff --git a/branches/sdo-1.0-incubating/tools/templates/models/generator.skeleton b/sdo-java/branches/sdo-1.0-incubating/tools/templates/models/generator.skeleton
index 5c123c01fd..5c123c01fd 100644
--- a/branches/sdo-1.0-incubating/tools/templates/models/generator.skeleton
+++ b/sdo-java/branches/sdo-1.0-incubating/tools/templates/models/generator.skeleton