summaryrefslogtreecommitdiffstats
path: root/branches/java-post-M1/sdo
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/model/SDO.ecore (renamed from branches/java-post-M1/sdo/impl/model/SDO.ecore)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/model/SDO.genmodel (renamed from branches/java-post-M1/sdo/impl/model/SDO.genmodel)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/model/SDO.mdl (renamed from branches/java-post-M1/sdo/impl/model/SDO.mdl)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/pom.xml (renamed from branches/java-post-M1/sdo/impl/pom.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelper.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelper.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelPackage.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelPackage.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelPackageImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelPackageImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaPackageImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaPackageImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataPackageImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataPackageImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceFactoryImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceImpl.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLDocumentStreamReader.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLDocumentStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLFragmentStreamReader.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLFragmentStreamReader.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLStreamSerializer.java (renamed from branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLStreamSerializer.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/LICENSE.txt (renamed from branches/java-post-M1/sdo/impl/src/main/resources/META-INF/LICENSE.txt)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/MANIFEST.MF (renamed from branches/java-post-M1/sdo/impl/src/main/resources/META-INF/MANIFEST.MF)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/NOTICE (renamed from branches/java-post-M1/sdo/impl/src/main/resources/META-INF/NOTICE)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/README.txt (renamed from branches/java-post-M1/sdo/impl/src/main/resources/META-INF/README.txt)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider (renamed from branches/java-post-M1/sdo/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/resources/sdo-metadata.xsd (renamed from branches/java-post-M1/sdo/impl/src/main/resources/sdo-metadata.xsd)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SubstitutionValues.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SubstitutionValues.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTest.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTest.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLDocumentTestCase.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLDocumentTestCase.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperTestCase.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperTestCase.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java (renamed from branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/SubstitutionValues.xsd (renamed from branches/java-post-M1/sdo/impl/src/test/resources/SubstitutionValues.xsd)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/XMLDocumentNoNamespaceSchemaLocation.xsd (renamed from branches/java-post-M1/sdo/impl/src/test/resources/XMLDocumentNoNamespaceSchemaLocation.xsd)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/XMLDocumentSchemaLocation.xsd (renamed from branches/java-post-M1/sdo/impl/src/test/resources/XMLDocumentSchemaLocation.xsd)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/XMLDocumentTestCase.xml (renamed from branches/java-post-M1/sdo/impl/src/test/resources/XMLDocumentTestCase.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/customer1.xml (renamed from branches/java-post-M1/sdo/impl/src/test/resources/customer1.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/customer2.xml (renamed from branches/java-post-M1/sdo/impl/src/test/resources/customer2.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/datatype.xsd (renamed from branches/java-post-M1/sdo/impl/src/test/resources/datatype.xsd)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/foo-ext.xml (renamed from branches/java-post-M1/sdo/impl/src/test/resources/foo-ext.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/foo-ext.xsd (renamed from branches/java-post-M1/sdo/impl/src/test/resources/foo-ext.xsd)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/foo.xsd (renamed from branches/java-post-M1/sdo/impl/src/test/resources/foo.xsd)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/mixed.xml (renamed from branches/java-post-M1/sdo/impl/src/test/resources/mixed.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/mixed.xsd (renamed from branches/java-post-M1/sdo/impl/src/test/resources/mixed.xsd)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/mixed2.xml (renamed from branches/java-post-M1/sdo/impl/src/test/resources/mixed2.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/mixedopen.xml (renamed from branches/java-post-M1/sdo/impl/src/test/resources/mixedopen.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/names.xsd (renamed from branches/java-post-M1/sdo/impl/src/test/resources/names.xsd)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/open.xml (renamed from branches/java-post-M1/sdo/impl/src/test/resources/open.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/open.xsd (renamed from branches/java-post-M1/sdo/impl/src/test/resources/open.xsd)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/open2.xml (renamed from branches/java-post-M1/sdo/impl/src/test/resources/open2.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/quote.xml (renamed from branches/java-post-M1/sdo/impl/src/test/resources/quote.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/sdoannotations.xsd (renamed from branches/java-post-M1/sdo/impl/src/test/resources/sdoannotations.xsd)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/sdotypes.xsd (renamed from branches/java-post-M1/sdo/impl/src/test/resources/sdotypes.xsd)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/shallowquote.xml (renamed from branches/java-post-M1/sdo/impl/src/test/resources/shallowquote.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/simple.xsd (renamed from branches/java-post-M1/sdo/impl/src/test/resources/simple.xsd)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/simplechangesummary.xml (renamed from branches/java-post-M1/sdo/impl/src/test/resources/simplechangesummary.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/xpath.xml (renamed from branches/java-post-M1/sdo/impl/src/test/resources/xpath.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/xpath.xsd (renamed from branches/java-post-M1/sdo/impl/src/test/resources/xpath.xsd)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/plugin/pom.xml (renamed from branches/java-post-M1/sdo/plugin/pom.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java (renamed from branches/java-post-M1/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java (renamed from branches/java-post-M1/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/plugin/src/main/resources/META-INF/LICENSE.txt (renamed from branches/java-post-M1/sdo/plugin/src/main/resources/META-INF/LICENSE.txt)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/plugin/src/main/resources/META-INF/NOTICE (renamed from branches/java-post-M1/sdo/plugin/src/main/resources/META-INF/NOTICE)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/plugin/src/main/resources/META-INF/README.txt (renamed from branches/java-post-M1/sdo/plugin/src/main/resources/META-INF/README.txt)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/pom.xml (renamed from branches/java-post-M1/sdo/pom.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/pom.xml (renamed from branches/java-post-M1/sdo/tools/pom.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/readme.htm (renamed from branches/java-post-M1/sdo/tools/readme.htm)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java (renamed from branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java (renamed from branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java (renamed from branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java (renamed from branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapterFactory.java (renamed from branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapterFactory.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java (renamed from branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java (renamed from branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java (renamed from branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/eclipse/jdt/core/formatter/CodeFormatter.java (renamed from branches/java-post-M1/sdo/tools/src/main/java/org/eclipse/jdt/core/formatter/CodeFormatter.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/resources/META-INF/LICENSE.txt (renamed from branches/java-post-M1/sdo/tools/src/main/resources/META-INF/LICENSE.txt)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/resources/META-INF/NOTICE (renamed from branches/java-post-M1/sdo/tools/src/main/resources/META-INF/NOTICE)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/resources/META-INF/README.txt (renamed from branches/java-post-M1/sdo/tools/src/main/resources/META-INF/README.txt)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/MixedQuote.java (renamed from branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/MixedQuote.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java (renamed from branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/RepeatingChoice.java (renamed from branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/RepeatingChoice.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/SequencesFactory.java (renamed from branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/SequencesFactory.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/TwoRCs.java (renamed from branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/TwoRCs.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/TwoRCsMixed.java (renamed from branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/TwoRCsMixed.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java (renamed from branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java (renamed from branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java (renamed from branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java (renamed from branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java (renamed from branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java (renamed from branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/Quote.java (renamed from branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/Quote.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/SimpleFactory.java (renamed from branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/SimpleFactory.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/impl/QuoteImpl.java (renamed from branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/impl/QuoteImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java (renamed from branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/impl/SimplePackageImpl.java (renamed from branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/impl/SimplePackageImpl.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTest.java (renamed from branches/java-post-M1/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTest.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/StaticSequenceNoEmfTest.java (renamed from branches/java-post-M1/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/StaticSequenceNoEmfTest.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java (renamed from branches/java-post-M1/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/enum.xsd (renamed from branches/java-post-M1/sdo/tools/src/test/resources/enum.xsd)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml (renamed from branches/java-post-M1/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/mixedStaticTestResult.xml (renamed from branches/java-post-M1/sdo/tools/src/test/resources/mixedStaticTestResult.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/repeatingChoice.xsd (renamed from branches/java-post-M1/sdo/tools/src/test/resources/repeatingChoice.xsd)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/repeatingChoiceTestResult.xml (renamed from branches/java-post-M1/sdo/tools/src/test/resources/repeatingChoiceTestResult.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/sequences.xsd (renamed from branches/java-post-M1/sdo/tools/src/test/resources/sequences.xsd)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/simple.xsd (renamed from branches/java-post-M1/sdo/tools/src/test/resources/simple.xsd)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml (renamed from branches/java-post-M1/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/twoRepeatingChoicesTestResult.xml (renamed from branches/java-post-M1/sdo/tools/src/test/resources/twoRepeatingChoicesTestResult.xml)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/templates/Header.javajetinc (renamed from branches/java-post-M1/sdo/tools/templates/Header.javajetinc)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/templates/models/SDOClass.javajet (renamed from branches/java-post-M1/sdo/tools/templates/models/SDOClass.javajet)0
-rw-r--r--sca-java-1.x/branches/java-post-M1/sdo/tools/templates/models/SDOFactoryClass.javajet (renamed from branches/java-post-M1/sdo/tools/templates/models/SDOFactoryClass.javajet)0
203 files changed, 0 insertions, 0 deletions
diff --git a/branches/java-post-M1/sdo/impl/model/SDO.ecore b/sca-java-1.x/branches/java-post-M1/sdo/impl/model/SDO.ecore
index dce261ecd2..dce261ecd2 100644
--- a/branches/java-post-M1/sdo/impl/model/SDO.ecore
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/model/SDO.ecore
diff --git a/branches/java-post-M1/sdo/impl/model/SDO.genmodel b/sca-java-1.x/branches/java-post-M1/sdo/impl/model/SDO.genmodel
index d28946204c..d28946204c 100644
--- a/branches/java-post-M1/sdo/impl/model/SDO.genmodel
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/model/SDO.genmodel
diff --git a/branches/java-post-M1/sdo/impl/model/SDO.mdl b/sca-java-1.x/branches/java-post-M1/sdo/impl/model/SDO.mdl
index 2288766bab..2288766bab 100644
--- a/branches/java-post-M1/sdo/impl/model/SDO.mdl
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/model/SDO.mdl
diff --git a/branches/java-post-M1/sdo/impl/pom.xml b/sca-java-1.x/branches/java-post-M1/sdo/impl/pom.xml
index c0e3477d73..c0e3477d73 100644
--- a/branches/java-post-M1/sdo/impl/pom.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/pom.xml
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java
index 5eea403613..5eea403613 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java
index 7bc75d8faa..7bc75d8faa 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java
index 5b066bb6e3..5b066bb6e3 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java
index caa154baf5..caa154baf5 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java
index ced62cc058..ced62cc058 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java
index 5fed5829ae..5fed5829ae 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java
index 6608357769..6608357769 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java
index 15ff8a7502..15ff8a7502 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java
index b7048ed6ab..b7048ed6ab 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java
index 5b9b3742d5..5b9b3742d5 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java
index 060bd381dc..060bd381dc 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java
index ab5ee13af9..ab5ee13af9 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java
index 8ba98407cf..8ba98407cf 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java
index a31066d598..a31066d598 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
index 89512a73f6..89512a73f6 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java
index 1b1313c4f8..1b1313c4f8 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
index 9867393ca4..9867393ca4 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
index f4d39670b6..f4d39670b6 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
index b0205b5362..b0205b5362 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
index 653665e1b8..653665e1b8 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelper.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelper.java
index 03d7936894..03d7936894 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelper.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelper.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java
index 788cd99927..788cd99927 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
index 2194b0c6ce..2194b0c6ce 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java
index a1bb922d69..a1bb922d69 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
index b516cea449..b516cea449 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java
index 5460257079..5460257079 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java
index 9f714b9cfa..9f714b9cfa 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
index eca552a78d..eca552a78d 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java
index ec07a3ae1a..ec07a3ae1a 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
index 4617656fff..4617656fff 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java
index e952e5eea5..e952e5eea5 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
index 18e1c3a19b..18e1c3a19b 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java
index dd9cdfa779..dd9cdfa779 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java
index d3b709c070..d3b709c070 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
index 56e7eadcea..56e7eadcea 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
index e57fb54544..e57fb54544 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
index a3536f4230..a3536f4230 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java
index db60094adc..db60094adc 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java
index 15011fc37f..15011fc37f 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java
index 33ca015ac9..33ca015ac9 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java
index 06bb3a6d05..06bb3a6d05 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java
index 05fe4d1a8f..05fe4d1a8f 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java
index dfdc1d0b97..dfdc1d0b97 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ChangeSummaryType.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java
index 353d25f6ef..353d25f6ef 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java
index 9d4f7b90a8..9d4f7b90a8 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java
index 19e59bbc5f..19e59bbc5f 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelPackage.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelPackage.java
index c33ca619cc..c33ca619cc 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelPackage.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelPackage.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java
index a05545afed..a05545afed 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java
index a124dee1c2..a124dee1c2 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java
index e792fc7a87..e792fc7a87 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java
index 3be181bd9a..3be181bd9a 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java
index 73188861d4..73188861d4 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java
index 9b12301381..9b12301381 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java
index 31d54ca425..31d54ca425 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java
index 07ff624c4f..07ff624c4f 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ChangeSummaryTypeImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java
index e6e8dd1f39..e6e8dd1f39 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java
index ed516ebd95..ed516ebd95 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
index c5ec4ae591..c5ec4ae591 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelPackageImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelPackageImpl.java
index 86604e91f6..86604e91f6 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelPackageImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelPackageImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java
index f2873031ee..f2873031ee 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java
index 9c71e82474..9c71e82474 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java
index 5d77ce2fae..5d77ce2fae 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java
index c51cd7948c..c51cd7948c 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java
index bfd673f0d2..bfd673f0d2 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java
index 74b60af0ae..74b60af0ae 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java
index 7ca6ee818f..7ca6ee818f 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java
index 555be8de4f..555be8de4f 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java
index 6e76337615..6e76337615 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java
index db395f9632..db395f9632 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaPackageImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaPackageImpl.java
index de32f55141..de32f55141 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaPackageImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaPackageImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java
index 5a631dde77..5a631dde77 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
index a2288ce027..a2288ce027 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
index 63e21e3bd0..63e21e3bd0 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
index ec9697d8ad..ec9697d8ad 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java
index c4f9701cbc..c4f9701cbc 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java
index 4dd00c075d..4dd00c075d 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java
index e2c33713d3..e2c33713d3 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java
index 7cbeeda682..7cbeeda682 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java
index bc311015ec..bc311015ec 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java
index dc004a8f5e..dc004a8f5e 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java
index b36d7fa8f9..b36d7fa8f9 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java
index e0e24fc9c2..e0e24fc9c2 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataPackageImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataPackageImpl.java
index df1404ddd9..df1404ddd9 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataPackageImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataPackageImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java
index 5a668bb306..5a668bb306 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java
index a147b12053..a147b12053 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java
index 1bfdc9d465..1bfdc9d465 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
index 595218791f..595218791f 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceFactoryImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceFactoryImpl.java
index a4b4455fb5..a4b4455fb5 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceFactoryImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceFactoryImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceImpl.java
index fbbe8ef80c..fbbe8ef80c 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceImpl.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLDocumentStreamReader.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLDocumentStreamReader.java
index 25fcc0bc69..25fcc0bc69 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLDocumentStreamReader.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLDocumentStreamReader.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLFragmentStreamReader.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLFragmentStreamReader.java
index 3a5b3e9eb1..3a5b3e9eb1 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLFragmentStreamReader.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLFragmentStreamReader.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLStreamSerializer.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLStreamSerializer.java
index b891dfcadb..b891dfcadb 100644
--- a/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLStreamSerializer.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLStreamSerializer.java
diff --git a/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/MANIFEST.MF b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/MANIFEST.MF
index 6abece6be5..6abece6be5 100644
--- a/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/MANIFEST.MF
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/MANIFEST.MF
diff --git a/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/NOTICE
diff --git a/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/README.txt
diff --git a/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider
index 73693d6556..73693d6556 100644
--- a/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider
diff --git a/branches/java-post-M1/sdo/impl/src/main/resources/sdo-metadata.xsd b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/resources/sdo-metadata.xsd
index b3daf2b894..b3daf2b894 100644
--- a/branches/java-post-M1/sdo/impl/src/main/resources/sdo-metadata.xsd
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/main/resources/sdo-metadata.xsd
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java
index f862837715..f862837715 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java
index 35a878015f..35a878015f 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java
index 7c64a42ab3..7c64a42ab3 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java
index 6a401d48bb..6a401d48bb 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java
index 9d67b61317..9d67b61317 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java
index 5cee856217..5cee856217 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java
index 209d7021c0..209d7021c0 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java
index 4cc8c5e842..4cc8c5e842 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java
index faa8782a77..faa8782a77 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
index b77b534be6..b77b534be6 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DefineTypeTestCase.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java
index e46f9858e2..e46f9858e2 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java
index 7e743e296a..7e743e296a 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java
index 2e91a1a66f..2e91a1a66f 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java
index d86b793087..d86b793087 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java
index ac05b362d9..ac05b362d9 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SubstitutionValues.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SubstitutionValues.java
index acc08c1056..acc08c1056 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SubstitutionValues.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SubstitutionValues.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
index d2ac035e02..d2ac035e02 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTest.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTest.java
index b14ae165dc..b14ae165dc 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTest.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TypeRoundTripTest.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLDocumentTestCase.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLDocumentTestCase.java
index c4f2cc4586..c4f2cc4586 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLDocumentTestCase.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLDocumentTestCase.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperTestCase.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperTestCase.java
index d318f4ba73..d318f4ba73 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperTestCase.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XMLStreamHelperTestCase.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java
index 7940663290..7940663290 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XPathTestCase.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
index 16a2cbd195..16a2cbd195 100644
--- a/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/SubstitutionValues.xsd b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/SubstitutionValues.xsd
index ec4a25740f..ec4a25740f 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/SubstitutionValues.xsd
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/SubstitutionValues.xsd
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/XMLDocumentNoNamespaceSchemaLocation.xsd b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/XMLDocumentNoNamespaceSchemaLocation.xsd
index 42f9555d44..42f9555d44 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/XMLDocumentNoNamespaceSchemaLocation.xsd
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/XMLDocumentNoNamespaceSchemaLocation.xsd
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/XMLDocumentSchemaLocation.xsd b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/XMLDocumentSchemaLocation.xsd
index 268ea375f0..268ea375f0 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/XMLDocumentSchemaLocation.xsd
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/XMLDocumentSchemaLocation.xsd
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/XMLDocumentTestCase.xml b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/XMLDocumentTestCase.xml
index 34e1648429..34e1648429 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/XMLDocumentTestCase.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/XMLDocumentTestCase.xml
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/customer1.xml b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/customer1.xml
index 0c18fa47fa..0c18fa47fa 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/customer1.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/customer1.xml
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/customer2.xml b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/customer2.xml
index 5b74c06c73..5b74c06c73 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/customer2.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/customer2.xml
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/datatype.xsd b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/datatype.xsd
index 032f026137..032f026137 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/datatype.xsd
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/datatype.xsd
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/foo-ext.xml b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/foo-ext.xml
index 000909a52e..000909a52e 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/foo-ext.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/foo-ext.xml
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/foo-ext.xsd b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/foo-ext.xsd
index cb74df8fa3..cb74df8fa3 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/foo-ext.xsd
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/foo-ext.xsd
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/foo.xsd b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/foo.xsd
index fec090de71..fec090de71 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/foo.xsd
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/foo.xsd
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/mixed.xml b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/mixed.xml
index 42ff3a3a5b..42ff3a3a5b 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/mixed.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/mixed.xml
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/mixed.xsd b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/mixed.xsd
index c45fc87de2..c45fc87de2 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/mixed.xsd
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/mixed.xsd
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/mixed2.xml b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/mixed2.xml
index 723d7bb891..723d7bb891 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/mixed2.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/mixed2.xml
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/mixedopen.xml b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/mixedopen.xml
index 2409ce85a6..2409ce85a6 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/mixedopen.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/mixedopen.xml
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/names.xsd b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/names.xsd
index 601ecc5f6a..601ecc5f6a 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/names.xsd
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/names.xsd
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/open.xml b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/open.xml
index d4a5b92e0c..d4a5b92e0c 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/open.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/open.xml
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/open.xsd b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/open.xsd
index 06881e3f05..06881e3f05 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/open.xsd
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/open.xsd
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/open2.xml b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/open2.xml
index 5bd70af711..5bd70af711 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/open2.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/open2.xml
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/quote.xml b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/quote.xml
index d7b5969e23..d7b5969e23 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/quote.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/quote.xml
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/sdoannotations.xsd b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/sdoannotations.xsd
index 355e9e2ba3..355e9e2ba3 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/sdoannotations.xsd
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/sdoannotations.xsd
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/sdotypes.xsd b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/sdotypes.xsd
index aa0def2be6..aa0def2be6 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/sdotypes.xsd
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/sdotypes.xsd
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/shallowquote.xml b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/shallowquote.xml
index a56f2fe2b7..a56f2fe2b7 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/shallowquote.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/shallowquote.xml
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/simple.xsd b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/simple.xsd
index 5310f7e1f3..5310f7e1f3 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/simple.xsd
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/simple.xsd
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/simplechangesummary.xml b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/simplechangesummary.xml
index 1a34e0bf80..1a34e0bf80 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/simplechangesummary.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/simplechangesummary.xml
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/xpath.xml b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/xpath.xml
index b1972b7260..b1972b7260 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/xpath.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/xpath.xml
diff --git a/branches/java-post-M1/sdo/impl/src/test/resources/xpath.xsd b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/xpath.xsd
index 258d1b40e6..258d1b40e6 100644
--- a/branches/java-post-M1/sdo/impl/src/test/resources/xpath.xsd
+++ b/sca-java-1.x/branches/java-post-M1/sdo/impl/src/test/resources/xpath.xsd
diff --git a/branches/java-post-M1/sdo/plugin/pom.xml b/sca-java-1.x/branches/java-post-M1/sdo/plugin/pom.xml
index e4641f9617..e4641f9617 100644
--- a/branches/java-post-M1/sdo/plugin/pom.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/plugin/pom.xml
diff --git a/branches/java-post-M1/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java b/sca-java-1.x/branches/java-post-M1/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java
index 88a7b93b6e..88a7b93b6e 100644
--- a/branches/java-post-M1/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java
diff --git a/branches/java-post-M1/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java b/sca-java-1.x/branches/java-post-M1/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java
index ec10a59f68..ec10a59f68 100644
--- a/branches/java-post-M1/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/SchemaFileOption.java
diff --git a/branches/java-post-M1/sdo/plugin/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/java-post-M1/sdo/plugin/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/java-post-M1/sdo/plugin/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/java-post-M1/sdo/plugin/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/java-post-M1/sdo/plugin/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/java-post-M1/sdo/plugin/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/java-post-M1/sdo/plugin/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/java-post-M1/sdo/plugin/src/main/resources/META-INF/NOTICE
diff --git a/branches/java-post-M1/sdo/plugin/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/java-post-M1/sdo/plugin/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/java-post-M1/sdo/plugin/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/java-post-M1/sdo/plugin/src/main/resources/META-INF/README.txt
diff --git a/branches/java-post-M1/sdo/pom.xml b/sca-java-1.x/branches/java-post-M1/sdo/pom.xml
index 6f50e10e36..6f50e10e36 100644
--- a/branches/java-post-M1/sdo/pom.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/pom.xml
diff --git a/branches/java-post-M1/sdo/tools/pom.xml b/sca-java-1.x/branches/java-post-M1/sdo/tools/pom.xml
index ad7eacf2c4..ad7eacf2c4 100644
--- a/branches/java-post-M1/sdo/tools/pom.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/pom.xml
diff --git a/branches/java-post-M1/sdo/tools/readme.htm b/sca-java-1.x/branches/java-post-M1/sdo/tools/readme.htm
index 1d96e24387..1d96e24387 100644
--- a/branches/java-post-M1/sdo/tools/readme.htm
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/readme.htm
diff --git a/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java
index 5bf5eba837..5bf5eba837 100644
--- a/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/Interface2JavaGenerator.java
diff --git a/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
index f12a2667ee..f12a2667ee 100644
--- a/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
diff --git a/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java
index d14604b65c..d14604b65c 100644
--- a/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java
diff --git a/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java
index 965307eefc..965307eefc 100644
--- a/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java
diff --git a/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapterFactory.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapterFactory.java
index aa47d612ed..aa47d612ed 100644
--- a/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapterFactory.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapterFactory.java
diff --git a/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java
index b8e33fefc5..b8e33fefc5 100644
--- a/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java
diff --git a/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
index f1e1db7bbc..f1e1db7bbc 100644
--- a/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
diff --git a/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
index c74f196d95..c74f196d95 100644
--- a/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
diff --git a/branches/java-post-M1/sdo/tools/src/main/java/org/eclipse/jdt/core/formatter/CodeFormatter.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/eclipse/jdt/core/formatter/CodeFormatter.java
index 99c9191a34..99c9191a34 100644
--- a/branches/java-post-M1/sdo/tools/src/main/java/org/eclipse/jdt/core/formatter/CodeFormatter.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/java/org/eclipse/jdt/core/formatter/CodeFormatter.java
diff --git a/branches/java-post-M1/sdo/tools/src/main/resources/META-INF/LICENSE.txt b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/resources/META-INF/LICENSE.txt
index 25d78feeac..25d78feeac 100644
--- a/branches/java-post-M1/sdo/tools/src/main/resources/META-INF/LICENSE.txt
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/resources/META-INF/LICENSE.txt
diff --git a/branches/java-post-M1/sdo/tools/src/main/resources/META-INF/NOTICE b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/resources/META-INF/NOTICE
index d48810c0ec..d48810c0ec 100644
--- a/branches/java-post-M1/sdo/tools/src/main/resources/META-INF/NOTICE
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/resources/META-INF/NOTICE
diff --git a/branches/java-post-M1/sdo/tools/src/main/resources/META-INF/README.txt b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/resources/META-INF/README.txt
index 9b26d1690a..9b26d1690a 100644
--- a/branches/java-post-M1/sdo/tools/src/main/resources/META-INF/README.txt
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/main/resources/META-INF/README.txt
diff --git a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/MixedQuote.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/MixedQuote.java
index 8ec83abfdb..8ec83abfdb 100644
--- a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/MixedQuote.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/MixedQuote.java
diff --git a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java
index f92285c048..f92285c048 100644
--- a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java
diff --git a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/RepeatingChoice.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/RepeatingChoice.java
index ab5b144e09..ab5b144e09 100644
--- a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/RepeatingChoice.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/RepeatingChoice.java
diff --git a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/SequencesFactory.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/SequencesFactory.java
index c73310b5b5..c73310b5b5 100644
--- a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/SequencesFactory.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/SequencesFactory.java
diff --git a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/TwoRCs.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/TwoRCs.java
index 9615d2a0ef..9615d2a0ef 100644
--- a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/TwoRCs.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/TwoRCs.java
diff --git a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/TwoRCsMixed.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/TwoRCsMixed.java
index 0325e2cd9c..0325e2cd9c 100644
--- a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/TwoRCsMixed.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/TwoRCsMixed.java
diff --git a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java
index b3381cda76..b3381cda76 100644
--- a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java
diff --git a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java
index 7e49e448f8..7e49e448f8 100644
--- a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java
diff --git a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java
index f4bc2c301f..f4bc2c301f 100644
--- a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java
diff --git a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java
index 0cef7a04d1..0cef7a04d1 100644
--- a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java
diff --git a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java
index c29eae934d..c29eae934d 100644
--- a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java
diff --git a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java
index a8c3186088..a8c3186088 100644
--- a/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java
diff --git a/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/Quote.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/Quote.java
index 57b12ef331..57b12ef331 100644
--- a/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/Quote.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/Quote.java
diff --git a/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/SimpleFactory.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/SimpleFactory.java
index 9203976521..9203976521 100644
--- a/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/SimpleFactory.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/SimpleFactory.java
diff --git a/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/impl/QuoteImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/impl/QuoteImpl.java
index 5b407dd311..5b407dd311 100644
--- a/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/impl/QuoteImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/impl/QuoteImpl.java
diff --git a/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java
index 06b0e3891e..06b0e3891e 100644
--- a/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java
diff --git a/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/impl/SimplePackageImpl.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/impl/SimplePackageImpl.java
index e8fe40c24d..e8fe40c24d 100644
--- a/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/impl/SimplePackageImpl.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/com/example/simple/impl/SimplePackageImpl.java
diff --git a/branches/java-post-M1/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTest.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTest.java
index 520cf707e7..520cf707e7 100644
--- a/branches/java-post-M1/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTest.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTest.java
diff --git a/branches/java-post-M1/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/StaticSequenceNoEmfTest.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/StaticSequenceNoEmfTest.java
index ef6544bdb8..ef6544bdb8 100644
--- a/branches/java-post-M1/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/StaticSequenceNoEmfTest.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/StaticSequenceNoEmfTest.java
diff --git a/branches/java-post-M1/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
index c5bc850e16..c5bc850e16 100644
--- a/branches/java-post-M1/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
diff --git a/branches/java-post-M1/sdo/tools/src/test/resources/enum.xsd b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/enum.xsd
index efa951c410..efa951c410 100644
--- a/branches/java-post-M1/sdo/tools/src/test/resources/enum.xsd
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/enum.xsd
diff --git a/branches/java-post-M1/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
index 6564fe6112..6564fe6112 100644
--- a/branches/java-post-M1/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
diff --git a/branches/java-post-M1/sdo/tools/src/test/resources/mixedStaticTestResult.xml b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/mixedStaticTestResult.xml
index f68e456a0e..f68e456a0e 100644
--- a/branches/java-post-M1/sdo/tools/src/test/resources/mixedStaticTestResult.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/mixedStaticTestResult.xml
diff --git a/branches/java-post-M1/sdo/tools/src/test/resources/repeatingChoice.xsd b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/repeatingChoice.xsd
index b7aef69735..b7aef69735 100644
--- a/branches/java-post-M1/sdo/tools/src/test/resources/repeatingChoice.xsd
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/repeatingChoice.xsd
diff --git a/branches/java-post-M1/sdo/tools/src/test/resources/repeatingChoiceTestResult.xml b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/repeatingChoiceTestResult.xml
index 1b2281f7d3..1b2281f7d3 100644
--- a/branches/java-post-M1/sdo/tools/src/test/resources/repeatingChoiceTestResult.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/repeatingChoiceTestResult.xml
diff --git a/branches/java-post-M1/sdo/tools/src/test/resources/sequences.xsd b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/sequences.xsd
index 6e70ad528c..6e70ad528c 100644
--- a/branches/java-post-M1/sdo/tools/src/test/resources/sequences.xsd
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/sequences.xsd
diff --git a/branches/java-post-M1/sdo/tools/src/test/resources/simple.xsd b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/simple.xsd
index 37b1773859..37b1773859 100644
--- a/branches/java-post-M1/sdo/tools/src/test/resources/simple.xsd
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/simple.xsd
diff --git a/branches/java-post-M1/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
index 2a53982a8f..2a53982a8f 100644
--- a/branches/java-post-M1/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
diff --git a/branches/java-post-M1/sdo/tools/src/test/resources/twoRepeatingChoicesTestResult.xml b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/twoRepeatingChoicesTestResult.xml
index 2679d973c5..2679d973c5 100644
--- a/branches/java-post-M1/sdo/tools/src/test/resources/twoRepeatingChoicesTestResult.xml
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/src/test/resources/twoRepeatingChoicesTestResult.xml
diff --git a/branches/java-post-M1/sdo/tools/templates/Header.javajetinc b/sca-java-1.x/branches/java-post-M1/sdo/tools/templates/Header.javajetinc
index 27becf3645..27becf3645 100644
--- a/branches/java-post-M1/sdo/tools/templates/Header.javajetinc
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/templates/Header.javajetinc
diff --git a/branches/java-post-M1/sdo/tools/templates/models/SDOClass.javajet b/sca-java-1.x/branches/java-post-M1/sdo/tools/templates/models/SDOClass.javajet
index 9acd32751b..9acd32751b 100644
--- a/branches/java-post-M1/sdo/tools/templates/models/SDOClass.javajet
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/templates/models/SDOClass.javajet
diff --git a/branches/java-post-M1/sdo/tools/templates/models/SDOFactoryClass.javajet b/sca-java-1.x/branches/java-post-M1/sdo/tools/templates/models/SDOFactoryClass.javajet
index 31794dae3f..31794dae3f 100644
--- a/branches/java-post-M1/sdo/tools/templates/models/SDOFactoryClass.javajet
+++ b/sca-java-1.x/branches/java-post-M1/sdo/tools/templates/models/SDOFactoryClass.javajet
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 02:27:16 +0000