summaryrefslogtreecommitdiffstats
path: root/branches
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/BUILDING.txt (renamed from branches/sdo-java-M2/sdo-api/BUILDING.txt)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/LICENSE.txt (renamed from branches/sdo-java-M2/sdo-api/LICENSE.txt)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/NOTICE.txt (renamed from branches/sdo-java-M2/sdo-api/NOTICE.txt)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/STATUS.txt (renamed from branches/sdo-java-M2/sdo-api/STATUS.txt)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/pom.xml (renamed from branches/sdo-java-M2/sdo-api/pom.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/ChangeSummary.java (renamed from branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/ChangeSummary.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/DataGraph.java (renamed from branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/DataGraph.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/DataObject.java (renamed from branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/DataObject.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/Property.java (renamed from branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/Property.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/Sequence.java (renamed from branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/Sequence.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/Type.java (renamed from branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/Type.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/CopyHelper.java (renamed from branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/CopyHelper.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/DataFactory.java (renamed from branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/DataFactory.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/DataHelper.java (renamed from branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/DataHelper.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/EqualityHelper.java (renamed from branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/EqualityHelper.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/TypeHelper.java (renamed from branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/TypeHelper.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/XMLDocument.java (renamed from branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/XMLDocument.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/XMLHelper.java (renamed from branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/XMLHelper.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/XSDHelper.java (renamed from branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/XSDHelper.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/impl/ExternalizableDelegator.java (renamed from branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/impl/ExternalizableDelegator.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/impl/HelperProvider.java (renamed from branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/impl/HelperProvider.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/impl/NoHelperProviderException.java (renamed from branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/impl/NoHelperProviderException.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/datagraph.xsd (renamed from branches/sdo-java-M2/sdo-api/src/main/resources/xml/datagraph.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoJava.xml (renamed from branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoJava.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoJava.xsd (renamed from branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoJava.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoModel.xml (renamed from branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoModel.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoModel.xsd (renamed from branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoModel.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoXML.xml (renamed from branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoXML.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoXML.xsd (renamed from branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoXML.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/test/java/commonj/sdo/impl/HelperProviderTestCase.java (renamed from branches/sdo-java-M2/sdo-api/src/test/java/commonj/sdo/impl/HelperProviderTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/test/java/test/DefaultHelperProvider.java (renamed from branches/sdo-java-M2/sdo-api/src/test/java/test/DefaultHelperProvider.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/test/java/test/TCCL1HelperProvider.java (renamed from branches/sdo-java-M2/sdo-api/src/test/java/test/TCCL1HelperProvider.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/test/resources/default/META-INF/services/commonj.sdo.impl.HelperProvider (renamed from branches/sdo-java-M2/sdo-api/src/test/resources/default/META-INF/services/commonj.sdo.impl.HelperProvider)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo-api/src/test/resources/tccl1/META-INF/services/commonj.sdo.impl.HelperProvider (renamed from branches/sdo-java-M2/sdo-api/src/test/resources/tccl1/META-INF/services/commonj.sdo.impl.HelperProvider)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/BUILDING.txt (renamed from branches/sdo-java-M2/sdo/BUILDING.txt)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/LICENSE.txt (renamed from branches/sdo-java-M2/sdo/LICENSE.txt)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/NOTICE.txt (renamed from branches/sdo-java-M2/sdo/NOTICE.txt)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/STATUS.txt (renamed from branches/sdo-java-M2/sdo/STATUS.txt)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/distribution/RELEASE_NOTES.txt (renamed from branches/sdo-java-M2/sdo/distribution/RELEASE_NOTES.txt)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/distribution/readme.html (renamed from branches/sdo-java-M2/sdo/distribution/readme.html)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/model/SDO.ecore (renamed from branches/sdo-java-M2/sdo/impl/model/SDO.ecore)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/model/SDO.genmodel (renamed from branches/sdo-java-M2/sdo/impl/model/SDO.genmodel)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/model/SDO.mdl (renamed from branches/sdo-java-M2/sdo/impl/model/SDO.mdl)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/pom.xml (renamed from branches/sdo-java-M2/sdo/impl/pom.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CrossScopeCopyHelperImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CrossScopeCopyHelperImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOAnnotations.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOAnnotations.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SchemaBuilder.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SchemaBuilder.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeTable.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeTable.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelper.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelper.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelPackage.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelPackage.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelPackageImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelPackageImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaPackageImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaPackageImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataPackageImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataPackageImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceFactoryImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceFactoryImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLDocumentStreamReader.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLDocumentStreamReader.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLFragmentStreamReader.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLFragmentStreamReader.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLStreamSerializer.java (renamed from branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLStreamSerializer.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/LICENSE.txt (renamed from branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/LICENSE.txt)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/MANIFEST.MF (renamed from branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/MANIFEST.MF)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/NOTICE (renamed from branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/NOTICE)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/README.txt (renamed from branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/README.txt)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider (renamed from branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/main/resources/sdo-metadata.xsd (renamed from branches/sdo-java-M2/sdo/impl/src/main/resources/sdo-metadata.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/Quote.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/Quote.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/SimpleFactory.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/SimpleFactory.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/impl/QuoteImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/impl/QuoteImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/impl/SimplePackageImpl.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/impl/SimplePackageImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/CrossScopeCopyTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/CrossScopeCopyTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DateConversionTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DateConversionTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineOpenContentPropertyTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineOpenContentPropertyTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/IsManyTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/IsManyTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/JiraTestCases.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/JiraTestCases.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SerializeTypesTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SerializeTypesTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SubstitutionValuesTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SubstitutionValuesTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeConversionTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeConversionTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLDocumentTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLDocumentTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java (renamed from branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/SubstitutionValues.xsd (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/SubstitutionValues.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/XMLDocumentNoNamespaceSchemaLocation.xsd (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/XMLDocumentNoNamespaceSchemaLocation.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/XMLDocumentSchemaLocation.xsd (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/XMLDocumentSchemaLocation.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/XMLDocumentTestCase.xml (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/XMLDocumentTestCase.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/api_test.xsd (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/api_test.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/bank.xsd (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/bank.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/company.xsd (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/company.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/customer1.xml (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/customer1.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/customer2.xml (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/customer2.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/datatype.xsd (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/datatype.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/foo-ext.xml (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/foo-ext.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/foo-ext.xsd (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/foo-ext.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/foo.xsd (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/foo.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/mixed.xml (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/mixed.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/mixed.xsd (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/mixed.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/mixed2.xml (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/mixed2.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/mixedopen.xml (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/mixedopen.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/names.xsd (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/names.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/open.xml (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/open.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/open.xsd (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/open.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/open1any.xsd (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/open1any.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/open2.xml (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/open2.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/openContentProperty.xml (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/openContentProperty.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/po.xsd (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/po.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/quote.xml (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/quote.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/sdoannotations.xsd (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/sdoannotations.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/sdotypes.xsd (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/sdotypes.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/shallowquote.xml (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/shallowquote.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/simple.xsd (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/simple.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/simplechangesummary.xml (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/simplechangesummary.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/xpath.xml (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/xpath.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/xpath.xsd (renamed from branches/sdo-java-M2/sdo/impl/src/test/resources/xpath.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/plugin/pom.xml (renamed from branches/sdo-java-M2/sdo/plugin/pom.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java (renamed from branches/sdo-java-M2/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java (renamed from branches/sdo-java-M2/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/plugin/src/main/resources/META-INF/LICENSE.txt (renamed from branches/sdo-java-M2/sdo/plugin/src/main/resources/META-INF/LICENSE.txt)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/plugin/src/main/resources/META-INF/NOTICE (renamed from branches/sdo-java-M2/sdo/plugin/src/main/resources/META-INF/NOTICE)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/plugin/src/main/resources/META-INF/README.txt (renamed from branches/sdo-java-M2/sdo/plugin/src/main/resources/META-INF/README.txt)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/pom.xml (renamed from branches/sdo-java-M2/sdo/pom.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/LICENSE.txt (renamed from branches/sdo-java-M2/sdo/sample/LICENSE.txt)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/NOTICE.txt (renamed from branches/sdo-java-M2/sdo/sample/NOTICE.txt)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/README.txt (renamed from branches/sdo-java-M2/sdo/sample/README.txt)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/STATUS.txt (renamed from branches/sdo-java-M2/sdo/sample/STATUS.txt)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/pom.xml (renamed from branches/sdo-java-M2/sdo/sample/pom.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/ExecuteSamples.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/ExecuteSamples.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/SdoSampleConstants.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/SdoSampleConstants.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/CreateCompany.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/CreateCompany.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/CreatePurchaseOrder.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/CreatePurchaseOrder.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/PurchaseOrderCmdLine.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/PurchaseOrderCmdLine.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/PurchaseOrderControl.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/PurchaseOrderControl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/ReadPurchaseOrder.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/ReadPurchaseOrder.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/package.html (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/package.html)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/overview.html (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/overview.html)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/package.html (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/package.html)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/AccessDataObjectPropertiesByName.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/AccessDataObjectPropertiesByName.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/AccessDataObjectUsingValidXPath.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/AccessDataObjectUsingValidXPath.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/CreateDataObjectFromXmlString.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/CreateDataObjectFromXmlString.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/CreateDataObjectFromXsdAndXmlFiles.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/CreateDataObjectFromXsdAndXmlFiles.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/DynamicCustomerTypeSample.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/DynamicCustomerTypeSample.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/ObtainingDataGraphFromXml.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/ObtainingDataGraphFromXml.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/PrintPropertiesOfDataObject.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/PrintPropertiesOfDataObject.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/UsingXPath.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/UsingXPath.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/package.html (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/package.html)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/AccessDataObjectsUsingXPath.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/AccessDataObjectsUsingXPath.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/AccessingDataObjectsViaPropertyIndex.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/AccessingDataObjectsViaPropertyIndex.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/AccessingTheContentsOfASequence.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/AccessingTheContentsOfASequence.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/CreatingDataObjectTreesFromXMLDocuments.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/CreatingDataObjectTreesFromXMLDocuments.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/CreatingXmlFromDataObjects.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/CreatingXmlFromDataObjects.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/SerializingDesearializingADataObject.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/SerializingDesearializingADataObject.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/UsingTypeAndPropertyWithDataObjects.java (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/UsingTypeAndPropertyWithDataObjects.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/package.html (renamed from branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/package.html)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/company.xsd (renamed from branches/sdo-java-M2/sdo/sample/src/main/resources/company.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/companyCompleteDataGraph.xml (renamed from branches/sdo-java-M2/sdo/sample/src/main/resources/companyCompleteDataGraph.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/companyDataGraph.xml (renamed from branches/sdo-java-M2/sdo/sample/src/main/resources/companyDataGraph.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/companyDataGraphGenerated.xml (renamed from branches/sdo-java-M2/sdo/sample/src/main/resources/companyDataGraphGenerated.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/companyGenerated.xml (renamed from branches/sdo-java-M2/sdo/sample/src/main/resources/companyGenerated.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/doc-files/cmdPrompt.GIF (renamed from branches/sdo-java-M2/sdo/sample/src/main/resources/doc-files/cmdPrompt.GIF)bin9431 -> 9431 bytes
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/letter.xml (renamed from branches/sdo-java-M2/sdo/sample/src/main/resources/letter.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/letter.xsd (renamed from branches/sdo-java-M2/sdo/sample/src/main/resources/letter.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/po.xml (renamed from branches/sdo-java-M2/sdo/sample/src/main/resources/po.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/po.xsd (renamed from branches/sdo-java-M2/sdo/sample/src/main/resources/po.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/sdo.xml (renamed from branches/sdo-java-M2/sdo/sdo.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/pom.xml (renamed from branches/sdo-java-M2/sdo/tools/pom.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/readme.htm (renamed from branches/sdo-java-M2/sdo/tools/readme.htm)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java (renamed from branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java (renamed from branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java (renamed from branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java (renamed from branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapterFactory.java (renamed from branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapterFactory.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java (renamed from branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java (renamed from branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java (renamed from branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java (renamed from branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/eclipse/jdt/core/formatter/CodeFormatter.java (renamed from branches/sdo-java-M2/sdo/tools/src/main/java/org/eclipse/jdt/core/formatter/CodeFormatter.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/main/resources/META-INF/LICENSE.txt (renamed from branches/sdo-java-M2/sdo/tools/src/main/resources/META-INF/LICENSE.txt)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/main/resources/META-INF/NOTICE (renamed from branches/sdo-java-M2/sdo/tools/src/main/resources/META-INF/NOTICE)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/main/resources/META-INF/README.txt (renamed from branches/sdo-java-M2/sdo/tools/src/main/resources/META-INF/README.txt)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/MixedQuote.java (renamed from branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/MixedQuote.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java (renamed from branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/RepeatingChoice.java (renamed from branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/RepeatingChoice.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/SequencesFactory.java (renamed from branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/SequencesFactory.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/TwoRCs.java (renamed from branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/TwoRCs.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/TwoRCsMixed.java (renamed from branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/TwoRCsMixed.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java (renamed from branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java (renamed from branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java (renamed from branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java (renamed from branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java (renamed from branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java (renamed from branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/Quote.java (renamed from branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/Quote.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/SimpleFactory.java (renamed from branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/SimpleFactory.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/impl/QuoteImpl.java (renamed from branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/impl/QuoteImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java (renamed from branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/impl/SimplePackageImpl.java (renamed from branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/impl/SimplePackageImpl.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTest.java (renamed from branches/sdo-java-M2/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTest.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/StaticSequenceNoEmfTestCase.java (renamed from branches/sdo-java-M2/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/StaticSequenceNoEmfTestCase.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java (renamed from branches/sdo-java-M2/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/enum.xsd (renamed from branches/sdo-java-M2/sdo/tools/src/test/resources/enum.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml (renamed from branches/sdo-java-M2/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/mixedStaticTestResult.xml (renamed from branches/sdo-java-M2/sdo/tools/src/test/resources/mixedStaticTestResult.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/repeatingChoice.xsd (renamed from branches/sdo-java-M2/sdo/tools/src/test/resources/repeatingChoice.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/repeatingChoiceTestResult.xml (renamed from branches/sdo-java-M2/sdo/tools/src/test/resources/repeatingChoiceTestResult.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/sequences.xsd (renamed from branches/sdo-java-M2/sdo/tools/src/test/resources/sequences.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/simple.xsd (renamed from branches/sdo-java-M2/sdo/tools/src/test/resources/simple.xsd)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml (renamed from branches/sdo-java-M2/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/twoRepeatingChoicesTestResult.xml (renamed from branches/sdo-java-M2/sdo/tools/src/test/resources/twoRepeatingChoicesTestResult.xml)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/templates/Header.javajetinc (renamed from branches/sdo-java-M2/sdo/tools/templates/Header.javajetinc)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/templates/models/SDOClass.javajet (renamed from branches/sdo-java-M2/sdo/tools/templates/models/SDOClass.javajet)0
-rw-r--r--sdo-java/branches/sdo-java-M2/sdo/tools/templates/models/SDOFactoryClass.javajet (renamed from branches/sdo-java-M2/sdo/tools/templates/models/SDOFactoryClass.javajet)0
309 files changed, 0 insertions, 0 deletions
diff --git a/branches/sdo-java-M2/sdo-api/BUILDING.txt b/sdo-java/branches/sdo-java-M2/sdo-api/BUILDING.txt
index 1b5cc24880..1b5cc24880 100644
--- a/branches/sdo-java-M2/sdo-api/BUILDING.txt
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/BUILDING.txt
diff --git a/branches/sdo-java-M2/sdo-api/LICENSE.txt b/sdo-java/branches/sdo-java-M2/sdo-api/LICENSE.txt
index 1f4c1af73a..1f4c1af73a 100644
--- a/branches/sdo-java-M2/sdo-api/LICENSE.txt
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/LICENSE.txt
diff --git a/branches/sdo-java-M2/sdo-api/NOTICE.txt b/sdo-java/branches/sdo-java-M2/sdo-api/NOTICE.txt
index 32e5f84d1c..32e5f84d1c 100644
--- a/branches/sdo-java-M2/sdo-api/NOTICE.txt
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/NOTICE.txt
diff --git a/branches/sdo-java-M2/sdo-api/STATUS.txt b/sdo-java/branches/sdo-java-M2/sdo-api/STATUS.txt
index 24a37ea606..24a37ea606 100644
--- a/branches/sdo-java-M2/sdo-api/STATUS.txt
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/STATUS.txt
diff --git a/branches/sdo-java-M2/sdo-api/pom.xml b/sdo-java/branches/sdo-java-M2/sdo-api/pom.xml
index 4c9aedf6ed..4c9aedf6ed 100644
--- a/branches/sdo-java-M2/sdo-api/pom.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/pom.xml
diff --git a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/ChangeSummary.java b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/ChangeSummary.java
index 3eeacf4c01..3eeacf4c01 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/ChangeSummary.java
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/ChangeSummary.java
diff --git a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/DataGraph.java b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/DataGraph.java
index 78bc7227a1..78bc7227a1 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/DataGraph.java
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/DataGraph.java
diff --git a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/DataObject.java b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/DataObject.java
index 8a1819f475..8a1819f475 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/DataObject.java
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/DataObject.java
diff --git a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/Property.java b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/Property.java
index cc96e90b44..cc96e90b44 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/Property.java
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/Property.java
diff --git a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/Sequence.java b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/Sequence.java
index b46a5be7e0..b46a5be7e0 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/Sequence.java
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/Sequence.java
diff --git a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/Type.java b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/Type.java
index 85d43aad60..85d43aad60 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/Type.java
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/Type.java
diff --git a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/CopyHelper.java b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/CopyHelper.java
index f0bf98aada..f0bf98aada 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/CopyHelper.java
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/CopyHelper.java
diff --git a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/DataFactory.java b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/DataFactory.java
index fc9bf96ba4..fc9bf96ba4 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/DataFactory.java
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/DataFactory.java
diff --git a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/DataHelper.java b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/DataHelper.java
index 1a630e4118..1a630e4118 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/DataHelper.java
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/DataHelper.java
diff --git a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/EqualityHelper.java b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/EqualityHelper.java
index 6214020701..6214020701 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/EqualityHelper.java
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/EqualityHelper.java
diff --git a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/TypeHelper.java b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/TypeHelper.java
index d178789a67..d178789a67 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/TypeHelper.java
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/TypeHelper.java
diff --git a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/XMLDocument.java b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/XMLDocument.java
index 3ef7fd70c8..3ef7fd70c8 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/XMLDocument.java
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/XMLDocument.java
diff --git a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/XMLHelper.java b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/XMLHelper.java
index 1d0c6ca127..1d0c6ca127 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/XMLHelper.java
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/XMLHelper.java
diff --git a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/XSDHelper.java b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/XSDHelper.java
index 7b4a99493c..7b4a99493c 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/XSDHelper.java
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/helper/XSDHelper.java
diff --git a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/impl/ExternalizableDelegator.java b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/impl/ExternalizableDelegator.java
index 886138d3a5..886138d3a5 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/impl/ExternalizableDelegator.java
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/impl/ExternalizableDelegator.java
diff --git a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/impl/HelperProvider.java b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/impl/HelperProvider.java
index 6fbdad8bd5..6fbdad8bd5 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/impl/HelperProvider.java
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/impl/HelperProvider.java
diff --git a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/impl/NoHelperProviderException.java b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/impl/NoHelperProviderException.java
index 83f0b21e2e..83f0b21e2e 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/impl/NoHelperProviderException.java
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/java/commonj/sdo/impl/NoHelperProviderException.java
diff --git a/branches/sdo-java-M2/sdo-api/src/main/resources/xml/datagraph.xsd b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/datagraph.xsd
index 30727473a0..30727473a0 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/resources/xml/datagraph.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/datagraph.xsd
diff --git a/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoJava.xml b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoJava.xml
index 08c3b9734c..08c3b9734c 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoJava.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoJava.xml
diff --git a/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoJava.xsd b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoJava.xsd
index 094a705aa5..094a705aa5 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoJava.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoJava.xsd
diff --git a/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoModel.xml b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoModel.xml
index fcd1a4e283..fcd1a4e283 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoModel.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoModel.xml
diff --git a/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoModel.xsd b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoModel.xsd
index 114fb57145..114fb57145 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoModel.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoModel.xsd
diff --git a/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoXML.xml b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoXML.xml
index ac831576fb..ac831576fb 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoXML.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoXML.xml
diff --git a/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoXML.xsd b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoXML.xsd
index 88fc7daaf6..88fc7daaf6 100644
--- a/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoXML.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/main/resources/xml/sdoXML.xsd
diff --git a/branches/sdo-java-M2/sdo-api/src/test/java/commonj/sdo/impl/HelperProviderTestCase.java b/sdo-java/branches/sdo-java-M2/sdo-api/src/test/java/commonj/sdo/impl/HelperProviderTestCase.java
index 8854e936b7..8854e936b7 100644
--- a/branches/sdo-java-M2/sdo-api/src/test/java/commonj/sdo/impl/HelperProviderTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/test/java/commonj/sdo/impl/HelperProviderTestCase.java
diff --git a/branches/sdo-java-M2/sdo-api/src/test/java/test/DefaultHelperProvider.java b/sdo-java/branches/sdo-java-M2/sdo-api/src/test/java/test/DefaultHelperProvider.java
index 77d6206972..77d6206972 100644
--- a/branches/sdo-java-M2/sdo-api/src/test/java/test/DefaultHelperProvider.java
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/test/java/test/DefaultHelperProvider.java
diff --git a/branches/sdo-java-M2/sdo-api/src/test/java/test/TCCL1HelperProvider.java b/sdo-java/branches/sdo-java-M2/sdo-api/src/test/java/test/TCCL1HelperProvider.java
index 05b1b04925..05b1b04925 100644
--- a/branches/sdo-java-M2/sdo-api/src/test/java/test/TCCL1HelperProvider.java
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/test/java/test/TCCL1HelperProvider.java
diff --git a/branches/sdo-java-M2/sdo-api/src/test/resources/default/META-INF/services/commonj.sdo.impl.HelperProvider b/sdo-java/branches/sdo-java-M2/sdo-api/src/test/resources/default/META-INF/services/commonj.sdo.impl.HelperProvider
index 5175e5abea..5175e5abea 100644
--- a/branches/sdo-java-M2/sdo-api/src/test/resources/default/META-INF/services/commonj.sdo.impl.HelperProvider
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/test/resources/default/META-INF/services/commonj.sdo.impl.HelperProvider
diff --git a/branches/sdo-java-M2/sdo-api/src/test/resources/tccl1/META-INF/services/commonj.sdo.impl.HelperProvider b/sdo-java/branches/sdo-java-M2/sdo-api/src/test/resources/tccl1/META-INF/services/commonj.sdo.impl.HelperProvider
index fa88e4c705..fa88e4c705 100644
--- a/branches/sdo-java-M2/sdo-api/src/test/resources/tccl1/META-INF/services/commonj.sdo.impl.HelperProvider
+++ b/sdo-java/branches/sdo-java-M2/sdo-api/src/test/resources/tccl1/META-INF/services/commonj.sdo.impl.HelperProvider
diff --git a/branches/sdo-java-M2/sdo/BUILDING.txt b/sdo-java/branches/sdo-java-M2/sdo/BUILDING.txt
index d8621aefe9..d8621aefe9 100644
--- a/branches/sdo-java-M2/sdo/BUILDING.txt
+++ b/sdo-java/branches/sdo-java-M2/sdo/BUILDING.txt
diff --git a/branches/sdo-java-M2/sdo/LICENSE.txt b/sdo-java/branches/sdo-java-M2/sdo/LICENSE.txt
index 517cda22ca..517cda22ca 100644
--- a/branches/sdo-java-M2/sdo/LICENSE.txt
+++ b/sdo-java/branches/sdo-java-M2/sdo/LICENSE.txt
diff --git a/branches/sdo-java-M2/sdo/NOTICE.txt b/sdo-java/branches/sdo-java-M2/sdo/NOTICE.txt
index 0ef0d54fb6..0ef0d54fb6 100644
--- a/branches/sdo-java-M2/sdo/NOTICE.txt
+++ b/sdo-java/branches/sdo-java-M2/sdo/NOTICE.txt
diff --git a/branches/sdo-java-M2/sdo/STATUS.txt b/sdo-java/branches/sdo-java-M2/sdo/STATUS.txt
index 24a37ea606..24a37ea606 100644
--- a/branches/sdo-java-M2/sdo/STATUS.txt
+++ b/sdo-java/branches/sdo-java-M2/sdo/STATUS.txt
diff --git a/branches/sdo-java-M2/sdo/distribution/RELEASE_NOTES.txt b/sdo-java/branches/sdo-java-M2/sdo/distribution/RELEASE_NOTES.txt
index 25ae065c9f..25ae065c9f 100644
--- a/branches/sdo-java-M2/sdo/distribution/RELEASE_NOTES.txt
+++ b/sdo-java/branches/sdo-java-M2/sdo/distribution/RELEASE_NOTES.txt
diff --git a/branches/sdo-java-M2/sdo/distribution/readme.html b/sdo-java/branches/sdo-java-M2/sdo/distribution/readme.html
index e9bc489bef..e9bc489bef 100644
--- a/branches/sdo-java-M2/sdo/distribution/readme.html
+++ b/sdo-java/branches/sdo-java-M2/sdo/distribution/readme.html
diff --git a/branches/sdo-java-M2/sdo/impl/model/SDO.ecore b/sdo-java/branches/sdo-java-M2/sdo/impl/model/SDO.ecore
index dce261ecd2..dce261ecd2 100644
--- a/branches/sdo-java-M2/sdo/impl/model/SDO.ecore
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/model/SDO.ecore
diff --git a/branches/sdo-java-M2/sdo/impl/model/SDO.genmodel b/sdo-java/branches/sdo-java-M2/sdo/impl/model/SDO.genmodel
index d28946204c..d28946204c 100644
--- a/branches/sdo-java-M2/sdo/impl/model/SDO.genmodel
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/model/SDO.genmodel
diff --git a/branches/sdo-java-M2/sdo/impl/model/SDO.mdl b/sdo-java/branches/sdo-java-M2/sdo/impl/model/SDO.mdl
index 2288766bab..2288766bab 100644
--- a/branches/sdo-java-M2/sdo/impl/model/SDO.mdl
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/model/SDO.mdl
diff --git a/branches/sdo-java-M2/sdo/impl/pom.xml b/sdo-java/branches/sdo-java-M2/sdo/impl/pom.xml
index ff70c1e0b3..ff70c1e0b3 100644
--- a/branches/sdo-java-M2/sdo/impl/pom.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/pom.xml
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java
index 79deec6d29..79deec6d29 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java
index 355b62f7b2..355b62f7b2 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java
index 6d07e4b01a..6d07e4b01a 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java
index f9023aec4b..f9023aec4b 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java
index 5d3640100c..5d3640100c 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java
index 93ff2ebf14..93ff2ebf14 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java
index 3fe2cd952e..3fe2cd952e 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java
index 3d645be1da..3d645be1da 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java
index dc88a0d60d..dc88a0d60d 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java
index a6253e8131..a6253e8131 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java
index 16bafe68ca..16bafe68ca 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CrossScopeCopyHelperImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CrossScopeCopyHelperImpl.java
index b7a5534800..b7a5534800 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CrossScopeCopyHelperImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CrossScopeCopyHelperImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java
index 128f63f4d7..128f63f4d7 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java
index 2406af1a8a..2406af1a8a 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java
index e59a7d9f1c..e59a7d9f1c 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
index 24734cfaaf..24734cfaaf 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOAnnotations.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOAnnotations.java
index 816fb3bf9f..816fb3bf9f 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOAnnotations.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOAnnotations.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java
index b8bbfcb2d5..b8bbfcb2d5 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
index 9ec309b547..9ec309b547 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SchemaBuilder.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SchemaBuilder.java
index 1597d0bd9e..1597d0bd9e 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SchemaBuilder.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SchemaBuilder.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
index eee90b866f..eee90b866f 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeTable.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeTable.java
index a28492e28e..a28492e28e 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeTable.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeTable.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
index ce0031940f..ce0031940f 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
index 8a94167108..8a94167108 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelper.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelper.java
index 8b01398adf..8b01398adf 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelper.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelper.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java
index 306c60ca2b..306c60ca2b 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
index f67d35d74d..f67d35d74d 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java
index b7d22c3be0..b7d22c3be0 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
index d3e2b7c997..d3e2b7c997 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java
index d3c6a0b96e..d3c6a0b96e 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java
index d1cd1d3e05..d1cd1d3e05 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
index 581af61285..581af61285 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java
index 704ec8c3bc..704ec8c3bc 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
index 2392d07961..2392d07961 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java
index 7c8dffe02e..7c8dffe02e 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
index 4e676741be..4e676741be 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java
index 20cf2a3058..20cf2a3058 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java
index d9d39bad49..d9d39bad49 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
index af17b7b2b0..af17b7b2b0 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
index 2ff31233d0..2ff31233d0 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
index c90b8f8ee9..c90b8f8ee9 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java
index 8bb10297ff..8bb10297ff 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java
index 5c7192d9f6..5c7192d9f6 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java
index e257e30d27..e257e30d27 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java
index 0cf7f3586c..0cf7f3586c 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java
index baa0654a74..baa0654a74 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java
index c22cfbc5e8..c22cfbc5e8 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java
index 2c83244789..2c83244789 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java
index 1c02e5b988..1c02e5b988 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java
index 1432d36c63..1432d36c63 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelPackage.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelPackage.java
index 602e7a9403..602e7a9403 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelPackage.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelPackage.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java
index a88e7f4f4d..a88e7f4f4d 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java
index 12139ad29f..12139ad29f 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java
index 74a1176647..74a1176647 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java
index 12f7043bb8..12f7043bb8 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java
index 4fa53f5bf9..4fa53f5bf9 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java
index 1e818adb30..1e818adb30 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java
index 23d631b925..23d631b925 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java
index 047b35adb6..047b35adb6 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java
index 0e166165a0..0e166165a0 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java
index d40c7cced4..d40c7cced4 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
index 7bf9052a89..7bf9052a89 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelPackageImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelPackageImpl.java
index 4f3efa332d..4f3efa332d 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelPackageImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelPackageImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java
index 4c0f107f1f..4c0f107f1f 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java
index c7936d28f0..c7936d28f0 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java
index 1c93857644..1c93857644 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java
index 723858bec4..723858bec4 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java
index 59d3dda2c1..59d3dda2c1 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java
index 6cd90b2400..6cd90b2400 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java
index 2afdfdb65d..2afdfdb65d 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java
index 8ea0baf093..8ea0baf093 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java
index d6284419b1..d6284419b1 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java
index ba1e7e5ab6..ba1e7e5ab6 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaPackageImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaPackageImpl.java
index dace50c6c5..dace50c6c5 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaPackageImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaPackageImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java
index 4de8b6e1a7..4de8b6e1a7 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
index d1b86d59fa..d1b86d59fa 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
index 328858bcaf..328858bcaf 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
index d9d4533d4c..d9d4533d4c 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java
index 932fcff8cb..932fcff8cb 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java
index d52e9a4e51..d52e9a4e51 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java
index 7d16e6be83..7d16e6be83 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java
index dcdb3d77ca..dcdb3d77ca 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java
index fcf4170b80..fcf4170b80 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java
index 44c9d7e124..44c9d7e124 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java
index b8f842ffe4..b8f842ffe4 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java
index 013a552215..013a552215 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataPackageImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataPackageImpl.java
index ac9cda6f41..ac9cda6f41 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataPackageImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataPackageImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java
index 6add915cfc..6add915cfc 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java
index cabbe5585f..cabbe5585f 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java
index 96abb49d37..96abb49d37 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
index 87b1dd9ffc..87b1dd9ffc 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceFactoryImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceFactoryImpl.java
index c8189f9766..c8189f9766 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceFactoryImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceFactoryImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceImpl.java
index d08264a702..d08264a702 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLDocumentStreamReader.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLDocumentStreamReader.java
index 21a1f849d9..21a1f849d9 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLDocumentStreamReader.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLDocumentStreamReader.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLFragmentStreamReader.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLFragmentStreamReader.java
index 68d5e201a3..68d5e201a3 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLFragmentStreamReader.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLFragmentStreamReader.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLStreamSerializer.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLStreamSerializer.java
index b891dfcadb..b891dfcadb 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLStreamSerializer.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLStreamSerializer.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/LICENSE.txt b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/LICENSE.txt
index 30e4ab9e24..30e4ab9e24 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/LICENSE.txt
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/MANIFEST.MF b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/MANIFEST.MF
index 6abece6be5..6abece6be5 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/MANIFEST.MF
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/MANIFEST.MF
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/NOTICE b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/NOTICE
index 322cf40f9f..322cf40f9f 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/NOTICE
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/NOTICE
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/README.txt b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/README.txt
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/README.txt
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider
index 73693d6556..73693d6556 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider
diff --git a/branches/sdo-java-M2/sdo/impl/src/main/resources/sdo-metadata.xsd b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/resources/sdo-metadata.xsd
index 6a5132ed56..6a5132ed56 100644
--- a/branches/sdo-java-M2/sdo/impl/src/main/resources/sdo-metadata.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/main/resources/sdo-metadata.xsd
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/Quote.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/Quote.java
index 2855d2a67c..2855d2a67c 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/Quote.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/Quote.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/SimpleFactory.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/SimpleFactory.java
index 4f33a3e19f..4f33a3e19f 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/SimpleFactory.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/SimpleFactory.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/impl/QuoteImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/impl/QuoteImpl.java
index 18c63894af..18c63894af 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/impl/QuoteImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/impl/QuoteImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java
index 5f275a94d4..5f275a94d4 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/impl/SimplePackageImpl.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/impl/SimplePackageImpl.java
index 50ad614fd7..50ad614fd7 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/impl/SimplePackageImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/com/example/simple/impl/SimplePackageImpl.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java
index 4a51310cd0..4a51310cd0 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java
index e9151b9d46..e9151b9d46 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java
index 218a725226..218a725226 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java
index 56bf6af9b4..56bf6af9b4 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java
index 6cc0529c5f..6cc0529c5f 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java
index d7e70369c0..d7e70369c0 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java
index 4d3ecf9799..4d3ecf9799 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java
index e956720117..e956720117 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/CrossScopeCopyTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/CrossScopeCopyTestCase.java
index 41801685f5..41801685f5 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/CrossScopeCopyTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/CrossScopeCopyTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java
index a49b165386..a49b165386 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DateConversionTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DateConversionTestCase.java
index ca345eb241..ca345eb241 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DateConversionTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DateConversionTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineOpenContentPropertyTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineOpenContentPropertyTestCase.java
index e1a3e2b781..e1a3e2b781 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineOpenContentPropertyTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineOpenContentPropertyTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
index 259820b2f6..259820b2f6 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/IsManyTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/IsManyTestCase.java
index 1eef4ea657..1eef4ea657 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/IsManyTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/IsManyTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/JiraTestCases.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/JiraTestCases.java
index 66138495ce..66138495ce 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/JiraTestCases.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/JiraTestCases.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java
index 806662a83c..806662a83c 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java
index 833ab433f1..833ab433f1 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SerializeTypesTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SerializeTypesTestCase.java
index 3ffca96f5e..3ffca96f5e 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SerializeTypesTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SerializeTypesTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java
index 36f038d779..36f038d779 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java
index 8c4345be46..8c4345be46 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java
index c3fffa4f10..c3fffa4f10 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SubstitutionValuesTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SubstitutionValuesTestCase.java
index b473503122..b473503122 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SubstitutionValuesTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SubstitutionValuesTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
index a7ab3f954a..a7ab3f954a 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeConversionTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeConversionTestCase.java
index 278355bfd3..278355bfd3 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeConversionTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeConversionTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java
index f718a3f330..f718a3f330 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLDocumentTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLDocumentTestCase.java
index 1cf59757ef..1cf59757ef 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLDocumentTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLDocumentTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperTestCase.java
index 4afbbf6137..4afbbf6137 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java
index 4012ee7d3f..4012ee7d3f 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
index 557fa12d87..557fa12d87 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/SubstitutionValues.xsd b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/SubstitutionValues.xsd
index 7aee02c032..7aee02c032 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/SubstitutionValues.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/SubstitutionValues.xsd
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/XMLDocumentNoNamespaceSchemaLocation.xsd b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/XMLDocumentNoNamespaceSchemaLocation.xsd
index 7718cb424f..7718cb424f 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/XMLDocumentNoNamespaceSchemaLocation.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/XMLDocumentNoNamespaceSchemaLocation.xsd
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/XMLDocumentSchemaLocation.xsd b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/XMLDocumentSchemaLocation.xsd
index c48fab79f1..c48fab79f1 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/XMLDocumentSchemaLocation.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/XMLDocumentSchemaLocation.xsd
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/XMLDocumentTestCase.xml b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/XMLDocumentTestCase.xml
index 88160e0b2f..88160e0b2f 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/XMLDocumentTestCase.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/XMLDocumentTestCase.xml
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/api_test.xsd b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/api_test.xsd
index 3ccaebdd57..3ccaebdd57 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/api_test.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/api_test.xsd
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/bank.xsd b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/bank.xsd
index ae23feefa3..ae23feefa3 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/bank.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/bank.xsd
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/company.xsd b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/company.xsd
index 18e99352be..18e99352be 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/company.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/company.xsd
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/customer1.xml b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/customer1.xml
index 5a29e30a3c..5a29e30a3c 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/customer1.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/customer1.xml
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/customer2.xml b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/customer2.xml
index e9ebb92677..e9ebb92677 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/customer2.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/customer2.xml
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/datatype.xsd b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/datatype.xsd
index 9c03964367..9c03964367 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/datatype.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/datatype.xsd
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/foo-ext.xml b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/foo-ext.xml
index 000909a52e..000909a52e 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/foo-ext.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/foo-ext.xml
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/foo-ext.xsd b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/foo-ext.xsd
index 8bad6f9307..8bad6f9307 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/foo-ext.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/foo-ext.xsd
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/foo.xsd b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/foo.xsd
index 27a8e3644c..27a8e3644c 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/foo.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/foo.xsd
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/mixed.xml b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/mixed.xml
index 42ff3a3a5b..42ff3a3a5b 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/mixed.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/mixed.xml
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/mixed.xsd b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/mixed.xsd
index b9a8487559..b9a8487559 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/mixed.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/mixed.xsd
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/mixed2.xml b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/mixed2.xml
index d95d179478..d95d179478 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/mixed2.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/mixed2.xml
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/mixedopen.xml b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/mixedopen.xml
index 21a62ef2d0..21a62ef2d0 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/mixedopen.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/mixedopen.xml
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/names.xsd b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/names.xsd
index 97b57c1741..97b57c1741 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/names.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/names.xsd
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/open.xml b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/open.xml
index d4a5b92e0c..d4a5b92e0c 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/open.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/open.xml
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/open.xsd b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/open.xsd
index d100d58fc6..d100d58fc6 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/open.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/open.xsd
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/open1any.xsd b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/open1any.xsd
index 00efaef5e0..00efaef5e0 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/open1any.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/open1any.xsd
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/open2.xml b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/open2.xml
index ab992ccf74..ab992ccf74 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/open2.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/open2.xml
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/openContentProperty.xml b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/openContentProperty.xml
index 03608365c0..03608365c0 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/openContentProperty.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/openContentProperty.xml
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/po.xsd b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/po.xsd
index 5c53ac1905..5c53ac1905 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/po.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/po.xsd
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/quote.xml b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/quote.xml
index d7b5969e23..d7b5969e23 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/quote.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/quote.xml
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/sdoannotations.xsd b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/sdoannotations.xsd
index 98be3a57d7..98be3a57d7 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/sdoannotations.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/sdoannotations.xsd
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/sdotypes.xsd b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/sdotypes.xsd
index f206c86013..f206c86013 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/sdotypes.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/sdotypes.xsd
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/shallowquote.xml b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/shallowquote.xml
index a56f2fe2b7..a56f2fe2b7 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/shallowquote.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/shallowquote.xml
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/simple.xsd b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/simple.xsd
index 46a2b1f4df..46a2b1f4df 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/simple.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/simple.xsd
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/simplechangesummary.xml b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/simplechangesummary.xml
index 1a34e0bf80..1a34e0bf80 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/simplechangesummary.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/simplechangesummary.xml
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/xpath.xml b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/xpath.xml
index 3b3e2ffbb4..3b3e2ffbb4 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/xpath.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/xpath.xml
diff --git a/branches/sdo-java-M2/sdo/impl/src/test/resources/xpath.xsd b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/xpath.xsd
index 0b817d425d..0b817d425d 100644
--- a/branches/sdo-java-M2/sdo/impl/src/test/resources/xpath.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/impl/src/test/resources/xpath.xsd
diff --git a/branches/sdo-java-M2/sdo/plugin/pom.xml b/sdo-java/branches/sdo-java-M2/sdo/plugin/pom.xml
index 63a6b6d5e2..63a6b6d5e2 100644
--- a/branches/sdo-java-M2/sdo/plugin/pom.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/plugin/pom.xml
diff --git a/branches/sdo-java-M2/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java b/sdo-java/branches/sdo-java-M2/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java
index b73886ee24..b73886ee24 100644
--- a/branches/sdo-java-M2/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java
diff --git a/branches/sdo-java-M2/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java b/sdo-java/branches/sdo-java-M2/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java
index dfd2f25001..dfd2f25001 100644
--- a/branches/sdo-java-M2/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java
diff --git a/branches/sdo-java-M2/sdo/plugin/src/main/resources/META-INF/LICENSE.txt b/sdo-java/branches/sdo-java-M2/sdo/plugin/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/sdo-java-M2/sdo/plugin/src/main/resources/META-INF/LICENSE.txt
+++ b/sdo-java/branches/sdo-java-M2/sdo/plugin/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sdo-java-M2/sdo/plugin/src/main/resources/META-INF/NOTICE b/sdo-java/branches/sdo-java-M2/sdo/plugin/src/main/resources/META-INF/NOTICE
index 322cf40f9f..322cf40f9f 100644
--- a/branches/sdo-java-M2/sdo/plugin/src/main/resources/META-INF/NOTICE
+++ b/sdo-java/branches/sdo-java-M2/sdo/plugin/src/main/resources/META-INF/NOTICE
diff --git a/branches/sdo-java-M2/sdo/plugin/src/main/resources/META-INF/README.txt b/sdo-java/branches/sdo-java-M2/sdo/plugin/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/sdo-java-M2/sdo/plugin/src/main/resources/META-INF/README.txt
+++ b/sdo-java/branches/sdo-java-M2/sdo/plugin/src/main/resources/META-INF/README.txt
diff --git a/branches/sdo-java-M2/sdo/pom.xml b/sdo-java/branches/sdo-java-M2/sdo/pom.xml
index 11c11cf00a..11c11cf00a 100644
--- a/branches/sdo-java-M2/sdo/pom.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/pom.xml
diff --git a/branches/sdo-java-M2/sdo/sample/LICENSE.txt b/sdo-java/branches/sdo-java-M2/sdo/sample/LICENSE.txt
index 82fa517fac..82fa517fac 100644
--- a/branches/sdo-java-M2/sdo/sample/LICENSE.txt
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/LICENSE.txt
diff --git a/branches/sdo-java-M2/sdo/sample/NOTICE.txt b/sdo-java/branches/sdo-java-M2/sdo/sample/NOTICE.txt
index 6e0a0b8dce..6e0a0b8dce 100644
--- a/branches/sdo-java-M2/sdo/sample/NOTICE.txt
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/NOTICE.txt
diff --git a/branches/sdo-java-M2/sdo/sample/README.txt b/sdo-java/branches/sdo-java-M2/sdo/sample/README.txt
index 0a6f233d55..0a6f233d55 100644
--- a/branches/sdo-java-M2/sdo/sample/README.txt
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/README.txt
diff --git a/branches/sdo-java-M2/sdo/sample/STATUS.txt b/sdo-java/branches/sdo-java-M2/sdo/sample/STATUS.txt
index 24a37ea606..24a37ea606 100644
--- a/branches/sdo-java-M2/sdo/sample/STATUS.txt
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/STATUS.txt
diff --git a/branches/sdo-java-M2/sdo/sample/pom.xml b/sdo-java/branches/sdo-java-M2/sdo/sample/pom.xml
index 9c98895620..9c98895620 100644
--- a/branches/sdo-java-M2/sdo/sample/pom.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/pom.xml
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/ExecuteSamples.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/ExecuteSamples.java
index 8a151aa3af..8a151aa3af 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/ExecuteSamples.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/ExecuteSamples.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/SdoSampleConstants.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/SdoSampleConstants.java
index ff36dd0ae8..ff36dd0ae8 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/SdoSampleConstants.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/SdoSampleConstants.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/CreateCompany.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/CreateCompany.java
index c4eddabb6b..c4eddabb6b 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/CreateCompany.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/CreateCompany.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/CreatePurchaseOrder.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/CreatePurchaseOrder.java
index f3c0a6e704..f3c0a6e704 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/CreatePurchaseOrder.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/CreatePurchaseOrder.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/PurchaseOrderCmdLine.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/PurchaseOrderCmdLine.java
index 148f677a5f..148f677a5f 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/PurchaseOrderCmdLine.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/PurchaseOrderCmdLine.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/PurchaseOrderControl.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/PurchaseOrderControl.java
index 9a5a3279f6..9a5a3279f6 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/PurchaseOrderControl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/PurchaseOrderControl.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/ReadPurchaseOrder.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/ReadPurchaseOrder.java
index 1e9b8e7c2d..1e9b8e7c2d 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/ReadPurchaseOrder.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/ReadPurchaseOrder.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/package.html b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/package.html
index 357048094b..357048094b 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/package.html
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/otherSources/package.html
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/overview.html b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/overview.html
index 17310acb4d..17310acb4d 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/overview.html
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/overview.html
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/package.html b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/package.html
index 68ff7a8914..68ff7a8914 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/package.html
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/package.html
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/AccessDataObjectPropertiesByName.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/AccessDataObjectPropertiesByName.java
index 7aa9909657..7aa9909657 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/AccessDataObjectPropertiesByName.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/AccessDataObjectPropertiesByName.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/AccessDataObjectUsingValidXPath.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/AccessDataObjectUsingValidXPath.java
index 3906ed3c32..3906ed3c32 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/AccessDataObjectUsingValidXPath.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/AccessDataObjectUsingValidXPath.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/CreateDataObjectFromXmlString.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/CreateDataObjectFromXmlString.java
index b58c7070e9..b58c7070e9 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/CreateDataObjectFromXmlString.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/CreateDataObjectFromXmlString.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/CreateDataObjectFromXsdAndXmlFiles.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/CreateDataObjectFromXsdAndXmlFiles.java
index 6f1d8c60db..6f1d8c60db 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/CreateDataObjectFromXsdAndXmlFiles.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/CreateDataObjectFromXsdAndXmlFiles.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/DynamicCustomerTypeSample.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/DynamicCustomerTypeSample.java
index 7df6e9fc93..7df6e9fc93 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/DynamicCustomerTypeSample.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/DynamicCustomerTypeSample.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/ObtainingDataGraphFromXml.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/ObtainingDataGraphFromXml.java
index 69c2098798..69c2098798 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/ObtainingDataGraphFromXml.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/ObtainingDataGraphFromXml.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/PrintPropertiesOfDataObject.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/PrintPropertiesOfDataObject.java
index 453cec211a..453cec211a 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/PrintPropertiesOfDataObject.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/PrintPropertiesOfDataObject.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/UsingXPath.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/UsingXPath.java
index b243bc0361..b243bc0361 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/UsingXPath.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/UsingXPath.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/package.html b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/package.html
index ac784deabc..ac784deabc 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/package.html
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specCodeSnippets/package.html
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/AccessDataObjectsUsingXPath.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/AccessDataObjectsUsingXPath.java
index 97441c7473..97441c7473 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/AccessDataObjectsUsingXPath.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/AccessDataObjectsUsingXPath.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/AccessingDataObjectsViaPropertyIndex.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/AccessingDataObjectsViaPropertyIndex.java
index f2e2b8f2d7..f2e2b8f2d7 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/AccessingDataObjectsViaPropertyIndex.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/AccessingDataObjectsViaPropertyIndex.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/AccessingTheContentsOfASequence.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/AccessingTheContentsOfASequence.java
index 04ef5e704f..04ef5e704f 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/AccessingTheContentsOfASequence.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/AccessingTheContentsOfASequence.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/CreatingDataObjectTreesFromXMLDocuments.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/CreatingDataObjectTreesFromXMLDocuments.java
index 53fc82e06d..53fc82e06d 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/CreatingDataObjectTreesFromXMLDocuments.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/CreatingDataObjectTreesFromXMLDocuments.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/CreatingXmlFromDataObjects.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/CreatingXmlFromDataObjects.java
index 3c5e147677..3c5e147677 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/CreatingXmlFromDataObjects.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/CreatingXmlFromDataObjects.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/SerializingDesearializingADataObject.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/SerializingDesearializingADataObject.java
index 97772eaf33..97772eaf33 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/SerializingDesearializingADataObject.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/SerializingDesearializingADataObject.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/UsingTypeAndPropertyWithDataObjects.java b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/UsingTypeAndPropertyWithDataObjects.java
index f93b716fb5..f93b716fb5 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/UsingTypeAndPropertyWithDataObjects.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/UsingTypeAndPropertyWithDataObjects.java
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/package.html b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/package.html
index 0aa2a9bcb2..0aa2a9bcb2 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/package.html
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/java/org/apache/tuscany/samples/sdo/specExampleSection/package.html
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/resources/company.xsd b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/company.xsd
index 887dddbc61..887dddbc61 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/resources/company.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/company.xsd
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/resources/companyCompleteDataGraph.xml b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/companyCompleteDataGraph.xml
index 49aed2b0c5..49aed2b0c5 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/resources/companyCompleteDataGraph.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/companyCompleteDataGraph.xml
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/resources/companyDataGraph.xml b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/companyDataGraph.xml
index e16284ddc6..e16284ddc6 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/resources/companyDataGraph.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/companyDataGraph.xml
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/resources/companyDataGraphGenerated.xml b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/companyDataGraphGenerated.xml
index 7cdadf9378..7cdadf9378 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/resources/companyDataGraphGenerated.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/companyDataGraphGenerated.xml
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/resources/companyGenerated.xml b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/companyGenerated.xml
index 10e0aa6739..10e0aa6739 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/resources/companyGenerated.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/companyGenerated.xml
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/resources/doc-files/cmdPrompt.GIF b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/doc-files/cmdPrompt.GIF
index ad2fbbf46f..ad2fbbf46f 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/resources/doc-files/cmdPrompt.GIF
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/doc-files/cmdPrompt.GIF
Binary files differ
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/resources/letter.xml b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/letter.xml
index a436d24b5e..a436d24b5e 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/resources/letter.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/letter.xml
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/resources/letter.xsd b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/letter.xsd
index 25fb6eb5f8..25fb6eb5f8 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/resources/letter.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/letter.xsd
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/resources/po.xml b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/po.xml
index 7da98c1369..7da98c1369 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/resources/po.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/po.xml
diff --git a/branches/sdo-java-M2/sdo/sample/src/main/resources/po.xsd b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/po.xsd
index bde118b6ea..bde118b6ea 100644
--- a/branches/sdo-java-M2/sdo/sample/src/main/resources/po.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/sample/src/main/resources/po.xsd
diff --git a/branches/sdo-java-M2/sdo/sdo.xml b/sdo-java/branches/sdo-java-M2/sdo/sdo.xml
index 8d77cf0a30..8d77cf0a30 100644
--- a/branches/sdo-java-M2/sdo/sdo.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/sdo.xml
diff --git a/branches/sdo-java-M2/sdo/tools/pom.xml b/sdo-java/branches/sdo-java-M2/sdo/tools/pom.xml
index 4c0467928d..4c0467928d 100644
--- a/branches/sdo-java-M2/sdo/tools/pom.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/pom.xml
diff --git a/branches/sdo-java-M2/sdo/tools/readme.htm b/sdo-java/branches/sdo-java-M2/sdo/tools/readme.htm
index 693d14baa5..693d14baa5 100644
--- a/branches/sdo-java-M2/sdo/tools/readme.htm
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/readme.htm
diff --git a/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java
index 837a3504f2..837a3504f2 100644
--- a/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
index 80030bf3d0..80030bf3d0 100644
--- a/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java
index 78af8efc6e..78af8efc6e 100644
--- a/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java
index 80f8fe7755..80f8fe7755 100644
--- a/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapterFactory.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapterFactory.java
index eabf90c310..eabf90c310 100644
--- a/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapterFactory.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapterFactory.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java
index 4a187674ce..4a187674ce 100644
--- a/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
index 956157a3a8..956157a3a8 100644
--- a/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
index 1bcbcc4bc2..1bcbcc4bc2 100644
--- a/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java
index 83b57cc8da..83b57cc8da 100644
--- a/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/main/java/org/eclipse/jdt/core/formatter/CodeFormatter.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/eclipse/jdt/core/formatter/CodeFormatter.java
index 1c1f37682f..1c1f37682f 100644
--- a/branches/sdo-java-M2/sdo/tools/src/main/java/org/eclipse/jdt/core/formatter/CodeFormatter.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/java/org/eclipse/jdt/core/formatter/CodeFormatter.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/main/resources/META-INF/LICENSE.txt b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/sdo-java-M2/sdo/tools/src/main/resources/META-INF/LICENSE.txt
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/sdo-java-M2/sdo/tools/src/main/resources/META-INF/NOTICE b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/resources/META-INF/NOTICE
index 322cf40f9f..322cf40f9f 100644
--- a/branches/sdo-java-M2/sdo/tools/src/main/resources/META-INF/NOTICE
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/resources/META-INF/NOTICE
diff --git a/branches/sdo-java-M2/sdo/tools/src/main/resources/META-INF/README.txt b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/sdo-java-M2/sdo/tools/src/main/resources/META-INF/README.txt
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/main/resources/META-INF/README.txt
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/MixedQuote.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/MixedQuote.java
index 9fe16b1eea..9fe16b1eea 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/MixedQuote.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/MixedQuote.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java
index 6f20eba6e1..6f20eba6e1 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/RepeatingChoice.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/RepeatingChoice.java
index 1ffff03539..1ffff03539 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/RepeatingChoice.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/RepeatingChoice.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/SequencesFactory.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/SequencesFactory.java
index 66eac414c6..66eac414c6 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/SequencesFactory.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/SequencesFactory.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/TwoRCs.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/TwoRCs.java
index 8ffc5a39af..8ffc5a39af 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/TwoRCs.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/TwoRCs.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/TwoRCsMixed.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/TwoRCsMixed.java
index ef2d776d90..ef2d776d90 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/TwoRCsMixed.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/TwoRCsMixed.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java
index be5915b1ce..be5915b1ce 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java
index e2a49f12f2..e2a49f12f2 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java
index addcb5b246..addcb5b246 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java
index f558c6d5c7..f558c6d5c7 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java
index 8ad414935c..8ad414935c 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java
index 05fa81d977..05fa81d977 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/Quote.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/Quote.java
index 2855d2a67c..2855d2a67c 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/Quote.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/Quote.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/SimpleFactory.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/SimpleFactory.java
index 4f33a3e19f..4f33a3e19f 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/SimpleFactory.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/SimpleFactory.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/impl/QuoteImpl.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/impl/QuoteImpl.java
index 18c63894af..18c63894af 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/impl/QuoteImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/impl/QuoteImpl.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java
index 5f275a94d4..5f275a94d4 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/impl/SimplePackageImpl.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/impl/SimplePackageImpl.java
index 50ad614fd7..50ad614fd7 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/impl/SimplePackageImpl.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/com/example/simple/impl/SimplePackageImpl.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTest.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTest.java
index b177373b5e..b177373b5e 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTest.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTest.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/StaticSequenceNoEmfTestCase.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/StaticSequenceNoEmfTestCase.java
index 966e52cdba..966e52cdba 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/StaticSequenceNoEmfTestCase.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/StaticSequenceNoEmfTestCase.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
index 0ca49b6122..0ca49b6122 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/resources/enum.xsd b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/enum.xsd
index 8be96d6896..8be96d6896 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/resources/enum.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/enum.xsd
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
index cefaf93fa3..cefaf93fa3 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/resources/mixedStaticTestResult.xml b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/mixedStaticTestResult.xml
index 01a20bd350..01a20bd350 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/resources/mixedStaticTestResult.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/mixedStaticTestResult.xml
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/resources/repeatingChoice.xsd b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/repeatingChoice.xsd
index 3650b634ab..3650b634ab 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/resources/repeatingChoice.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/repeatingChoice.xsd
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/resources/repeatingChoiceTestResult.xml b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/repeatingChoiceTestResult.xml
index 2719457b6d..2719457b6d 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/resources/repeatingChoiceTestResult.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/repeatingChoiceTestResult.xml
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/resources/sequences.xsd b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/sequences.xsd
index 7d1d9e07ac..7d1d9e07ac 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/resources/sequences.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/sequences.xsd
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/resources/simple.xsd b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/simple.xsd
index 4092113c42..4092113c42 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/resources/simple.xsd
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/simple.xsd
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
index cfc434c8e8..cfc434c8e8 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
diff --git a/branches/sdo-java-M2/sdo/tools/src/test/resources/twoRepeatingChoicesTestResult.xml b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/twoRepeatingChoicesTestResult.xml
index 3585ad00d3..3585ad00d3 100644
--- a/branches/sdo-java-M2/sdo/tools/src/test/resources/twoRepeatingChoicesTestResult.xml
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/src/test/resources/twoRepeatingChoicesTestResult.xml
diff --git a/branches/sdo-java-M2/sdo/tools/templates/Header.javajetinc b/sdo-java/branches/sdo-java-M2/sdo/tools/templates/Header.javajetinc
index 27becf3645..27becf3645 100644
--- a/branches/sdo-java-M2/sdo/tools/templates/Header.javajetinc
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/templates/Header.javajetinc
diff --git a/branches/sdo-java-M2/sdo/tools/templates/models/SDOClass.javajet b/sdo-java/branches/sdo-java-M2/sdo/tools/templates/models/SDOClass.javajet
index 8daf6a9904..8daf6a9904 100644
--- a/branches/sdo-java-M2/sdo/tools/templates/models/SDOClass.javajet
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/templates/models/SDOClass.javajet
diff --git a/branches/sdo-java-M2/sdo/tools/templates/models/SDOFactoryClass.javajet b/sdo-java/branches/sdo-java-M2/sdo/tools/templates/models/SDOFactoryClass.javajet
index 5d2609b9c3..5d2609b9c3 100644
--- a/branches/sdo-java-M2/sdo/tools/templates/models/SDOFactoryClass.javajet
+++ b/sdo-java/branches/sdo-java-M2/sdo/tools/templates/models/SDOFactoryClass.javajet