Moving 1.x branches

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

131 files changed, 0 insertions, 0 deletions

diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java
index 5eea403613..5eea403613 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java
index 7bc75d8faa..7bc75d8faa 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java
index 5b066bb6e3..5b066bb6e3 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java
index caa154baf5..caa154baf5 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java
index ced62cc058..ced62cc058 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java
index 5fed5829ae..5fed5829ae 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/XMLStreamHelper.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/XMLStreamHelper.java
index 4375faa9f3..4375faa9f3 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/XMLStreamHelper.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/XMLStreamHelper.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java
index 6608357769..6608357769 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java
index 15ff8a7502..15ff8a7502 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java
index b7048ed6ab..b7048ed6ab 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java
index 5b9b3742d5..5b9b3742d5 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java
index 060bd381dc..060bd381dc 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java
index ab5ee13af9..ab5ee13af9 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java
index 3986fa4be7..3986fa4be7 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java
index a31066d598..a31066d598 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
index d0ece134e3..d0ece134e3 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java
index 1b1313c4f8..1b1313c4f8 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
index 9867393ca4..9867393ca4 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
index f4d39670b6..f4d39670b6 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
index 72fdc93f60..72fdc93f60 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
index 653665e1b8..653665e1b8 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java
index ace561e28f..ace561e28f 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
index 2194b0c6ce..2194b0c6ce 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java
index a1bb922d69..a1bb922d69 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
index b516cea449..b516cea449 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java
index 5460257079..5460257079 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java
index 9f714b9cfa..9f714b9cfa 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
index eca552a78d..eca552a78d 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java
index 725c0211dc..725c0211dc 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
index 4617656fff..4617656fff 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java
index 82d808e4f3..82d808e4f3 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
index 18e1c3a19b..18e1c3a19b 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java
index dd9cdfa779..dd9cdfa779 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java
index d3b709c070..d3b709c070 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
index 56e7eadcea..56e7eadcea 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
index e57fb54544..e57fb54544 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
index a3536f4230..a3536f4230 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java
index f8c3f05cae..f8c3f05cae 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java
index 15011fc37f..15011fc37f 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java
index 33ca015ac9..33ca015ac9 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java
index 06bb3a6d05..06bb3a6d05 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java
index 05fe4d1a8f..05fe4d1a8f 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java
index dfdc1d0b97..dfdc1d0b97 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java
index 353d25f6ef..353d25f6ef 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java
index 9d4f7b90a8..9d4f7b90a8 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java
index 19e59bbc5f..19e59bbc5f 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelPackage.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelPackage.java
index c33ca619cc..c33ca619cc 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelPackage.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelPackage.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java
index a05545afed..a05545afed 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java
index a124dee1c2..a124dee1c2 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java
index e792fc7a87..e792fc7a87 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java
index 3be181bd9a..3be181bd9a 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java
index 73188861d4..73188861d4 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java
index 9b12301381..9b12301381 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java
index 31d54ca425..31d54ca425 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java
index 07ff624c4f..07ff624c4f 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java
index e6e8dd1f39..e6e8dd1f39 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java
index ed516ebd95..ed516ebd95 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
index eaf56bd477..eaf56bd477 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelPackageImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelPackageImpl.java
index 86604e91f6..86604e91f6 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelPackageImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelPackageImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java
index f2873031ee..f2873031ee 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java
index 6a4e346bb1..6a4e346bb1 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java
index 5d77ce2fae..5d77ce2fae 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java
index c51cd7948c..c51cd7948c 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java
index bfd673f0d2..bfd673f0d2 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java
index 74b60af0ae..74b60af0ae 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java
index 7ca6ee818f..7ca6ee818f 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java
index 555be8de4f..555be8de4f 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java
index 6e76337615..6e76337615 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java
index db395f9632..db395f9632 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaPackageImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaPackageImpl.java
index de32f55141..de32f55141 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaPackageImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaPackageImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java
index 5a631dde77..5a631dde77 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
index 8f10b7f198..8f10b7f198 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
index 23df894b32..23df894b32 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
index 834176bfab..834176bfab 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java
index 858d445640..858d445640 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java
index 4dd00c075d..4dd00c075d 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java
index e2c33713d3..e2c33713d3 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java
index 7cbeeda682..7cbeeda682 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java
index bc311015ec..bc311015ec 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java
index dc004a8f5e..dc004a8f5e 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java
index b36d7fa8f9..b36d7fa8f9 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java
index e0e24fc9c2..e0e24fc9c2 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataPackageImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataPackageImpl.java
index df1404ddd9..df1404ddd9 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataPackageImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataPackageImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java
index 5a668bb306..5a668bb306 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java
index a147b12053..a147b12053 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java
index 1bfdc9d465..1bfdc9d465 100644
--- a/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java
diff --git a/branches/java-M1/java/sdo/impl/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/java-M1/java/sdo/impl/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/java-M1/java/sdo/impl/src/main/resources/META-INF/MANIFEST.MF b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/resources/META-INF/MANIFEST.MF
index 6abece6be5..6abece6be5 100644
--- a/branches/java-M1/java/sdo/impl/src/main/resources/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/resources/META-INF/MANIFEST.MF
diff --git a/branches/java-M1/java/sdo/impl/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/java-M1/java/sdo/impl/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/resources/META-INF/NOTICE
diff --git a/branches/java-M1/java/sdo/impl/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/java-M1/java/sdo/impl/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/resources/META-INF/README.txt
diff --git a/branches/java-M1/java/sdo/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider
index 73693d6556..73693d6556 100644
--- a/branches/java-M1/java/sdo/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider
diff --git a/branches/java-M1/java/sdo/impl/src/main/resources/sdo-metadata.xsd b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/resources/sdo-metadata.xsd
index b3daf2b894..b3daf2b894 100644
--- a/branches/java-M1/java/sdo/impl/src/main/resources/sdo-metadata.xsd
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/main/resources/sdo-metadata.xsd
diff --git a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java
index f862837715..f862837715 100644
--- a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java
diff --git a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java
index 35a878015f..35a878015f 100644
--- a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java
diff --git a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java
index 7c64a42ab3..7c64a42ab3 100644
--- a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java
diff --git a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java
index 6a401d48bb..6a401d48bb 100644
--- a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java
diff --git a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java
index 9d67b61317..9d67b61317 100644
--- a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java
diff --git a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java
index 5cee856217..5cee856217 100644
--- a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java
diff --git a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java
index 209d7021c0..209d7021c0 100644
--- a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java
diff --git a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java
index 4cc8c5e842..4cc8c5e842 100644
--- a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java
diff --git a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java
index faa8782a77..faa8782a77 100644
--- a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java
diff --git a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
index b77b534be6..b77b534be6 100644
--- a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
diff --git a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java
index e46f9858e2..e46f9858e2 100644
--- a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java
diff --git a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java
index 7e743e296a..7e743e296a 100644
--- a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java
diff --git a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java
index 2e91a1a66f..2e91a1a66f 100644
--- a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java
diff --git a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java
index d86b793087..d86b793087 100644
--- a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java
diff --git a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java
index ac05b362d9..ac05b362d9 100644
--- a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java
diff --git a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
index d2ac035e02..d2ac035e02 100644
--- a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
diff --git a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTest.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTest.java
index b14ae165dc..b14ae165dc 100644
--- a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTest.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTest.java
diff --git a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLDocumentTestCase.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLDocumentTestCase.java
index c4f2cc4586..c4f2cc4586 100644
--- a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLDocumentTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLDocumentTestCase.java
diff --git a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
index 16a2cbd195..16a2cbd195 100644
--- a/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
diff --git a/branches/java-M1/java/sdo/impl/src/test/resources/XMLDocumentNoNamespaceSchemaLocation.xsd b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/XMLDocumentNoNamespaceSchemaLocation.xsd
index 42f9555d44..42f9555d44 100644
--- a/branches/java-M1/java/sdo/impl/src/test/resources/XMLDocumentNoNamespaceSchemaLocation.xsd
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/XMLDocumentNoNamespaceSchemaLocation.xsd
diff --git a/branches/java-M1/java/sdo/impl/src/test/resources/XMLDocumentSchemaLocation.xsd b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/XMLDocumentSchemaLocation.xsd
index 268ea375f0..268ea375f0 100644
--- a/branches/java-M1/java/sdo/impl/src/test/resources/XMLDocumentSchemaLocation.xsd
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/XMLDocumentSchemaLocation.xsd
diff --git a/branches/java-M1/java/sdo/impl/src/test/resources/XMLDocumentTestCase.xml b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/XMLDocumentTestCase.xml
index 34e1648429..34e1648429 100644
--- a/branches/java-M1/java/sdo/impl/src/test/resources/XMLDocumentTestCase.xml
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/XMLDocumentTestCase.xml
diff --git a/branches/java-M1/java/sdo/impl/src/test/resources/customer1.xml b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/customer1.xml
index 0c18fa47fa..0c18fa47fa 100644
--- a/branches/java-M1/java/sdo/impl/src/test/resources/customer1.xml
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/customer1.xml
diff --git a/branches/java-M1/java/sdo/impl/src/test/resources/customer2.xml b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/customer2.xml
index 5b74c06c73..5b74c06c73 100644
--- a/branches/java-M1/java/sdo/impl/src/test/resources/customer2.xml
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/customer2.xml
diff --git a/branches/java-M1/java/sdo/impl/src/test/resources/datatype.xsd b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/datatype.xsd
index 032f026137..032f026137 100644
--- a/branches/java-M1/java/sdo/impl/src/test/resources/datatype.xsd
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/datatype.xsd
diff --git a/branches/java-M1/java/sdo/impl/src/test/resources/mixed.xml b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/mixed.xml
index 42ff3a3a5b..42ff3a3a5b 100644
--- a/branches/java-M1/java/sdo/impl/src/test/resources/mixed.xml
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/mixed.xml
diff --git a/branches/java-M1/java/sdo/impl/src/test/resources/mixed.xsd b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/mixed.xsd
index c45fc87de2..c45fc87de2 100644
--- a/branches/java-M1/java/sdo/impl/src/test/resources/mixed.xsd
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/mixed.xsd
diff --git a/branches/java-M1/java/sdo/impl/src/test/resources/mixed2.xml b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/mixed2.xml
index 723d7bb891..723d7bb891 100644
--- a/branches/java-M1/java/sdo/impl/src/test/resources/mixed2.xml
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/mixed2.xml
diff --git a/branches/java-M1/java/sdo/impl/src/test/resources/mixedopen.xml b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/mixedopen.xml
index 5e618c58c8..5e618c58c8 100644
--- a/branches/java-M1/java/sdo/impl/src/test/resources/mixedopen.xml
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/mixedopen.xml
diff --git a/branches/java-M1/java/sdo/impl/src/test/resources/names.xsd b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/names.xsd
index 601ecc5f6a..601ecc5f6a 100644
--- a/branches/java-M1/java/sdo/impl/src/test/resources/names.xsd
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/names.xsd
diff --git a/branches/java-M1/java/sdo/impl/src/test/resources/open.xml b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/open.xml
index d4a5b92e0c..d4a5b92e0c 100644
--- a/branches/java-M1/java/sdo/impl/src/test/resources/open.xml
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/open.xml
diff --git a/branches/java-M1/java/sdo/impl/src/test/resources/open.xsd b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/open.xsd
index 06881e3f05..06881e3f05 100644
--- a/branches/java-M1/java/sdo/impl/src/test/resources/open.xsd
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/open.xsd
diff --git a/branches/java-M1/java/sdo/impl/src/test/resources/open2.xml b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/open2.xml
index 1dd5cf49f6..1dd5cf49f6 100644
--- a/branches/java-M1/java/sdo/impl/src/test/resources/open2.xml
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/open2.xml
diff --git a/branches/java-M1/java/sdo/impl/src/test/resources/quote.xml b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/quote.xml
index d7b5969e23..d7b5969e23 100644
--- a/branches/java-M1/java/sdo/impl/src/test/resources/quote.xml
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/quote.xml
diff --git a/branches/java-M1/java/sdo/impl/src/test/resources/sdoannotations.xsd b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/sdoannotations.xsd
index 355e9e2ba3..355e9e2ba3 100644
--- a/branches/java-M1/java/sdo/impl/src/test/resources/sdoannotations.xsd
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/sdoannotations.xsd
diff --git a/branches/java-M1/java/sdo/impl/src/test/resources/sdotypes.xsd b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/sdotypes.xsd
index aa0def2be6..aa0def2be6 100644
--- a/branches/java-M1/java/sdo/impl/src/test/resources/sdotypes.xsd
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/sdotypes.xsd
diff --git a/branches/java-M1/java/sdo/impl/src/test/resources/shallowquote.xml b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/shallowquote.xml
index a56f2fe2b7..a56f2fe2b7 100644
--- a/branches/java-M1/java/sdo/impl/src/test/resources/shallowquote.xml
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/shallowquote.xml
diff --git a/branches/java-M1/java/sdo/impl/src/test/resources/simple.xsd b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/simple.xsd
index 5310f7e1f3..5310f7e1f3 100644
--- a/branches/java-M1/java/sdo/impl/src/test/resources/simple.xsd
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/simple.xsd
diff --git a/branches/java-M1/java/sdo/impl/src/test/resources/simplechangesummary.xml b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/simplechangesummary.xml
index 7ac7a7cb2a..7ac7a7cb2a 100644
--- a/branches/java-M1/java/sdo/impl/src/test/resources/simplechangesummary.xml
+++ b/sca-java-1.x/branches/java-M1/java/sdo/impl/src/test/resources/simplechangesummary.xml