moving SDO branches

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

113 files changed, 0 insertions, 46082 deletions

diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java
deleted file mode 100644
index 79deec6d29..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo;
-
-import commonj.sdo.DataObject;
-
-import org.eclipse.emf.ecore.xml.type.AnyType;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Any Type Data Object</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.apache.tuscany.sdo.SDOPackage#getAnyTypeDataObject()
- * @model extendedMetaData="kind='mixed'"
- * @generated
- */
-public interface AnyTypeDataObject extends DataObject, AnyType {
-} // AnyTypeDataObject
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java
deleted file mode 100644
index ad546cc614..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOExtendedMetaData.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo;
-
-import java.util.List;
-
-import org.apache.tuscany.sdo.helper.SDOExtendedMetaDataImpl;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-
-public interface SDOExtendedMetaData extends ExtendedMetaData {
-
-  SDOExtendedMetaData INSTANCE = new SDOExtendedMetaDataImpl();
-  
-  List getAliasNames(EModelElement eModelElement);
-  
-  void setAliasNames(EModelElement eModelElement, List aliasNames);
-  
-  void setAliasNames(EModelElement eModelElement, String aliasNames);
-
-  void setFeatureNamespaceMatchingLax(boolean featureNamespaceMatchingLax);
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java
deleted file mode 100644
index 04ef0d714a..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.DataGraph;
-import commonj.sdo.DataObject;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.sdo.SDOPackage
- * @generated
- */
-public interface SDOFactory extends EFactory{
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  SDOFactory eINSTANCE = org.apache.tuscany.sdo.impl.SDOFactoryImpl.init();
-
-  /**
-   * Returns a new object of class '<em>Change Summary</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Change Summary</em>'.
-   * @generated
-   */
-  ChangeSummary createChangeSummary();
-
-  /**
-   * Returns a new object of class '<em>Change Summary Setting</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Change Summary Setting</em>'.
-   * @generated
-   */
-  ChangeSummary.Setting createChangeSummarySetting();
-
-  /**
-   * Returns a new object of class '<em>Data Graph</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Data Graph</em>'.
-   * @generated
-   */
-  DataGraph createDataGraph();
-
-  /**
-   * Returns a new object of class '<em>Any Type Data Object</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Any Type Data Object</em>'.
-   * @generated
-   */
-  AnyTypeDataObject createAnyTypeDataObject();
-
-  /**
-   * Returns a new object of class '<em>Simple Any Type Data Object</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Simple Any Type Data Object</em>'.
-   * @generated
-   */
-  SimpleAnyTypeDataObject createSimpleAnyTypeDataObject();
-
-  /**
-   * Returns a new object of class '<em>Class</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Class</em>'.
-   * @generated
-   */
-  Type createClass();
-
-  /**
-   * Returns a new object of class '<em>Data Type</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Data Type</em>'.
-   * @generated
-   */
-  Type createDataType();
-
-  /**
-   * Returns a new object of class '<em>Attribute</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Attribute</em>'.
-   * @generated
-   */
-  Property createAttribute();
-
-  /**
-   * Returns a new object of class '<em>Reference</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Reference</em>'.
-   * @generated
-   */
-  Property createReference();
-
-  /**
-   * Returns a new object of class '<em>Enum</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Enum</em>'.
-   * @generated
-   */
-  Type createEnum();
-
-  /**
-   * Returns a new object of class '<em>Dynamic Data Object</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Dynamic Data Object</em>'.
-   * @generated
-   */
-  DataObject createDynamicDataObject();
-
-  /**
-   * Returns a new object of class '<em>Store Data Object</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Store Data Object</em>'.
-   * @generated
-   */
-  DataObject createStoreDataObject();
-
-  /**
-   * Returns a new object of class '<em>Dynamic Store Data Object</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Dynamic Store Data Object</em>'.
-   * @generated
-   */
-  DataObject createDynamicStoreDataObject();
-
-  /**
-   * Returns a new object of class '<em>Extensible Data Object</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Extensible Data Object</em>'.
-   * @generated
-   */
-  DataObject createExtensibleDataObject();
-
-  /**
-   * Returns the package supported by this factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the package supported by this factory.
-   * @generated
-   */
-  SDOPackage getSDOPackage();
-
-  ChangeSummary.Setting createChangeSummarySetting(EStructuralFeature eStructuralFeature, Object value, boolean isSet);
-
-} //SDOFactory
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java
deleted file mode 100644
index a21f2308ab..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java
+++ /dev/null
@@ -1,1657 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.change.ChangePackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.apache.tuscany.sdo.SDOFactory
- * @model kind="package"
- * @generated
- */
-public interface SDOPackage extends EPackage{
-  /**
-   * The package name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNAME = "sdo";
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_URI = "http://www.apache.org/tuscany/2005/SDO";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  String eNS_PREFIX = "sdo";
-
-  /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  SDOPackage eINSTANCE = org.apache.tuscany.sdo.impl.SDOPackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link org.apache.tuscany.sdo.impl.DataGraphImpl <em>Data Graph</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.apache.tuscany.sdo.impl.DataGraphImpl
-   * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getDataGraph()
-   * @generated
-   */
-  int DATA_GRAPH = 2;
-
-  /**
-   * The meta object id for the '{@link org.apache.tuscany.sdo.impl.ChangeSummaryImpl <em>Change Summary</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.apache.tuscany.sdo.impl.ChangeSummaryImpl
-   * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getChangeSummary()
-   * @generated
-   */
-  int CHANGE_SUMMARY = 0;
-
-  /**
-   * The feature id for the '<em><b>Object Changes</b></em>' map.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CHANGE_SUMMARY__OBJECT_CHANGES = ChangePackage.CHANGE_DESCRIPTION__OBJECT_CHANGES;
-
-  /**
-   * The feature id for the '<em><b>Objects To Detach</b></em>' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CHANGE_SUMMARY__OBJECTS_TO_DETACH = ChangePackage.CHANGE_DESCRIPTION__OBJECTS_TO_DETACH;
-
-  /**
-   * The feature id for the '<em><b>Objects To Attach</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CHANGE_SUMMARY__OBJECTS_TO_ATTACH = ChangePackage.CHANGE_DESCRIPTION__OBJECTS_TO_ATTACH;
-
-  /**
-   * The feature id for the '<em><b>Resource Changes</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CHANGE_SUMMARY__RESOURCE_CHANGES = ChangePackage.CHANGE_DESCRIPTION__RESOURCE_CHANGES;
-
-  /**
-   * The feature id for the '<em><b>EData Graph</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CHANGE_SUMMARY__EDATA_GRAPH = ChangePackage.CHANGE_DESCRIPTION_FEATURE_COUNT + 0;
-
-//TODO T-153 
-//  /**
-//   * The feature id for the '<em><b>EData Graph</b></em>' reference.
-//   * <!-- begin-user-doc -->
-//   * <!-- end-user-doc -->
-//   * *handcrafted but could be generated
-//   * @ordered
-//   */
-//  int CHANGE_SUMMARY__EDATA_OBJECT = ChangePackage.CHANGE_DESCRIPTION_FEATURE_COUNT + 1;
-
-  /**
-   * The number of structural features of the '<em>Change Summary</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   * @ordered
-   */
-//TODO T-153 
-  int CHANGE_SUMMARY_FEATURE_COUNT = ChangePackage.CHANGE_DESCRIPTION_FEATURE_COUNT + 1;
-  //int CHANGE_SUMMARY_FEATURE_COUNT = ChangePackage.CHANGE_DESCRIPTION_FEATURE_COUNT + 2;
-
-  /**
-   * The meta object id for the '{@link org.apache.tuscany.sdo.impl.ChangeSummarySettingImpl <em>Change Summary Setting</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.apache.tuscany.sdo.impl.ChangeSummarySettingImpl
-   * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getChangeSummarySetting()
-   * @generated
-   */
-  int CHANGE_SUMMARY_SETTING = 1;
-
-  /**
-   * The feature id for the '<em><b>Feature Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CHANGE_SUMMARY_SETTING__FEATURE_NAME = ChangePackage.FEATURE_CHANGE__FEATURE_NAME;
-
-  /**
-   * The feature id for the '<em><b>Data Value</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CHANGE_SUMMARY_SETTING__DATA_VALUE = ChangePackage.FEATURE_CHANGE__DATA_VALUE;
-
-  /**
-   * The feature id for the '<em><b>Set</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CHANGE_SUMMARY_SETTING__SET = ChangePackage.FEATURE_CHANGE__SET;
-
-  /**
-   * The feature id for the '<em><b>Value</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CHANGE_SUMMARY_SETTING__VALUE = ChangePackage.FEATURE_CHANGE__VALUE;
-
-  /**
-   * The feature id for the '<em><b>Feature</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CHANGE_SUMMARY_SETTING__FEATURE = ChangePackage.FEATURE_CHANGE__FEATURE;
-
-  /**
-   * The feature id for the '<em><b>Reference Value</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CHANGE_SUMMARY_SETTING__REFERENCE_VALUE = ChangePackage.FEATURE_CHANGE__REFERENCE_VALUE;
-
-  /**
-   * The feature id for the '<em><b>List Changes</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CHANGE_SUMMARY_SETTING__LIST_CHANGES = ChangePackage.FEATURE_CHANGE__LIST_CHANGES;
-
-  /**
-   * The number of structural features of the '<em>Change Summary Setting</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CHANGE_SUMMARY_SETTING_FEATURE_COUNT = ChangePackage.FEATURE_CHANGE_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Resource Set</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DATA_GRAPH__RESOURCE_SET = EcorePackage.EOBJECT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Root Resource</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DATA_GRAPH__ROOT_RESOURCE = EcorePackage.EOBJECT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>EChange Summary</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DATA_GRAPH__ECHANGE_SUMMARY = EcorePackage.EOBJECT_FEATURE_COUNT + 2;
-
-  /**
-   * The feature id for the '<em><b>ERoot Object</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DATA_GRAPH__EROOT_OBJECT = EcorePackage.EOBJECT_FEATURE_COUNT + 3;
-
-  /**
-   * The number of structural features of the '<em>Data Graph</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DATA_GRAPH_FEATURE_COUNT = EcorePackage.EOBJECT_FEATURE_COUNT + 4;
-
-  /**
-   * The meta object id for the '{@link org.apache.tuscany.sdo.impl.DataObjectImpl <em>Data Object</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.apache.tuscany.sdo.impl.DataObjectImpl
-   * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getDataObject()
-   * @generated
-   */
-  int DATA_OBJECT = 3;
-
-  /**
-   * The meta object id for the '{@link commonj.sdo.Property <em>Property</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see commonj.sdo.Property
-   * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getProperty()
-   * @generated
-   */
-  int PROPERTY = 4;
-
-  /**
-   * The meta object id for the '{@link commonj.sdo.Sequence <em>Sequence</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see commonj.sdo.Sequence
-   * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getSequence()
-   * @generated
-   */
-  int SEQUENCE = 5;
-
-  /**
-   * The meta object id for the '{@link commonj.sdo.Type <em>Type</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see commonj.sdo.Type
-   * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getType()
-   * @generated
-   */
-  int TYPE = 6;
-
-  /**
-   * The number of structural features of the '<em>Data Object</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DATA_OBJECT_FEATURE_COUNT = 0;
-
-  /**
-   * The number of structural features of the '<em>Property</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int PROPERTY_FEATURE_COUNT = 0;
-
-  /**
-   * The number of structural features of the '<em>Sequence</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SEQUENCE_FEATURE_COUNT = 0;
-
-  /**
-   * The number of structural features of the '<em>Type</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int TYPE_FEATURE_COUNT = 0;
-
-  /**
-   * The meta object id for the '{@link org.apache.tuscany.sdo.impl.AnyTypeDataObjectImpl <em>Any Type Data Object</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.apache.tuscany.sdo.impl.AnyTypeDataObjectImpl
-   * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getAnyTypeDataObject()
-   * @generated
-   */
-  int ANY_TYPE_DATA_OBJECT = 7;
-
-  /**
-   * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ANY_TYPE_DATA_OBJECT__MIXED = DATA_OBJECT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Any</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ANY_TYPE_DATA_OBJECT__ANY = DATA_OBJECT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Any Attribute</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE = DATA_OBJECT_FEATURE_COUNT + 2;
-
-  /**
-   * The number of structural features of the '<em>Any Type Data Object</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ANY_TYPE_DATA_OBJECT_FEATURE_COUNT = DATA_OBJECT_FEATURE_COUNT + 3;
-
-  /**
-   * The meta object id for the '{@link org.apache.tuscany.sdo.impl.SimpleAnyTypeDataObjectImpl <em>Simple Any Type Data Object</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.apache.tuscany.sdo.impl.SimpleAnyTypeDataObjectImpl
-   * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getSimpleAnyTypeDataObject()
-   * @generated
-   */
-  int SIMPLE_ANY_TYPE_DATA_OBJECT = 8;
-
-  /**
-   * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SIMPLE_ANY_TYPE_DATA_OBJECT__MIXED = ANY_TYPE_DATA_OBJECT__MIXED;
-
-  /**
-   * The feature id for the '<em><b>Any</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SIMPLE_ANY_TYPE_DATA_OBJECT__ANY = ANY_TYPE_DATA_OBJECT__ANY;
-
-  /**
-   * The feature id for the '<em><b>Any Attribute</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SIMPLE_ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE = ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE;
-
-  /**
-   * The feature id for the '<em><b>Raw Value</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SIMPLE_ANY_TYPE_DATA_OBJECT__RAW_VALUE = ANY_TYPE_DATA_OBJECT_FEATURE_COUNT + 0;
-
-  /**
-   * The feature id for the '<em><b>Value</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SIMPLE_ANY_TYPE_DATA_OBJECT__VALUE = ANY_TYPE_DATA_OBJECT_FEATURE_COUNT + 1;
-
-  /**
-   * The feature id for the '<em><b>Instance Type</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SIMPLE_ANY_TYPE_DATA_OBJECT__INSTANCE_TYPE = ANY_TYPE_DATA_OBJECT_FEATURE_COUNT + 2;
-
-  /**
-   * The number of structural features of the '<em>Simple Any Type Data Object</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int SIMPLE_ANY_TYPE_DATA_OBJECT_FEATURE_COUNT = ANY_TYPE_DATA_OBJECT_FEATURE_COUNT + 3;
-
-  /**
-   * The meta object id for the '{@link org.apache.tuscany.sdo.impl.ClassImpl <em>Class</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.apache.tuscany.sdo.impl.ClassImpl
-   * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getClass_()
-   * @generated
-   */
-  int CLASS = 9;
-
-  /**
-   * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS__EANNOTATIONS = EcorePackage.ECLASS__EANNOTATIONS;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS__NAME = EcorePackage.ECLASS__NAME;
-
-  /**
-   * The feature id for the '<em><b>Instance Class Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS__INSTANCE_CLASS_NAME = EcorePackage.ECLASS__INSTANCE_CLASS_NAME;
-
-  /**
-   * The feature id for the '<em><b>Instance Class</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS__INSTANCE_CLASS = EcorePackage.ECLASS__INSTANCE_CLASS;
-
-  /**
-   * The feature id for the '<em><b>Default Value</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS__DEFAULT_VALUE = EcorePackage.ECLASS__DEFAULT_VALUE;
-
-  /**
-   * The feature id for the '<em><b>EPackage</b></em>' container reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS__EPACKAGE = EcorePackage.ECLASS__EPACKAGE;
-
-  /**
-   * The feature id for the '<em><b>Abstract</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS__ABSTRACT = EcorePackage.ECLASS__ABSTRACT;
-
-  /**
-   * The feature id for the '<em><b>Interface</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS__INTERFACE = EcorePackage.ECLASS__INTERFACE;
-
-  /**
-   * The feature id for the '<em><b>ESuper Types</b></em>' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS__ESUPER_TYPES = EcorePackage.ECLASS__ESUPER_TYPES;
-
-  /**
-   * The feature id for the '<em><b>EOperations</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS__EOPERATIONS = EcorePackage.ECLASS__EOPERATIONS;
-
-  /**
-   * The feature id for the '<em><b>EAll Attributes</b></em>' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS__EALL_ATTRIBUTES = EcorePackage.ECLASS__EALL_ATTRIBUTES;
-
-  /**
-   * The feature id for the '<em><b>EAll References</b></em>' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS__EALL_REFERENCES = EcorePackage.ECLASS__EALL_REFERENCES;
-
-  /**
-   * The feature id for the '<em><b>EReferences</b></em>' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS__EREFERENCES = EcorePackage.ECLASS__EREFERENCES;
-
-  /**
-   * The feature id for the '<em><b>EAttributes</b></em>' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS__EATTRIBUTES = EcorePackage.ECLASS__EATTRIBUTES;
-
-  /**
-   * The feature id for the '<em><b>EAll Containments</b></em>' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS__EALL_CONTAINMENTS = EcorePackage.ECLASS__EALL_CONTAINMENTS;
-
-  /**
-   * The feature id for the '<em><b>EAll Operations</b></em>' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS__EALL_OPERATIONS = EcorePackage.ECLASS__EALL_OPERATIONS;
-
-  /**
-   * The feature id for the '<em><b>EAll Structural Features</b></em>' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS__EALL_STRUCTURAL_FEATURES = EcorePackage.ECLASS__EALL_STRUCTURAL_FEATURES;
-
-  /**
-   * The feature id for the '<em><b>EAll Super Types</b></em>' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS__EALL_SUPER_TYPES = EcorePackage.ECLASS__EALL_SUPER_TYPES;
-
-  /**
-   * The feature id for the '<em><b>EID Attribute</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS__EID_ATTRIBUTE = EcorePackage.ECLASS__EID_ATTRIBUTE;
-
-  /**
-   * The feature id for the '<em><b>EStructural Features</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS__ESTRUCTURAL_FEATURES = EcorePackage.ECLASS__ESTRUCTURAL_FEATURES;
-
-  /**
-   * The number of structural features of the '<em>Class</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CLASS_FEATURE_COUNT = EcorePackage.ECLASS_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.apache.tuscany.sdo.impl.DataTypeImpl <em>Data Type</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.apache.tuscany.sdo.impl.DataTypeImpl
-   * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getDataType()
-   * @generated
-   */
-  int DATA_TYPE = 10;
-
-  /**
-   * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DATA_TYPE__EANNOTATIONS = EcorePackage.EDATA_TYPE__EANNOTATIONS;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DATA_TYPE__NAME = EcorePackage.EDATA_TYPE__NAME;
-
-  /**
-   * The feature id for the '<em><b>Instance Class Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DATA_TYPE__INSTANCE_CLASS_NAME = EcorePackage.EDATA_TYPE__INSTANCE_CLASS_NAME;
-
-  /**
-   * The feature id for the '<em><b>Instance Class</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DATA_TYPE__INSTANCE_CLASS = EcorePackage.EDATA_TYPE__INSTANCE_CLASS;
-
-  /**
-   * The feature id for the '<em><b>Default Value</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DATA_TYPE__DEFAULT_VALUE = EcorePackage.EDATA_TYPE__DEFAULT_VALUE;
-
-  /**
-   * The feature id for the '<em><b>EPackage</b></em>' container reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DATA_TYPE__EPACKAGE = EcorePackage.EDATA_TYPE__EPACKAGE;
-
-  /**
-   * The feature id for the '<em><b>Serializable</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DATA_TYPE__SERIALIZABLE = EcorePackage.EDATA_TYPE__SERIALIZABLE;
-
-  /**
-   * The number of structural features of the '<em>Data Type</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DATA_TYPE_FEATURE_COUNT = EcorePackage.EDATA_TYPE_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.apache.tuscany.sdo.impl.AttributeImpl <em>Attribute</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.apache.tuscany.sdo.impl.AttributeImpl
-   * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getAttribute()
-   * @generated
-   */
-  int ATTRIBUTE = 11;
-
-  /**
-   * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ATTRIBUTE__EANNOTATIONS = EcorePackage.EATTRIBUTE__EANNOTATIONS;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ATTRIBUTE__NAME = EcorePackage.EATTRIBUTE__NAME;
-
-  /**
-   * The feature id for the '<em><b>Ordered</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ATTRIBUTE__ORDERED = EcorePackage.EATTRIBUTE__ORDERED;
-
-  /**
-   * The feature id for the '<em><b>Unique</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ATTRIBUTE__UNIQUE = EcorePackage.EATTRIBUTE__UNIQUE;
-
-  /**
-   * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ATTRIBUTE__LOWER_BOUND = EcorePackage.EATTRIBUTE__LOWER_BOUND;
-
-  /**
-   * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ATTRIBUTE__UPPER_BOUND = EcorePackage.EATTRIBUTE__UPPER_BOUND;
-
-  /**
-   * The feature id for the '<em><b>Many</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ATTRIBUTE__MANY = EcorePackage.EATTRIBUTE__MANY;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ATTRIBUTE__REQUIRED = EcorePackage.EATTRIBUTE__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>EType</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ATTRIBUTE__ETYPE = EcorePackage.EATTRIBUTE__ETYPE;
-
-  /**
-   * The feature id for the '<em><b>Changeable</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ATTRIBUTE__CHANGEABLE = EcorePackage.EATTRIBUTE__CHANGEABLE;
-
-  /**
-   * The feature id for the '<em><b>Volatile</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ATTRIBUTE__VOLATILE = EcorePackage.EATTRIBUTE__VOLATILE;
-
-  /**
-   * The feature id for the '<em><b>Transient</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ATTRIBUTE__TRANSIENT = EcorePackage.EATTRIBUTE__TRANSIENT;
-
-  /**
-   * The feature id for the '<em><b>Default Value Literal</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ATTRIBUTE__DEFAULT_VALUE_LITERAL = EcorePackage.EATTRIBUTE__DEFAULT_VALUE_LITERAL;
-
-  /**
-   * The feature id for the '<em><b>Default Value</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ATTRIBUTE__DEFAULT_VALUE = EcorePackage.EATTRIBUTE__DEFAULT_VALUE;
-
-  /**
-   * The feature id for the '<em><b>Unsettable</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ATTRIBUTE__UNSETTABLE = EcorePackage.EATTRIBUTE__UNSETTABLE;
-
-  /**
-   * The feature id for the '<em><b>Derived</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ATTRIBUTE__DERIVED = EcorePackage.EATTRIBUTE__DERIVED;
-
-  /**
-   * The feature id for the '<em><b>EContaining Class</b></em>' container reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ATTRIBUTE__ECONTAINING_CLASS = EcorePackage.EATTRIBUTE__ECONTAINING_CLASS;
-
-  /**
-   * The feature id for the '<em><b>ID</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ATTRIBUTE__ID = EcorePackage.EATTRIBUTE__ID;
-
-  /**
-   * The feature id for the '<em><b>EAttribute Type</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ATTRIBUTE__EATTRIBUTE_TYPE = EcorePackage.EATTRIBUTE__EATTRIBUTE_TYPE;
-
-  /**
-   * The number of structural features of the '<em>Attribute</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ATTRIBUTE_FEATURE_COUNT = EcorePackage.EATTRIBUTE_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.apache.tuscany.sdo.impl.ReferenceImpl <em>Reference</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.apache.tuscany.sdo.impl.ReferenceImpl
-   * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getReference()
-   * @generated
-   */
-  int REFERENCE = 12;
-
-  /**
-   * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__EANNOTATIONS = EcorePackage.EREFERENCE__EANNOTATIONS;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__NAME = EcorePackage.EREFERENCE__NAME;
-
-  /**
-   * The feature id for the '<em><b>Ordered</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__ORDERED = EcorePackage.EREFERENCE__ORDERED;
-
-  /**
-   * The feature id for the '<em><b>Unique</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__UNIQUE = EcorePackage.EREFERENCE__UNIQUE;
-
-  /**
-   * The feature id for the '<em><b>Lower Bound</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__LOWER_BOUND = EcorePackage.EREFERENCE__LOWER_BOUND;
-
-  /**
-   * The feature id for the '<em><b>Upper Bound</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__UPPER_BOUND = EcorePackage.EREFERENCE__UPPER_BOUND;
-
-  /**
-   * The feature id for the '<em><b>Many</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__MANY = EcorePackage.EREFERENCE__MANY;
-
-  /**
-   * The feature id for the '<em><b>Required</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__REQUIRED = EcorePackage.EREFERENCE__REQUIRED;
-
-  /**
-   * The feature id for the '<em><b>EType</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__ETYPE = EcorePackage.EREFERENCE__ETYPE;
-
-  /**
-   * The feature id for the '<em><b>Changeable</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__CHANGEABLE = EcorePackage.EREFERENCE__CHANGEABLE;
-
-  /**
-   * The feature id for the '<em><b>Volatile</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__VOLATILE = EcorePackage.EREFERENCE__VOLATILE;
-
-  /**
-   * The feature id for the '<em><b>Transient</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__TRANSIENT = EcorePackage.EREFERENCE__TRANSIENT;
-
-  /**
-   * The feature id for the '<em><b>Default Value Literal</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__DEFAULT_VALUE_LITERAL = EcorePackage.EREFERENCE__DEFAULT_VALUE_LITERAL;
-
-  /**
-   * The feature id for the '<em><b>Default Value</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__DEFAULT_VALUE = EcorePackage.EREFERENCE__DEFAULT_VALUE;
-
-  /**
-   * The feature id for the '<em><b>Unsettable</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__UNSETTABLE = EcorePackage.EREFERENCE__UNSETTABLE;
-
-  /**
-   * The feature id for the '<em><b>Derived</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__DERIVED = EcorePackage.EREFERENCE__DERIVED;
-
-  /**
-   * The feature id for the '<em><b>EContaining Class</b></em>' container reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__ECONTAINING_CLASS = EcorePackage.EREFERENCE__ECONTAINING_CLASS;
-
-  /**
-   * The feature id for the '<em><b>Containment</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__CONTAINMENT = EcorePackage.EREFERENCE__CONTAINMENT;
-
-  /**
-   * The feature id for the '<em><b>Container</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__CONTAINER = EcorePackage.EREFERENCE__CONTAINER;
-
-  /**
-   * The feature id for the '<em><b>Resolve Proxies</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__RESOLVE_PROXIES = EcorePackage.EREFERENCE__RESOLVE_PROXIES;
-
-  /**
-   * The feature id for the '<em><b>EOpposite</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__EOPPOSITE = EcorePackage.EREFERENCE__EOPPOSITE;
-
-  /**
-   * The feature id for the '<em><b>EReference Type</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE__EREFERENCE_TYPE = EcorePackage.EREFERENCE__EREFERENCE_TYPE;
-
-  /**
-   * The number of structural features of the '<em>Reference</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int REFERENCE_FEATURE_COUNT = EcorePackage.EREFERENCE_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.apache.tuscany.sdo.impl.EnumImpl <em>Enum</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.apache.tuscany.sdo.impl.EnumImpl
-   * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getEnum()
-   * @generated
-   */
-  int ENUM = 13;
-
-  /**
-   * The feature id for the '<em><b>EAnnotations</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ENUM__EANNOTATIONS = EcorePackage.EENUM__EANNOTATIONS;
-
-  /**
-   * The feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ENUM__NAME = EcorePackage.EENUM__NAME;
-
-  /**
-   * The feature id for the '<em><b>Instance Class Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ENUM__INSTANCE_CLASS_NAME = EcorePackage.EENUM__INSTANCE_CLASS_NAME;
-
-  /**
-   * The feature id for the '<em><b>Instance Class</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ENUM__INSTANCE_CLASS = EcorePackage.EENUM__INSTANCE_CLASS;
-
-  /**
-   * The feature id for the '<em><b>Default Value</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ENUM__DEFAULT_VALUE = EcorePackage.EENUM__DEFAULT_VALUE;
-
-  /**
-   * The feature id for the '<em><b>EPackage</b></em>' container reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ENUM__EPACKAGE = EcorePackage.EENUM__EPACKAGE;
-
-  /**
-   * The feature id for the '<em><b>Serializable</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ENUM__SERIALIZABLE = EcorePackage.EENUM__SERIALIZABLE;
-
-  /**
-   * The feature id for the '<em><b>ELiterals</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ENUM__ELITERALS = EcorePackage.EENUM__ELITERALS;
-
-  /**
-   * The number of structural features of the '<em>Enum</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int ENUM_FEATURE_COUNT = EcorePackage.EENUM_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.apache.tuscany.sdo.impl.DynamicDataObjectImpl <em>Dynamic Data Object</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.apache.tuscany.sdo.impl.DynamicDataObjectImpl
-   * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getDynamicDataObject()
-   * @generated
-   */
-  int DYNAMIC_DATA_OBJECT = 14;
-
-  /**
-   * The number of structural features of the '<em>Dynamic Data Object</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DYNAMIC_DATA_OBJECT_FEATURE_COUNT = DATA_OBJECT_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.apache.tuscany.sdo.impl.StoreDataObjectImpl <em>Store Data Object</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.apache.tuscany.sdo.impl.StoreDataObjectImpl
-   * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getStoreDataObject()
-   * @generated
-   */
-  int STORE_DATA_OBJECT = 15;
-
-  /**
-   * The number of structural features of the '<em>Store Data Object</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int STORE_DATA_OBJECT_FEATURE_COUNT = DATA_OBJECT_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.apache.tuscany.sdo.impl.DynamicStoreDataObjectImpl <em>Dynamic Store Data Object</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.apache.tuscany.sdo.impl.DynamicStoreDataObjectImpl
-   * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getDynamicStoreDataObject()
-   * @generated
-   */
-  int DYNAMIC_STORE_DATA_OBJECT = 16;
-
-  /**
-   * The number of structural features of the '<em>Dynamic Store Data Object</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int DYNAMIC_STORE_DATA_OBJECT_FEATURE_COUNT = STORE_DATA_OBJECT_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '{@link org.apache.tuscany.sdo.impl.ExtensibleDataObjectImpl <em>Extensible Data Object</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.apache.tuscany.sdo.impl.ExtensibleDataObjectImpl
-   * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getExtensibleDataObject()
-   * @generated
-   */
-  int EXTENSIBLE_DATA_OBJECT = 17;
-
-  /**
-   * The number of structural features of the '<em>Extensible Data Object</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int EXTENSIBLE_DATA_OBJECT_FEATURE_COUNT = DATA_OBJECT_FEATURE_COUNT + 0;
-
-  /**
-   * The meta object id for the '<em>EJava List</em>' data type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see java.util.List
-   * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getEJavaList()
-   * @generated
-   */
-  int EJAVA_LIST = 18;
-
-  /**
-   * The meta object id for the '<em>EObject Stream Exception</em>' data type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see java.io.ObjectStreamException
-   * @see org.apache.tuscany.sdo.impl.SDOPackageImpl#getEObjectStreamException()
-   * @generated
-   */
-  int EOBJECT_STREAM_EXCEPTION = 19;
-
-
-  /**
-   * Returns the meta object for class '{@link commonj.sdo.ChangeSummary <em>Change Summary</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Change Summary</em>'.
-   * @see commonj.sdo.ChangeSummary
-   * @model instanceClass="commonj.sdo.ChangeSummary"
-   * @generated
-   */
-  EClass getChangeSummary();
-
-  /**
-   * Returns the meta object for the reference '{@link commonj.sdo.ChangeSummary#getEDataGraph <em>EData Graph</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EData Graph</em>'.
-   * @see commonj.sdo.ChangeSummary#getEDataGraph()
-   * @see #getChangeSummary()
-   * @generated
-   */
-  EReference getChangeSummary_EDataGraph();
-
-// TODO T-153
-//  /**
-//   * Returns the meta object for the reference '{@link commonj.sdo.ChangeSummary#getEDataGraph <em>EData Graph</em>}'.
-//   * <!-- begin-user-doc -->
-//   * <!-- end-user-doc -->
-//   * @return the meta object for the reference '<em>EData Graph</em>'.
-//   * @see commonj.sdo.ChangeSummary#getEDataGraph()
-//   * @see #getChangeSummary()
-//   * *handcrafted but could be generated
-//   */
-//  EReference getChangeSummary_EDataObject();
-
-  
-  /**
-   * Returns the meta object for class '{@link commonj.sdo.ChangeSummary.Setting <em>Change Summary Setting</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Change Summary Setting</em>'.
-   * @see commonj.sdo.ChangeSummary.Setting
-   * @model instanceClass="commonj.sdo.ChangeSummary$Setting"
-   * @generated
-   */
-  EClass getChangeSummarySetting();
-
-  /**
-   * Returns the meta object for class '{@link commonj.sdo.DataGraph <em>Data Graph</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Data Graph</em>'.
-   * @see commonj.sdo.DataGraph
-   * @model instanceClass="commonj.sdo.DataGraph"
-   * @generated
-   */
-  EClass getDataGraph();
-
-  /**
-   * Returns the meta object for the attribute '{@link commonj.sdo.DataGraph#getResourceSet <em>Resource Set</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Resource Set</em>'.
-   * @see commonj.sdo.DataGraph#getResourceSet()
-   * @see #getDataGraph()
-   * @generated
-   */
-  EAttribute getDataGraph_ResourceSet();
-
-  /**
-   * Returns the meta object for the attribute '{@link commonj.sdo.DataGraph#getRootResource <em>Root Resource</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Root Resource</em>'.
-   * @see commonj.sdo.DataGraph#getRootResource()
-   * @see #getDataGraph()
-   * @generated
-   */
-  EAttribute getDataGraph_RootResource();
-
-  /**
-   * Returns the meta object for the reference '{@link commonj.sdo.DataGraph#getEChangeSummary <em>EChange Summary</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>EChange Summary</em>'.
-   * @see commonj.sdo.DataGraph#getEChangeSummary()
-   * @see #getDataGraph()
-   * @generated
-   */
-  EReference getDataGraph_EChangeSummary();
-
-  /**
-   * Returns the meta object for the reference '{@link commonj.sdo.DataGraph#getERootObject <em>ERoot Object</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the reference '<em>ERoot Object</em>'.
-   * @see commonj.sdo.DataGraph#getERootObject()
-   * @see #getDataGraph()
-   * @generated
-   */
-  EReference getDataGraph_ERootObject();
-
-  /**
-   * Returns the meta object for class '{@link commonj.sdo.DataObject <em>Data Object</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Data Object</em>'.
-   * @see commonj.sdo.DataObject
-   * @model instanceClass="commonj.sdo.DataObject"
-   * @generated
-   */
-  EClass getDataObject();
-
-  /**
-   * Returns the meta object for class '{@link commonj.sdo.Property <em>Property</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Property</em>'.
-   * @see commonj.sdo.Property
-   * @model instanceClass="commonj.sdo.Property"
-   * @generated
-   */
-  EClass getProperty();
-
-  /**
-   * Returns the meta object for class '{@link commonj.sdo.Sequence <em>Sequence</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Sequence</em>'.
-   * @see commonj.sdo.Sequence
-   * @model instanceClass="commonj.sdo.Sequence"
-   * @generated
-   */
-  EClass getSequence();
-
-  /**
-   * Returns the meta object for class '{@link commonj.sdo.Type <em>Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Type</em>'.
-   * @see commonj.sdo.Type
-   * @model instanceClass="commonj.sdo.Type"
-   * @generated
-   */
-  EClass getType();
-
-  /**
-   * Returns the meta object for class '{@link org.apache.tuscany.sdo.AnyTypeDataObject <em>Any Type Data Object</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Any Type Data Object</em>'.
-   * @see org.apache.tuscany.sdo.AnyTypeDataObject
-   * @generated
-   */
-  EClass getAnyTypeDataObject();
-
-  /**
-   * Returns the meta object for class '{@link org.apache.tuscany.sdo.SimpleAnyTypeDataObject <em>Simple Any Type Data Object</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Simple Any Type Data Object</em>'.
-   * @see org.apache.tuscany.sdo.SimpleAnyTypeDataObject
-   * @generated
-   */
-  EClass getSimpleAnyTypeDataObject();
-
-  /**
-   * Returns the meta object for class '{@link commonj.sdo.Type <em>Class</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Class</em>'.
-   * @see commonj.sdo.Type
-   * @model instanceClass="commonj.sdo.Type"
-   * @generated
-   */
-  EClass getClass_();
-
-  /**
-   * Returns the meta object for class '{@link commonj.sdo.Type <em>Data Type</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Data Type</em>'.
-   * @see commonj.sdo.Type
-   * @model instanceClass="commonj.sdo.Type"
-   * @generated
-   */
-  EClass getDataType();
-
-  /**
-   * Returns the meta object for class '{@link commonj.sdo.Property <em>Attribute</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Attribute</em>'.
-   * @see commonj.sdo.Property
-   * @model instanceClass="commonj.sdo.Property"
-   * @generated
-   */
-  EClass getAttribute();
-
-  /**
-   * Returns the meta object for class '{@link commonj.sdo.Property <em>Reference</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Reference</em>'.
-   * @see commonj.sdo.Property
-   * @model instanceClass="commonj.sdo.Property"
-   * @generated
-   */
-  EClass getReference();
-
-  /**
-   * Returns the meta object for class '{@link commonj.sdo.Type <em>Enum</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Enum</em>'.
-   * @see commonj.sdo.Type
-   * @model instanceClass="commonj.sdo.Type"
-   * @generated
-   */
-  EClass getEnum();
-
-  /**
-   * Returns the meta object for class '{@link commonj.sdo.DataObject <em>Dynamic Data Object</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Dynamic Data Object</em>'.
-   * @see commonj.sdo.DataObject
-   * @model instanceClass="commonj.sdo.DataObject"
-   * @generated
-   */
-  EClass getDynamicDataObject();
-
-  /**
-   * Returns the meta object for class '{@link commonj.sdo.DataObject <em>Store Data Object</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Store Data Object</em>'.
-   * @see commonj.sdo.DataObject
-   * @model instanceClass="commonj.sdo.DataObject"
-   * @generated
-   */
-  EClass getStoreDataObject();
-
-  /**
-   * Returns the meta object for class '{@link commonj.sdo.DataObject <em>Dynamic Store Data Object</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Dynamic Store Data Object</em>'.
-   * @see commonj.sdo.DataObject
-   * @model instanceClass="commonj.sdo.DataObject"
-   * @generated
-   */
-  EClass getDynamicStoreDataObject();
-
-  /**
-   * Returns the meta object for class '{@link commonj.sdo.DataObject <em>Extensible Data Object</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Extensible Data Object</em>'.
-   * @see commonj.sdo.DataObject
-   * @model instanceClass="commonj.sdo.DataObject"
-   * @generated
-   */
-  EClass getExtensibleDataObject();
-
-  /**
-   * Returns the meta object for data type '{@link java.util.List <em>EJava List</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for data type '<em>EJava List</em>'.
-   * @see java.util.List
-   * @model instanceClass="java.util.List" serializable="false"
-   * @generated
-   */
-  EDataType getEJavaList();
-
-  /**
-   * Returns the meta object for data type '{@link java.io.ObjectStreamException <em>EObject Stream Exception</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for data type '<em>EObject Stream Exception</em>'.
-   * @see java.io.ObjectStreamException
-   * @model instanceClass="java.io.ObjectStreamException" serializable="false"
-   * @generated
-   */
-  EDataType getEObjectStreamException();
-
-  /**
-   * Returns the factory that creates the instances of the model.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the factory that creates the instances of the model.
-   * @generated
-   */
-  SDOFactory getSDOFactory();
-
-} //SDOPackage
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java
deleted file mode 100644
index 5d3640100c..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo;
-
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-
-/**
- * Visitor interface that allows applications to process SDO type metadata.
- *
- * @version $Rev$ $Date$
- */
-public interface SDOTypeVisitor {
-    /**
-     * Visit a type definition.
-     *
-     * @param type the type to visit
-     */
-    void visitType(Type type);
-
-    /**
-     * Visit a property definition.
-     *
-     * @param property the property to visit
-     */
-    void visitProperty(Property property);
-
-    /**
-     * Visit after all properties.
-     */
-    void visitEnd();
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java
deleted file mode 100644
index 93ff2ebf14..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo;
-
-import org.eclipse.emf.ecore.xml.type.SimpleAnyType;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Simple Any Type Data Object</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.apache.tuscany.sdo.SDOPackage#getSimpleAnyTypeDataObject()
- * @model extendedMetaData="kind='simple'"
- * @generated
- */
-public interface SimpleAnyTypeDataObject extends AnyTypeDataObject, SimpleAnyType {
-} // SimpleAnyTypeDataObject
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java
deleted file mode 100644
index 3fe2cd952e..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.codegen;
-
-import java.util.List;
-
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Opcodes;
-
-import org.apache.tuscany.sdo.SDOTypeVisitor;
-
-/**
- * Implementation of a generator that will directly emit bytecode for an interface that
- * corresponds to the static properties of a SDO type.
- *
- * @version $Rev$ $Date$
- */
-public class BytecodeInterfaceGenerator implements SDOTypeVisitor {
-    private final ClassWriter cw;
-
-    public BytecodeInterfaceGenerator() {
-        cw = new ClassWriter(false);
-    }
-
-    public void visitType(Type type) {
-        String name = type.getName();
-        int lastDot = name.lastIndexOf('.');
-        if (lastDot != -1) {
-            name = name.replace('.', '/');
-        } else {
-            name = Character.toUpperCase(name.charAt(0)) + name.substring(1);
-        }
-
-        List baseTypes = type.getBaseTypes();
-        String[] interfaces = new String[baseTypes.size()];
-        for (int i = 0; i < baseTypes.size(); i++) {
-            Type baseType = (Type) baseTypes.get(i);
-            interfaces[i] = baseType.getInstanceClass().getName().replace('.', '/');
-        }
-
-        cw.visit(Opcodes.V1_4,
-                 Opcodes.ACC_PUBLIC + Opcodes.ACC_ABSTRACT + Opcodes.ACC_INTERFACE,
-                 name, null, "java/lang/Object", interfaces);
-    }
-
-    public void visitProperty(Property property) {
-        String name = property.getName();
-        String propertyName = Character.toUpperCase(name.charAt(0)) + name.substring(1);
-        Class javaType = property.getType().getInstanceClass();
-        String desc = org.objectweb.asm.Type.getDescriptor(javaType);
-
-        if (property.isMany()) {
-            cw.visitMethod(Opcodes.ACC_PUBLIC + Opcodes.ACC_ABSTRACT, "get" + propertyName, "()Ljava/util/List;", null, null).visitEnd();
-        } else {
-            if (boolean.class.equals(javaType)) {
-                cw.visitMethod(Opcodes.ACC_PUBLIC + Opcodes.ACC_ABSTRACT, "is" + propertyName, "()Z", null, null).visitEnd();
-            } else {
-                cw.visitMethod(Opcodes.ACC_PUBLIC + Opcodes.ACC_ABSTRACT, "get" + propertyName, "()" + desc, null, null).visitEnd();
-            }
-            if (!property.isReadOnly()) {
-                cw.visitMethod(Opcodes.ACC_PUBLIC + Opcodes.ACC_ABSTRACT, "set" + propertyName, '(' + desc + ")V", null, null).visitEnd();
-            }
-        }
-    }
-
-    public void visitEnd() {
-        cw.visitEnd();
-    }
-
-    /**
-     * Return the bytecode for the interface class in a form that can be written
-     * to disk, added to a JAR file, or passed to a ClassLoader.
-     *
-     * @return the bytecode for the SDO Type's interface class
-     */
-    public byte[] getClassData() {
-        return cw.toByteArray();
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java
deleted file mode 100644
index 3d645be1da..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.codegen;
-
-/**
- * Exception indicating there was a problem with code generation.
- *
- * @version $Rev$ $Date$
- */
-public abstract class GenerationException extends RuntimeException {
-    public GenerationException() {
-    }
-
-    public GenerationException(String message) {
-        super(message);
-    }
-
-    public GenerationException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public GenerationException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java
deleted file mode 100644
index dc88a0d60d..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.codegen;
-
-import java.io.PrintWriter;
-import java.util.List;
-
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-
-import org.apache.tuscany.sdo.SDOTypeVisitor;
-
-/**
- * Implementation of a generator that will output the source code for a Java interface
- * that corresponds to the SDO Type's static properties.
- *
- * @version $Rev$ $Date$
- */
-public class JavaInterfaceGenerator implements SDOTypeVisitor {
-    
-    private static String canonicalize(String className) {
-        if (className == null) {
-            return "";
-        }
-        if (className.charAt(0) != '[') { // if not array
-            return className;
-        }
-        // process array
-        boolean invalidClassName = false;
-        int nestLevel = 1;
-        StringBuffer sb = new StringBuffer();
-        try {
-            while (className.charAt(nestLevel) == '[') {
-                nestLevel++;
-            }
-            char typeChar = className.charAt(nestLevel);
-            int end = nestLevel;
-            switch (typeChar) {
-            case 'L':
-                end = className.length() - 1;
-                if (className.charAt(end) != ';') {
-                    invalidClassName = true;
-                } else {
-                    sb.append(className.substring(nestLevel+1, end));    
-                }
-                break;
-            case 'Z':
-                sb.append("boolean"); 
-                break;
-            case 'B':
-                sb.append("byte"); 
-                break;
-            case 'C':
-                sb.append("char"); 
-                break;
-            case 'D':
-                sb.append("double"); 
-                break;
-            case 'F':
-                sb.append("float"); 
-                break;
-            case 'I':
-                sb.append("int"); 
-                break;
-            case 'J':
-                sb.append("long"); 
-                break;
-            case 'S':
-                sb.append("short"); 
-                break;
-            default:
-                invalidClassName = true;
-                break;
-            }
-            if (end != (className.length() - 1)) {
-                invalidClassName = true; // we have not used all the characters
-            } else {
-                for (int i=0; i<nestLevel; i++) {
-                    sb.append("[]");
-                }
-            }
-        } catch(Exception e) {
-            invalidClassName = true;
-        }
-        if (invalidClassName) {
-            System.err.println("unable to canonicalize class name: "+className);
-            return className;
-        }
-        return sb.toString();
-    }
-    
-    private final PrintWriter writer;
-
-    /**
-     * Constructor providing the Writer to output the source to.
-     *
-     * @param writer where the generated source code will be written to 
-     */
-    public JavaInterfaceGenerator(PrintWriter writer) {
-        this.writer = writer;
-    }
-
-    public void visitType(Type type) {
-        String name = type.getName();
-        int lastDot = name.lastIndexOf('.');
-        if (lastDot != -1) {
-            writer.print("package ");
-            writer.print(name.substring(0, lastDot));
-            writer.println(';');
-            writer.println();
-
-            name = name.substring(lastDot + 1);
-        } else {
-            name = Character.toUpperCase(name.charAt(0)) + name.substring(1);
-        }
-
-        writer.print("public interface ");
-        writer.print(name);
-        List baseTypes = type.getBaseTypes();
-        for (int i = 0; i < baseTypes.size(); i++) {
-            Type baseType = (Type) baseTypes.get(i);
-            if (i == 0) {
-                writer.print(" extends ");
-            } else {
-                writer.print(", ");
-            }
-            writer.print(baseType.getInstanceClass().getName());
-        }
-
-        writer.println(" {");
-    }
-
-    public void visitProperty(Property property) {
-        String name = property.getName();
-        String propertyName = Character.toUpperCase(name.charAt(0)) + name.substring(1);
-        String javaType = canonicalize(property.getType().getInstanceClass().getName());
-
-        if (!property.isMany()) {
-            writer.print("    ");
-            writer.print(javaType);
-            writer.print("boolean".equals(javaType) ? " is" : " get");
-            writer.print(propertyName);
-            writer.println("();");
-            if (!property.isReadOnly()) {
-                writer.print("    void set");
-                writer.print(propertyName);
-                writer.print('(');
-                writer.print(javaType);
-                writer.println(" value);");
-            }
-        } else {
-            writer.print("    java.util.List get");
-            writer.print(propertyName);
-            writer.println("();");
-        }
-    }
-
-    public void visitEnd() {
-        writer.println('}');
-        writer.flush();
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java
deleted file mode 100644
index a6253e8131..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.codegen;
-
-import commonj.sdo.Type;
-
-/**
- * Exception that indicates there is no Java mapping for an SDO type.
- *
- * @version $Rev$ $Date$
- */
-public class NoJavaImplementationException extends GenerationException {
-    private final Type type;
-
-    /**
-     * Constructor supplying the Type that did not have a Java implementation.
-     * A default message is provided of the form "${URI}#${Name}"
-     *
-     * @param type the type that did not have a Java implementation.
-     */
-    public NoJavaImplementationException(Type type) {
-        super(type == null ? null : type.getURI() + "#" + type.getName());
-        this.type = type;
-    }
-
-    /**
-     * Constructor supplying a message and the Type that did not have a Java implementation.
-     *
-     * @param message the message
-     * @param type the type that did not have a Java implementation.
-     */
-    public NoJavaImplementationException(String message, Type type) {
-        super(message);
-        this.type = type;
-    }
-
-    /**
-     * Return the type that did not have a Java implementation.
-     * @return the type that did not have a Java implementation
-     */
-    public Type getType() {
-        return type;
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOExtendedMetaDataImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOExtendedMetaDataImpl.java
deleted file mode 100644
index 88c714f8bf..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOExtendedMetaDataImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.helper;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.util.BasicExtendedMetaData;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-/**
- * A BasicExtendedMetaData that uses a supplied (SDO) ecore factory to create properties and types.
- */
-public class BaseSDOExtendedMetaDataImpl extends BasicExtendedMetaData
-{
-  protected EcoreFactory ecoreFactory = EcoreFactory.eINSTANCE;
-  protected DemandMetaData demandMetaData = new DemandMetaData();
-  
-  public static class DemandMetaData {
-    EClassifier getEObject() { return EcorePackage.eINSTANCE.getEObject(); }
-    EClassifier getAnyType() { return XMLTypePackage.eINSTANCE.getAnyType(); }
-    EClassifier getAnySimpleType() { return XMLTypePackage.eINSTANCE.getAnySimpleType(); }
-    EClassifier getXMLTypeDocumentRoot() { return XMLTypePackage.eINSTANCE.getXMLTypeDocumentRoot(); }
-  }
-
-  public BaseSDOExtendedMetaDataImpl(EPackage.Registry registry)
-  {
-    super(registry);
-  }
-
-  public EPackage demandPackage(String namespace)
-  {
-    EPackage ePackage = demandRegistry.getEPackage(namespace);
-    if (ePackage == null)
-    {
-      ePackage = ecoreFactory.createEPackage();
-      ePackage.setNsURI(namespace);
-      setQualified(ePackage, namespace != null);
-      if (namespace != null)
-      {
-        ePackage.setNsPrefix
-          (namespace.equals(ExtendedMetaData.XMLNS_URI) ? 
-             namespace.equals(ExtendedMetaData.XML_URI) ?
-               "xml" : 
-               "xmlns" : 
-             computePrefix(namespace));
-      }
-      demandRegistry.put(namespace, ePackage);
-
-      // demandDocumentRoot(ePackage);
-
-      EClass documentRootEClass = ecoreFactory.createEClass();
-      documentRootEClass.getESuperTypes().add(demandMetaData.getXMLTypeDocumentRoot());
-      documentRootEClass.setName("DocumentRoot");
-      ePackage.getEClassifiers().add(documentRootEClass);
-      setDocumentRoot(documentRootEClass);
-    }
-    return ePackage;
-  }
-  
-  public EClassifier demandType(String namespace, String name)
-  {
-    EPackage ePackage = demandPackage(namespace);
-    EClassifier eClassifier = getType(ePackage, name);
-    if (eClassifier != null)
-    {
-      return eClassifier;
-    }
-    else
-    {
-      EClass eClass = ecoreFactory.createEClass();
-      eClass.setName(name);
-      eClass.getESuperTypes().add(demandMetaData.getAnyType());
-      setContentKind(eClass, MIXED_CONTENT);
-      ePackage.getEClassifiers().add(eClass);
-      return eClass;
-    }
-  }
-
-  public EStructuralFeature demandFeature(String namespace, String name, boolean isElement, boolean isReference)
-  {
-    EPackage ePackage = demandPackage(namespace);
-    EClass documentRootEClass = getDocumentRoot(ePackage);
-    EStructuralFeature eStructuralFeature = 
-      isElement ? 
-        getLocalElement(documentRootEClass, namespace, name) : 
-        getLocalAttribute(documentRootEClass, namespace, name);
-    if (eStructuralFeature != null)
-    {
-      return eStructuralFeature;
-    }
-    else
-    {
-      if (isReference)
-      {
-        EReference eReference = ecoreFactory.createEReference();
-        eReference.setContainment(isElement);
-        eReference.setEType(demandMetaData.getEObject());
-        eReference.setName(name);
-        eReference.setDerived(true);
-        eReference.setTransient(true);
-        eReference.setVolatile(true);
-        documentRootEClass.getEStructuralFeatures().add(eReference);
-
-        setFeatureKind(eReference, isElement ? ELEMENT_FEATURE : ATTRIBUTE_FEATURE);
-        setNamespace(eReference, namespace);
-
-        // Mark the bound as unspecified so that it won't be considered many
-        // but can nevertheless be recognized as being unspecified and perhaps still be treat as many.
-        //
-        if (isElement)
-        {
-          eReference.setUpperBound(ETypedElement.UNSPECIFIED_MULTIPLICITY);
-        }
-
-        return eReference;
-      }
-      else
-      {
-        EAttribute eAttribute = ecoreFactory.createEAttribute();
-        eAttribute.setName(name);
-        eAttribute.setEType(demandMetaData.getAnySimpleType());
-        eAttribute.setDerived(true);
-        eAttribute.setTransient(true);
-        eAttribute.setVolatile(true);
-        documentRootEClass.getEStructuralFeatures().add(eAttribute);
-
-        setFeatureKind(eAttribute, isElement ? ELEMENT_FEATURE : ATTRIBUTE_FEATURE);
-        setNamespace(eAttribute, namespace);
-
-        // Mark the bound as unspecified so that it won't be considered many
-        // but can nevertheless be recognized as being unspecified and perhaps still be treat as many.
-        //
-        if (isElement)
-        {
-          eAttribute.setUpperBound(ETypedElement.UNSPECIFIED_MULTIPLICITY);
-        }
-
-        return eAttribute;
-      }
-    }
-  }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOXSDEcoreBuilder.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOXSDEcoreBuilder.java
deleted file mode 100644
index 3d297fa671..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/BaseSDOXSDEcoreBuilder.java
+++ /dev/null
@@ -1,1771 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.helper;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EParameter;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.xsd.XSDAnnotation;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDContentTypeCategory;
-import org.eclipse.xsd.XSDDerivationMethod;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDFeature;
-import org.eclipse.xsd.XSDLengthFacet;
-import org.eclipse.xsd.XSDMaxLengthFacet;
-import org.eclipse.xsd.XSDMinLengthFacet;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTerm;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDVariety;
-import org.eclipse.xsd.XSDWildcard;
-import org.eclipse.xsd.ecore.XSDEcoreBuilder;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * An XSDEcoreBuilder that uses a supplied (SDO) ecore factory to create properties and types.
- */
-public class BaseSDOXSDEcoreBuilder extends XSDEcoreBuilder
-{
-  protected EcorePackage ecorePackage = EcorePackage.eINSTANCE;
-  protected EcoreFactory ecoreFactory = EcoreFactory.eINSTANCE;
-
-  public BaseSDOXSDEcoreBuilder(ExtendedMetaData extendedMetaData)
-  {
-    super(extendedMetaData);
-  }
-  
-  private void createDocumentRoot(XSDSchema xsdSchema, EPackage ePackage) {
-      EClass documentEClass = ecoreFactory.createEClass();
-      String name = getEcoreAttribute(xsdSchema, "documentRoot");
-      if (name == null)
-      {
-        name = "DocumentRoot";
-      }
-      documentEClass.setName(name);
-
-      extendedMetaData.setDocumentRoot(documentEClass);
-
-      ePackage.getEClassifiers().add(documentEClass);
-
-      createFeature
-        (documentEClass,
-         "mixed",
-         ecorePackage.getEFeatureMapEntry(),
-         null,
-         0,
-         -1);
-
-      EStructuralFeature xmlnsPrefixMapFeature =
-        createFeature
-          (documentEClass,
-           "xMLNSPrefixMap",
-           ecorePackage.getEStringToStringMapEntry(),
-           null,
-           0,
-           -1);
-      extendedMetaData.setName(xmlnsPrefixMapFeature, "xmlns:prefix");
-
-      EStructuralFeature xsiSchemaLocationMapFeature =
-        createFeature
-          (documentEClass,
-           "xSISchemaLocation",
-           ecorePackage.getEStringToStringMapEntry(),
-           null,
-           0,
-           -1);
-      extendedMetaData.setName(xsiSchemaLocationMapFeature, "xsi:schemaLocation");
-  }
-
-  public EPackage getEPackage(XSDNamedComponent xsdNamedComponent)
-  {
-    XSDSchema containingXSDSchema = xsdNamedComponent.getSchema();
-    if (containingXSDSchema != null && !xsdSchemas.contains(containingXSDSchema))
-    {
-      xsdSchemas.add(containingXSDSchema);
-      addInput(containingXSDSchema);
-      validate(containingXSDSchema);
-    }
-
-    String targetNamespace = 
-      containingXSDSchema == null ? 
-        xsdNamedComponent.getTargetNamespace() : 
-        containingXSDSchema.getTargetNamespace();
-    EPackage ePackage = (EPackage)targetNamespaceToEPackageMap.get(targetNamespace);
-    if (ePackage == null)
-    {
-      ePackage = ecoreFactory.createEPackage();
-      setAnnotations(ePackage, containingXSDSchema);
-      addOutput(ePackage);
-      if (targetNamespace == null)
-      {
-        if (containingXSDSchema == null)
-        {
-          containingXSDSchema = rootSchema;
-        }
-        ePackage.setName(validName(containingXSDSchema.eResource().getURI().trimFileExtension().lastSegment(), true));
-        ePackage.setNsURI(containingXSDSchema.eResource().getURI().toString());
-
-        // Also register against the nsURI for the case that the target namespace is null.
-        //
-        // extendedMetaData.putPackage(ePackage.getNsURI(), ePackage);
-      }
-      else
-      {
-        String qualifiedPackageName = qualifiedPackageName(targetNamespace);
-        ePackage.setName(qualifiedPackageName);
-        ePackage.setNsURI(targetNamespace);
-      }
-
-      String nsPrefix = ePackage.getName();
-      int index = nsPrefix.lastIndexOf('.');
-      nsPrefix = index == -1 ? nsPrefix : nsPrefix.substring(index + 1);
-
-      // http://www.w3.org/TR/REC-xml-names/#xmlReserved
-      // Namespace Constraint: Leading "XML"
-      // Prefixes beginning with the three-letter sequence x, m, l, in any case combination, 
-      // are reserved for use by XML and XML-related specifications.
-      //
-      if (nsPrefix.toLowerCase().startsWith("xml"))
-      {
-        nsPrefix = "_" + nsPrefix;
-      }
-      ePackage.setNsPrefix(nsPrefix);
-
-      extendedMetaData.setQualified(ePackage, targetNamespace != null);
-      extendedMetaData.putPackage(targetNamespace, ePackage);
-
-      targetNamespaceToEPackageMap.put(targetNamespace, ePackage);
-      
-      createDocumentRoot(xsdNamedComponent.getSchema(), ePackage);
-    }
-
-    return ePackage;
-  }
-
-  protected EClassifier computeEClassifier(XSDTypeDefinition xsdTypeDefinition)
-  {
-    if (xsdTypeDefinition == null)
-    {
-      return getBuiltInEClassifier(rootSchema.getSchemaForSchemaNamespace(), "anySimpleType");
-    }
-    else if (xsdTypeDefinition instanceof XSDSimpleTypeDefinition)
-    {
-      return computeEDataType((XSDSimpleTypeDefinition)xsdTypeDefinition);
-    }
-    else
-    {
-      return computeEClass((XSDComplexTypeDefinition)xsdTypeDefinition);
-    }
-  }
-
-  protected EDataType computeEDataType(XSDSimpleTypeDefinition xsdSimpleTypeDefinition)
-  {
-    if (xsdSimpleTypeDefinition == null)
-    {
-      return (EDataType)getBuiltInEClassifier(rootSchema.getSchemaForSchemaNamespace(), "anySimpleType");
-    }
-    else if (XSDConstants.isSchemaForSchemaNamespace(xsdSimpleTypeDefinition.getTargetNamespace()))
-    {
-      String name = xsdSimpleTypeDefinition.getName();
-      if (name != null)
-      {
-        EDataType result = (EDataType)getBuiltInEClassifier(xsdSimpleTypeDefinition.getTargetNamespace(), "anyType".equals(name) ? "anySimpleType" : name);
-        if (result != null)
-        {
-          return result;
-        }
-      }
-    }
-    else if (xsdSimpleTypeDefinition.getContainer() == null)
-    {
-      return (EDataType)getBuiltInEClassifier(rootSchema.getSchemaForSchemaNamespace(), "anySimpleType");
-    }
-
-    String explicitInstanceClassName = getEcoreAttribute(xsdSimpleTypeDefinition, "instanceClass");
-    if (explicitInstanceClassName != null)
-    {
-      EDataType eDataType = ecoreFactory.createEDataType();
-      setAnnotations(eDataType, xsdSimpleTypeDefinition);
-
-      String aliasName = getEcoreAttribute(xsdSimpleTypeDefinition, "name");
-      if (aliasName == null)
-      {
-        aliasName = validAliasName(xsdSimpleTypeDefinition, true);
-      }
-      eDataType.setName(aliasName);
-      extendedMetaData.setName(eDataType, xsdSimpleTypeDefinition.getAliasName());
-
-      eDataType.setInstanceClassName(explicitInstanceClassName);
-
-      EPackage ePackage = getEPackage(xsdSimpleTypeDefinition);
-      addToSortedList(ePackage.getEClassifiers(), eDataType);
-
-      checkForPrimitive(xsdSimpleTypeDefinition, eDataType);
-
-      handleFacets(xsdSimpleTypeDefinition, eDataType);
-
-      String constraints = getEcoreAttribute(xsdSimpleTypeDefinition, "constraints");
-      if (constraints != null)
-      {
-        EcoreUtil.setAnnotation(eDataType, EcorePackage.eNS_URI, "constraints", constraints);
-      }
-
-      if ("false".equals(getEcoreAttribute(xsdSimpleTypeDefinition, "serializable")))
-      {
-        eDataType.setSerializable(false);
-      }
-      return eDataType;
-    }
-    else
-    {
-      EEnum eEnum = computeEEnum(xsdSimpleTypeDefinition);
-      if (eEnum != null)
-      {
-        return eEnum;
-      }
-      else
-      {
-        XSDSimpleTypeDefinition baseTypeDefinition = xsdSimpleTypeDefinition.getBaseTypeDefinition();
-        if (baseTypeDefinition != null)
-        {
-          EDataType eDataType = ecoreFactory.createEDataType();
-          setAnnotations(eDataType, xsdSimpleTypeDefinition);
-
-          String name = getEcoreAttribute(xsdSimpleTypeDefinition, "name");
-          if (name == null)
-          {
-            name = validAliasName(xsdSimpleTypeDefinition, true);
-          }
-
-          eDataType.setName(name);
-          extendedMetaData.setName(eDataType, xsdSimpleTypeDefinition.getAliasName());
-
-          EPackage ePackage = getEPackage(xsdSimpleTypeDefinition);
-          addToSortedList(ePackage.getEClassifiers(), eDataType);
-
-          if (baseTypeDefinition.getVariety() != xsdSimpleTypeDefinition.getVariety())
-          {
-            if (xsdSimpleTypeDefinition.getVariety() == XSDVariety.LIST_LITERAL)
-            {
-              EDataType itemEDataType = getEDataType(xsdSimpleTypeDefinition.getItemTypeDefinition());
-              extendedMetaData.setItemType(eDataType, itemEDataType);
-              eDataType.setInstanceClassName("java.util.List");
-            }
-            else
-            {
-              String instanceClassName = null;
-              List memberTypes = new ArrayList();
-              for (Iterator i = xsdSimpleTypeDefinition.getMemberTypeDefinitions().iterator(); i.hasNext(); )
-              {
-                XSDSimpleTypeDefinition memberTypeDefinition = (XSDSimpleTypeDefinition)i.next();
-                EDataType memberEDataType = getEDataType(memberTypeDefinition);
-                memberTypes.add(memberEDataType);
-                String memberInstanceClassName = memberEDataType.getInstanceClassName();
-                if (memberInstanceClassName == null && memberEDataType instanceof EEnum)
-                {
-                  memberInstanceClassName = "org.eclipse.emf.common.util.Enumerator";
-                }
-                if (instanceClassName == null)
-                {
-                  instanceClassName = memberInstanceClassName;
-                }
-                else if (instanceClassName != memberInstanceClassName)
-                {
-                  instanceClassName = "java.lang.Object";
-                }
-              }
-              extendedMetaData.setMemberTypes(eDataType, memberTypes);
-              eDataType.setInstanceClassName(instanceClassName);
-            }
-          }
-          else
-          {
-            EDataType baseEDataType = getEDataType(baseTypeDefinition);
-            extendedMetaData.setBaseType(eDataType, baseEDataType);
-            String instanceClassName = getInstanceClassName(xsdSimpleTypeDefinition, baseEDataType);
-            eDataType.setInstanceClassName
-              (instanceClassName == null ? 
-                 "org.eclipse.emf.common.util.Enumerator" : 
-                 instanceClassName);
-          }
-
-          checkForPrimitive(xsdSimpleTypeDefinition, eDataType);
-          handleFacets(xsdSimpleTypeDefinition, eDataType);
-
-          String constraints = getEcoreAttribute(xsdSimpleTypeDefinition, "constraints");
-          if (constraints != null)
-          {
-            EcoreUtil.setAnnotation(eDataType, EcorePackage.eNS_URI, "constraints", constraints);
-          }
-
-          if ("false".equals(getEcoreAttribute(xsdSimpleTypeDefinition, "serializable")))
-          {
-            eDataType.setSerializable(false);
-          }
-
-          return eDataType;
-        }
-      }
-      return (EDataType)getBuiltInEClassifier(rootSchema.getSchemaForSchemaNamespace(), "anySimpleType");
-    }
-  }
-
-  protected void checkForPrimitive(EDataType eDataType)
-  {
-    int index = PRIMITIVES.indexOf(eDataType.getInstanceClassName());
-    if (index != -1 || eDataType instanceof EEnum)
-    {
-      EDataType eDataTypeObject = ecoreFactory.createEDataType();
-      eDataTypeObject.setName(eDataType.getName() + "Object");
-      if (index != -1)
-      {
-        eDataTypeObject.setInstanceClassName(PRIMITIVE_WRAPPERS[index]);
-      }
-      else
-      {
-        eDataTypeObject.setInstanceClassName("org.eclipse.emf.common.util.Enumerator");
-      }
-      extendedMetaData.setName(eDataTypeObject, extendedMetaData.getName(eDataType) + ":Object");
-      addToSortedList(eDataType.getEPackage().getEClassifiers(), eDataTypeObject);
-      extendedMetaData.setBaseType(eDataTypeObject, eDataType);
-
-      typeToTypeObjectMap.put(eDataType, eDataTypeObject);
-    }
-  }
-
-  public EClass computeEClass(XSDComplexTypeDefinition xsdComplexTypeDefinition)
-  {
-    if (xsdComplexTypeDefinition == null)
-    {
-      return (EClass)getBuiltInEClassifier(rootSchema.getSchemaForSchemaNamespace(), "anyType");
-    }
-    else if (XSDConstants.isSchemaForSchemaNamespace(xsdComplexTypeDefinition.getTargetNamespace()))
-    {
-      String name = xsdComplexTypeDefinition.getName();
-      if (name != null)
-      {
-        EClass result = (EClass)getBuiltInEClassifier(xsdComplexTypeDefinition.getTargetNamespace(), name);
-        if (result != null)
-        {
-          return result;
-        }
-      }
-    }
-    else if (xsdComplexTypeDefinition.getContainer() == null)
-    {
-      return (EClass)getBuiltInEClassifier(rootSchema.getSchemaForSchemaNamespace(), "anyType");
-    }
-
-    EClass eClass = ecoreFactory.createEClass();
-    setAnnotations(eClass, xsdComplexTypeDefinition);
-    // Do this early to prevent recursive loop.
-    xsdComponentToEModelElementMap.put(xsdComplexTypeDefinition, eClass);
-
-    if ("true".equals(getEcoreAttribute(xsdComplexTypeDefinition, "interface")))
-    {
-      eClass.setInterface(true);
-    }
-
-    String instanceClassName = getEcoreAttribute(xsdComplexTypeDefinition, "instanceClass");
-    if (instanceClassName != null)
-    {
-      eClass.setInstanceClassName(instanceClassName);
-    }
-
-    String aliasName = getEcoreAttribute(xsdComplexTypeDefinition, "name");
-    if (aliasName == null)
-    {
-      aliasName = validAliasName(xsdComplexTypeDefinition, true);
-    }
-    eClass.setName(aliasName);
-    extendedMetaData.setName(eClass, xsdComplexTypeDefinition.getAliasName());
-
-    String constraints = getEcoreAttribute(xsdComplexTypeDefinition, "constraints");
-    if (constraints != null)
-    {
-      EcoreUtil.setAnnotation(eClass, EcorePackage.eNS_URI, "constraints", constraints);
-    }
-
-    EPackage ePackage = getEPackage(xsdComplexTypeDefinition);
-    addToSortedList(ePackage.getEClassifiers(), eClass);
-
-    if (xsdComplexTypeDefinition.isAbstract())
-    {
-      eClass.setAbstract(true);
-    }
-
-    EClass baseClass = null;
-    XSDTypeDefinition baseTypeDefinition = xsdComplexTypeDefinition.getBaseTypeDefinition();
-    if (!baseTypeDefinition.isCircular())
-    {
-      EClassifier baseType = getEClassifier(baseTypeDefinition);
-      if (baseType instanceof EClass && baseType != ecorePackage.getEObject())
-      {
-        eClass.getESuperTypes().add(baseClass = (EClass)baseType);
-      }
-    }
-
-    boolean isRestriction = 
-      !eClass.getESuperTypes().isEmpty() && 
-        xsdComplexTypeDefinition.getDerivationMethod() == XSDDerivationMethod.RESTRICTION_LITERAL;
-
-    for (Iterator i = getEcoreTypeQNamesAttribute(xsdComplexTypeDefinition, "implements").iterator(); i.hasNext(); )
-    {
-      XSDTypeDefinition mixin = (XSDTypeDefinition)i.next();
-      if (!XSDConstants.isURType(mixin))
-      {
-        EClassifier mixinType = getEClassifier(mixin);
-        if (mixinType instanceof EClass && mixinType != ecorePackage.getEObject())
-        {
-          eClass.getESuperTypes().add(mixinType);
-        }
-      }
-    }
-
-    // 51210
-    // EAnnotation contentParticle = null;
-
-    if (xsdComplexTypeDefinition.getContentTypeCategory() == XSDContentTypeCategory.SIMPLE_LITERAL)
-    {
-      extendedMetaData.setContentKind(eClass, ExtendedMetaData.SIMPLE_CONTENT);
-      if (!"SimpleAnyType".equals(eClass.getName()) || !XMLTypePackage.eNS_URI.equals(eClass.getEPackage().getNsURI()))
-      {
-        if (eClass.getEAllStructuralFeatures().isEmpty())
-        {
-          XSDComplexTypeContent xsdComplexTypeContent = xsdComplexTypeDefinition.getContent();
-          String name = getEcoreAttribute(xsdComplexTypeContent, "name");
-          if (name == null)
-          {
-            name = "value";
-          }
-          createFeature
-            (eClass,
-             null,
-             name,
-             xsdComplexTypeContent,
-             false);
-        }
-        else
-        {
-          XSDSimpleTypeDefinition xsdSimpleTypeDefinition = xsdComplexTypeDefinition.getSimpleType();
-          getEClassifier(xsdSimpleTypeDefinition);
-        }
-      }
-    }
-    else 
-    {
-      EStructuralFeature globalGroup = null;
-      boolean isMixed = xsdComplexTypeDefinition.getContentTypeCategory() == XSDContentTypeCategory.MIXED_LITERAL;
-      String featureMapName = getEcoreAttribute(xsdComplexTypeDefinition, "featureMap");
-      if (eClass.getESuperTypes().isEmpty() ?
-            "true".equals(getEcoreAttribute(xsdComplexTypeDefinition, "mixed")) :
-            extendedMetaData.getMixedFeature((EClass)eClass.getESuperTypes().get(0)) != null)
-      {
-        isMixed = true;
-      }
-      extendedMetaData.setContentKind
-        (eClass, 
-         isMixed ? 
-           ExtendedMetaData.MIXED_CONTENT : 
-           xsdComplexTypeDefinition.getContentTypeCategory() == XSDContentTypeCategory.EMPTY_LITERAL ?
-             ExtendedMetaData.EMPTY_CONTENT :
-             ExtendedMetaData.ELEMENT_ONLY_CONTENT);
-      if (isMixed)
-      {
-        EStructuralFeature mixedFeature = extendedMetaData.getMixedFeature(eClass);
-        if (mixedFeature == null)
-        {
-          if (featureMapName == null)
-          {
-            featureMapName = "mixed";
-          }
-          mixedFeature =
-            createFeature
-              (eClass,
-               featureMapName,
-               ecorePackage.getEFeatureMapEntry(),
-               null,
-               0,
-               -1);
-          extendedMetaData.setName(mixedFeature, ":mixed");
-        }
-      }
-      else 
-      {
-        globalGroup = extendedMetaData.getElement(eClass, null, ":group");
-        if (globalGroup == null && featureMapName != null && eClass.getESuperTypes().isEmpty())
-        {
-          globalGroup =
-            createFeature
-              (eClass,
-               featureMapName,
-               ecorePackage.getEFeatureMapEntry(),
-               null,
-               0,
-               -1);
-          extendedMetaData.setName(globalGroup, ":group");
-          extendedMetaData.setFeatureKind(globalGroup, ExtendedMetaData.GROUP_FEATURE);
-        }
-      }
-
-      if (xsdComplexTypeDefinition.getContent() != null)
-      {
-        // 51210
-        // Map particleMap = new HashMap();
-        Map groups = new HashMap();
-        List particleInformation = collectParticles((XSDParticle)xsdComplexTypeDefinition.getContent());
-        for (Iterator i = particleInformation.iterator(); i.hasNext(); )
-        {
-          EffectiveOccurrence effectiveOccurrence = (EffectiveOccurrence)i.next();
-          XSDParticle xsdParticle = effectiveOccurrence.xsdParticle;
-          EStructuralFeature group = (EStructuralFeature)groups.get(effectiveOccurrence.xsdModelGroup);
-          XSDTerm xsdTerm = xsdParticle.getTerm();
-          EStructuralFeature eStructuralFeature = null;
-          String name = getEcoreAttribute(xsdParticle, "name");
-          if (xsdTerm instanceof XSDModelGroup)
-          {
-            if (!isRestriction) 
-            {
-              XSDModelGroup xsdModelGroup = (XSDModelGroup)xsdTerm;
-              if (name == null)
-              {
-                name = getEcoreAttribute(xsdParticle, "featureMap");
-                if (name == null)
-                {
-                  name = getEcoreAttribute(xsdModelGroup, "name");
-                  if (name == null)
-                  {
-                    name = getEcoreAttribute(xsdModelGroup, "featureMap");
-                    if (name == null)
-                    {
-                      if (xsdModelGroup.getContainer() instanceof XSDModelGroupDefinition)
-                      {
-                        XSDModelGroupDefinition xsdModelGroupDefinition = (XSDModelGroupDefinition)xsdModelGroup.getContainer();
-                        name =  getEcoreAttribute(xsdModelGroupDefinition, "name");
-                        if (name == null)
-                        {
-                          name = validName(xsdModelGroupDefinition.getName(), true);
-                        }
-                      }
-                      else
-                      {
-                        name = "group";
-                      }
-                    }
-                  }
-                }
-              }
-
-              eStructuralFeature =
-                createFeature
-                  (eClass,
-                   name,
-                   ecorePackage.getEFeatureMapEntry(),
-                   xsdParticle,
-                   0,
-                   -1);
-              groups.put(xsdTerm, eStructuralFeature);
-              extendedMetaData.setName(eStructuralFeature, name + ":" + eClass.getEAllStructuralFeatures().indexOf(eStructuralFeature));
-            }
-          }
-          else if (xsdTerm instanceof XSDWildcard)
-          {
-            if (!isRestriction) 
-            {
-              if (name == null)
-              {
-                name = getEcoreAttribute(xsdTerm, "name");
-                if (name == null)
-                {
-                  name = "any";
-                }
-              }
-              eStructuralFeature =
-                createFeature
-                  (eClass,
-                   name,
-                   ecorePackage.getEFeatureMapEntry(),
-                   xsdParticle,
-                   effectiveOccurrence.minOccurs,
-                   effectiveOccurrence.maxOccurs);
-              // 51210
-              // particleMap.put(xsdParticle, eStructuralFeature);
-            }
-          }
-          else
-          {
-            XSDElementDeclaration xsdElementDeclaration = (XSDElementDeclaration)xsdTerm;
-
-            boolean isRedundant = false;
-            if (isRestriction)
-            {
-              isRedundant = 
-                extendedMetaData.getElement
-                  (baseClass, xsdElementDeclaration.getTargetNamespace(), xsdElementDeclaration.getName()) != null;
-              
-              if (!isRedundant)
-              {
-                group = 
-                  extendedMetaData.getElementWildcardAffiliation
-                    (baseClass, xsdElementDeclaration.getTargetNamespace(), xsdElementDeclaration.getName());
-              }  
-            }
-
-            if (!isRedundant) 
-            {
-              if (name == null)
-              {
-                name = getEcoreAttribute(xsdElementDeclaration, "name");
-                if (name == null)
-                {
-                  name = validName(xsdElementDeclaration.getName(), true);
-                }
-              }
-
-              String groupName = getEcoreAttribute(xsdParticle, "featureMap");
-              if (groupName == null)
-              {
-                groupName = getEcoreAttribute(xsdElementDeclaration, "featureMap");
-              }
-
-              if (!"".equals(groupName) &&
-                   (groupName != null  ||
-                      xsdElementDeclaration.isAbstract() || 
-                      xsdElementDeclaration.getSubstitutionGroup().size() > 1))
-              {
-                if (groupName == null)
-                {
-                  groupName = name + "Group";
-                }
-                eStructuralFeature = 
-                  createFeature
-                    (eClass,
-                     groupName,
-                     ecorePackage.getEFeatureMapEntry(),
-                     xsdParticle,
-                     effectiveOccurrence.minOccurs,
-                     effectiveOccurrence.maxOccurs);
-
-                eStructuralFeature.setChangeable(true);
-
-                extendedMetaData.setFeatureKind(eStructuralFeature, ExtendedMetaData.GROUP_FEATURE);
-                extendedMetaData.setName(eStructuralFeature, xsdElementDeclaration.getName() + ":group");
-
-                if (group != null)
-                {
-                  extendedMetaData.setGroup(eStructuralFeature, group);
-                  eStructuralFeature.setDerived(true);
-                  eStructuralFeature.setTransient(true);
-                  eStructuralFeature.setVolatile(true);
-                }
-                else if (isMixed)
-                {
-                  eStructuralFeature.setDerived(true);
-                  eStructuralFeature.setTransient(true);
-                  eStructuralFeature.setVolatile(true);
-                }
-                else if (globalGroup != null)
-                {
-                  extendedMetaData.setGroup(eStructuralFeature, globalGroup);
-                  eStructuralFeature.setDerived(true);
-                  eStructuralFeature.setTransient(true);
-                  eStructuralFeature.setVolatile(true);
-                }
-
-                group = eStructuralFeature;
-              }
-
-              eStructuralFeature = 
-                 createFeature(eClass, xsdElementDeclaration, name, xsdParticle, effectiveOccurrence.minOccurs, effectiveOccurrence.maxOccurs);
-              // 51210
-              // particleMap.put(xsdParticle, eStructuralFeature);
-
-              // If the group is turned off, we better make the feature changeable.
-              //
-              if (!eStructuralFeature.isChangeable() && group == null && getEcoreAttribute(xsdParticle, xsdElementDeclaration, "changeable") == null)
-              {
-                eStructuralFeature.setChangeable(true);
-              }
-            }
-          }
-
-          if (eStructuralFeature != null) 
-          {
-            if (group != null)
-            {
-              extendedMetaData.setGroup(eStructuralFeature, group);
-              eStructuralFeature.setDerived(true);
-              eStructuralFeature.setTransient(true);
-              eStructuralFeature.setVolatile(true);
-            }
-            else if (isMixed)
-            {
-              eStructuralFeature.setDerived(true);
-              eStructuralFeature.setTransient(true);
-              eStructuralFeature.setVolatile(true);
-            }
-            else if (globalGroup != null)
-            {
-              extendedMetaData.setGroup(eStructuralFeature, globalGroup);
-              eStructuralFeature.setDerived(true);
-              eStructuralFeature.setTransient(true);
-              eStructuralFeature.setVolatile(true);
-            }
-          }
-        }
-
-        // 51210
-        // contentParticle = computeParticleConstraints(eClass, particleMap, (XSDParticle)xsdComplexTypeDefinition.getContent());
-      }
-    }
-
-    // 51210
-    // EAnnotation attributeParticle = null;
-    // if (isRestriction)
-    // {
-    //   attributeParticle = ecoreFactory.createEAnnotation();
-    //   attributeParticle.setSource("attributes");
-    // }
-
-    XSDWildcard baseXSDWildcard = null;
-    Collection baseAttributeUses = Collections.EMPTY_LIST;
-    Map baseAttributeURIs = new HashMap();
-    if (baseTypeDefinition instanceof XSDComplexTypeDefinition)
-    {
-      XSDComplexTypeDefinition complexBaseTypeDefinition = (XSDComplexTypeDefinition)baseTypeDefinition;
-      baseXSDWildcard = complexBaseTypeDefinition.getAttributeWildcard();
-      baseAttributeUses = complexBaseTypeDefinition.getAttributeUses();
-      for (Iterator i = baseAttributeUses.iterator(); i.hasNext(); )
-      {
-        XSDAttributeUse xsdAttributeUse = (XSDAttributeUse)i.next();
-        baseAttributeURIs.put(xsdAttributeUse.getAttributeDeclaration().getURI(), xsdAttributeUse);
-      }
-    }
-
-    for (Iterator i = getAttributeUses(xsdComplexTypeDefinition).iterator(); i.hasNext(); )
-    {
-      XSDAttributeUse xsdAttributeUse = (XSDAttributeUse)i.next();
-      XSDAttributeDeclaration xsdAttributeDeclaration = xsdAttributeUse.getAttributeDeclaration();
-      if (baseAttributeURIs.remove(xsdAttributeDeclaration.getURI()) == null)
-      {
-        String name = getEcoreAttribute(xsdAttributeUse, "name");
-        if (name == null)
-        {
-          name = getEcoreAttribute(xsdAttributeDeclaration, "name");
-        }
-        if (name == null)
-        {
-          name = validName(xsdAttributeDeclaration.getName(), true);
-        }
-
-        EStructuralFeature eStructuralFeature = 
-          createFeature(eClass, xsdAttributeDeclaration, name, xsdAttributeUse, xsdAttributeUse.isRequired());
-      
-        if (isRestriction)
-        {
-          EStructuralFeature attributeWildcardEStructuralFeature = 
-            extendedMetaData.getAttributeWildcardAffiliation
-              (baseClass, xsdAttributeDeclaration.getTargetNamespace(), xsdAttributeDeclaration.getName());
-          if (attributeWildcardEStructuralFeature != null)
-          {
-            extendedMetaData.setGroup(eStructuralFeature, attributeWildcardEStructuralFeature);
-            eStructuralFeature.setDerived(true);
-            eStructuralFeature.setTransient(true);
-            eStructuralFeature.setVolatile(true);
-          }
-        } 
-      }
-      /* 51210
-      else if (isRestriction && !baseAttributeUses.contains(xsdAttributeUse))
-      {
-        EStructuralFeature eStructuralFeature = 
-          extendedMetaData.getAttribute(eClass, xsdAttributeDeclaration.getTargetNamespace(), xsdAttributeDeclaration.getName());
-        if (eStructuralFeature != null)
-        {
-          EAnnotation attributeEAnnotation = ecoreFactory.createEAnnotation();
-          if (xsdAttributeUse.isRequired())
-          {
-            attributeEAnnotation.getDetails().put("minOccurs", "1");
-          }
-          attributeEAnnotation.getReferences().add(eStructuralFeature);
-
-          if (xsdAttributeDeclaration.getTypeDefinition() != null)
-          {
-            EClassifier type = getEClassifier(xsdAttributeDeclaration.getTypeDefinition());
-            if (type != eStructuralFeature.getEType() && type != null)
-            {
-              attributeEAnnotation.getReferences().add(type);
-            }
-          }
-
-          attributeParticle.getContents().add(attributeEAnnotation);
-        }
-      }
-      */
-    }
-
-    /* 51210
-    if (isRestriction && !baseAttributeURIs.isEmpty())
-    {
-      for (Iterator i = baseAttributeURIs.values().iterator(); i.hasNext(); )
-      {
-        XSDAttributeUse xsdAttributeUse = (XSDAttributeUse)i.next();
-        XSDAttributeDeclaration xsdAttributeDeclaration = xsdAttributeUse.getAttributeDeclaration();
-        EStructuralFeature eStructuralFeature = 
-          extendedMetaData.getAttribute(eClass, xsdAttributeDeclaration.getTargetNamespace(), xsdAttributeDeclaration.getName());
-        if (eStructuralFeature != null)
-        {
-          EAnnotation attributeEAnnotation = ecoreFactory.createEAnnotation();
-          attributeEAnnotation.getReferences().add(eStructuralFeature);
-          attributeEAnnotation.getDetails().put("maxOccurs", "0");
-          attributeParticle.getContents().add(attributeEAnnotation);
-        }
-      }
-    }
-    */
-
-    XSDWildcard xsdWildcard = xsdComplexTypeDefinition.getAttributeWildcard();
-    if (xsdWildcard != null && baseXSDWildcard != xsdWildcard || XSDConstants.isURType(xsdComplexTypeDefinition))
-    {
-      if (isRestriction && !XSDConstants.isURType(xsdComplexTypeDefinition))
-      {
-        // 51210
-        // attributeParticle.getDetails().put
-        //   ("wildcard", BasicExtendedMetaData.getEncodedWildcards(xsdComplexTypeDefinition.getTargetNamespace(), getWildcards(xsdWildcard)));
-      }
-      else
-      {
-        String name = getEcoreAttribute(xsdWildcard, "name");
-        if (name == null)
-        {
-          name = "anyAttribute";
-        }
-        createFeature
-          (eClass,
-           name,
-           ecorePackage.getEFeatureMapEntry(),
-           xsdWildcard,
-           0,
-           -1);
-      }
-    }
-
-    if (isRestriction)
-    {
-      // 51210
-      // EAnnotation restrictionParticle = ecoreFactory.createEAnnotation();
-      // restrictionParticle.setSource("restriction");
-      // if (contentParticle != null)
-      // {
-      //  restrictionParticle.getContents().add(contentParticle);
-      // }
-      // if (!attributeParticle.getContents().isEmpty() || !attributeParticle.getDetails().isEmpty())
-      // {
-      //   restrictionParticle.getContents().add(attributeParticle);
-      // }
-      // contentParticle = restrictionParticle;
-
-      int baseContentKind = extendedMetaData.getContentKind((EClass)eClass.getESuperTypes().get(0));
-      if (baseContentKind == ExtendedMetaData.MIXED_CONTENT && 
-            xsdComplexTypeDefinition.getContentTypeCategory() == XSDContentTypeCategory.SIMPLE_LITERAL)
-      {
-        extendedMetaData.setContentKind(eClass, ExtendedMetaData.SIMPLE_CONTENT);
-        EStructuralFeature eStructuralFeature =
-          createFeature
-            (eClass,
-             "rawValue",
-             getBuiltInEClassifier(xsdComplexTypeDefinition.getSchema().getSchemaForSchemaNamespace(), "string"),
-             null,
-             0,
-             1);
-        eStructuralFeature.setDerived(true);
-        eStructuralFeature.setTransient(true);
-        eStructuralFeature.setVolatile(true);
-
-        eStructuralFeature =
-          createFeature
-            (eClass,
-             "value",
-             getBuiltInEClassifier(xsdComplexTypeDefinition.getSchema().getSchemaForSchemaNamespace(), "anySimpleType"),
-             null,
-             0,
-             1);
-        eStructuralFeature.setDerived(true);
-        eStructuralFeature.setTransient(true);
-        eStructuralFeature.setVolatile(true);
-
-        if ("SimpleAnyType".equals(eClass.getName()) && XMLTypePackage.eNS_URI.equals(eClass.getEPackage().getNsURI()))
-        {
-          eStructuralFeature =
-            createFeature
-              (eClass,
-               "instanceType",
-               ecorePackage.getEDataType(),
-               null,
-               1,
-               1);
-
-          ((EReference)eStructuralFeature).setResolveProxies(false);
-        }
-      }
-      else
-      {
-        extendedMetaData.setContentKind(eClass, baseContentKind);
-      }
-    }
-
-    // 51210
-    // extendedMetaData.setContent(eClass, contentParticle);
-
-    XSDAnnotation xsdAnnotation = xsdComplexTypeDefinition.getAnnotation();
-    if (xsdAnnotation != null)
-    {
-      List applicationInformationList = xsdAnnotation.getApplicationInformation(EcorePackage.eNS_URI);
-      for (Iterator i = applicationInformationList.iterator(); i.hasNext(); )
-      {
-        Element applicationInformation = (Element)i.next();
-        if ("operations".equals(applicationInformation.getAttributeNS(EcorePackage.eNS_URI, "key")))
-        {
-          for (Iterator j =  getElements(applicationInformation, "operation").iterator(); j.hasNext(); )
-          {
-            EOperation eOperation = ecoreFactory.createEOperation();
-            Element operation = (Element)j.next();
-            String operationName = operation.getAttributeNS(null, "name");
-            eOperation.setName(operationName);
-            XSDTypeDefinition returnType = getEcoreTypeQNameAttribute(xsdComplexTypeDefinition, operation, null, "type");
-            if (returnType != null)
-            {
-              EClassifier returnEType = getEClassifier(returnType);
-              eOperation.setEType(returnEType);
-            }
-            
-            List exceptions = getEcoreTypeQNamesAttribute(xsdComplexTypeDefinition, operation, null, "exceptions");
-            for (Iterator k = exceptions.iterator(); k.hasNext(); )
-            {
-              XSDTypeDefinition exceptionTypeDefinition = (XSDTypeDefinition)k.next();
-              eOperation.getEExceptions().add(getEClassifier(exceptionTypeDefinition));
-            }
-          
-            for (Iterator k = getElements(operation, "parameter").iterator(); k.hasNext(); )
-            {
-              EParameter eParameter = ecoreFactory.createEParameter();
-              Element parameter = (Element)k.next();
-              String paramaterName = parameter.getAttributeNS(null, "name");
-              XSDTypeDefinition parameterType = getEcoreTypeQNameAttribute(xsdComplexTypeDefinition, parameter, null, "type");
-              EClassifier parameterEType = getEClassifier(parameterType);
-              eParameter.setName(paramaterName);
-              eParameter.setEType(parameterEType);
-
-              populateETypedElement(eParameter, parameter);
-              eOperation.getEParameters().add(eParameter);
-            }
-            
-            List body = getElements(operation, "body");
-            if (!body.isEmpty())
-            {
-              EcoreUtil.setAnnotation(eOperation, "http://www.eclipse.org/emf/2002/GenModel", "body", getText((Element)body.get(0)));
-            }
-
-            populateETypedElement(eOperation, operation);
-            eClass.getEOperations().add(eOperation);
-          }
-        }
-      }
-    }
-    return eClass;
-  }
-    
-  private String getText(Element element)
-  {
-    StringBuffer text = new StringBuffer();
-    for (Node node = element.getFirstChild(); node != null; node = node.getNextSibling())
-    {
-      switch (node.getNodeType())
-      {
-        case Node.TEXT_NODE:
-        case Node.CDATA_SECTION_NODE:
-        {
-          text.append(node.getNodeValue());
-        }
-      }
-    }
-    return text.toString();
-  }
-
-  private List getElements(Element element, String localName)
-  {
-    List result = new ArrayList();
-    for (Node node = element.getFirstChild(); node != null; node = node.getNextSibling())
-    {
-      if (node.getNodeType() == Node.ELEMENT_NODE)
-      {
-        Element child = (Element)node;
-        if (localName.equals(child.getLocalName()) && child.getNamespaceURI() == null)
-        {
-          result.add(child);
-        }
-      }
-    }
-    return result;
-  }
-  
-  protected EStructuralFeature createFeature
-    (EClass eClass, String name, EClassifier type, XSDComponent xsdComponent, int minOccurs, int maxOccurs)
-  {
-    if (xsdComponent != null)
-    {
-      XSDSchema containingXSDSchema = xsdComponent.getSchema();
-      if (containingXSDSchema != null && !xsdSchemas.contains(containingXSDSchema))
-      {
-        xsdSchemas.add(containingXSDSchema);
-        addInput(containingXSDSchema);
-        validate(containingXSDSchema);
-      }
-    }
-    else if (extendedMetaData.getContentKind(eClass) == ExtendedMetaData.MIXED_CONTENT)
-    {
-      if (type == ecorePackage.getEFeatureMapEntry())
-      {
-        EAttribute eAttribute = ecoreFactory.createEAttribute();
-        setAnnotations(eAttribute, xsdComponent);
-        eAttribute.setName(Character.toLowerCase(name.charAt(0)) + name.substring(1));
-        eAttribute.setUnique(false);
-        eAttribute.setEType(type);
-        eAttribute.setLowerBound(minOccurs);
-        eAttribute.setUpperBound(maxOccurs);
-        eClass.getEStructuralFeatures().add(eAttribute);
-        extendedMetaData.setFeatureKind(eAttribute, ExtendedMetaData.ELEMENT_WILDCARD_FEATURE);
-        extendedMetaData.setName(eAttribute, ":" + eAttribute.getName());
-        return eAttribute;
-      }
-      else
-      {
-        EReference eReference = ecoreFactory.createEReference();
-        setAnnotations(eReference, xsdComponent);
-        eReference.setName(name);
-        eReference.setEType(ecorePackage.getEStringToStringMapEntry());
-        eReference.setLowerBound(0);
-        eReference.setUpperBound(-1);
-        eReference.setContainment(true);
-        eReference.setResolveProxies(false);
-        eReference.setTransient(true);
-        eClass.getEStructuralFeatures().add(eReference);
-        extendedMetaData.setFeatureKind(eReference, ExtendedMetaData.ATTRIBUTE_FEATURE);
-        return eReference;
-      }
-    }
-
-    if (type instanceof EClass)
-    {
-      EReference eReference = ecoreFactory.createEReference();
-      setAnnotations(eReference, xsdComponent);
-      eReference.setName(Character.toLowerCase(name.charAt(0)) + name.substring(1));
-      eReference.setEType(type);
-      eReference.setLowerBound(minOccurs);
-      eReference.setUpperBound(maxOccurs);
-
-      eClass.getEStructuralFeatures().add(eReference);
-      if (xsdComponent == null || xsdComponent instanceof XSDSimpleTypeDefinition)
-      {
-        extendedMetaData.setName(eReference, ":" + eClass.getEAllStructuralFeatures().indexOf(eReference));
-        extendedMetaData.setFeatureKind(eReference, ExtendedMetaData.SIMPLE_FEATURE);
-        eReference.setResolveProxies(!isLocalReferenceType((XSDSimpleTypeDefinition)xsdComponent));
-      }
-      else 
-      {
-        map(xsdComponent, eReference);
-        if (xsdComponent instanceof XSDParticle)
-        {
-          eReference.setContainment(true);
-          eReference.setResolveProxies(false);
-
-          XSDParticle xsdParticle = (XSDParticle)xsdComponent;
-
-          XSDTerm xsdTerm = ((XSDParticle)xsdComponent).getTerm();
-          if (xsdTerm instanceof XSDElementDeclaration)
-          {
-            XSDElementDeclaration xsdElementDeclaration = (XSDElementDeclaration)xsdTerm;
-            extendedMetaData.setFeatureKind(eReference, ExtendedMetaData.ELEMENT_FEATURE);
-            extendedMetaData.setName(eReference, xsdElementDeclaration.getName());
-            extendedMetaData.setNamespace(eReference, xsdElementDeclaration.getTargetNamespace());
-
-            XSDTypeDefinition xsdType = getEffectiveTypeDefinition(xsdParticle, xsdElementDeclaration);
-            if (xsdType instanceof XSDSimpleTypeDefinition)
-            {
-              eReference.setContainment(false);
-              eReference.setResolveProxies(!isLocalReferenceType((XSDSimpleTypeDefinition)xsdType));
-            }
-
-            if (maxOccurs == 1 && xsdElementDeclaration.isNillable())
-            {
-              eReference.setUnsettable(true);
-            }
-
-            if (xsdElementDeclaration.isAbstract())
-            {
-              eReference.setChangeable(false);
-            }
-
-            String opposite = getEcoreAttribute(xsdParticle, "opposite");
-            if (opposite != null)
-            {
-              eReferenceToOppositeNameMap.put(eReference, opposite);
-            }
-          }
-          else if (xsdTerm instanceof XSDWildcard)
-          {
-            // EATM shouldn't happen
-            XSDWildcard xsdWildcard = (XSDWildcard)xsdTerm;
-            extendedMetaData.setFeatureKind(eReference, ExtendedMetaData.ELEMENT_WILDCARD_FEATURE);
-            extendedMetaData.setWildcards(eReference, getWildcards(xsdWildcard));
-            extendedMetaData.setProcessingKind(eReference, xsdWildcard.getProcessContents().getValue() + 1);
-            extendedMetaData.setName(eReference, ":" + eClass.getEAllStructuralFeatures().indexOf(eReference));
-          }
-          else
-          {
-            extendedMetaData.setFeatureKind(eReference, ExtendedMetaData.GROUP_FEATURE);
-            extendedMetaData.setName(eReference, ":" + eClass.getEAllStructuralFeatures().indexOf(eReference));
-          }
-        }
-        else if (xsdComponent instanceof XSDElementDeclaration)
-        {
-          XSDElementDeclaration xsdElementDeclaration = (XSDElementDeclaration)xsdComponent;
-          eReference.setContainment(true);
-          eReference.setResolveProxies(false);
-          extendedMetaData.setFeatureKind(eReference, ExtendedMetaData.ELEMENT_FEATURE);
-          extendedMetaData.setName(eReference, xsdElementDeclaration.getName());
-          extendedMetaData.setNamespace(eReference, xsdElementDeclaration.getTargetNamespace());
-
-          XSDElementDeclaration substitutionGroupAffiliation = xsdElementDeclaration.getSubstitutionGroupAffiliation();
-          if (substitutionGroupAffiliation != null)
-          {
-            EStructuralFeature affiliation = getEStructuralFeature(substitutionGroupAffiliation);
-            extendedMetaData.setAffiliation(eReference, affiliation);
-          }
-          XSDTypeDefinition xsdType = getEffectiveTypeDefinition(null, xsdElementDeclaration);
-          if (xsdType instanceof XSDSimpleTypeDefinition)
-          {
-            eReference.setResolveProxies(!isLocalReferenceType((XSDSimpleTypeDefinition)xsdType));
-          }
-
-          if (maxOccurs == 1 && xsdElementDeclaration.isNillable())
-          {
-            eReference.setUnsettable(true);
-          }
-
-          if (xsdElementDeclaration.isAbstract())
-          {
-            eReference.setChangeable(false);
-          }
-        }
-        else if (xsdComponent instanceof XSDAttributeUse)
-        {
-          String opposite = getEcoreAttribute(xsdComponent, "opposite");
-          if (opposite != null)
-          {
-            eReferenceToOppositeNameMap.put(eReference, opposite);
-          }
-          
-          XSDAttributeUse xsdAttributeUse = (XSDAttributeUse)xsdComponent;
-          XSDAttributeDeclaration xsdAttributeDeclaration = xsdAttributeUse.getAttributeDeclaration();
-          extendedMetaData.setFeatureKind(eReference, ExtendedMetaData.ATTRIBUTE_FEATURE);
-          extendedMetaData.setName(eReference, xsdAttributeDeclaration.getName());
-          extendedMetaData.setNamespace(eReference, xsdAttributeDeclaration.getTargetNamespace());
-          eReference.setResolveProxies
-            (!isLocalReferenceType((XSDSimpleTypeDefinition)getEffectiveTypeDefinition(xsdAttributeUse, xsdAttributeDeclaration)));
-        }
-        else if (xsdComponent instanceof XSDAttributeDeclaration)
-        {
-          XSDAttributeDeclaration xsdAttributeDeclaration = (XSDAttributeDeclaration)xsdComponent;
-          extendedMetaData.setFeatureKind(eReference, ExtendedMetaData.ATTRIBUTE_FEATURE);
-          extendedMetaData.setName(eReference, xsdAttributeDeclaration.getName());
-          extendedMetaData.setNamespace(eReference, xsdAttributeDeclaration.getTargetNamespace());
-          eReference.setResolveProxies
-            (!isLocalReferenceType((XSDSimpleTypeDefinition)getEffectiveTypeDefinition(null, xsdAttributeDeclaration)));
-        }
-      }
-
-      return eReference;
-    }
-    else
-    {
-      EAttribute eAttribute = ecoreFactory.createEAttribute();
-      setAnnotations(eAttribute, xsdComponent);
-      eAttribute.setName(Character.toLowerCase(name.charAt(0)) + name.substring(1));
-      eAttribute.setUnique(false);
-      eAttribute.setEType(type);
-      eAttribute.setLowerBound(minOccurs);
-      eAttribute.setUpperBound(maxOccurs);
-      eClass.getEStructuralFeatures().add(eAttribute);
-
-      if (xsdComponent == null || xsdComponent instanceof XSDSimpleTypeDefinition)
-      {
-        extendedMetaData.setName(eAttribute, ":" + eClass.getEAllStructuralFeatures().indexOf(eAttribute));
-        extendedMetaData.setFeatureKind(eAttribute, ExtendedMetaData.SIMPLE_FEATURE);
-      }
-      else
-      {
-        map(xsdComponent, eAttribute);
-        if (xsdComponent instanceof XSDAttributeUse)
-        {
-          XSDAttributeUse xsdAttributeUse = (XSDAttributeUse)xsdComponent;
-          XSDAttributeDeclaration xsdAttributeDeclaration = xsdAttributeUse.getAttributeDeclaration();
-          extendedMetaData.setFeatureKind(eAttribute, ExtendedMetaData.ATTRIBUTE_FEATURE);
-          extendedMetaData.setName(eAttribute, xsdAttributeDeclaration.getName());
-          extendedMetaData.setNamespace(eAttribute, xsdAttributeDeclaration.getTargetNamespace());
-
-          String defaultValue = getEcoreAttribute(xsdComponent, "default");
-          if (defaultValue == null)
-          {
-            defaultValue = xsdAttributeUse.getLexicalValue();
-          }
-          eAttribute.setDefaultValueLiteral(defaultValue);
-          initialize(eAttribute, (XSDSimpleTypeDefinition)getEffectiveTypeDefinition(xsdAttributeUse, xsdAttributeDeclaration));
-        }
-        else if (xsdComponent instanceof XSDAttributeDeclaration)
-        {
-          XSDAttributeDeclaration xsdAttributeDeclaration = (XSDAttributeDeclaration)xsdComponent;
-          extendedMetaData.setFeatureKind(eAttribute, ExtendedMetaData.ATTRIBUTE_FEATURE);
-          extendedMetaData.setName(eAttribute, xsdAttributeDeclaration.getName());
-          extendedMetaData.setNamespace(eAttribute, xsdAttributeDeclaration.getTargetNamespace());
-
-          eAttribute.setDefaultValueLiteral(xsdAttributeDeclaration.getLexicalValue());
-          initialize(eAttribute, (XSDSimpleTypeDefinition)getEffectiveTypeDefinition(null, xsdAttributeDeclaration));
-        }
-        else if (xsdComponent instanceof XSDParticle)
-        {
-          XSDTerm xsdTerm = ((XSDParticle)xsdComponent).getTerm();
-          if (xsdTerm instanceof XSDElementDeclaration)
-          {
-            XSDElementDeclaration xsdElementDeclaration = (XSDElementDeclaration)xsdTerm;
-            extendedMetaData.setFeatureKind(eAttribute, ExtendedMetaData.ELEMENT_FEATURE);
-            extendedMetaData.setName(eAttribute, xsdElementDeclaration.getName());
-            extendedMetaData.setNamespace(eAttribute, xsdElementDeclaration.getTargetNamespace());
-
-            eAttribute.setDefaultValueLiteral(xsdElementDeclaration.getLexicalValue());
-            XSDTypeDefinition xsdType = getEffectiveTypeDefinition(xsdComponent, xsdElementDeclaration);
-            if (xsdType instanceof XSDSimpleTypeDefinition)
-            {
-              initialize(eAttribute, (XSDSimpleTypeDefinition)xsdType);
-            }
-
-            if (xsdElementDeclaration.isNillable())
-            {
-              if (!canSupportNull((EDataType)type))
-              {
-                eAttribute.setEType(type = (EDataType)typeToTypeObjectMap.get(type));
-              }
-              if (maxOccurs == 1)
-              {
-                eAttribute.setUnsettable(true);
-              }
-            }
-
-            if (xsdElementDeclaration.isAbstract())
-            {
-              eAttribute.setChangeable(false);
-            }
-          }
-          else if (xsdTerm instanceof XSDWildcard)
-          {
-            XSDWildcard xsdWildcard = (XSDWildcard)xsdTerm;
-            extendedMetaData.setFeatureKind(eAttribute, ExtendedMetaData.ELEMENT_WILDCARD_FEATURE);
-            extendedMetaData.setWildcards(eAttribute, getWildcards(xsdWildcard));
-            extendedMetaData.setProcessingKind(eAttribute, xsdWildcard.getProcessContents().getValue() + 1);
-            extendedMetaData.setName(eAttribute, ":" + eClass.getEAllStructuralFeatures().indexOf(eAttribute));
-          }
-          else
-          {
-            extendedMetaData.setFeatureKind(eAttribute, ExtendedMetaData.GROUP_FEATURE);
-          }
-        }
-        else if (xsdComponent instanceof XSDWildcard)
-        {
-          XSDWildcard xsdWildcard = (XSDWildcard)xsdComponent;
-          extendedMetaData.setFeatureKind(eAttribute, ExtendedMetaData.ATTRIBUTE_WILDCARD_FEATURE);
-          extendedMetaData.setWildcards(eAttribute, getWildcards(xsdWildcard));
-          extendedMetaData.setProcessingKind(eAttribute, xsdWildcard.getProcessContents().getValue() + 1);
-          extendedMetaData.setName(eAttribute, ":" + eClass.getEAllStructuralFeatures().indexOf(eAttribute));
-        }
-        else if (xsdComponent instanceof XSDElementDeclaration)
-        {
-          XSDElementDeclaration xsdElementDeclaration = (XSDElementDeclaration)xsdComponent;
-          extendedMetaData.setFeatureKind(eAttribute, ExtendedMetaData.ELEMENT_FEATURE);
-          extendedMetaData.setName(eAttribute, xsdElementDeclaration.getName());
-          extendedMetaData.setNamespace(eAttribute, xsdElementDeclaration.getTargetNamespace());
-
-          eAttribute.setDefaultValueLiteral(xsdElementDeclaration.getLexicalValue());
-          XSDTypeDefinition xsdType = getEffectiveTypeDefinition(null, xsdElementDeclaration);
-          if (xsdType instanceof XSDSimpleTypeDefinition)
-          {
-            initialize(eAttribute, (XSDSimpleTypeDefinition)xsdType);
-          }
-
-          XSDElementDeclaration substitutionGroupAffiliation = xsdElementDeclaration.getSubstitutionGroupAffiliation();
-          if (substitutionGroupAffiliation != null)
-          {
-            EStructuralFeature affiliation = getEStructuralFeature(substitutionGroupAffiliation);
-            extendedMetaData.setAffiliation(eAttribute, affiliation);
-          }
-
-          if (xsdElementDeclaration.isNillable() && !canSupportNull((EDataType)type))
-          {
-              eAttribute.setEType(type = (EDataType)typeToTypeObjectMap.get(type));
-            if (maxOccurs == 1)
-            {
-              eAttribute.setUnsettable(true);
-            }
-          }
-
-          if (xsdElementDeclaration.isAbstract())
-          {
-            eAttribute.setChangeable(false);
-          }
-        }
-      }
-
-      if (maxOccurs == 1 && (type.getDefaultValue() != null || eAttribute.getDefaultValueLiteral() != null))
-      {
-        eAttribute.setUnsettable(true);
-      }
-
-      return eAttribute;
-    }
-  }
-
-  protected XSDTypeDefinition getEffectiveTypeDefinition(XSDComponent xsdComponent, XSDFeature xsdFeature) 
-  {
-    return xsdFeature == null ? 
-        ((XSDComplexTypeDefinition)xsdComponent.eContainer()).getSimpleType() : xsdFeature.getType();
-  }
-  
-  protected EStructuralFeature createFeature
-   (EClass eClass, XSDElementDeclaration xsdElementDeclaration, String name, XSDComponent xsdComponent, int minOccurs, int maxOccurs)
-  {
-    XSDTypeDefinition elementTypeDefinition = getEffectiveTypeDefinition(xsdComponent, xsdElementDeclaration);
-    EClassifier eClassifier = getEClassifier(elementTypeDefinition);
-  
-    XSDTypeDefinition referenceType = getEcoreTypeQNameAttribute(xsdComponent, "reference");
-    if (referenceType == null)
-    {
-      referenceType = getEcoreTypeQNameAttribute(xsdElementDeclaration, "reference");
-    }
-    if (referenceType != null)
-    {
-      EClassifier referenceClassifier = getEClassifier(referenceType);
-      boolean needsHolder = false;
-      if (elementTypeDefinition instanceof XSDSimpleTypeDefinition)
-      {
-        XSDSimpleTypeDefinition xsdSimpleTypeDefinition = (XSDSimpleTypeDefinition)elementTypeDefinition;
-        if (xsdSimpleTypeDefinition.getVariety() == XSDVariety.LIST_LITERAL)
-        {
-          needsHolder = true;
-          
-          EPackage holderPackage = getEPackage(xsdElementDeclaration);
-          String holderName = xsdElementDeclaration.getName() + ":holder";
-          EClass holderClass = (EClass)extendedMetaData.getType(holderPackage, holderName);
-          if (holderClass == null)
-          {
-            // Create a holder class like an anonymous complex type.
-            //
-            holderClass = ecoreFactory.createEClass();
-            setAnnotations(holderClass, xsdElementDeclaration);
-            holderClass.setName(validName(holderName, true));
-            extendedMetaData.setName(holderClass, holderName);
-            extendedMetaData.setContentKind(holderClass, ExtendedMetaData.SIMPLE_CONTENT);
-                   
-            addToSortedList(holderPackage.getEClassifiers(), holderClass);
-     
-            EReference holderReference =
-              (EReference)createFeature
-                (holderClass,
-                 "value",
-                 referenceClassifier,
-                 null,
-                 0,
-                 -1);
-     
-            holderReference.setResolveProxies(!isLocalReferenceType(xsdSimpleTypeDefinition));
-          }
-          referenceClassifier = holderClass;
-        }
-      }
-      EStructuralFeature result =
-        createFeature
-          (eClass,
-           name,
-           referenceClassifier,
-           xsdComponent,
-           minOccurs,
-           maxOccurs);
-      ((EReference)result).setContainment(needsHolder);
-      if (needsHolder)
-      {
-        ((EReference)result).setUnsettable(false);
-        ((EReference)result).setResolveProxies(false);
-      }
-      initialize(result, xsdElementDeclaration, xsdComponent);
-      return result;
-    }
-    else
-    {
-      EStructuralFeature result =
-        createFeature
-          (eClass,
-           name,
-           eClassifier,
-           xsdComponent,
-           minOccurs,
-           maxOccurs);
-      initialize(result, xsdElementDeclaration, xsdComponent);
-      return result;
-    }
-  }
-
-  protected EStructuralFeature createFeature
-    (EClass eClass, XSDAttributeDeclaration xsdAttributeDeclaration, String name, XSDComponent xsdComponent, boolean isRequired)
-  {
-    XSDSimpleTypeDefinition attributeTypeDefinition = (XSDSimpleTypeDefinition)getEffectiveTypeDefinition(xsdComponent, xsdAttributeDeclaration);
-    if (attributeTypeDefinition == null)
-    {
-      attributeTypeDefinition = xsdComponent.getSchema().getSchemaForSchema().resolveSimpleTypeDefinition("anySimpleType");
-    }
-  
-    XSDTypeDefinition referenceType = getEcoreTypeQNameAttribute(xsdComponent, "reference");
-    if (referenceType == null && xsdAttributeDeclaration != null)
-    {
-      referenceType = getEcoreTypeQNameAttribute(xsdAttributeDeclaration, "reference");
-    }
-    if (referenceType != null)
-    {
-      int lowerBound = isRequired ? 1 : 0;
-      int upperBound = 1;
-      if (attributeTypeDefinition.getVariety() == XSDVariety.LIST_LITERAL)
-      {
-        XSDLengthFacet xsdLengthFacet = attributeTypeDefinition.getEffectiveLengthFacet();
-        if (isRequired)
-        {
-          if (xsdLengthFacet != null)
-          {
-            lowerBound = xsdLengthFacet.getValue();
-          }
-          else
-          {
-            XSDMinLengthFacet xsdMinLengthFacet = attributeTypeDefinition.getEffectiveMinLengthFacet();
-            if (xsdMinLengthFacet != null)
-            {
-              lowerBound = xsdMinLengthFacet.getValue();
-            }
-          }
-        }
-        if (xsdLengthFacet != null)
-        {
-          upperBound = xsdLengthFacet.getValue();
-        }
-        else
-        {
-          XSDMaxLengthFacet xsdMaxLengthFacet = attributeTypeDefinition.getEffectiveMaxLengthFacet();
-          if (xsdMaxLengthFacet != null)
-          {
-            upperBound = xsdMaxLengthFacet.getValue();
-          }
-          else
-          {
-            upperBound = -1;
-          }
-        }
-      }
-  
-      EClassifier referenceClassifier = getEClassifier(referenceType);
-      EStructuralFeature result =
-        createFeature
-          (eClass,
-           name,
-           referenceClassifier,
-           xsdComponent,
-           lowerBound,
-           upperBound);
-      initialize(result, xsdAttributeDeclaration, xsdComponent);
-      return result;
-    }
-    else
-    {
-      boolean isMany = 
-          attributeTypeDefinition.getVariety() == XSDVariety.LIST_LITERAL &&
-          xsdComponent instanceof XSDAttributeUse && 
-          "true".equals(getEcoreAttribute(xsdComponent, "many"));
-      if (isMany)
-      {
-        EDataType eDataType = getEDataType(attributeTypeDefinition.getItemTypeDefinition());
-        XSDLengthFacet xsdLengthFacet = attributeTypeDefinition.getEffectiveLengthFacet();
-        int lowerBound = isRequired ? 1 : 0;
-        int upperBound = -1;
-        if (isRequired)
-        {
-          if (xsdLengthFacet != null)
-          {
-            lowerBound = xsdLengthFacet.getValue();
-          }
-          else
-          {
-            XSDMinLengthFacet xsdMinLengthFacet = attributeTypeDefinition.getEffectiveMinLengthFacet();
-            if (xsdMinLengthFacet != null)
-            {
-              lowerBound = xsdMinLengthFacet.getValue();
-            }
-          }
-        }
-        if (xsdLengthFacet != null)
-        {
-          upperBound = xsdLengthFacet.getValue();
-        }
-        else
-        {
-          XSDMaxLengthFacet xsdMaxLengthFacet = attributeTypeDefinition.getEffectiveMaxLengthFacet();
-          if (xsdMaxLengthFacet != null)
-          {
-            upperBound = xsdMaxLengthFacet.getValue();
-          }
-        }
-        EStructuralFeature result =
-          createFeature
-            (eClass,
-             name,
-             eDataType,
-             xsdComponent,
-             lowerBound,
-             upperBound);
-        initialize(result, xsdAttributeDeclaration, xsdComponent);
-        return result;
-      }
-      else
-      {
-        EDataType eDataType = getEDataType(attributeTypeDefinition);
-        EStructuralFeature result =
-          createFeature
-            (eClass,
-             name,
-             eDataType,
-             xsdComponent,
-             isRequired ? 1 : 0,
-             1);
-        initialize(result, xsdAttributeDeclaration, xsdComponent);
-        return result;
-      }
-    }
-  }
-  
-  public EStructuralFeature getEStructuralFeature(XSDFeature xsdFeature)
-  {
-    if ("true".equals(getEcoreAttribute(xsdFeature, "ignore"))) return null;
-    EStructuralFeature eStructuralFeature = (EStructuralFeature)xsdComponentToEModelElementMap.get(xsdFeature);
-    if (eStructuralFeature == null)
-    {
-      EPackage ePackage = getEPackage(xsdFeature);
-      EClass documentEClass = extendedMetaData.getDocumentRoot(ePackage);
-      if (documentEClass == null)
-      {
-          createDocumentRoot(xsdFeature.getSchema(), ePackage);
-      }
-
-      String name = getEcoreAttribute(xsdFeature, "name");
-      if (name == null)
-      {
-        name= validName(xsdFeature.getName(), true);       
-      }
-      
-      if (xsdFeature instanceof XSDElementDeclaration)
-      {
-        // Mark the bound as unspecified so that it won't be considered many 
-        // but can nevertheless be recognized as being unspecified and perhaps still be treat as many.
-        //
-        EStructuralFeature result = 
-          createFeature(documentEClass, (XSDElementDeclaration)xsdFeature, name, xsdFeature, 0, ETypedElement.UNSPECIFIED_MULTIPLICITY);            
-
-        result.setDerived(true);
-        result.setTransient(true);
-        result.setVolatile(true);
-        return result;
-      }
-      else
-      {
-        EStructuralFeature result = 
-          createFeature(documentEClass, (XSDAttributeDeclaration)xsdFeature, name, xsdFeature, false);
-        return result;
-      }
-    }
-
-    return eStructuralFeature;
-  }
-
-  public void generate(XSDSchema xsdSchema)
-  {
-    this.rootSchema = xsdSchema;
-    if (xsdSchemas.add(xsdSchema))
-    {
-      addInput(xsdSchema);
-      validate(xsdSchema);
-    }
-
-    Collection visitedElementDeclarations = new ArrayList();
-    Collection elementDeclarations = new ArrayList(xsdSchema.getElementDeclarations());
-
-    Collection visitedAttributeDeclarations = new ArrayList();
-    Collection attributeDeclarations = new ArrayList(xsdSchema.getAttributeDeclarations());
-
-    Collection visitedTypeDefinitions = new ArrayList();
-    Collection typeDefinitions = new ArrayList(xsdSchema.getTypeDefinitions());
-
-    while (!elementDeclarations.isEmpty() || !attributeDeclarations.isEmpty() || !typeDefinitions.isEmpty())
-    {
-      for (Iterator i = elementDeclarations.iterator(); i.hasNext(); )
-      {
-        XSDElementDeclaration xsdElementDeclaration = (XSDElementDeclaration)i.next();
-        getEStructuralFeature(xsdElementDeclaration);
-      }
-      visitedElementDeclarations.addAll(elementDeclarations);
-      elementDeclarations = new ArrayList(xsdSchema.getElementDeclarations());
-      elementDeclarations.removeAll(visitedElementDeclarations);
-
-      for (Iterator i = attributeDeclarations.iterator(); i.hasNext(); )
-      {
-        XSDAttributeDeclaration xsdAttributeDeclaration = (XSDAttributeDeclaration)i.next();
-        if (!XSDConstants.isSchemaInstanceNamespace(xsdAttributeDeclaration.getTargetNamespace()))
-        {
-          getEStructuralFeature(xsdAttributeDeclaration);
-        }
-      }
-      visitedAttributeDeclarations.addAll(attributeDeclarations);
-      attributeDeclarations = new ArrayList(xsdSchema.getAttributeDeclarations());
-      attributeDeclarations.removeAll(visitedAttributeDeclarations);
-
-      for (Iterator i = typeDefinitions.iterator(); i.hasNext(); )
-      {
-        XSDTypeDefinition xsdTypeDefinition = (XSDTypeDefinition)i.next();
-        getEClassifier(xsdTypeDefinition);
-      }
-      visitedTypeDefinitions.addAll(typeDefinitions);
-      typeDefinitions = new ArrayList(xsdSchema.getTypeDefinitions());
-      typeDefinitions.removeAll(visitedTypeDefinitions);
-    }
-
-    resolveNameConflicts();
-
-    for (Iterator i = xsdSchemas.iterator(); i.hasNext(); )
-    {
-      XSDSchema generatedXSDSchema = (XSDSchema)i.next();
-      EPackage ePackage = (EPackage)targetNamespaceToEPackageMap.get(generatedXSDSchema.getTargetNamespace());
-      if (ePackage != null)
-      {
-        String packageName= getEcoreAttribute(generatedXSDSchema, "package");
-        if (packageName != null)
-        {
-          ePackage.setName(packageName);
-        }
-        String packageNsPrefix= getEcoreAttribute(generatedXSDSchema, "nsPrefix");
-        if (packageNsPrefix != null)
-        {
-          ePackage.setNsPrefix(packageNsPrefix);
-        }
-      }
-    }
-
-    for (Iterator i = eReferenceToOppositeNameMap.entrySet().iterator(); i.hasNext(); )
-    {
-      Map.Entry entry = (Map.Entry)i.next();
-      EReference eReference = (EReference)entry.getKey();
-      String opposite = (String)entry.getValue();
-      EClass oppositeEClass = eReference.getEReferenceType();
-      if (eReference.getEOpposite() == null)
-      {
-        EStructuralFeature eOppositeFeature =  oppositeEClass.getEStructuralFeature(opposite);
-        
-        // Match by XML name if this fails.
-        if (eOppositeFeature == null)
-        {
-          for (Iterator j = oppositeEClass.getEAllStructuralFeatures().iterator(); j.hasNext(); )
-          {
-            EStructuralFeature feature = (EStructuralFeature)j.next();
-            if (opposite.equals(extendedMetaData.getName(feature)))
-            {
-              eOppositeFeature = feature;
-              break;
-            }
-          }
-        }
-        
-        if (eOppositeFeature instanceof EReference)
-        {
-          EReference eOpposite = (EReference)eOppositeFeature;
-          eOpposite.setEOpposite(eReference);
-          eReference.setEOpposite(eOpposite);
-        }
-      }
-
-      if (eReference.getEOpposite() == null && eReference.isContainment())
-      {
-        EReference eOpposite = ecoreFactory.createEReference();
-        eOpposite.setName(opposite);
-        eOpposite.setEType(eReference.getEContainingClass());
-        eOpposite.setLowerBound(0);
-        eOpposite.setEOpposite(eReference);
-        eReference.setEOpposite(eOpposite);
-        eOpposite.setTransient(true);
-        oppositeEClass.getEStructuralFeatures().add(eOpposite);
-      }
-    }
-
-    eReferenceToOppositeNameMap.clear();
-  }
-
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java
deleted file mode 100644
index d768076ecb..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.helper;
-
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.util.EcoreUtil.Copier;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.CopyHelper;
-
-
-/**
- * A helper for copying DataObjects.
- */
-public class CopyHelperImpl implements CopyHelper
-{
-  public DataObject copyShallow(DataObject dataObject)
-  {
-    Copier copier = new Copier()
-      {
-        protected void copyContainment(EReference eReference, EObject eObject, EObject copyEObject)
-        {
-        }
-
-        protected void copyAttribute(EAttribute eAttribute, EObject eObject, EObject copyEObject) {
-            if(("ChangeSummaryType".equals(eAttribute.getEType().getName()) && "commonj.sdo".equals(eAttribute.getEType().getEPackage().getNsURI()))) {
-                boolean isLogging = ((ChangeSummary)eObject.eGet(eAttribute)).isLogging();
-                ChangeSummary destSum = (ChangeSummary)copyEObject.eGet(eAttribute);
-                if(isLogging) {
-                    if(!destSum.isLogging()) destSum.beginLogging();
-                } else {
-                    if(destSum.isLogging()) destSum.endLogging();
-                }
-            } else {
-                super.copyAttribute(eAttribute, eObject, copyEObject);
-            }
-        }
-      };
-    EObject result = copier.copy((EObject)dataObject);
-    copier.copyReferences();
-    return (DataObject)result;
-  }
-
-  public DataObject copy(DataObject dataObject)
-  {
-    Copier copier = new Copier()
-    {
-
-        protected void copyAttribute(EAttribute eAttribute, EObject eObject, EObject copyEObject) {
-            if(("ChangeSummaryType".equals(eAttribute.getEType().getName()) && "commonj.sdo".equals(eAttribute.getEType().getEPackage().getNsURI()))) {
-                throw new UnsupportedOperationException("This will be implemented when change summary serialization/deserialization is in place");
-            } else {
-                super.copyAttribute(eAttribute, eObject, copyEObject);
-            }
-        }
-    };
-    EObject result = copier.copy((EObject)dataObject);
-    copier.copyReferences();
-    return (DataObject)result;
-  }
-
-
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/CrossScopeCopyHelperImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/CrossScopeCopyHelperImpl.java
deleted file mode 100644
index 3f51876035..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/CrossScopeCopyHelperImpl.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.helper;
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.util.EcoreUtil.Copier;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-import commonj.sdo.helper.CopyHelper;
-import commonj.sdo.helper.TypeHelper;
-
-/**
- * A CopyHelper implementation that creates the copy objects in a specific metadata scope.
- * The target scope must contain a compatible version of the Types needed to create the copy objects.
- */
-public class CrossScopeCopyHelperImpl implements CopyHelper 
-{
-  protected TypeHelper scope;
-    
-  public CrossScopeCopyHelperImpl(TypeHelper targetScope)
-  {
-    scope = targetScope;
-  }
-    
-  public DataObject copyShallow(DataObject dataObject)
-  {
-    Copier copier = new CrossScopeCopier()
-    {
-      protected void copyContainment(EReference eReference, EObject eObject, EObject copyEObject)
-      {
-      }
-      protected void copyAttribute(EAttribute eAttribute, EObject eObject, EObject copyEObject)
-      {
-        if (eObject.eIsSet(eAttribute) && !FeatureMapUtil.isFeatureMap(eAttribute))
-		{
-		  super.copyAttribute(eAttribute,eObject,copyEObject);
-		}
-	  }
-    };
-    EObject result = copier.copy((EObject)dataObject);
-    copier.copyReferences();
-    return (DataObject)result;
-  }
-
-  public DataObject copy(DataObject dataObject)
-  {
-    Copier copier = new CrossScopeCopier();
-    DataObject result = (DataObject)copier.copy((EObject)dataObject);
-    copier.copyReferences();
-    return (DataObject)result;
-  }
-    
-  protected class CrossScopeCopier extends EcoreUtil.Copier
-  {
-    protected boolean useOriginalReferences = false;
-      
-    protected EClass getTarget(EClass eClass)
-    {
-      EClass target = (EClass)get(eClass);
-      if (target == null)
-      {
-        Type type = (Type)eClass;
-        target = (EClass)scope.getType(type.getURI(), type.getName());
-      }
-      return target;
-    }
-      
-    protected EStructuralFeature getTarget(EStructuralFeature eStructuralFeature)
-    {
-      EClass eClass = getTarget(eStructuralFeature.getEContainingClass());
-      EStructuralFeature targetEf = eClass.getEStructuralFeature(eStructuralFeature.getName());
-      return targetEf;
-    }
-    
-    /**
-     * This Method WILL BE REMOVED when EMF 3.0 is available
-     */
-    public void copyReferences()
-    {
-      for (Iterator i = entrySet().iterator(); i.hasNext();)
-      {
-        Map.Entry entry = (Map.Entry)i.next();
-        EObject eObject = (EObject)entry.getKey();
-        EObject copyEObject = (EObject)entry.getValue();
-        EClass eClass = eObject.eClass();
-        for (int j = 0, size = eClass.getFeatureCount(); j < size; ++j)
-        {
-          EStructuralFeature eStructuralFeature = eClass.getEStructuralFeature(j);
-          if (eStructuralFeature.isChangeable() && !eStructuralFeature.isDerived())
-          {
-            if (eStructuralFeature instanceof EReference)
-            {
-              EReference eReference = (EReference)eStructuralFeature;
-              if (!eReference.isContainment() && !eReference.isContainer())
-              {
-                copyReference(eReference, eObject, copyEObject);
-              }
-            }
-            else if (FeatureMapUtil.isFeatureMap(eStructuralFeature))
-            {
-              FeatureMap featureMap = (FeatureMap)eObject.eGet(eStructuralFeature);
-              FeatureMap copyFeatureMap = (FeatureMap)copyEObject.eGet(getTarget(eStructuralFeature));
-              int copyFeatureMapSize = copyFeatureMap.size();
-              for (int k = 0, featureMapSize = featureMap.size(); k < featureMapSize; ++k)
-              {
-                EStructuralFeature feature = featureMap.getEStructuralFeature(k);
-                if (feature instanceof EReference)
-                {
-                  Object referencedEObject = featureMap.getValue(k);
-                  Object copyReferencedEObject = get(referencedEObject);
-                  if (copyReferencedEObject == null && referencedEObject != null)
-                  {
-                    EReference reference = (EReference)feature;
-                    if (!useOriginalReferences || reference.isContainment() || reference.getEOpposite() != null)
-                    {
-                      continue;
-                    }
-                    copyReferencedEObject = referencedEObject;
-                  }
-                  // If we can't add it, it must aleady be in the list so find it and move it to the end.
-                  //
-                  if (!copyFeatureMap.add(feature, copyReferencedEObject))
-                  {
-                    for (int l = 0; l < copyFeatureMapSize; ++l) 
-                    {
-                      if (copyFeatureMap.getEStructuralFeature(l) == feature && copyFeatureMap.getValue(l) == copyReferencedEObject)
-                      {
-                        copyFeatureMap.move(copyFeatureMap.size() - 1, l);
-                        --copyFeatureMapSize;
-                        break;
-                      }
-                    }
-                  }
-                }
-                else
-                {
-                  copyFeatureMap.add(featureMap.get(k));
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-
-    /**
-     * This Method WILL BE REMOVED when EMF 3.0 is available
-     */
-    protected void copyReference(EReference eReference, EObject eObject, EObject copyEObject)
-    {
-      if (eObject.eIsSet(eReference))
-      {
-        if (eReference.isMany())
-        {
-          InternalEList source = (InternalEList)eObject.eGet(eReference);
-          InternalEList target = (InternalEList)copyEObject.eGet(getTarget(eReference));
-          if (source.isEmpty())
-          {
-            target.clear();
-          }
-          else
-          {
-            boolean isBidirectional = eReference.getEOpposite() != null;
-            int index = 0;
-            for (Iterator k = resolveProxies ? source.iterator() : source.basicIterator(); k.hasNext();)
-            {
-              Object referencedEObject = k.next();
-              Object copyReferencedEObject = get(referencedEObject);
-              if (copyReferencedEObject == null)
-              {
-                if (useOriginalReferences && !isBidirectional)
-                {
-                  target.addUnique(index, referencedEObject);
-                  ++index;
-                }
-              }
-              else
-              {
-                if (isBidirectional)
-                {
-                  int position = target.indexOf(copyReferencedEObject);
-                  if (position == -1)
-                  {
-                    target.addUnique(index, copyReferencedEObject);
-                  }
-                  else if (index != position)
-                  {
-                    target.move(index, copyReferencedEObject);
-                  }
-                }
-                else
-                {
-                  target.addUnique(index, copyReferencedEObject);
-                }
-                ++index;
-              }
-            }
-          }
-        }
-        else
-        {
-          Object referencedEObject = eObject.eGet(eReference, resolveProxies);
-          if (referencedEObject == null)
-          {
-            copyEObject.eSet(getTarget(eReference), null);
-          }
-          else
-          {
-            Object copyReferencedEObject = get(referencedEObject);
-            if (copyReferencedEObject == null)
-            {
-              if (useOriginalReferences && eReference.getEOpposite() == null)
-              {
-                copyEObject.eSet(getTarget(eReference), referencedEObject);
-              }
-            }
-            else
-            {
-              copyEObject.eSet(getTarget(eReference), copyReferencedEObject);
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java
deleted file mode 100644
index 774d296eae..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.helper;
-
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-import commonj.sdo.helper.DataFactory;
-import commonj.sdo.helper.HelperContext;
-
-/**
- * A Factory for creating DataObjects. The created DataObjects are not connected
- * to any other DataObjects.
- */
-public class DataFactoryImpl implements DataFactory {
-    protected HelperContext helperContext;
-
-    public DataFactoryImpl(HelperContext hc) {
-        this.helperContext = hc;
-    }
-
-    public DataObject create(String uri, String typeName) {
-        Type type = helperContext.getTypeHelper().getType(uri, typeName);
-        return create(type);
-    }
-
-    public DataObject create(Class interfaceClass) {
-        // TODO more efficient implementation ... this is a really bad one!
-        Type type = helperContext.getTypeHelper().getType(interfaceClass);
-        return create(type);
-    }
-
-    public DataObject create(Type type) {
-        return DataObjectUtil.create(type);
-    }
-
-    public HelperContext getHelperContext() {
-        return helperContext;
-    }
-
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java
deleted file mode 100644
index d30da1cc4a..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java
+++ /dev/null
@@ -1,615 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.helper;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.TimeZone;
-
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-import commonj.sdo.helper.DataHelper;
-
-/**
- * Data helper methods.
- */
-public class DataHelperImpl implements DataHelper
-{
-  /**
-   * @param dateString - Must comply to the pattern of yyyy-MM-dd'T'HH:mm:ss'.'SSS'Z'
-   * @return null if dataString couldn't be parsed
-   */
-  public synchronized Date toDate(String dateString)
-  {
-    if (dateString == null)
-    {
-      return null;
-    }
-      
-    SDOSimpleDateFormat format;
-    Date result = null;
-    boolean negative = false;
-    String formatString;
-    dateString = dateString.trim();
-    
-    // Determine if it is a negative Date, DateTime, or Duration
-    
-    if (dateString.length() > 2 && dateString.charAt(0) == '-' && dateString.charAt(1) != '-')
-    {
-      negative = true;
-      dateString = dateString.substring(1);
-    }
-    
-    //  SDO Date Format ends with a Z
-    
-    if (dateString.endsWith("Z"))
-    {
-      if (dateString.indexOf('.') != -1)
-        formatString = new String("yyyy-MM-dd'T'HH:mm:ss'.'S'Z'");
-      else
-        formatString = new String ("yyyy-MM-dd'T'HH:mm:ss'Z'");
-        
-      format = new SDOSimpleDateFormat(formatString);
-      format.setTimeZone(TimeZone.getTimeZone("UTC"));
-      
-      result = checkFormat(dateString, format);
-      
-      // If no match, continue to try further possibilities
-      
-      if (result != null)
-      {
-        if (negative)
-          return handleBCE(result);
-        else
-          return result;
-      }
-      
-    }
-    
-    // Duration format begins with a P
-    
-    if (dateString.startsWith("P"))
-    {
-      // Remove any spaces in the dateString
-        
-      String durationString = dateString.replaceAll(" ", "");
-
-      // Build the formatString based on the contents of dateString
-        
-      formatString = obtainDurationFormats(durationString);
-      format = new SDOSimpleDateFormat(formatString);
-      result = checkFormat(durationString, format);
-      if (result != null)
-      {     
-        if (negative)
-          return handleNegative(result); 
-        else
-          return result;
-      }
-    }
-    
-    formatString = obtainSpecificFormat(dateString);
-
-    if (formatString != null)
-    {
-      format = new SDOSimpleDateFormat(formatString);
-      result = checkFormat(dateString, format); 
-
-      if (result != null)
-      {
-        if (negative)
-          return handleBCE(result);   
-        else
-          return result;
-      }
-    }
-    
-    return null;
-  }
-  
-  private synchronized Date checkFormat(String dateString, SDOSimpleDateFormat format)
-  {
-    String formatPattern = format.toPattern();
-    StringBuffer addedFields = new StringBuffer();
-    String fieldsString, parseString;
-    SDOSimpleDateFormat compositeFormat;
-    Date dateValue;
-
-    // For certain permissable input strings (e.g. those resulting from toYear
-    // toDay, toTime), there are fields missing which when converted to Date have
-    // default values.  (e.g. Year -> 1970).  Because of this, there can be great 
-    // variation in how daylight savings time is accounted for.  (e.g. In 1970 Britain
-    // was on DST year round, and during the summer of 1944 was on double daylight time.)
-    // Because these possible variations exist, it is assumed that the user would prefer
-    // the current handling of daylight savings time.  As such, the year, month and day 
-    // will default to their current values when absent.  (The user should not be checking
-    // for Year=1970 (etc.) as evidence of taking the default, as explicitly setting a 
-    // year to 1970 is valid and would then not be an instance of a default taken.)
-    
-    if (!(formatPattern.startsWith("P")))
-    {
-      if (formatPattern.indexOf('y') == -1)
-        addedFields.append("yyyy ");
-    
-      if (formatPattern.indexOf('M') == -1)
-        addedFields.append("MM ");
-    
-      if (formatPattern.indexOf('d') == -1)
-        addedFields.append("dd ");
-    }
-    
-    fieldsString = addedFields.toString();
-    
-    if (fieldsString.length() == 0)
-    {
-      parseString = dateString;
-      compositeFormat = format;
-    }
-    
-    else
-    {
-      compositeFormat = new SDOSimpleDateFormat(fieldsString);
-      dateValue = new Date(System.currentTimeMillis());
-      parseString = compositeFormat.format(dateValue) + dateString;    
-      compositeFormat.applyPattern(fieldsString + formatPattern);
-    }
-
-    try
-    {
-      return compositeFormat.parse(parseString);      
-    }
-    
-    catch (ParseException parseException)
-    {
-    }    
-      
-    return null;
-  }
-  
-  public synchronized String obtainSpecificFormat(String dateString)
-  {
-    StringBuffer formatBuffer = new StringBuffer();
-    int colonIndex = dateString.indexOf(':');
-    int hyphenIndex = dateString.indexOf('-');
-      
-    if (dateString.startsWith("--"))
-    {
-      if (dateString.charAt(2) == '-') // starts with ---
-        formatBuffer.append("'---'dd"); 
-      else if (dateString.substring(2).indexOf('-') == -1)
-        formatBuffer.append("'--'MM");
-      else
-        formatBuffer.append("'--'MM'-'dd");     
-    }
-    
-    else if (colonIndex == 1 || colonIndex == 2)
-    {
-      if (dateString.indexOf('.') != -1)
-        formatBuffer.append("HH:mm:ss'.'S");
-      else if (dateString.substring(colonIndex + 1).indexOf(':') != -1)
-        formatBuffer.append("HH:mm:ss");
-      else
-        formatBuffer.append("HH:mm");  
-    }
-    
-    else if (hyphenIndex != -1)
-    {
-      if (dateString.substring(hyphenIndex + 1).indexOf('-') == -1)    
-        formatBuffer.append("yyyy-MM");
-      else if (colonIndex != -1)
-      {
-        if (dateString.indexOf('.') != -1)
-          formatBuffer.append("yyyy-MM-dd'T'HH:mm:ss'.'S");
-        else if (dateString.substring(colonIndex + 1).indexOf(':') != -1)
-          formatBuffer.append("yyyy-MM-dd'T'HH:mm:ss");
-        else
-          formatBuffer.append("yyyy-MM-dd'T'HH:mm"); 
-      }
-      else
-        formatBuffer.append ("yyyy-MM-dd");
-    }
-    else if (colonIndex == -1)  // indexOf('-') == -1
-    {
-      formatBuffer.append("yyyy");
-    }
-    else
-      return null;
-    
-    // Determine if a Time Zone is included and needs to be parsed.
-    // ---------------------------------
-    // The only letter allowed in the above formats is 'T'.
-    // All times zones include at least one letter other than 'T'.
-
-    int i = 0;
-    boolean letterFound = false;
-    char currentChar;
-    while (i < dateString.length() && !letterFound)
-    {
-      currentChar = dateString.charAt(i);
-      if (Character.isLetter(currentChar) && currentChar != 'T')
-        letterFound = true;;  
-      i++;
-    }
-    
-    if (letterFound)
-      formatBuffer.append(" z");
-        
-    return formatBuffer.toString();
-  }
-  
-  public synchronized String obtainDurationFormats(String dateString)
-  {
-    String firstPart, secondPart;
-    StringBuffer formatBuffer = new StringBuffer("'P'");
-
-    // Must divide it into two parts to distinguish between Months and Minutes
-      
-    int time_index = dateString.indexOf('T');
-    if (time_index != -1)
-    {
-      firstPart = dateString.substring(0, time_index + 1);    
-      secondPart = dateString.substring(time_index);
-    }
-    else
-    {
-      firstPart = dateString;
-      secondPart = null;
-    }
-      
-    if (firstPart.indexOf('Y') != -1)
-      formatBuffer.append("yyyy'Y'");
-    if (firstPart.indexOf('M') != -1)
-      formatBuffer.append("MM'M'");
-    if (firstPart.indexOf('D') != -1)
-      formatBuffer.append("dd'D'");
-    if (time_index != -1)
-    {
-      formatBuffer.append("'T'");
-       
-      if (secondPart.indexOf('H') != -1)
-        formatBuffer.append("HH'H'");
-      if (secondPart.indexOf('M') != -1)
-        formatBuffer.append("mm'M'");
-      if (secondPart.indexOf("S.") != -1)
-        formatBuffer.append("ss'S'.S");
-      else if (secondPart.indexOf('S') != -1)
-        formatBuffer.append("ss'S'");
-    }
-
-    return formatBuffer.toString().replaceAll("''", "");
-  }
-
-  // Return a negative Duration if a negative sign existed in dateString
-  public synchronized Date handleNegative(Date output)
-  {
-    return new Date(0 - output.getTime());
-  }
-  
-  // Return the date in BCE if a negative sign existed in dateString
-  
-  public synchronized Date handleBCE(Date output)
-  {
-    GregorianCalendar temp = new GregorianCalendar();
-    temp.setTime(output);
-    temp.set(GregorianCalendar.ERA, GregorianCalendar.BC);
-        
-    return temp.getTime();
-  }
-  
-  public synchronized Calendar toCalendar(String dateString)
-  {
-    return toCalendar(dateString, null);
-  }
-  
-  public synchronized Calendar toCalendar(String dateString, Locale locale)
-  {
-    if (dateString == null)
-    {
-      return null;
-    }
-    
-    Date date = toDate(dateString);
-    if (date == null)
-    {
-      return null;
-    }
-    
-    Calendar calendar = locale != null ? new GregorianCalendar(locale) : new GregorianCalendar();
-    calendar.setTime(date);
-    return calendar;
-  }
-
-  public synchronized String toDateTime(Date date)
-  {
-    if (date == null)
-    {
-      return null;
-    }
-    
-    SDOSimpleDateFormat f = new SDOSimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'.'SSS'Z'");
-    f.setTimeZone(TimeZone.getTimeZone("UTC"));
-    
-    return f.format(date);
-  }
-  
-  public synchronized String toDuration(Date date)
-  {
-    if (date == null)
-    {
-      return null;
-    }
-    
-    SDOSimpleDateFormat f = new SDOSimpleDateFormat("'P'yyyy'Y' MM'M' dd'D' 'T' HH'H' mm'M' ss'S.'SSS");
-    
-    return f.format(date);
-  }
-
-  public synchronized String toTime(Date date)
-  {
-    if (date == null)
-    {
-      return null;
-    }
-    
-    SDOSimpleDateFormat f = new SDOSimpleDateFormat("HH:mm:ss'.'SSS zz");
-    
-    return f.format(date);
-  }
-  
-  public synchronized String toDay(Date date)
-  {
-    if (date == null)
-    {
-      return null;
-    }
-    
-    SDOSimpleDateFormat f = new SDOSimpleDateFormat("---dd zz");
-    
-    return f.format(date);
-  }
-  
-  public synchronized String toMonth(Date date)
-  {
-    if (date == null)
-    {
-      return null;
-    }
-    
-    SDOSimpleDateFormat f = new SDOSimpleDateFormat("--MM zz");
-    
-    return f.format(date);
-  }
-
-  public synchronized String toMonthDay(Date date)
-  {
-    if (date == null)
-    {
-      return null;
-    }
-    
-    SDOSimpleDateFormat f = new SDOSimpleDateFormat("--MM-dd zz");
-    
-    return f.format(date);
-  }
-
-  public synchronized String toYear(Date date)
-  {
-    if (date == null)
-    {
-      return null;
-    }
-    
-    SDOSimpleDateFormat f = new SDOSimpleDateFormat("yyyy zz");
-    
-    return f.format(date); 
-  }
-
-  public synchronized String toYearMonth(Date date)
-  {
-    if (date == null)
-    {
-      return null;
-    }
-    
-    SDOSimpleDateFormat f = new SDOSimpleDateFormat("yyyy-MM zz");
-    
-    return f.format(date);
-  }
-
-  public synchronized String toYearMonthDay(Date date)
-  {
-    if (date == null)
-    {
-      return null;
-    }
-    
-    SDOSimpleDateFormat f = new SDOSimpleDateFormat("yyyy-MM-dd zz");
-    
-    return f.format(date);
-  }
-
-  public synchronized String toDateTime(Calendar calendar)
-  {
-    if (calendar == null)
-    {
-      return null;
-    }
-    
-    return toDateTime(calendar.getTime());
-  }
-
-  public synchronized String toDuration(Calendar calendar)
-  {
-    if (calendar == null)
-    {
-      return null;
-    }
-    
-    return toDuration(calendar.getTime());
-  }
-
-  public synchronized String toTime(Calendar calendar)
-  {
-    if (calendar == null)
-    {
-      return null;
-    }
-    
-    return toTime(calendar.getTime());
-  }
-
-  public synchronized String toDay(Calendar calendar)
-  {
-    if (calendar == null)
-    {
-      return null;
-    }
-    
-    return toDay(calendar.getTime());
-  }
-
-  public synchronized String toMonth(Calendar calendar)
-  {
-    if (calendar == null)
-    {
-      return null;
-    }
-    
-    return toMonth(calendar.getTime());
-  }
-
-  public synchronized String toMonthDay(Calendar calendar)
-  {
-    if (calendar == null)
-    {
-      return null;
-    }
-    
-    return toMonthDay(calendar.getTime());
-  }
-
-  public synchronized String toYear(Calendar calendar)
-  {
-    if (calendar == null)
-    {
-      return null;
-    }
-    
-    return toYear(calendar.getTime());
-  }
-
-  public synchronized String toYearMonth(Calendar calendar)
-  {
-    if (calendar == null)
-    {
-      return null;
-    }
-    
-    return toYearMonth(calendar.getTime());
-  }
-
-  public synchronized String toYearMonthDay(Calendar calendar)
-  {
-    if (calendar == null)
-    {
-      return null;
-    }
-    
-    return toYearMonthDay(calendar.getTime());
-  }
-  
-  public Object convert(Type type, Object value)
-  {
-    Class typeClass = type.getInstanceClass();
-    if (typeClass.isInstance(value))
-      return value;
-    
-    if (typeClass == BigDecimal.class) {
-      return DataObjectUtil.getBigDecimal(value);
-    }
-    else if (typeClass == BigInteger.class) {
-      return DataObjectUtil.getBigInteger(value);
-    }
-    else if (typeClass == boolean.class || typeClass == Boolean.class) {
-      return new Boolean(DataObjectUtil.getBoolean(value));
-    }
-    else if (typeClass == byte.class || typeClass == Byte.class) {
-      return new Byte(DataObjectUtil.getByte(value));
-    }
-    else if (typeClass == byte[].class) {
-      return DataObjectUtil.getBytes(value);
-    }
-    else if (typeClass == char.class || typeClass == Character.class) {
-      return new Character(DataObjectUtil.getChar(value));
-    }
-    else if (typeClass == Date.class) {
-      return DataObjectUtil.getDate(value);
-    }
-    else if (typeClass == double.class || typeClass == Double.class) {
-      return new Double(DataObjectUtil.getDouble(value));
-    }
-    else if (typeClass == float.class || typeClass == Float.class) {
-      return new Float(DataObjectUtil.getFloat(value));
-    }
-    else if (typeClass == int.class || typeClass == Integer.class) {
-      return new Integer(DataObjectUtil.getInt(value));
-    }
-    else if (typeClass == long.class || typeClass == Long.class) {
-      return new Long(DataObjectUtil.getLong(value));
-    }
-    else if (typeClass == short.class || typeClass == Short.class) {
-      return new Short(DataObjectUtil.getShort(value));
-    }
-    else if (typeClass == String.class) {
-      return DataObjectUtil.getString(value);
-    }
-    
-    throw new IllegalArgumentException();
-  }
-  
-  public Object convert(Property property, Object value)
-  {
-    Type type = property.getType();
-    if (!property.isMany())
-    {
-      return convert(type, value);
-    } 
-    else 
-    {
-      List listValue = (List)value;
-      List listResult = new ArrayList();
-      for (Iterator iter = listValue.iterator(); iter.hasNext(); ) {
-        listResult.add(convert(type, iter.next()));
-      }
-      return listResult;
-    }
-  }
-
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DefaultHelperContextImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DefaultHelperContextImpl.java
deleted file mode 100644
index f7ac22632a..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/DefaultHelperContextImpl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.tuscany.sdo.helper;
-
-import java.util.Map;
-import java.util.WeakHashMap;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
-
-public class DefaultHelperContextImpl extends HelperContextImpl {
-    public DefaultHelperContextImpl(final boolean extensibleNamespaces) {
-        super(new SDOExtendedMetaDataImpl(new SDOPackageRegistryDelegator()), extensibleNamespaces);
-    }
-
-    public DefaultHelperContextImpl(final boolean extensibleNamespaces, final Map options) {
-        super(new SDOExtendedMetaDataImpl(new SDOPackageRegistryDelegator()), extensibleNamespaces, options);
-    }
-    
-    protected static class SDOPackageRegistryDelegator extends EPackageRegistryImpl.Delegator {
-        /**
-         * A map from class loader to its associated registry.
-         */
-        protected Map classLoaderToRegistryMap = new WeakHashMap();
-        
-        /**
-         * Returns the package registry associated with the given class loader.
-         * @param classLoader the class loader.
-         * @return the package registry associated with the given class loader.
-         */
-        public synchronized EPackage.Registry getRegistry(final ClassLoader classLoader)
-        {
-          EPackage.Registry result = (EPackage.Registry)classLoaderToRegistryMap.get(classLoader);
-          if (result == null)
-          {
-            if (classLoader == null)
-            {
-              result = HelperContextImpl.getBuiltInModelRegistry();  
-            }
-            else
-            {
-              result = new EPackageRegistryImpl(getRegistry(classLoader.getParent()));
-              classLoaderToRegistryMap.put(classLoader, result);
-            }
-          }
-          return result;
-        }
-        
-        protected EPackage.Registry delegateRegistry(final ClassLoader classLoader)
-        {
-          return getRegistry(classLoader);
-        }
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java
deleted file mode 100644
index 0d3d8ee5b7..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.helper;
-
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.EqualityHelper;
-
-
-/**
- * A helper for comparing DataObjects.
- */
-public class EqualityHelperImpl implements EqualityHelper
-{
-  public boolean equalShallow(DataObject dataObject1, DataObject dataObject2)
-  {
-    EcoreUtil.EqualityHelper equalityHelper = new EcoreUtil.EqualityHelper()
-      {
-        protected boolean haveEqualFeature(EObject eObject1, EObject eObject2, EStructuralFeature feature)
-        {
-          if (feature instanceof EAttribute)
-          {   
-              if(!("ChangeSummaryType".equals(feature.getEType().getName()) && "commonj.sdo".equals(feature.getEType().getEPackage().getNsURI()))) {
-                  boolean eIsSet = eObject1.eIsSet(feature);
-                  if (eIsSet != eObject2.eIsSet(feature) || !haveEqualAttribute(eObject1, eObject2, (EAttribute)feature))
-                  {
-                      return false;
-                  }
-              }
-          }
-          return true;
-        }
-
-        protected boolean equalFeatureMapValues(Object value1, Object value2, EStructuralFeature feature)
-        {
-          if (feature instanceof EAttribute)
-          {
-            return value1 == null ? value2 == null : value1.equals(value2);
-          }
-          return true;
-        }
-      };
-    return equalityHelper.equals((EObject)dataObject1, (EObject)dataObject2);
-  }
-
-  public boolean equal(DataObject dataObject1, DataObject dataObject2)
-  {
-      EcoreUtil.EqualityHelper equalityHelper = new EcoreUtil.EqualityHelper()
-      {
-        protected boolean haveEqualAttribute(EObject eObject1, EObject eObject2, EAttribute attribute) {
-            if(("ChangeSummaryType".equals(attribute.getEType().getName()) && "commonj.sdo".equals(attribute.getEType().getEPackage().getNsURI()))) {
-                throw new UnsupportedOperationException("This will be implemented when change summary serialzation/deserialization is in place"); 
-            } 
-            else if( "Bytes".equals(attribute.getEType().getName()) ) {
-                try
-                {
-                    byte [] value1 = (byte [])eObject1.eGet(attribute);
-                    byte [] value2 = (byte [])eObject2.eGet(attribute);
-                
-                    return( java.util.Arrays.equals(value1,value2) );
-                }
-                catch(Exception ex)
-                {
-                    // if any exception is thrown, assumption is they are not equal
-                    return false;
-                }
-            } 
-            else {
-                return super.haveEqualAttribute(eObject1, eObject2, attribute);
-            }
-        }
-      };
-    return equalityHelper.equals((EObject)dataObject1, (EObject)dataObject2);  }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperContextImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperContextImpl.java
deleted file mode 100644
index 64ee628693..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperContextImpl.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.tuscany.sdo.helper;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.change.ChangePackage;
-import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.xml.namespace.XMLNamespacePackage;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-import commonj.sdo.helper.CopyHelper;
-import commonj.sdo.helper.DataFactory;
-import commonj.sdo.helper.DataHelper;
-import commonj.sdo.helper.EqualityHelper;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XMLHelper;
-import commonj.sdo.helper.XSDHelper;
-
-import org.apache.tuscany.sdo.SDOPackage;
-import org.apache.tuscany.sdo.api.XMLStreamHelper;
-
-public class HelperContextImpl implements HelperContext {
-    /*
-     * Relationship: HelperContext*Impl* ---1:1---> ExtendedMetaData ---1:1--->
-     * Map (:defaultOption) <---1:1---> TypeHelper <---1:1---> XMLHelper
-     * <---1:1---> XMLStreamHelper <---1:1---> XSDHelper <---1:1---> DataFactory
-     */
-
-    protected ExtendedMetaData extendedMetaData;
-    protected DataFactory dataFactory;
-    protected TypeHelper typeHelper;
-    protected XMLHelper xmlHelper;
-    protected XSDHelper xsdHelper;
-    protected XMLStreamHelper xmlStreamHelper;
-    protected Map defaultOptions = null;
-    
-    public HelperContextImpl(ExtendedMetaData extendedMetaData, boolean extensibleNamespaces) {
-        this.defaultOptions = null;
-        this.extendedMetaData = extendedMetaData;
-        typeHelper = new TypeHelperImpl(this);
-        dataFactory = new DataFactoryImpl(this);
-        xmlHelper = new XMLHelperImpl(this);
-        xsdHelper = new XSDHelperImpl(this, null, extensibleNamespaces);
-        xmlStreamHelper = new XMLStreamHelperImpl(this);
-    }
-    
-
-    public HelperContextImpl(ExtendedMetaData extendedMetaData, boolean extensibleNamespaces, Map options) {
-        this.defaultOptions = options;
-        this.extendedMetaData = extendedMetaData;
-        typeHelper = new TypeHelperImpl(this);
-        dataFactory = new DataFactoryImpl(this);
-        xmlHelper = new XMLHelperImpl(this);
-        xsdHelper = new XSDHelperImpl(this, null, extensibleNamespaces);
-        xmlStreamHelper = new XMLStreamHelperImpl(this);
-    }
-
-    // many places this is called in existing code
-    // This is used for supporting the deprecated util -
-    // org.apache.tuscany.sdo.util.SDOUtil
-    // Once we conpletely remove this deprecated util, we can remove the below
-    // constructor
-    public HelperContextImpl(TypeHelper scope) {
-        this(scope, null);
-    }
-
-
-    public HelperContextImpl(TypeHelper scope, Map options) {
-        this.defaultOptions = options;
-        typeHelper = scope;
-        this.extendedMetaData = ((TypeHelperImpl)scope).getExtendedMetaData();
-        dataFactory = new DataFactoryImpl(this);
-        xmlHelper = new XMLHelperImpl(this);
-        xsdHelper = new XSDHelperImpl(this);
-        xmlStreamHelper = new XMLStreamHelperImpl(this);
-    }
-
-    public HelperContextImpl(boolean extensibleNamespaces) {
-        this(new SDOExtendedMetaDataImpl(new EPackageRegistryImpl(getBuiltInModelRegistry())), extensibleNamespaces);
-    }
-
-
-    public HelperContextImpl(boolean extensibleNamespaces, Map options) {
-        this(new SDOExtendedMetaDataImpl(new EPackageRegistryImpl(getBuiltInModelRegistry())), extensibleNamespaces,
-             options);
-    }
-
-    static protected EPackage.Registry builtInModelRegistry = null;
-
-    static public EPackage.Registry getBuiltInModelRegistry() {
-        if (builtInModelRegistry == null) {
-            EPackageRegistryImpl registry = new EPackageRegistryImpl();
-            for (Iterator iter = TypeHelperImpl.getBuiltInModels().iterator(); iter.hasNext();) {
-                EPackage ePackage = (EPackage)iter.next();
-                registry.put(ePackage.getNsURI(), ePackage);
-            }
-            
-            registry.put(EcorePackage.eNS_URI, EcorePackage.eINSTANCE);
-            registry.put(XMLTypePackage.eNS_URI, XMLTypePackage.eINSTANCE);
-            registry.put(ChangePackage.eNS_URI, ChangePackage.eINSTANCE);
-            registry.put(XMLNamespacePackage.eNS_URI, XMLNamespacePackage.eINSTANCE);
-            registry.put(SDOPackage.eNS_URI, SDOPackage.eINSTANCE);
-            
-            builtInModelRegistry = registry;
-        }
-        return builtInModelRegistry;
-    }
-
-    public CopyHelper getCopyHelper() {
-        return CopyHelper.INSTANCE;
-    }
-
-    public DataFactory getDataFactory() {
-        return dataFactory;
-    }
-
-    public DataHelper getDataHelper() {
-        return DataHelper.INSTANCE;
-    }
-
-    public EqualityHelper getEqualityHelper() {
-        return EqualityHelper.INSTANCE;
-    }
-
-    public TypeHelper getTypeHelper() {
-        return typeHelper;
-    }
-
-    public XMLHelper getXMLHelper() {
-        return xmlHelper;
-    }
-
-    public XMLStreamHelper getXMLStreamHelper() {
-        return xmlStreamHelper;
-    }
-
-    public XSDHelper getXSDHelper() {
-        return xsdHelper;
-    }
-
-    public void setOptions(Map options) {
-        this.defaultOptions = options;
-    }
-
-    public Map getOptions() {
-        return this.defaultOptions;
-    }
-
-    public Map getMergedOption(Map options) {
-        Map mergedOptions = null;// copy to be used for merge
-
-        if (defaultOptions == null) {
-            return options;
-        }
-        
-        mergedOptions = new HashMap(defaultOptions);
-        if (options == null) {
-            return mergedOptions;
-        }
-        mergedOptions.putAll(options);
-        
-        return mergedOptions;
-    }
-
-    public ExtendedMetaData getExtendedMetaData() {
-        return extendedMetaData;
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
deleted file mode 100644
index 360617bd20..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.helper;
-
-
-import org.apache.tuscany.sdo.spi.HelperProviderBase;
-
-import commonj.sdo.helper.HelperContext;
-
-/**
- * Create and manage all the default helper INSTANCEs
- */
-public class HelperProviderImpl extends HelperProviderBase
-{   
-  public HelperContext createDefaultHelpers()
-  {
-    //FB HelperContext hc = SDOUtil.createHelperContext();
-    //FB The defulat HelperContext must use EMF's ClassLoader-delegating EPackage.Registry.INSTANCE, until we provide
-    //FB another way to get (ClassLoader scope) support for HelperContext.
-      HelperContext hc = new DefaultHelperContextImpl(false);
-    typeHelper = hc.getTypeHelper();
-    dataFactory = hc.getDataFactory();
-    xmlHelper = hc.getXMLHelper();
-    xsdHelper = hc.getXSDHelper();
-    copyHelper = new CopyHelperImpl();
-    equalityHelper = new EqualityHelperImpl();
-    dataHelper = new DataHelperImpl();
-    sdoHelper = new SDOHelperImpl();
-    xmlStreamHelper = ((HelperContextImpl)hc).getXMLStreamHelper();
-    
-    return hc;
-  }  
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOAnnotations.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOAnnotations.java
deleted file mode 100644
index 816fb3bf9f..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOAnnotations.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.helper;
-
-public class SDOAnnotations 
-{
-    public static final String COLON = ":";
-    public static final String COMMONJ_SDO_NS           = "commonj.sdo";
-    public static final String COMMONJ_SDO_NS_PREFIX    = "sdo";
-    public static final String SDO_JAVA_NS              = "commonj.sdo/java";
-    public static final String SDO_JAVA_NS_PREFIX       = "sdoJava";
-    
-    public static final String JAVA_PACKAGE = SDO_JAVA_NS_PREFIX + COLON + "package";
-    public static final String ALIAS_NAMES = COMMONJ_SDO_NS_PREFIX + COLON + "aliasName";
-    public static final String READ_ONLY = COMMONJ_SDO_NS_PREFIX + COLON + "readOnly";
-    public static final String INSTANCE_CLASS = SDO_JAVA_NS_PREFIX + COLON + "instanceClass";
-    public static final String ABSTRACT_TYPE = "abstract";
-    public static final String PROPERTY_TYPE = COMMONJ_SDO_NS_PREFIX + COLON + "propertyType";
-    public static final String OPPOSITE_PROPERTY = COMMONJ_SDO_NS_PREFIX + COLON + "oppositeProperty";
-    
-    
-    //used by the annotations map to uniquely identify schema elements that need to be annotated
-    //and to store the corresponding annotations in a map
-    public static final String SCHEMA = "schema";
-    public static final String ELEMENT = "element";
-    public static final String COMPLEX_TYPE = "complexType";
-    public static final String SIMPLE_TYPE = "simpleType";
-    public static final String ATTRIBUTE = "attribute";
-    
-    public static String makeAnnotationMapKey(String namespace, String schemaElementType, String nameAttrValue)
-    {
-        return namespace + schemaElementType + nameAttrValue;
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java
deleted file mode 100644
index ba632a0523..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOExtendedMetaDataImpl.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.helper;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.apache.tuscany.sdo.SDOExtendedMetaData;
-import org.apache.tuscany.sdo.impl.SDOFactoryImpl.SDOEcoreFactory;
-import org.apache.tuscany.sdo.model.ModelFactory;
-import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EPackage.Registry;
-
-/**
- * TODO make demand() methods synchronous?
- */
-public class SDOExtendedMetaDataImpl 
-  extends BaseSDOExtendedMetaDataImpl 
-  implements SDOExtendedMetaData
-{
- 
-  public SDOExtendedMetaDataImpl() {
-      this(HelperContextImpl.getBuiltInModelRegistry());
-  }
-
-  public SDOExtendedMetaDataImpl(Registry registry) {
-    super(registry);
-    ecoreFactory = new SDOEcoreFactory();
-    demandMetaData = new SDODemandMetaData();
-  }
-
-  public static class SDODemandMetaData extends DemandMetaData {
-    EClassifier getEObject() { return (EClassifier)((ModelFactoryImpl)ModelFactory.INSTANCE).getDataObject(); }
-    EClassifier getAnySimpleType() { return (EClassifier)((ModelFactoryImpl)ModelFactory.INSTANCE).getObject(); }
-  }
-
-  public EPackage getPackage(String namespace)
-  {
-    if ("".equals(namespace)) namespace = null; //FB
-    EPackage result = registry.getEPackage(namespace);
-    return result == null ? super.getPackage(namespace) : result;
-  }
-
-  /**
-   * Returns the listing of alias names as specified by the sdo:aliasNames
-   * property.
-   */
-  public List getAliasNames(EModelElement modelElement) {
-    EAnnotation eAnnotation = getAnnotation(modelElement, false);
-    List list = null;
-    if (eAnnotation != null) {
-      String aliasNames = (String)eAnnotation.getDetails().get("aliasNames");
-      if (aliasNames != null) {
-        list = new ArrayList();
-        StringTokenizer st = new StringTokenizer(aliasNames, " ");
-        while (st.hasMoreTokens()) {
-          String t = st.nextToken();
-          list.add(t);
-        }
-      }
-    }
-    return list;
-  }
-
-  
-  public void setAliasNames(EModelElement modelElement, List aliasNames) {
-    if (aliasNames == null || aliasNames.isEmpty()) {
-      setAliasNames(modelElement, (String)null);
-    } else {
-      StringBuffer buf = new StringBuffer();
-      for (int n = 0; n < aliasNames.size(); n++) {
-        String name = (String) aliasNames.get(n);
-        buf.append(name);
-        buf.append(" ");
-      }
-      setAliasNames(modelElement, buf.toString());
-    }
-  }
-  
-  /**
-   * Adds an alias name per sdo:aliasName
-   */
-  public void setAliasNames(EModelElement modelElement, String aliasNames) {
-    EAnnotation eAnnotation = getAnnotation(modelElement, true);
-    eAnnotation.getDetails().put("aliasNames", aliasNames);
-  }
-  
-  public EPackage.Registry getRegistry()
-  {
-    return registry;
-  }
-
-  boolean featureNamespaceMatchingLax = true;
-
-  public void setFeatureNamespaceMatchingLax(boolean b) {
-    featureNamespaceMatchingLax = b;
-  }
-
-  protected boolean isFeatureNamespaceMatchingLax() {
-    return featureNamespaceMatchingLax;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * Eagerly pre-cache the "holder"s for static packages.
-   * 
-   * @see org.eclipse.emf.ecore.util.BasicExtendedMetaData#putPackage(java.lang.String,
-   *      org.eclipse.emf.ecore.EPackage)
-   */
-  public void putPackage(String namespace, EPackage ePackage) {
-    for (Iterator iterator = ePackage.eAllContents(); iterator.hasNext();) {
-      Object object = iterator.next();
-      if (object instanceof EClassifier) {
-        this.getName((EClassifier) object);
-      } else if (object instanceof EStructuralFeature) {
-        this.getName((EStructuralFeature) object);
-      }
-    }
-    super.putPackage(namespace, ePackage);
-  }
-  
-	/****************************************************************************************************** 
-   * Following methods, getLocalAttribute & getLocalElement, ARE TEMPORARY COPIES FROM THE BASE CLASS. 
-   * One line (the last line)in each method is changed to support lax namespace matching. 
-   * DO NOT EDIT THESE METHODS. THEY WILL BE REMOVED WHEN WE MOVE TO EMF 2.3, WHICH FIXES THE PROBLEM.
-   ******************************************************************************************************/
- 
-  public EStructuralFeature getLocalAttribute(EClass eClass, String namespace, String name)
-  {
-    EStructuralFeature result = null;
-    if (isFeatureKindSpecific())
-    {
-      List allAttributes = getAllAttributes(eClass);
-      for (int i = 0, size = allAttributes.size(); i < size; ++i)
-      {
-        EStructuralFeature eStructuralFeature = (EStructuralFeature) allAttributes.get(i);
-        if (name.equals(getName(eStructuralFeature)))
-        {
-          String featureNamespace = getNamespace(eStructuralFeature);
-          if (namespace == null) 
-          {
-            if (featureNamespace == null)
-            {
-              return eStructuralFeature;
-            }
-            else if (result == null)
-            {
-              result = eStructuralFeature;
-            }
-          }
-          else if (namespace.equals(featureNamespace))
-          {
-            return eStructuralFeature;
-          }
-          else if (featureNamespace == null && result == null)
-          {
-            result = eStructuralFeature;
-          }
-        }
-      }
-    }
-    else
-    {
-      for (int i = 0, size = eClass.getFeatureCount(); i < size; ++i)
-      {
-        EStructuralFeature eStructuralFeature = eClass.getEStructuralFeature(i);
-        switch (getFeatureKind(eStructuralFeature))
-        {
-          case UNSPECIFIED_FEATURE:
-          case ATTRIBUTE_FEATURE:
-          {
-            if (name.equals(getName(eStructuralFeature)))
-            {
-              String featureNamespace = getNamespace(eStructuralFeature);
-              if (namespace == null) 
-              {
-                if (featureNamespace == null)
-                {
-                  return eStructuralFeature;
-                }
-                else if (result == null)
-                {
-                  result = eStructuralFeature;
-                }
-              }
-              else if (namespace.equals(featureNamespace))
-              {
-                return eStructuralFeature;
-              }
-              else if (featureNamespace == null && result == null)
-              {
-                result = eStructuralFeature;
-              }
-            }
-            break;
-          }
-        }
-      }
-    }
-
-    return isFeatureNamespaceMatchingLax() ? result : null;
-  }
-
-  protected EStructuralFeature getLocalElement(EClass eClass, String namespace, String name)
-  {
-    EStructuralFeature result = null;
-    if (isFeatureKindSpecific())
-    {
-      List allElements = getAllElements(eClass);
-      for (int i = 0, size = allElements.size(); i < size; ++i)
-      {
-        EStructuralFeature eStructuralFeature = (EStructuralFeature) allElements.get(i);
-        if (name.equals(getName(eStructuralFeature)))
-        {
-          String featureNamespace = getNamespace(eStructuralFeature);
-          if (namespace == null) 
-          {
-            if (featureNamespace == null)
-            {
-              return eStructuralFeature;
-            }
-            else if (result == null)
-            {
-              result = eStructuralFeature;
-            }
-          }
-          else if (namespace.equals(featureNamespace))
-          {
-            return eStructuralFeature;
-          }
-          else if (featureNamespace == null && result == null)
-          {
-            result = eStructuralFeature;
-          }
-        }
-      }
-    }
-    else
-    {
-      for (int i = 0, size = eClass.getFeatureCount(); i < size; ++i)
-      {
-        EStructuralFeature eStructuralFeature = eClass.getEStructuralFeature(i);
-        switch (getFeatureKind(eStructuralFeature))
-        {
-          case UNSPECIFIED_FEATURE:
-          case ELEMENT_FEATURE:
-          {
-            if (name.equals(getName(eStructuralFeature)))
-            {
-              String featureNamespace = getNamespace(eStructuralFeature);
-              if (namespace == null) 
-              {
-                if (featureNamespace == null)
-                {
-                  return eStructuralFeature;
-                }
-                else if (result == null)
-                {
-                  result = eStructuralFeature;
-                }
-              }
-              else if (namespace.equals(featureNamespace))
-              {
-                return eStructuralFeature;
-              }
-              else if (featureNamespace == null && result == null)
-              {
-                result = eStructuralFeature;
-              }
-            }
-            break;
-          }
-        }
-      }
-    }
-
-    return isFeatureNamespaceMatchingLax() ? result : null;
-  }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java
deleted file mode 100644
index 922f092845..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOHelperImpl.java
+++ /dev/null
@@ -1,530 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.helper;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.tuscany.sdo.SDOExtendedMetaData;
-import org.apache.tuscany.sdo.SDOFactory;
-import org.apache.tuscany.sdo.SimpleAnyTypeDataObject;
-import org.apache.tuscany.sdo.api.SDOHelper;
-import org.apache.tuscany.sdo.api.XMLStreamHelper;
-import org.apache.tuscany.sdo.api.EventListener;
-import org.apache.tuscany.sdo.impl.ClassImpl;
-import org.apache.tuscany.sdo.impl.DataGraphImpl;
-import org.apache.tuscany.sdo.impl.DynamicDataObjectImpl;
-import org.apache.tuscany.sdo.model.ModelFactory;
-import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
-import org.apache.tuscany.sdo.spi.SDOHelperBase;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.UniqueEList;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-import commonj.sdo.DataGraph;
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-import commonj.sdo.helper.CopyHelper;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.impl.HelperProvider;
-
-public class SDOHelperImpl extends SDOHelperBase implements SDOHelper, SDOHelper.MetaDataBuilder {
-  
-  public DataObject createDataTypeWrapper(Type dataType, Object value) {
-        SimpleAnyTypeDataObject simpleAnyType = SDOFactory.eINSTANCE.createSimpleAnyTypeDataObject();
-        simpleAnyType.setInstanceType((EDataType)dataType);
-        simpleAnyType.setValue(value);
-        return simpleAnyType;
-    }
-
-    public Object createFromString(Type dataType, String literal) {
-        return EcoreUtil.createFromString((EDataType)dataType, literal);
-    }
-
-    public String convertToString(Type dataType, Object value) {
-        return EcoreUtil.convertToString((EDataType)dataType, value);
-    }
-
-    public Type getXSDSDOType(String xsdType) {
-        Type type = null;
-        String name = (String)xsdToSdoMappings.get(xsdType);
-        if (name != null)
-            type = (Type)((ModelFactoryImpl)ModelFactory.INSTANCE).getEClassifier(name);
-        return type;
-    }
-
-    public Sequence getSubstitutionValues(DataObject dataObject, Property head) {
-        final EStructuralFeature group = ExtendedMetaData.INSTANCE.getGroup((EStructuralFeature)head);
-        return null == group ? null : (Sequence)((FeatureMap.Internal)((EObject)dataObject).eGet(group)).getWrapper();
-    }
-
-    public Type getJavaSDOType(Class javaClass) {
-        String name = (String)javaToSdoMappings.get(javaClass);
-        if (name != null) {
-            return (Type)((ModelFactoryImpl)ModelFactory.INSTANCE).getEClassifier(name);
-        }
-        return null;
-    }
-
-    public boolean isRequired(Property property) {
-        return ((EStructuralFeature)property).isRequired();
-    }
-
-    public int getUpperBound(Property property) {
-        return ((EStructuralFeature)property).getUpperBound();
-    }
-
-    public int getLowerBound(Property property) {
-        return ((EStructuralFeature)property).getLowerBound();
-    }
-    
-    public List getEnumerationFacet(Type type) {
-    	List instProps = type.getInstanceProperties();
-    	String propertyName = "enumeration";
-    	Property enumProperty = null;
-    	
-		for (int i = 0; i < instProps.size(); i++)
-		{
-		  Property prop = (Property)instProps.get(i);
-		  if (propertyName.equals(prop.getName()))
-			  enumProperty = prop;
-		}
-
-		return (List)DataObjectUtil.getMetaObjectInstanceProperty((EModelElement)type, enumProperty);
-    }
-    
-    public List getPatternFacet(Type type) {
-    	List instProps = type.getInstanceProperties();
-    	String propertyName = "pattern";
-    	Property patternProperty = null;
-    	
-		for (int i = 0; i < instProps.size(); i++)
-		{
-		  Property prop = (Property)instProps.get(i);
-		  if (propertyName.equals(prop.getName()))
-			  patternProperty = prop;
-		}
-
-		return (List)DataObjectUtil.getMetaObjectInstanceProperty((EModelElement)type, patternProperty);
-    }
-
-    public boolean isMany(Property property, DataObject context) {
-        return FeatureMapUtil.isMany((EObject)context, (EStructuralFeature)property);
-    }
-
-    public DataGraph createDataGraph() {
-        return SDOFactory.eINSTANCE.createDataGraph();
-    }
-
-    public void setRootObject(DataGraph dataGraph, DataObject rootObject) {
-        ((DataGraphImpl)dataGraph).setERootObject((EObject)rootObject);
-    }
-
-    public static DataGraph loadDataGraph(InputStream inputStream, Map options) throws IOException {
-        ResourceSet resourceSet = DataObjectUtil.createResourceSet();
-        Resource resource = resourceSet.createResource(URI.createURI("all.datagraph"));
-        resource.load(inputStream, options);
-        return (DataGraph)resource.getContents().get(0);
-    }
-
-    static final Object LOADING_SCOPE = XMLResource.OPTION_EXTENDED_META_DATA;
-
-    protected void registerLoadingScope(Map options, TypeHelper scope) {
-        Object extendedMetaData = ((TypeHelperImpl)scope).getExtendedMetaData();
-        options.put(LOADING_SCOPE, extendedMetaData);
-    }
-
-    public DataGraph loadDataGraph(InputStream inputStream, Map options, HelperContext scope) throws IOException {
-        if (scope == null) {
-            scope = HelperProvider.getDefaultContext();
-        }
-        TypeHelper th = scope.getTypeHelper();
-        DataGraph result = null;
-		if (th == null || th == TypeHelper.INSTANCE) {
-		    result = loadDataGraph(inputStream, options);
-		} else if (options == null) {
-		    options = new HashMap();
-		    registerLoadingScope(options, th);
-		    result = loadDataGraph(inputStream, options);
-		} else if (options.containsKey(LOADING_SCOPE)) {
-		    Object restore = options.get(LOADING_SCOPE);
-		    registerLoadingScope(options, th);
-		    try {
-		        result = loadDataGraph(inputStream, options);
-		    } finally {
-		        options.put(LOADING_SCOPE, restore);
-		    }
-		} else {
-		    registerLoadingScope(options, th);
-		    try {
-		        result = loadDataGraph(inputStream, options);
-		    } finally {
-		        options.remove(LOADING_SCOPE);
-		    }
-		}
-		return result;
-    }
-
-    public void saveDataGraph(DataGraph dataGraph, OutputStream outputStream, Map options) throws IOException {
-        ((DataGraphImpl)dataGraph).getDataGraphResource().save(outputStream, options);
-    }
-
-    public void registerDataGraphTypes(DataGraph dataGraph, List/* Type */types) {
-        // if (types == null)
-        // types = SDOUtil.getDataGraphTypes(dataGraph);
-
-        Set/* EPackage */packages = new HashSet();
-        for (final Iterator iterator = types.iterator(); iterator.hasNext();) {
-            EClassifier type = (EClassifier)iterator.next();
-            packages.add(type.getEPackage());
-        }
-
-        ResourceSet resourceSet = ((DataGraphImpl)dataGraph).getResourceSet();
-
-        for (Iterator iterator = packages.iterator(); iterator.hasNext();) {
-            EPackage typePackage = (EPackage)iterator.next();
-            Resource resource = typePackage.eResource();
-            if (resource == null) {
-                resource = resourceSet.createResource(URI.createURI(".ecore"));
-                resource.setURI(URI.createURI(typePackage.getNsURI()));
-                resource.getContents().add(typePackage);
-            } else if (resource.getResourceSet() != resourceSet)
-                resourceSet.getResources().add(resource);
-        }
-    }
-
-    public HelperContext createHelperContext() {
-        return new HelperContextImpl(false, null);
-    }
-    
-    public HelperContext createHelperContext(boolean extensibleNamespaces) {
-        return new HelperContextImpl(extensibleNamespaces);
-    }
-    
-    public HelperContext createHelperContext(Map options) {
-        return new HelperContextImpl(false, options);
-    }
-
-    public HelperContext createHelperContext(boolean extensibleNamespaces, Map options) {
-        return new HelperContextImpl(extensibleNamespaces, options);
-    }
-
-
-    public CopyHelper createCrossScopeCopyHelper(HelperContext hc) {
-        return new CrossScopeCopyHelperImpl(hc.getTypeHelper());
-    }
-
-    
-    public XMLStreamHelper createXMLStreamHelper(HelperContext hc) {
-        return ((HelperContextImpl)hc).getXMLStreamHelper();
-    }
-
-    
-    public List getTypes(HelperContext hc, String uri) {
-
-        EPackage ePackage = ((HelperContextImpl)hc).getExtendedMetaData().getPackage(uri);
-        if (ePackage != null) {
-            return new ArrayList(ePackage.getEClassifiers());
-        }
-        return null;
-    }
-
-    public List getOpenContentProperties(DataObject dataObject) {
-        List result = new UniqueEList();
-        ((ClassImpl)dataObject.getType()).addOpenProperties((EObject)dataObject, result);
-        return result;
-    }
-
-    public boolean isDocumentRoot(Type type) {
-        return "".equals(SDOExtendedMetaData.INSTANCE.getName((EClassifier)type));
-    }
-
-    
-    public Type createType(HelperContext hc, String uri, String name, boolean isDataType) {
-        ExtendedMetaData extendedMetaData = ((HelperContextImpl)hc).getExtendedMetaData();
-        if ("".equals(uri))
-            uri = null; // FB
-
-        EPackage ePackage = extendedMetaData.getPackage(uri);
-        if (ePackage == null) {
-            ePackage = EcoreFactory.eINSTANCE.createEPackage();
-            ePackage.setEFactoryInstance(new DynamicDataObjectImpl.FactoryImpl());
-            ePackage.setNsURI(uri);
-            String packagePrefix = uri != null ? URI.createURI(uri).trimFileExtension().lastSegment() : ""; // FB
-            ePackage.setName(packagePrefix);
-            ePackage.setNsPrefix(packagePrefix);
-            extendedMetaData.putPackage(uri, ePackage);
-        }
-
-        EClassifier eClassifier = ePackage.getEClassifier(name);
-        if (eClassifier != null) // already defined?
-        {
-            // throw new IllegalArgumentException();
-            return null;
-        }
-
-        if (name != null) {
-            eClassifier =
-                isDataType ? (EClassifier)SDOFactory.eINSTANCE.createDataType() : (EClassifier)SDOFactory.eINSTANCE
-                    .createClass();
-            eClassifier.setName(name);
-        } else {
-            eClassifier = DataObjectUtil.createDocumentRoot();
-        }
-
-        ePackage.getEClassifiers().add(eClassifier);
-
-        return (Type)eClassifier;
-    }
-
-    public void addBaseType(Type type, Type baseType) {
-        ((EClass)type).getESuperTypes().add(baseType);
-    }
-
-    public void addAliasName(Type type, String aliasName) {
-        throw new UnsupportedOperationException(); // TODO: implement this
-                                                    // method properly
-        // type.getAliasNames().add(aliasName);
-    }
-
-    public void setOpen(Type type, boolean isOpen) {
-        if (isOpen == type.isOpen())
-            return;
-
-        if (isOpen) {
-            EAttribute eAttribute = (EAttribute)SDOFactory.eINSTANCE.createAttribute();
-            ((EClass)type).getEStructuralFeatures().add(eAttribute);
-
-            eAttribute.setName("any");
-            eAttribute.setUnique(false);
-            eAttribute.setUpperBound(ETypedElement.UNBOUNDED_MULTIPLICITY);
-            eAttribute.setEType(EcorePackage.eINSTANCE.getEFeatureMapEntry());
-            ExtendedMetaData.INSTANCE.setFeatureKind(eAttribute, ExtendedMetaData.ELEMENT_WILDCARD_FEATURE);
-            ExtendedMetaData.INSTANCE.setProcessingKind(eAttribute, ExtendedMetaData.LAX_PROCESSING);
-            ExtendedMetaData.INSTANCE.setWildcards(eAttribute, Collections.singletonList("##any"));
-
-            // FB TBD Add an "anyAttribute" EAttribute as well.
-
-            if (ExtendedMetaData.INSTANCE.getMixedFeature((EClass)type) != null) {
-                eAttribute.setDerived(true);
-                eAttribute.setTransient(true);
-                eAttribute.setVolatile(true);
-            }
-        } else {
-            EClass eClass = (EClass)type;
-            EAttribute any = (EAttribute)eClass.getEStructuralFeature("any");
-            eClass.getEStructuralFeatures().remove(any);
-        }
-    }
-
-    public void setSequenced(Type type, boolean isSequenced) {
-        // currently, we require setSequenced to be called first, before
-        // anything else is added to the type.
-        if (type.isDataType() || !type.getProperties().isEmpty()) {
-            if (type.getName() != "DocumentRoot") // document root is a
-                                                    // special case
-                throw new IllegalArgumentException();
-        }
-
-        if (isSequenced) {
-            EClass eClass = (EClass)type;
-            ExtendedMetaData.INSTANCE.setContentKind(eClass, ExtendedMetaData.MIXED_CONTENT);
-            EAttribute mixedFeature = (EAttribute)SDOFactory.eINSTANCE.createAttribute();
-            mixedFeature.setName("mixed");
-            mixedFeature.setUnique(false);
-            mixedFeature.setEType(EcorePackage.eINSTANCE.getEFeatureMapEntry());
-            mixedFeature.setLowerBound(0);
-            mixedFeature.setUpperBound(-1);
-            // eClass.getEStructuralFeatures().add(mixedFeature);
-            ((ClassImpl)eClass).setSequenceFeature(mixedFeature);
-            ExtendedMetaData.INSTANCE.setFeatureKind(mixedFeature, ExtendedMetaData.ELEMENT_WILDCARD_FEATURE);
-            ExtendedMetaData.INSTANCE.setName(mixedFeature, ":mixed");
-        } else {
-            // nothing to do, because of current restriction that setSequence
-            // must be called first.
-        }
-    }
-
-    public void setAbstract(Type type, boolean isAbstract) {
-        ((EClass)type).setAbstract(isAbstract);
-    }
-
-    public void setJavaClassName(Type type, String javaClassName) {
-        ((EClassifier)type).setInstanceClassName(javaClassName);
-    }
-
-    public Property createProperty(Type containingType, String name, Type propertyType) {
-      EStructuralFeature eStructuralFeature = 
-            propertyType.isDataType() ? (EStructuralFeature)SDOFactory.eINSTANCE.createAttribute()
-                : (EStructuralFeature)SDOFactory.eINSTANCE.createReference();
-
-      eStructuralFeature.setName(name);
-      eStructuralFeature.setEType((EClassifier)propertyType);
-      ((EClass)containingType).getEStructuralFeatures().add(eStructuralFeature);
-
-        if ("".equals(ExtendedMetaData.INSTANCE.getName((EClass)containingType))) // DocumentRoot
-                                                                                    // containingType?
-      {
-        ExtendedMetaData.INSTANCE.setNamespace(eStructuralFeature, containingType.getURI());
-        //FB???eStructuralFeature.setUnique(false);
-        //FB???eStructuralFeature.setUpperBound(ETypedElement.UNSPECIFIED_MULTIPLICITY);
-      }
-      
-      if (ExtendedMetaData.INSTANCE.getMixedFeature((EClass)containingType) != null) {
-        eStructuralFeature.setDerived(true);
-        eStructuralFeature.setTransient(true);
-        eStructuralFeature.setVolatile(true);
-        ExtendedMetaData.INSTANCE.setFeatureKind(eStructuralFeature, ExtendedMetaData.ELEMENT_FEATURE);
-      } else {
-          // By default, a SDO property is an XSD element
-          ExtendedMetaData.INSTANCE.setFeatureKind(eStructuralFeature, ExtendedMetaData.ELEMENT_FEATURE);
-      }
-      
-      return (Property)eStructuralFeature;
-    }
-
-  public void setPropertyXMLKind(Property property, boolean isXmlElement) {
-      if (isXmlElement) {
-          ExtendedMetaData.INSTANCE.setFeatureKind((EStructuralFeature)property, ExtendedMetaData.ELEMENT_FEATURE);
-      }
-      else {
-          ExtendedMetaData.INSTANCE.setFeatureKind((EStructuralFeature)property, ExtendedMetaData.ATTRIBUTE_FEATURE);
-      }
-  }
-  
-  
-  public Property createOpenContentProperty(HelperContext hc, String uri, String name, Type type)
-  {
-        ExtendedMetaData extendedMetaData = ((HelperContextImpl)hc).getExtendedMetaData();
-
-        // get/create document root
-        EPackage ePackage = extendedMetaData.getPackage(uri);
-        Type documentRoot = ePackage != null ? (Type)extendedMetaData.getType(ePackage, "") : null;
-        if (documentRoot == null) {
-            documentRoot = createType(hc, uri, null, false);
-        }
-
-        // Determine if property already exists
-        Property newProperty = documentRoot.getProperty(name);
-        if (newProperty == null) {
-            // Create the new property 'under' the document root.....
-            newProperty = createProperty(documentRoot, name, type);
-        } else {
-            // if property already exists, validate the expected type
-            if (!newProperty.getType().equals(type))
-                throw new IllegalArgumentException();
-        }
-        return newProperty;
-    }
-
-
-    public void addAliasName(Property property, String aliasName) {
-        throw new UnsupportedOperationException(); // TODO: implement this
-                                                    // method properly
-        // property.getAliasNames().add(aliasName);
-    }
-
-    public void setMany(Property property, boolean isMany) {
-        ((EStructuralFeature)property).setUpperBound(isMany ? EStructuralFeature.UNBOUNDED_MULTIPLICITY : 1);
-    }
-
-    public void setContainment(Property property, boolean isContainment) {
-        ((EReference)property).setContainment(isContainment);
-    }
-
-    public void setDefault(Property property, String defaultValue) {
-        ((EStructuralFeature)property).setDefaultValueLiteral(defaultValue);
-    }
-
-    public void setReadOnly(Property property, boolean isReadOnly) {
-        ((EStructuralFeature)property).setChangeable(!isReadOnly);
-    }
-
-    public void setOpposite(Property property, Property opposite) {
-        ((EReference)property).setEOpposite((EReference)opposite);
-    }
-
-    public void addTypeInstanceProperty(Type definedType, Property instanceProperty, Object value) {
-        addInstanceProperty((EModelElement)definedType, instanceProperty, value);
-    }
-
-    public void addPropertyInstanceProperty(Property definedProperty, Property instanceProperty, Object value) {
-        addInstanceProperty((EModelElement)definedProperty, instanceProperty, value);
-    }
-
-    protected void addInstanceProperty(EModelElement metaObject, Property property, Object value) {
-        String uri = property.getContainingType().getURI();
-        EAnnotation eAnnotation = metaObject.getEAnnotation(uri);
-        if (eAnnotation == null) {
-            eAnnotation = EcoreFactory.eINSTANCE.createEAnnotation();
-            eAnnotation.setSource(uri);
-            metaObject.getEAnnotations().add(eAnnotation);
-        }
-        // TODO if (property.isMany()) ... // convert list of values
-        String stringValue = convertToString(property.getType(), value);
-        eAnnotation.getDetails().put(property.getName(), stringValue);
-    }
-
-    
-    public void addChangeListener(DataObject dob, EventListener listener) {
-      // Adapter l = (Adapter)listener;
-      ((Notifier)dob).eAdapters().add(listener);
-    }
-    
-    public void removeChangeListener(DataObject dob, EventListener listener) {
-      ((Notifier)dob).eAdapters().remove(listener);
-    }
-    
-    
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOSimpleDateFormat.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOSimpleDateFormat.java
deleted file mode 100644
index 9d14a264d8..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOSimpleDateFormat.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/**

- *

- *  Licensed to the Apache Software Foundation (ASF) under one

- *  or more contributor license agreements.  See the NOTICE file

- *  distributed with this work for additional information

- *  regarding copyright ownership.  The ASF licenses this file

- *  to you under the Apache License, Version 2.0 (the

- *  "License"); you may not use this file except in compliance

- *  with the License.  You may obtain a copy of the License at

- *

- *    http://www.apache.org/licenses/LICENSE-2.0

- *

- *  Unless required by applicable law or agreed to in writing,

- *  software distributed under the License is distributed on an

- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- *  KIND, either express or implied.  See the License for the

- *  specific language governing permissions and limitations

- *  under the License.

- */

-

-package org.apache.tuscany.sdo.helper;

-

-import java.text.DateFormatSymbols;

-import java.text.SimpleDateFormat;

-import java.util.Locale;

-import java.util.TimeZone;

-

-/**

- * Fixes the bug reported at JIRA TUSCANY-1659

- * This class ensures the time zone will be formatted as the abbreviation format.

- */

-public class SDOSimpleDateFormat extends SimpleDateFormat {

-	

-	private static final long serialVersionUID = 2519728288048681529L;

-	

-	public SDOSimpleDateFormat() {

-		super();

-		setTimeZone(getTimeZone());

-		

-	}

-	

-	public SDOSimpleDateFormat(String pattern) {

-		super(pattern);

-		setTimeZone(getTimeZone());

-		

-	}

-	

-	public SDOSimpleDateFormat(String pattern, Locale locale) {

-		super(pattern, locale);

-		setTimeZone(getTimeZone());

-		

-	}

-	

-	public SDOSimpleDateFormat(String pattern, DateFormatSymbols formatSymbols) {

-		super(pattern, formatSymbols);

-		setTimeZone(getTimeZone());

-		

-	}

-

-	/**

-	 * Overrides the SimpleDateFormat.setTimeZone(TimeZone) method. 

-	 * It checks if the TimeZone to be set is in the abbreviation format. 

-	 * If not, it looks for its abbreviation format and set it.  

-	 * 

-	 * @param timeZone the time zone to be set

-	 * 

-	 */

-	public void setTimeZone(TimeZone timeZone) {

-		

-		if (timeZone.getID().length() != 3) {

-			String[] timeZoneNames = TimeZone.getAvailableIDs(timeZone.getRawOffset());

-			

-			for (int i = 0 ; i < timeZoneNames.length ; i++ ) {

-				String actualTimeZoneName = timeZoneNames[i].trim();

-				

-				// if the time zone name has 3 letters and ends with a T character, 

-				// it's considered to be the abbreviation format

-				if (actualTimeZoneName.length() == 3 && actualTimeZoneName.charAt(actualTimeZoneName.length() - 1) == 'T') {

-					timeZone = TimeZone.getTimeZone(timeZoneNames[i]);

-					break;

-					

-				}

-				

-			}

-			

-		}

-		

-		super.setTimeZone(timeZone);

-		

-	}

-

-}

diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
deleted file mode 100644
index 7a3a409479..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SDOXSDEcoreBuilder.java
+++ /dev/null
@@ -1,789 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.helper;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.xml.XMLConstants;
-
-import org.apache.tuscany.sdo.SDOExtendedMetaData;
-import org.apache.tuscany.sdo.api.SDOUtil;
-import org.apache.tuscany.sdo.impl.AttributeImpl;
-import org.apache.tuscany.sdo.impl.SDOFactoryImpl.SDOEcoreFactory;
-import org.apache.tuscany.sdo.model.ModelFactory;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.util.EcoreUtil.UsageCrossReferencer;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDFeature;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTerm;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.ecore.EcoreSchemaBuilder;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-import org.eclipse.xsd.util.XSDResourceImpl;
-import org.eclipse.xsd.util.XSDSchemaLocator;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-public class SDOXSDEcoreBuilder extends BaseSDOXSDEcoreBuilder
-{
-  protected boolean replaceConflictingTypes = false;
-
-  public SDOXSDEcoreBuilder(ExtendedMetaData extendedMetaData, boolean replaceConflictingTypes)
-  {
-    super(extendedMetaData);
-    ecoreFactory = new SDOEcoreFactory();
-    this.replaceConflictingTypes = replaceConflictingTypes;
-    populateTypeToTypeObjectMap((EPackage)ModelFactory.INSTANCE);
-  }
-  
-  /**
-   * Overrides method in EMF. This will cause the SDO Properties to be in the
-   * order in which the Attributes appeared in the XSD.
-   */
-  protected boolean useSortedAttributes()
-  {
-    return false;
-  }
-
-  /*
-   * Required for Java 1.4.2 support
-   * Node#lookupPrefix is only available since DOM Level 3 (Java 5)
-   * and it doesn't return rebound prefix.
-   * XSDConstants.lookupQualifier isn't supposed to return rebound prefix either.
-   * This lookupPrefix returns any bound prefix no matter rebound to other NameSpace or not, for {@link #getEPackage}.
-   */
-  static protected String lookupPrefix(Node element, String namespaceURI) {
-    String prefix = element.getPrefix();
-    if (prefix != null && namespaceURI != null && namespaceURI.equals(element.getNamespaceURI()))
-      return prefix;
-    NamedNodeMap attributes = element.getAttributes();
-    if (attributes != null)
-      for (int index = attributes.getLength(); index != 0;) {
-        Node attribute = attributes.item(--index);
-        if (XMLConstants.XMLNS_ATTRIBUTE_NS_URI.equals(attribute.getNamespaceURI()) && attribute.getNodeValue().equals(namespaceURI)
-              && XMLConstants.XMLNS_ATTRIBUTE.equals(attribute.getPrefix()))
-          return attribute.getLocalName();
-      }
-    for (Node parent; (parent = element.getParentNode()) != null; element = parent)
-      if (parent.getNodeType() == Node.ELEMENT_NODE)
-        return lookupPrefix(parent, namespaceURI);
-    return null;
-  }
-
-  public EPackage getEPackage(XSDNamedComponent xsdNamedComponent) {
-    XSDSchema containingXSDSchema = xsdNamedComponent.getSchema();
-    String targetNamespace = containingXSDSchema == null ?
-        xsdNamedComponent.getTargetNamespace() : containingXSDSchema.getTargetNamespace();
-    EPackage ePackage = (EPackage) targetNamespaceToEPackageMap.get(targetNamespace);
-    if (ePackage != null)
-      return ePackage;
-    ePackage = super.getEPackage(xsdNamedComponent);
-    String nsPrefix = lookupPrefix(xsdNamedComponent.getElement(), targetNamespace);
-    if (nsPrefix != null)
-      ePackage.setNsPrefix(nsPrefix);
-    return ePackage;
-  }
-
-  public EClassifier getEClassifier(XSDTypeDefinition xsdTypeDefinition) {
-    EClassifier eClassifier = null;
-    if (xsdTypeDefinition != null)
-    {
-      if (rootSchema.getSchemaForSchemaNamespace().equals(xsdTypeDefinition.getTargetNamespace())) {
-        eClassifier = 
-          getBuiltInEClassifier(xsdTypeDefinition.getURI(), xsdTypeDefinition.getName());
-      } 
-      else if (xsdTypeDefinition.getContainer() == null) {
-        EPackage pkg = extendedMetaData.getPackage(xsdTypeDefinition.getTargetNamespace());
-        if(pkg != null) {
-          eClassifier = pkg.getEClassifier(xsdTypeDefinition.getName());
-        }
-      }
-    }
-    if (eClassifier == null) {
-      eClassifier = super.getEClassifier(xsdTypeDefinition);
-    }
-    return eClassifier;
-  }
-  
-  public EDataType getEDataType(XSDSimpleTypeDefinition xsdSimpleTypeDefinition) {
-    EDataType eClassifier = null;
-    if (xsdSimpleTypeDefinition != null && rootSchema.getSchemaForSchemaNamespace().equals(xsdSimpleTypeDefinition.getTargetNamespace())) {
-      eClassifier =
-        (EDataType)getBuiltInEClassifier(
-          xsdSimpleTypeDefinition.getURI(),
-          xsdSimpleTypeDefinition.getName());
-    } else {
-      eClassifier = super.getEDataType(xsdSimpleTypeDefinition);
-    }
-    return (EDataType)eClassifier;
-  }
-
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.xsd.ecore.XSDEcoreBuilder#createResourceSet()
-   */
-  protected ResourceSet createResourceSet() {
-    ResourceSet result = super.createResourceSet();
-    result.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*", new XSDResourceFactoryImpl());
-    result.getAdapterFactories().add(new XSDSchemaAdapterFactoryImpl());
-    result.setPackageRegistry(new EPackageRegistryImpl(HelperContextImpl.getBuiltInModelRegistry()));     
-    
-    return result;
-  }
-
-  protected EClassifier getBuiltInEClassifier(String namespace, String name)
-  {
-      EClassifier eClassifier = null;
-      if ("base64Binary".equals(name)) {
-          eClassifier = (EClassifier)AttributeImpl.INTERNAL_BASE64_BYTES;
-      }
-      else if ("QName".equals(name)) {
-          eClassifier = (EClassifier)AttributeImpl.INTERNAL_QNAME;
-      }
-      else {
-          eClassifier = (EClassifier)SDOUtil.getXSDSDOType(name);
-      }
-      
-    if (eClassifier == null)
-      eClassifier = super.getBuiltInEClassifier(namespace, name);
-    return eClassifier;
-  }
-  
-  private void updateReferences(EObject oldEObject, EObject newEObject)
-  {
-    Collection usages = UsageCrossReferencer.find(oldEObject, targetNamespaceToEPackageMap.values());
-    for (Iterator iter = usages.iterator(); iter.hasNext(); )
-    {
-      EStructuralFeature.Setting setting = (EStructuralFeature.Setting)iter.next();
-      EObject referencingEObject = setting.getEObject();
-      EStructuralFeature eStructuralFeature = setting.getEStructuralFeature();
-      if (eStructuralFeature.isChangeable())
-      {
-        if (eStructuralFeature.isMany())
-        {
-          List refList = (List)referencingEObject.eGet(eStructuralFeature);
-          int refIndex = refList.indexOf(oldEObject);
-          if (refIndex != -1) refList.set(refIndex, newEObject);
-        }
-        else
-        {
-          referencingEObject.eSet(eStructuralFeature, newEObject);
-        }
-      }
-    }
-  }
-  
-  private XSDTypeDefinition getXSDTypeDefinition(EClassifier eClassifier)
-  {
-    //TODO Maybe we should create a reverse (eModelElementToXSDComponentMap) for better performance.
-    //     Use a HashMap subclass for xsdComponentToEModelElementMap that overrides put() to also add the 
-    //     reverse mapping in eModelElementToXSDComponentMap
-    XSDTypeDefinition xsdTypeDefinition = null;
-    for (Iterator i = xsdComponentToEModelElementMap.entrySet().iterator(); i.hasNext(); )
-    {
-      Entry e = (Entry) i.next();
-      if (eClassifier == e.getValue()) 
-      {
-        xsdTypeDefinition = (XSDTypeDefinition)e.getKey();
-        break;
-      }
-    }
-    return xsdTypeDefinition;
-  }
-  
-  private boolean sameType(XSDTypeDefinition t1, XSDTypeDefinition t2)
-  {
-    XSDConcreteComponent n1 = t1, n2 = t2;
-    while (n1 != null && n2 != null)
-    {
-      if (n1.eClass() != n2.eClass()) break;
-      if (n1 instanceof XSDNamedComponent /*&& n2 instanceof XSDNamedComponent*/)
-      {
-        String s1 = ((XSDNamedComponent)n1).getName();
-        String s2 = ((XSDNamedComponent)n2).getName();
-        if (s1 == null ? s1 != s2 : !s1.equals(s2)) break;
-      }
-      n1 = n1.getContainer();
-      n2 = n2.getContainer();
-    }
-    return n1 == null && n2 == null;
-  }
-  
-  protected void removeDuplicateEClassifier(EClassifier eClassifier, XSDTypeDefinition xsdTypeDefinition)
-  {
-    EPackage ePackage = eClassifier.getEPackage();
-    List eClassifiers = ePackage.getEClassifiers();
-    String name = eClassifier.getName();
-    int size = eClassifiers.size();
-    for (int index = eClassifiers.indexOf(eClassifier); ++index < size; )
-    {
-      EClassifier nextEClassifier = (EClassifier)eClassifiers.get(index);
-      if (!name.equals(nextEClassifier.getName())) break;
-      if (extendedMetaData.getName(eClassifier).equals(extendedMetaData.getName(nextEClassifier)))
-      {
-        XSDTypeDefinition nextXSDTypeDefinition = getXSDTypeDefinition(nextEClassifier);
-        if (!sameType(nextXSDTypeDefinition, xsdTypeDefinition))
-        {
-          //System.out.println("###EClassifier mismatch: ");
-          //System.out.println("    old: " + extendedMetaData.getName(nextEClassifier));
-          //System.out.println("    new: " + extendedMetaData.getName(eClassifier));
-          continue;
-        }
-        eClassifiers.remove(index); 
-        updateReferences(nextEClassifier, eClassifier);
-        break;
-      }
-    }
-  }
-  
-  protected void removeDuplicateDocumentRootFeature(EClass eClass, EStructuralFeature eStructuralFeature)
-  {
-    List eStructuralFeatures = eClass.getEStructuralFeatures();
-    int last = eStructuralFeatures.size() - 1;
-    String name = extendedMetaData.getName(eStructuralFeature);
-    for (int index = 0; index < last; index++)
-    {
-      EStructuralFeature otherEStructuralFeature = (EStructuralFeature)eStructuralFeatures.get(index);
-      if (name.equals(extendedMetaData.getName(otherEStructuralFeature)))
-      {
-        if (otherEStructuralFeature.eClass() != eStructuralFeature.eClass())
-        {
-          //System.out.println("###EStructuralFeature mismatch: ");
-          //System.out.println("    old: " + extendedMetaData.getName(otherEStructuralFeature));
-          //System.out.println("    new: " + extendedMetaData.getName(eStructuralFeature));
-          continue;
-        }
-        eStructuralFeatures.remove(index);
-        updateReferences(otherEStructuralFeature, eStructuralFeature);
-        break;
-      }
-    }
-  }
-  
-  public EClass computeEClass(XSDComplexTypeDefinition xsdComplexTypeDefinition) {
-    if (xsdComplexTypeDefinition == null) return super.computeEClass(xsdComplexTypeDefinition);
-    EPackage ePackage = (EPackage)targetNamespaceToEPackageMap.get(xsdComplexTypeDefinition.getTargetNamespace());
-    if (ePackage != null && TypeHelperImpl.getBuiltInModels().contains(ePackage)) {
-      EClassifier eclassifier = ePackage.getEClassifier(xsdComplexTypeDefinition.getName());
-      if (eclassifier != null) return (EClass)eclassifier;
-    }
-    EClass eClass = super.computeEClass(xsdComplexTypeDefinition);
-    if (replaceConflictingTypes) removeDuplicateEClassifier(eClass, xsdComplexTypeDefinition);
-    String aliasNames = getEcoreAttribute(xsdComplexTypeDefinition.getElement(), "aliasName");
-    if (aliasNames != null) {
-      SDOExtendedMetaData.INSTANCE.setAliasNames(eClass, aliasNames);
-    }
-    return eClass;
-  }
-
-  protected EClassifier computeEClassifier(XSDTypeDefinition xsdTypeDefinition) {
-    if (xsdTypeDefinition == null) return super.computeEClassifier(xsdTypeDefinition);
-    EPackage ePackage = (EPackage)targetNamespaceToEPackageMap.get(xsdTypeDefinition.getTargetNamespace());
-    if (ePackage != null && TypeHelperImpl.getBuiltInModels().contains(ePackage)) {
-      EClassifier eclassifier = ePackage.getEClassifier(xsdTypeDefinition.getName());
-      if (eclassifier != null) return eclassifier;
-    }
-    EClassifier eclassifier = super.computeEClassifier(xsdTypeDefinition);
-    EClassifier etype = (EClassifier) typeToTypeObjectMap.get(eclassifier);
-    String aliasNames = getEcoreAttribute(xsdTypeDefinition.getElement(), "aliasName");
-    if (aliasNames != null) {
-      SDOExtendedMetaData.INSTANCE.setAliasNames(eclassifier, aliasNames);
-      if (etype != null) {
-        SDOExtendedMetaData.INSTANCE.setAliasNames(etype, aliasNames);
-      }
-    }
-    return eclassifier;
-  }
-
-  protected EDataType computeEDataType(XSDSimpleTypeDefinition xsdSimpleTypeDefinition) {
-    if (xsdSimpleTypeDefinition == null) return super.computeEDataType(xsdSimpleTypeDefinition);
-    EPackage ePackage = (EPackage)targetNamespaceToEPackageMap.get(xsdSimpleTypeDefinition.getTargetNamespace());
-    if (ePackage != null && TypeHelperImpl.getBuiltInModels().contains(ePackage)) {
-      EClassifier eclassifier = ePackage.getEClassifier(xsdSimpleTypeDefinition.getName());
-      if (eclassifier != null) return (EDataType)eclassifier;
-    }
-    EDataType eDataType = super.computeEDataType(xsdSimpleTypeDefinition);
-    if (replaceConflictingTypes) removeDuplicateEClassifier(eDataType, xsdSimpleTypeDefinition);
-    String aliasNames = getEcoreAttribute(xsdSimpleTypeDefinition.getElement(), "aliasName");
-    if (aliasNames != null) {
-      SDOExtendedMetaData.INSTANCE.setAliasNames(eDataType, aliasNames);
-    }
-    return eDataType;
-  }
-
-  protected EEnum computeEEnum(XSDSimpleTypeDefinition xsdSimpleTypeDefinition) {
-    return null;
-  }
-    
-  protected EStructuralFeature createFeature(EClass eClass, String name, EClassifier type, XSDComponent xsdComponent, int minOccurs, int maxOccurs) {
-    EStructuralFeature feature = super.createFeature(eClass, name, type, xsdComponent, minOccurs, maxOccurs);
-
-    if (xsdComponent instanceof XSDParticle) {
-      XSDTerm xsdTerm = ((XSDParticle)xsdComponent).getTerm();
-      if (xsdTerm instanceof XSDElementDeclaration && ((XSDElementDeclaration)xsdTerm).isNillable())
-        EcoreUtil.setAnnotation(feature, ExtendedMetaData.ANNOTATION_URI, "nillable", "true");
-    }
-
-    //FB What is the following for?
-    if (feature instanceof EReference)
-    {
-      EReference eReference = (EReference)feature;
-      if (xsdComponent != null && xsdComponent instanceof XSDParticle)
-      {
-        XSDTerm xsdTerm = ((XSDParticle)xsdComponent).getTerm();
-        if (xsdTerm instanceof XSDElementDeclaration)
-        {
-          XSDTypeDefinition elementTypeDefinition = getEffectiveTypeDefinition(xsdComponent, (XSDElementDeclaration)xsdTerm);
-          EClassifier eClassifier = getEClassifier(elementTypeDefinition);
-          if (elementTypeDefinition instanceof XSDSimpleTypeDefinition && eClassifier instanceof EClass)
-          {
-            eReference.setContainment(true);
-          }
-        }
-      }
-    }
-    
-    feature.setName(name); // this is needed because super.createFeature() does EMF name mangling (toLower)
-    
-    if (replaceConflictingTypes && "".equals(extendedMetaData.getName(eClass)))
-      removeDuplicateDocumentRootFeature(eClass, feature);
-    
-    if (xsdComponent != null)
-    {
-      String aliasNames = getEcoreAttribute(xsdComponent.getElement(), "aliasName");
-      if (aliasNames != null)
-      {
-        SDOExtendedMetaData.INSTANCE.setAliasNames(feature, aliasNames);
-      }
-    }
-    return feature;
-  }
-
-  protected String getInstanceClassName(XSDTypeDefinition typeDefinition, EDataType baseEDataType) {
-    String name = getEcoreAttribute(typeDefinition, "extendedInstanceClass");
-    return (name != null) ? name : super.getInstanceClassName(typeDefinition, baseEDataType);
-  }
-  
-  protected String getEcoreAttribute(Element element, String attribute)
-  {
-    String sdoAttribute = null;
-
-    if ("name".equals(attribute))
-      sdoAttribute = "name";
-    else if ("opposite".equals(attribute))
-      sdoAttribute = "oppositeProperty";
-    else if ("mixed".equals(attribute))
-      sdoAttribute = "sequence";
-    else if ("string".equals(attribute))
-      sdoAttribute = "string";
-    else if ("changeable".equals(attribute))
-      sdoAttribute = "readOnly";
-    else if ("aliasName".equals(attribute))
-      sdoAttribute = "aliasName";
-    
-    if (sdoAttribute != null)
-    {
-      String value = 
-        element != null && element.hasAttributeNS("commonj.sdo/xml", sdoAttribute) ? 
-          element.getAttributeNS("commonj.sdo/xml", sdoAttribute) : 
-          null;
-      if ("changeable".equals(attribute)) {
-        if ("true".equals(value)) value = "false";
-        else if ("false".equals(value)) value = "true";
-      }
-      return value;
-    }
-    
-    if ("package".equals(attribute))
-      sdoAttribute = "package";
-    else if ("instanceClass".equals(attribute))
-      sdoAttribute = "instanceClass";
-    else if ("extendedInstanceClass".equals(attribute))
-      sdoAttribute = "extendedInstanceClass";
-    else if ("nestedInterfaces".equals(attribute))
-      sdoAttribute = "nestedInterfaces";
-    
-    if (sdoAttribute != null)
-    {
-      return 
-        element != null && element.hasAttributeNS("commonj.sdo/java", sdoAttribute) ? 
-          element.getAttributeNS("commonj.sdo/java", sdoAttribute) : 
-          null;
-    }
-
-    return super.getEcoreAttribute(element, attribute);
-  }
-
-  /*
-  protected String getEcoreAttribute(XSDConcreteComponent xsdConcreteComponent, String attribute)
-  {
-    String value = super.getEcoreAttribute(xsdConcreteComponent, attribute);
-    if ("package".equals(attribute) && value == null)
-    {
-      XSDSchema xsdSchema = (XSDSchema)xsdConcreteComponent;
-      value = getDefaultPackageName(xsdSchema.getTargetNamespace());
-    }
-    return value;
-  }
-  */
-  
-  protected XSDTypeDefinition getEcoreTypeQNameAttribute(XSDConcreteComponent xsdConcreteComponent, String attribute)
-  {    
-    if (xsdConcreteComponent == null) return null;
-    String sdoAttribute = null;
-
-    if ("reference".equals(attribute)) sdoAttribute = "propertyType";
-    if ("dataType".equals(attribute)) sdoAttribute = "dataType";
-    
-    if (sdoAttribute != null)
-    {
-      Element element = xsdConcreteComponent.getElement();
-      return  element == null ? null : getEcoreTypeQNameAttribute(xsdConcreteComponent, element, "commonj.sdo/xml", sdoAttribute);
-    }
-
-    return super.getEcoreTypeQNameAttribute(xsdConcreteComponent, attribute);
-  }
-   
-  /**
-   * Override default EMF behavior so that the name is not mangled.
-   */
-  protected String validName(String name, int casing, String prefix) {
-    return name; 
-  }
-
-  /**
-  * Override default EMF name mangling for anonymous types (simple and complex)
-  */
-  protected String validAliasName(XSDTypeDefinition xsdTypeDefinition, boolean isUpperCase) {
-    return getAliasName(xsdTypeDefinition);
-  }
-
-  protected String getAliasName(XSDNamedComponent xsdNamedComponent) {
-    String result = xsdNamedComponent.getName();
-    if (result == null)
-    {
-      XSDConcreteComponent container = xsdNamedComponent.getContainer();
-      if (container instanceof XSDNamedComponent)
-      {
-        result = getAliasName((XSDNamedComponent)container);
-        if (container instanceof XSDTypeDefinition)
-        {
-          result = "_" + result;
-        }
-      }
-
-    }
-    return result; 
-  }
-  
-  protected XSDTypeDefinition getEffectiveTypeDefinition(XSDComponent xsdComponent, XSDFeature xsdFeature) 
-  {
-    if (xsdFeature == null)
-    {
-      return super.getEffectiveTypeDefinition(xsdComponent, xsdFeature);
-    }
-    XSDTypeDefinition typeDef = getEcoreTypeQNameAttribute(xsdComponent, "dataType");
-
-    String isString = getEcoreAttribute(xsdComponent, xsdFeature, "string");
-    if ("true".equalsIgnoreCase(isString)) {
-      typeDef = 
-        xsdFeature.resolveSimpleTypeDefinition(rootSchema.getSchemaForSchemaNamespace(), "string");
-    }
-    if (typeDef == null)
-      typeDef = xsdFeature.getType();
-    return typeDef;
-  }
-
-  /**
-   * Override EMF algorithm.
-   */
-  public String qualifiedPackageName(String namespace)
-  {
-    return getDefaultPackageName(namespace);
-  }
-
-  //Code below here to provide common URI to java packagname
-  
-  public static String uncapNameStatic(String name)
-  {
-    if (name.length() == 0)
-    {
-      return name;
-    }
-    else
-    {
-      String lowerName = name.toLowerCase();
-      int i;
-      for (i = 0; i < name.length(); i++)
-      {
-        if (name.charAt(i) == lowerName.charAt(i))
-        {
-          break;
-        }
-      }
-      if (i > 1 && i < name.length() && !Character.isDigit(name.charAt(i)))
-      {
-        --i;
-      }
-      return name.substring(0, i).toLowerCase() + name.substring(i);
-    }
-  }
-
-  protected static String validNameStatic(String name, int casing, String prefix)
-  {
-    List parsedName = parseNameStatic(name, '_');
-    StringBuffer result = new StringBuffer();
-    for (Iterator i = parsedName.iterator(); i.hasNext(); )
-    {
-      String nameComponent = (String)i.next();
-      if (nameComponent.length() > 0)
-      {
-        if (result.length() > 0 || casing == UPPER_CASE)
-        {
-          result.append(Character.toUpperCase(nameComponent.charAt(0)));
-          result.append(nameComponent.substring(1));
-        }
-        else
-        {
-          result.append(nameComponent);
-        }
-      }
-    }
-
-    return
-      result.length() == 0 ?
-        prefix :
-        Character.isJavaIdentifierStart(result.charAt(0)) ?
-          casing == LOWER_CASE ?
-            uncapNameStatic(result.toString()) :
-            result.toString() :
-          prefix + result;
-  }
-
-  protected static List parseNameStatic(String sourceName, char separator)
-  {
-    List result = new ArrayList();
-    if (sourceName != null)
-    {
-      StringBuffer currentWord = new StringBuffer();
-      boolean lastIsLower = false;
-      for (int index = 0, length = sourceName.length(); index < length; ++index)
-      {
-        char curChar = sourceName.charAt(index);
-        if (!Character.isJavaIdentifierPart(curChar))
-        {
-          curChar = separator;
-        }
-        if (Character.isUpperCase(curChar) || (!lastIsLower && Character.isDigit(curChar)) || curChar == separator)
-        {
-          if (lastIsLower && currentWord.length() > 1 || curChar == separator && currentWord.length() > 0)
-          {
-            result.add(currentWord.toString());
-            currentWord = new StringBuffer();
-          }
-          lastIsLower = false;
-        }
-        else
-        {
-          if (!lastIsLower)
-          {
-            int currentWordLength = currentWord.length();
-            if (currentWordLength > 1)
-            {
-              char lastChar = currentWord.charAt(--currentWordLength);
-              currentWord.setLength(currentWordLength);
-              result.add(currentWord.toString());
-              currentWord = new StringBuffer();
-              currentWord.append(lastChar);
-            }
-          }
-          lastIsLower = true;
-        }
-
-        if (curChar != separator)
-        {
-          currentWord.append(curChar);
-        }
-      }
-
-      result.add(currentWord.toString());
-    }
-    return result;
-  }
-  
-  public static String getDefaultPackageName(String targetNamespace)
-  {
-      if (targetNamespace == null)
-          return null;
-     
-      URI uri = URI.createURI(targetNamespace);
-      List parsedName;
-      if (uri.isHierarchical())
-      {
-        String host = uri.host();
-        if (host != null && host.startsWith("www."))
-        {
-          host = host.substring(4);
-        }
-        parsedName = parseNameStatic(host, '.');
-        Collections.reverse(parsedName);
-        if (!parsedName.isEmpty())
-        {
-          parsedName.set(0, ((String)parsedName.get(0)).toLowerCase());
-        }
-  
-        parsedName.addAll(parseNameStatic(uri.trimFileExtension().path(), '/'));
-      }
-      else
-      {
-        String opaquePart = uri.opaquePart();
-        int index = opaquePart.indexOf(":");
-        if (index != -1 && "urn".equalsIgnoreCase(uri.scheme()))
-        {
-          parsedName = parseNameStatic(opaquePart.substring(0, index), '-');
-          if (parsedName.size() > 0 && DOMAINS.contains(parsedName.get(parsedName.size() - 1))) 
-          {
-            Collections.reverse(parsedName);
-            parsedName.set(0, ((String)parsedName.get(0)).toLowerCase());
-          }
-          parsedName.addAll(parseNameStatic(opaquePart.substring(index + 1), '/'));
-        }
-        else
-        {
-          parsedName = parseNameStatic(opaquePart, '/');
-        }
-      }
-
-      StringBuffer qualifiedPackageName = new StringBuffer();
-      for (Iterator i = parsedName.iterator(); i.hasNext(); )
-      {
-        String packageName = (String)i.next();
-        if (packageName.length() > 0)
-        {
-          if (qualifiedPackageName.length() > 0)
-          {
-            qualifiedPackageName.append('.');
-          }
-          qualifiedPackageName.append(validNameStatic(packageName, LOWER_CASE,"_"));
-        }
-      }
-    
-    return qualifiedPackageName.toString().toLowerCase(); //make sure it's lower case .. we can't work with Axis if not.
-  }
-  
-  private XSDSchema loadEPackage(EPackage ePackage)
-  {
-    XSDSchema ePackageXSDSchema = null;
-    XSDEcoreSchemaBuilder schemaBuilder = new XSDEcoreSchemaBuilder(extendedMetaData);
-    ePackageXSDSchema = schemaBuilder.getSchema(ePackage);
-    xsdComponentToEModelElementMap.putAll(schemaBuilder.getXSDComponentToEModelElementMap());
-    targetNamespaceToEPackageMap.put(ePackage.getNsURI(), ePackage);
-    populateTypeToTypeObjectMap(ePackage);
-    xsdSchemas.add(ePackageXSDSchema);
-    return ePackageXSDSchema;
-  }
-  
-  private static class XSDEcoreSchemaBuilder extends EcoreSchemaBuilder
-  {
-    public XSDEcoreSchemaBuilder(ExtendedMetaData extendedMetaData) 
-    {
-      super(extendedMetaData);
-    }
-    
-    public Map getXSDComponentToEModelElementMap()
-    {
-      return xsdComponentToEModelElementMap;
-    }
-  }
-  
-  class XSDSchemaAdapterFactoryImpl extends AdapterFactoryImpl
-  {
-    protected SchemaLocator schemaLocator = new SchemaLocator();
-    
-    public boolean isFactoryForType(Object type)
-    {
-      return type == XSDSchemaLocator.class;
-    }
-    
-    public Adapter adaptNew(Notifier target, Object type)
-    {
-      return schemaLocator;
-    }
-    
-    class SchemaLocator extends XSDResourceImpl.SchemaLocator
-    {
-      public XSDSchema locateSchema(XSDSchema xsdSchema, String namespaceURI,
-                                    String rawSchemaLocationURI, String resolvedSchemaLocation)
-      {
-        if (targetNamespaceToEPackageMap.containsKey(namespaceURI))
-        {
-          for (Iterator iter = xsdSchemas.iterator(); iter.hasNext();) {
-            XSDSchema schema = (XSDSchema)iter.next();
-            String targetNamespace = schema.getTargetNamespace();
-            if (targetNamespace != null && targetNamespace.equals(namespaceURI))
-            {
-              return schema;
-            } 
-          }
-        }
-        if (namespaceURI != null && !namespaceURI.equals(xsdSchema.getTargetNamespace()))
-        {
-          EPackage ePackage = extendedMetaData.getPackage(namespaceURI);
-          if (ePackage != null)
-          {
-            XSDSchema schema = loadEPackage(ePackage);
-            return schema;
-          }
-        }
-        return super.locateSchema(xsdSchema, namespaceURI, rawSchemaLocationURI, resolvedSchemaLocation);
-      }
-    }
-  }
-  
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SchemaBuilder.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SchemaBuilder.java
deleted file mode 100644
index 8ff7769041..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/SchemaBuilder.java
+++ /dev/null
@@ -1,786 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.helper;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sdo.util.SDOUtil;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDCompositor;
-import org.eclipse.xsd.XSDConstraint;
-import org.eclipse.xsd.XSDDerivationMethod;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDForm;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDInclude;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDProcessContents;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaContent;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDWildcard;
-
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-import commonj.sdo.helper.XSDHelper;
-
-public class SchemaBuilder extends SDOAnnotations
-{
-    public static final String DEFAULT_SCHEMA_LOCATION = "";
-    public static final String NAME_SPACE_PREFIX        = "stn_";
-    private static int prefixCount                      = 1;
-    
-    //public static final String MIXED = "mixed";
-    //public static final String GROUP = "group";
-    public static final String EFEATURE_MAP_ENTRY = "EFeatureMapEntry";
-    
-    private Map schemaMap = null;
-    protected Map targetNamespacePrefixMap = new Hashtable();
-    protected Map schemaLocationMap = null;
-    protected TypeTable typeTable = null;
-    protected XSDFactory xsdFactory = XSDFactory.eINSTANCE;
-    
-    
-    protected SchemaBuilder(Map schemaMap,
-                            Map nsPrefixMap,
-                            TypeTable typeTable,
-                            Map schemaLocMap )
-    {
-        this.schemaMap = schemaMap;
-        this.targetNamespacePrefixMap = nsPrefixMap;
-        this.typeTable = typeTable;
-        this.schemaLocationMap = schemaLocMap;
-    }
-        
-    
-    
-    
-    private QName addAttribute2ComplexType(String targetNamespace, 
-                                                XSDComplexTypeDefinition complexType, 
-                                                Property aProperty) 
-    {
-        QName attributeSchemaType = null;
-        String prefix = null;
-        
-        try
-        {
-            attributeSchemaType = buildSchema(aProperty.getType());
-        }
-        catch ( IllegalArgumentException e )
-        {
-            //schema cannot be generated for this type as there exists an xsd already
-            //so include that original XSD
-            attributeSchemaType = new QName(aProperty.getType().getURI(), 
-                                            aProperty.getType().getName(),
-                                            generatePrefix());
-            if ( aProperty.getType().isDataType() )
-            {
-                typeTable.addSimpleSchemaType(aProperty.getType().getName(), attributeSchemaType);
-                
-                XSDSimpleTypeDefinition simpleType = xsdFactory.createXSDSimpleTypeDefinition();
-                simpleType.setName(aProperty.getType().getName());
-                simpleType.setTargetNamespace(aProperty.getType().getURI());
-                typeTable.addXSDTypeDef(attributeSchemaType.getNamespaceURI(), 
-                                        attributeSchemaType.getLocalPart(), 
-                                        simpleType);
-            }
-            else
-            {
-                typeTable.addComplexSchemaType(aProperty.getType().getURI(),
-                                                aProperty.getType().getName(),
-                                                attributeSchemaType);
-                
-                XSDComplexTypeDefinition extComplexType = xsdFactory.createXSDComplexTypeDefinition();
-                extComplexType.setName(aProperty.getType().getName());
-                extComplexType.setTargetNamespace(aProperty.getType().getURI());
-                typeTable.addXSDTypeDef(attributeSchemaType.getNamespaceURI(), 
-                                        attributeSchemaType.getLocalPart(), 
-                                        extComplexType);
-            }
-            includeExtXSD(aProperty.getType());
-        }
-        //ensure than an import is done rightaway so that the right prefixes will be used by the 
-        //attribute whose type is set as 'this type'.  Otherwise when setting the type for the attribute
-        //there will be a duplicate prefix (like Q1 or Q2... ) that will be created
-        prefix = addImports((XSDSchema)schemaMap.get(targetNamespace), attributeSchemaType);
-        
-        XSDAttributeDeclaration attribute  = xsdFactory.createXSDAttributeDeclaration();
-        attribute.setName(aProperty.getName());    
-        XSDAttributeUse orderDateAttributeUse = xsdFactory.createXSDAttributeUse();
-        orderDateAttributeUse.setContent(attribute);
-        complexType.getAttributeContents().add(orderDateAttributeUse);
-        attribute.updateElement();
-        
-        if ( aProperty.getType().isDataType() )
-        {
-            attribute.setTypeDefinition((XSDSimpleTypeDefinition)typeTable.getXSDTypeDef(attributeSchemaType.getNamespaceURI(), 
-                                            attributeSchemaType.getLocalPart()));
-            
-        }
-        else
-        {
-            attribute.setTypeDefinition((XSDSimpleTypeDefinition)typeTable.getXSDTypeDef(
-                    typeTable.getSimpleSchemaTypeName("URI").getNamespaceURI(), 
-                    typeTable.getSimpleSchemaTypeName("URI").getLocalPart()));
-            
-        }
-        
-        if ( aProperty.getDefault() != null  )
-        {
-            attribute.setConstraint(XSDConstraint.DEFAULT_LITERAL);
-            attribute.setLexicalValue(aProperty.getDefault().toString());
-        }
-
-        addAnnotations(attribute, aProperty );
-        if ( !aProperty.getType().isDataType() )
-        {
-            String value = prefix + COLON + attributeSchemaType.getLocalPart();
-            attribute.getElement().setAttribute(PROPERTY_TYPE, value);
-        }
-        
-        return attributeSchemaType;
-    }
-    
-    private QName addElement2ComplexType(String targetNamespace, 
-                                            XSDComplexTypeDefinition complexType, 
-                                            Property aProperty) 
-    {
-        String prefix = null;
-        QName elementSchemaType = null;
-        try 
-        {
-            elementSchemaType = buildSchema(aProperty.getType());
-        }
-        catch ( IllegalArgumentException e )
-        {
-            //schema cannot be generated for this type as there exists an xsd already
-            //so include that original XSD
-            elementSchemaType = new QName(aProperty.getType().getURI(), 
-                                            aProperty.getType().getName(),
-                                            generatePrefix());
-            if ( aProperty.getType().isDataType() )
-            {
-                typeTable.addSimpleSchemaType(aProperty.getType().getName(), elementSchemaType);
-                
-                XSDSimpleTypeDefinition simpleType = xsdFactory.createXSDSimpleTypeDefinition();
-                simpleType.setName(aProperty.getType().getName());
-                simpleType.setTargetNamespace(aProperty.getType().getURI());
-                typeTable.addXSDTypeDef(elementSchemaType.getNamespaceURI(), 
-                                        elementSchemaType.getLocalPart(), 
-                                        simpleType);
-            }
-            else
-            {
-                typeTable.addComplexSchemaType(aProperty.getType().getURI(),
-                                                aProperty.getType().getName(),
-                                                elementSchemaType);
-                XSDComplexTypeDefinition extComplexType = xsdFactory.createXSDComplexTypeDefinition();
-                extComplexType.setName(aProperty.getType().getName());
-                extComplexType.setTargetNamespace(aProperty.getType().getURI());
-                typeTable.addXSDTypeDef(elementSchemaType.getNamespaceURI(), 
-                                        elementSchemaType.getLocalPart(), 
-                                        extComplexType);
-            }
-            includeExtXSD(aProperty.getType());
-        }
-        
-        //ensure than an import is done rightaway so that the right prefixes will be used by the 
-        //element whose type is set as 'this type'.  Otherwise when setting the type for the element
-        //there will be a duplicate prefix (like Q1 or Q2... ) that will be created
-        prefix = addImports((XSDSchema)schemaMap.get(targetNamespace), elementSchemaType);
-        
-        //XmlSchemaElement element = new XmlSchemaElement();
-        XSDElementDeclaration element = xsdFactory.createXSDElementDeclaration();
-        element.setName(aProperty.getName());
-         
-        XSDParticle aParticle = xsdFactory.createXSDParticle();
-        aParticle.setContent(element);
-        
-        ((XSDModelGroup)((XSDParticle)complexType.getContent()).getContent()).
-        getContents().add(aParticle);
-        
-        element.updateElement();
-
-        if ( aProperty.isMany() )
-        {
-            aParticle.setMaxOccurs(-1);
-            aParticle.setMinOccurs(0);
-            
-        }
-        
-        if ( aProperty.isContainment() )
-        {
-            element.setTypeDefinition(typeTable.getXSDTypeDef(elementSchemaType.getNamespaceURI(),
-                                                                elementSchemaType.getLocalPart()));
-        }
-        else
-        {
-            if ( !aProperty.getType().isDataType() )
-            {
-                QName qName = typeTable.getSimpleSchemaTypeName("URI");
-                element.setTypeDefinition(typeTable.getXSDTypeDef(qName.getNamespaceURI(),
-                                            qName.getLocalPart())); 
-            }
-        }
-        
-        addAnnotations(element, aProperty);
-        if ( !aProperty.isContainment() && !aProperty.getType().isDataType() )
-        {
-            String value = prefix + COLON + elementSchemaType.getLocalPart();
-            element.getElement().setAttribute(PROPERTY_TYPE, value);
-        }
-        return elementSchemaType;
-        
-    }
-    
-    private void addAnnotations(XSDSchemaContent xsdContent, Property aProperty)
-    {
-        if ( !aProperty.getAliasNames().isEmpty() )
-        {
-            addAliasNamesAnnotation(xsdContent, aProperty.getAliasNames());
-        }
-        
-        if ( aProperty.isReadOnly() )
-        {
-            xsdContent.getElement().setAttribute(READ_ONLY, Boolean.toString(aProperty.isReadOnly()));
-        }
-        
-        if ( aProperty.getOpposite() != null )
-        {
-            xsdContent.getElement().setAttribute(OPPOSITE_PROPERTY, aProperty.getOpposite().getName());
-        }
-    }
-    
-    
-    private QName buildComplexSchemaTypeContents(String targetNamespace, 
-                                                        XSDComplexTypeDefinition complexType, 
-                                                        Type dataType)
-    {
-        //clipProperties(dataType);
-        List properties = dataType.getDeclaredProperties();
-        Iterator iterator = properties.iterator();
-        Property aProperty; 
-        QName propertySchemaTypeName = null;
-        
-        while ( iterator.hasNext() )
-        {
-            aProperty = (Property)iterator.next();
-            if ( aProperty.isContainment() || aProperty.isMany() || !aProperty.getType().isDataType() )
-            {
-                propertySchemaTypeName = addElement2ComplexType(targetNamespace, complexType, aProperty);
-            }
-            else
-            {
-                propertySchemaTypeName = addAttribute2ComplexType(targetNamespace, complexType, aProperty);
-            }
-            
-            /*if ( !EFEATURE_MAP_ENTRY.equals(aProperty.getType().getName()) )
-            {
-                addContents2ComplexType(targetNamespace, complexType, aProperty);
-            }*/
-        }
-        
-        return propertySchemaTypeName;
-        
-    }
-    
-    public QName buildComplexSchemaType(Type dataType) 
-    {
-        //this is called from buildSchema only if isXSD(dataType) is false
-        QName complexSchemaTypeName = null ;
-        if ( !dataType.isDataType() && 
-                (complexSchemaTypeName = typeTable.getComplexSchemaTypeName(dataType.getURI(), dataType.getName())) == null )
-        {
-            XSDSchema xmlSchema = getXmlSchema(dataType);
-            String targetNamespace = dataType.getURI(); 
-            String targetNamespacePrefix = (String)targetNamespacePrefixMap.get(targetNamespace);
-            
-            complexSchemaTypeName = new QName(targetNamespace, 
-                                                dataType.getName(), 
-                                                targetNamespacePrefix);
-            
-            XSDComplexTypeDefinition complexType = xsdFactory.createXSDComplexTypeDefinition();
-            complexType.setName(dataType.getName());
-            complexType.setTargetNamespace(targetNamespace);     
-            complexType.setAbstract(dataType.isAbstract());
-            
-            xmlSchema.getTypeDefinitions().add(complexType);
-            xmlSchema.getContents().add(complexType);
-            
-            complexType.updateElement();
-            
-            addAnnotations(complexType, dataType);
-            
-            handleBaseExtn(xmlSchema, dataType, complexType);
-            handleSDOSequence(dataType, complexType);
-            handleSDOOpenType(dataType, complexType);
-            
-            //add before constructing the contents because a content element could
-            //possibly be of type 'complexType'. 
-            typeTable.addComplexSchemaType(dataType.getURI(), dataType.getName(), complexSchemaTypeName);
-            typeTable.addXSDTypeDef(dataType.getURI(), dataType.getName(), complexType);
-            
-            //now compose the contents for this complex type
-            buildComplexSchemaTypeContents(targetNamespace, complexType, dataType);
-            
-            //finally create a global element for this type
-            createGlobalElement(xmlSchema, complexType, complexSchemaTypeName);
-        }
-        
-        return complexSchemaTypeName;
-    }
-    
-    private void addAnnotations(XSDTypeDefinition xsdType, Type dataType)
-    {
-        if ( dataType.isAbstract() )
-        {
-            if ( xsdType instanceof XSDComplexTypeDefinition )
-            {
-                ((XSDComplexTypeDefinition)xsdType).setAbstract(dataType.isAbstract());
-            }
-            else
-            {
-                xsdType.getElement().setAttribute(ABSTRACT_TYPE, 
-                                Boolean.toString(dataType.isAbstract()));
-            }
-        }
-        
-        //add alias names if it exists
-        addAliasNamesAnnotation(xsdType, 
-                                    dataType.getAliasNames());
-        
-        //add instanceClass annotation
-        if ( dataType.getInstanceClass() != null )
-        {
-            xsdType.getElement().setAttribute(INSTANCE_CLASS, dataType.getInstanceClass().getName());
-        }
-    }
-    
-    
-    private QName buildSimpleSchemaType(Type dataType)
-    {
-        QName simpleSchemaTypeName = null;
-        if ( dataType.isDataType() &&
-                (simpleSchemaTypeName = typeTable.getSimpleSchemaTypeName(dataType.getName()) ) == null )
-        {
-            XSDSchema xmlSchema = getXmlSchema(dataType);
-            XSDSimpleTypeDefinition simpleType = xsdFactory.createXSDSimpleTypeDefinition();
-            //set the name
-            simpleType.setName(dataType.getName());
-            simpleType.setTargetNamespace(dataType.getURI());
-            //set abstract=true if abstract
-            simpleSchemaTypeName = new QName(dataType.getURI(), 
-                                             dataType.getName(), 
-                                             (String)targetNamespacePrefixMap.get(dataType.getURI()));
-            xmlSchema.getContents().add(simpleType);
-            simpleType.updateElement();
-            
-            addAnnotations(simpleType, dataType);
-            
-            if ( !dataType.getBaseTypes().isEmpty() )
-            {
-                Type baseType = (Type)dataType.getBaseTypes().get(0);
-                
-                QName baseSchemaType = null;
-                
-                try
-                {
-                    baseSchemaType = buildSchema(baseType);
-                }
-                catch ( IllegalArgumentException e )
-                {
-                    //this means that the base type comes from a original xsd and hence not generated
-                    baseSchemaType = new QName(baseType.getURI(), 
-                                                baseType.getName(),
-                                                generatePrefix());
-                    
-                    typeTable.addSimpleSchemaType(baseType.getName(), baseSchemaType);
-
-                    XSDSimpleTypeDefinition baseTypeDef = xsdFactory.createXSDSimpleTypeDefinition();
-                    baseTypeDef.setName(baseType.getName());
-                    baseTypeDef.setTargetNamespace(baseType.getURI());
-                    typeTable.addXSDTypeDef(baseType.getURI(), baseType.getName(), baseTypeDef);
-                        
-                    //include external XSD locations
-                    includeExtXSD(baseType);
-                }
-                
-                simpleType.setBaseTypeDefinition((XSDSimpleTypeDefinition)typeTable.
-                        getXSDTypeDef(baseSchemaType.getNamespaceURI(),baseSchemaType.getLocalPart()));
-                addImports(xmlSchema, baseSchemaType);
-            }
-            
-            
-            typeTable.addSimpleSchemaType(dataType.getName(), simpleSchemaTypeName);
-            typeTable.addXSDTypeDef(dataType.getURI(), dataType.getName(), simpleType);
-        }
-        return simpleSchemaTypeName;
-    }
-
-    private void includeExtXSD(Type dataType)
-    {
-        //now we know there is a type for which the xsd must come from outside
-        //create a schema for the namespace of this type and add an include in it for 
-        //the xsd that is defined externally
-        XSDSchema xmlSchema = getXmlSchema(dataType);
-        
-        //ideally there could  be more than one external schema defintions for a namespace
-        //and hence schemalocations will be a list of locations
-        //List schemaLocations = (List)schemaLocationMap.get(dataType.getURI());
-        
-        //since as per the specs the input to XSDHelper is a map of <String, String> allowing
-        //only one schemalocation for a namespace.  So for now this single location will be
-        //picked up and put into a list
-        List schemaLocations = new Vector();
-        if ( schemaLocationMap.get(dataType.getURI()) != null )
-        {
-            schemaLocations.add(schemaLocationMap.get(dataType.getURI()));
-        }
-        
-        if ( schemaLocations.size() <= 0 )
-        {
-            schemaLocations.add(DEFAULT_SCHEMA_LOCATION);
-        }
-        
-        Object schemaContent = null;
-        Iterator includesIterator = xmlSchema.getContents().iterator();
-        Iterator schemaLocIterator = schemaLocations.iterator();
-        String aSchemaLocation = null;
-        boolean includeExists = false;
-        //include all external schema locations
-        while ( schemaLocIterator.hasNext() )
-        {
-            aSchemaLocation = (String)schemaLocIterator.next();
-            while ( includesIterator.hasNext() )
-            {
-                schemaContent = includesIterator.next();
-                if ( schemaContent instanceof XSDInclude )
-                {
-                    if ( !includeExists && aSchemaLocation.equals(
-                            ((XSDInclude)schemaContent).getSchemaLocation() 
-                                 ))
-                    {
-                        includeExists = true;
-                    }
-                }
-            }
-            
-            if ( !includeExists )
-            {
-                XSDInclude includeElement = xsdFactory.createXSDInclude();
-                includeElement.setSchemaLocation(aSchemaLocation);
-                xmlSchema.getContents().add(0, includeElement);
-            }
-        }
-    }
-    
-    protected QName buildSchema(Type dataType) throws IllegalArgumentException
-    {
-        QName schemaTypeName = null;
-        
-        if ( dataType.isDataType() )
-        {
-            schemaTypeName = typeTable.getSimpleSchemaTypeName(dataType.getName());
-        }
-        else
-        {
-            schemaTypeName = typeTable.getComplexSchemaTypeName(dataType.getURI(), dataType.getName());
-        }
-        
-        //attempt to generate only if we have not done it already..i.e the type is 
-        //not found in the typetable
-        if ( schemaTypeName == null )
-        {
-            XSDHelper xsdHelper = SDOUtil.createHelperContext().getXSDHelper();
-        
-            if ( !xsdHelper.isXSD( dataType ) )
-            {
-                if ( dataType.isDataType() )
-                {
-                    schemaTypeName =  buildSimpleSchemaType(dataType);
-                }
-                else
-                {
-                    schemaTypeName =  buildComplexSchemaType(dataType);
-                }
-            }
-            else
-            {
-                throw new IllegalArgumentException("Cannot generate XSD since SDO Type '" + 
-                        dataType.getName() + "' was orginally generated from XSD.  Use original XSD");
-            }
-        }
-        return schemaTypeName;
-    }
-    
-    
-    private XSDSchema getXmlSchema(Type dataType) 
-    {
-        XSDSchema xmlSchema = null; 
-        
-        if ((xmlSchema = (XSDSchema) schemaMap.get(dataType.getURI())) == null) 
-        {
-            String targetNamespacePrefix = generatePrefix();
-            
-            xmlSchema = xsdFactory.createXSDSchema();
-            xmlSchema.setTargetNamespace(dataType.getURI());
-            xmlSchema.setAttributeFormDefault(XSDForm.QUALIFIED_LITERAL);
-            xmlSchema.setElementFormDefault(XSDForm.QUALIFIED_LITERAL);
-            
-            targetNamespacePrefixMap.put(dataType.getURI(), targetNamespacePrefix);
-            schemaMap.put(dataType.getURI(), xmlSchema);
-            
-            xmlSchema.getQNamePrefixToNamespaceMap().put(TypeTable.XS_URI_PREFIX, TypeTable.XML_SCHEMA_URI);
-            xmlSchema.setSchemaForSchemaQNamePrefix(TypeTable.XS_URI_PREFIX);
-
-            xmlSchema.getQNamePrefixToNamespaceMap().put(targetNamespacePrefix, dataType.getURI());
-            //xmlSchema.setSchemaForSchemaQNamePrefix(targetNamespacePrefix);
-            
-            addSDONamespaces(xmlSchema);
-            addPackageAnnotation(xmlSchema, dataType);
-        }
-        return xmlSchema;
-    }
-
-    
-    private void addSDONamespaces(XSDSchema xmlSchema)
-    {
-        xmlSchema.getQNamePrefixToNamespaceMap().put(COMMONJ_SDO_NS_PREFIX, COMMONJ_SDO_NS);
-        //xmlSchema.setSchemaForSchemaQNamePrefix(COMMONJ_SDO_NS_PREFIX);
-        
-        xmlSchema.getQNamePrefixToNamespaceMap().put(SDO_JAVA_NS_PREFIX, SDO_JAVA_NS);
-        //xmlSchema.setSchemaForSchemaQNamePrefix(SDO_JAVA_NS_PREFIX);
-    }
-    
-    
-    /**
-     * JAM convert first name of an attribute into UpperCase as an example if
-     * there is a instance variable called foo in a bean , then Jam give that as
-     * Foo so this method is to correct that error
-     *
-     * @param wrongName
-     * @return the right name, using english as the locale for case conversion
-     */
-    public static String getCorrectName(String wrongName) 
-    {
-        if (wrongName.length() > 1) {
-            return wrongName.substring(0, 1).toLowerCase(Locale.ENGLISH)
-                    + wrongName.substring(1, wrongName.length());
-        } else {
-            return wrongName.substring(0, 1).toLowerCase(Locale.ENGLISH);
-        }
-    }
-    
-    private String addImports(XSDSchema xmlSchema, QName schemaTypeName)
-    {
-        String prefix = null;
-        Iterator iterator = xmlSchema.getQNamePrefixToNamespaceMap().keySet().iterator();
-        while ( iterator.hasNext() )
-        {
-            prefix = (String)iterator.next();
-            
-            if ( schemaTypeName.getNamespaceURI().equals(
-                    xmlSchema.getQNamePrefixToNamespaceMap().get(prefix)) )
-            {
-                return prefix;
-            }
-        }
-        
-        //the following lines are executed only if a prefix was not found which implies that the 
-        //schemaTypeName was not imported earlier and also it does not belong to the targetnamespace
-        XSDImport importElement = xsdFactory.createXSDImport();
-        importElement.setNamespace(schemaTypeName.getNamespaceURI());
-        xmlSchema.getContents().add(0, importElement);
-        prefix = schemaTypeName.getPrefix();
-        if ( prefix == null || prefix.length() <= 0 )
-        {
-            prefix = generatePrefix();
-        }
-        xmlSchema.getQNamePrefixToNamespaceMap().put(prefix, schemaTypeName.getNamespaceURI());
-
-        return prefix;
-    }
-    
-    private void handleSDOSequence(Type datatype, XSDComplexTypeDefinition complexType)
-    {
-        if ( datatype.isSequenced()     )
-        {
-            complexType.setMixed(true);
-            XSDModelGroup choice = xsdFactory.createXSDModelGroup();
-            choice.setCompositor(XSDCompositor.CHOICE_LITERAL);
-            XSDParticle aParticle = xsdFactory.createXSDParticle();
-            aParticle.setContent(choice);
-            aParticle.setMaxOccurs(-1);
-            complexType.setContent(aParticle);
-        }
-        else
-        {
-            //hack to handle group property as choice
-            /*if ( getPropertyStartsWithName(datatype.getDeclaredProperties(), GROUP).size() > 0 )
-            {
-                XmlSchemaChoice choice = new XmlSchemaChoice();
-                choice.setMaxOccurs(Long.MAX_VALUE);
-                complexType.setParticle(choice);
-            }
-            else*/
-            {
-                XSDModelGroup sequence = xsdFactory.createXSDModelGroup();
-                sequence.setCompositor(XSDCompositor.SEQUENCE_LITERAL);
-                XSDParticle aParticle = xsdFactory.createXSDParticle();
-                aParticle.setContent(sequence);
-                complexType.setContent(aParticle);
-            }
-        }
-    }
-    
-    private void handleSDOOpenType(Type datatype, XSDComplexTypeDefinition complexType)
-    {
-        if ( datatype.isOpen() /*&& 
-                getPropertyStartsWithName(datatype.getDeclaredProperties(), GROUP).size() <= 0 */)
-        {
-            XSDWildcard elementWildcard = xsdFactory.createXSDWildcard();
-            elementWildcard.getLexicalNamespaceConstraint().add("##other");
-            elementWildcard.setProcessContents(XSDProcessContents.LAX_LITERAL);
-            // Create a particle to hold the wildcard.
-            XSDParticle wildcardParticle = xsdFactory.createXSDParticle();
-            wildcardParticle.setContent(elementWildcard);
-            wildcardParticle.setMaxOccurs(-1);
-            ((XSDModelGroup)((XSDParticle)complexType.getContent()).getContent()).
-                getContents().add(wildcardParticle);
-               
-            XSDWildcard attributeWildcard = xsdFactory.createXSDWildcard();
-            attributeWildcard.getLexicalNamespaceConstraint().add("##other");
-            attributeWildcard.setProcessContents(XSDProcessContents.LAX_LITERAL);
-            complexType.setAttributeWildcard(attributeWildcard);
-        }
-    }
-    
-    private void handleBaseExtn(XSDSchema xmlSchema, 
-                                    Type datatype, 
-                                    XSDComplexTypeDefinition complexType) 
-    {
-        if ( datatype.getBaseTypes().size() > 0 )
-        {
-            Type baseType = (Type)datatype.getBaseTypes().get(0);
-            QName baseSchemaType = null;
-            
-            try
-            {
-                baseSchemaType = buildSchema(baseType);
-            }
-            catch ( IllegalArgumentException e )
-            {
-                //schema cannot be generated for this type as there exists an xsd already
-                //so include that original XSD
-                baseSchemaType = new QName(baseType.getURI(), 
-                                            baseType.getName(),
-                                            generatePrefix());
-                
-                XSDSimpleTypeDefinition baseTypeDef = xsdFactory.createXSDSimpleTypeDefinition();
-                baseTypeDef.setName(baseType.getName());
-                baseTypeDef.setTargetNamespace(baseType.getURI());
-                typeTable.addXSDTypeDef(baseType.getURI(), baseType.getName(), baseTypeDef);
-                
-                includeExtXSD(baseType);
-            }
-            
-            complexType.setDerivationMethod(XSDDerivationMethod.EXTENSION_LITERAL);
-            
-            if ( baseType.isDataType() )
-            {
-                XSDSimpleTypeDefinition anonymousSimpleTypeDefinition 
-                    = xsdFactory.createXSDSimpleTypeDefinition();
-                anonymousSimpleTypeDefinition.setBaseTypeDefinition((XSDSimpleTypeDefinition)typeTable.
-                        getXSDTypeDef(baseSchemaType.getNamespaceURI(),baseSchemaType.getLocalPart()));
-                complexType.setContent(anonymousSimpleTypeDefinition);
-            }
-            else
-            {
-                complexType.setBaseTypeDefinition((XSDSimpleTypeDefinition)typeTable.
-                    getXSDTypeDef(baseSchemaType.getNamespaceURI(),baseSchemaType.getLocalPart()));
-                
-            }    
-                
-            addImports(xmlSchema, baseSchemaType);
-        }
-    }
-    
-    private String formGlobalElementName(String typeName)
-    {
-        String firstChar = typeName.substring(0,1);
-        return typeName.replaceFirst(firstChar, firstChar.toLowerCase());
-    }
-    
-    private void createGlobalElement(XSDSchema xmlSchema, 
-                                         XSDComplexTypeDefinition complexType, 
-                                         QName schemaElementName )
-    {
-        XSDElementDeclaration globalElement = xsdFactory.createXSDElementDeclaration();
-        globalElement.setTargetNamespace(xmlSchema.getTargetNamespace());
-        globalElement.setName(formGlobalElementName(complexType.getName()));
-        globalElement.setTypeDefinition
-            (typeTable.getXSDTypeDef(schemaElementName.getNamespaceURI(), 
-                                                    schemaElementName.getLocalPart()));
-        xmlSchema.getContents().add(globalElement);
-        xmlSchema.getElementDeclarations().add(globalElement);
-    }
-    
-    private void addAliasNamesAnnotation(XSDSchemaContent typeDef, 
-                                            List aliasNames)
-    {
-        if ( !aliasNames.isEmpty() )
-        {
-            StringBuffer sb = new StringBuffer();
-            Iterator iterator = aliasNames.iterator();
-            while ( iterator.hasNext() )
-            {
-                sb.append(iterator.next());
-            }
-            typeDef.getElement().setAttribute(ALIAS_NAMES, sb.toString());
-        }
-    }
-    
-    private void addPackageAnnotation(XSDSchema xmlSchema, Type dataType)
-    {
-        if ( dataType.getInstanceClass() != null )
-        {
-            xmlSchema.updateElement();
-            xmlSchema.getElement().setAttribute(JAVA_PACKAGE, 
-                                                dataType.getInstanceClass().getPackage().getName());
-        }
-    }
-    
-    private String generatePrefix() 
-    {
-        return NAME_SPACE_PREFIX + prefixCount++;
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
deleted file mode 100644
index 1aa2ae466b..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.helper;
-
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.tuscany.sdo.api.SDOUtil;
-import org.apache.tuscany.sdo.model.ModelFactory;
-import org.apache.tuscany.sdo.model.internal.InternalFactory;
-import org.apache.tuscany.sdo.model.java.JavaFactory;
-import org.apache.tuscany.sdo.model.xml.XMLFactory;
-import org.apache.tuscany.sdo.model.xml.impl.XMLFactoryImpl;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.TypeHelper;
-
-/**
- * Look up a Type given the uri and typeName or interfaceClass. SDO Types are
- * available through the getType("commonj.sdo", typeName) method. Defines Types
- * from DataObjects.
- */
-public class TypeHelperImpl implements TypeHelper {
-    protected HelperContext helperContext;
-    private ExtendedMetaData extendedMetaData;
-
-    static protected Set builtInModels = null;
-
-    static public Set getBuiltInModels() {
-        if (builtInModels == null) {
-            builtInModels = new HashSet();
-            builtInModels.add(ModelFactory.INSTANCE);
-            builtInModels.add(JavaFactory.INSTANCE);
-            builtInModels.add(XMLFactory.INSTANCE);
-            builtInModels.add(InternalFactory.INSTANCE);
-        }
-        return TypeHelperImpl.builtInModels;
-    }
-
-    public ExtendedMetaData getExtendedMetaData() {
-        return extendedMetaData;
-    }
-
-    // JIRA-helperContext
-    public TypeHelperImpl(HelperContext hc) {
-        this.helperContext = hc;
-        this.extendedMetaData = ((HelperContextImpl)hc).extendedMetaData;
-        
-        // Register the standard (predefined) SDO types
-        getBuiltInModels(); // Simply accessing EMF packages causes auto
-                            // registration in global registry
-
-        // MetadataFactoryImpl.init(); //FB do we want to preregister this?
-    }
-
-
-    public Type getType(String uri, String typeName) {
-        EPackage ePackage = extendedMetaData.getPackage(uri);
-
-        if (ePackage != null) {
-            EClassifier eClassifier = ePackage.getEClassifier(typeName);
-            if (eClassifier == null) {
-                eClassifier = extendedMetaData.getType(ePackage, typeName);
-            }
-            return (Type)eClassifier;
-        }
-        return null;
-    }
-
-    private Method getGetStaticTypeMethod(Class classObj) {
-        try {
-            Method method = classObj.getMethod("getStaticType", null);
-            return method;
-        }
-        catch (Exception e) {
-            return null;
-        }
-    }
-    
-    public Type getType(Class interfaceClass) {
-        Type type = SDOUtil.getJavaSDOType(interfaceClass);
-        if (type != null) {
-            return type;
-        }
-        
-        Class sdoTypeImplClass = interfaceClass;
-        Method getStaticTypeMethod = getGetStaticTypeMethod(interfaceClass);
-        if (getStaticTypeMethod == null) {
-            String sdoTypeImplClassName = interfaceClass.getName();
-            if (sdoTypeImplClassName.endsWith("Impl") == false) {
-                sdoTypeImplClass = DataObjectUtil.getImplementationClass(interfaceClass, false);
-                if (sdoTypeImplClass == null) {
-                    return null;
-                }
-                
-                getStaticTypeMethod = getGetStaticTypeMethod(sdoTypeImplClass);
-                if (getStaticTypeMethod == null) {
-                    return null;
-                }
-            }
-            else {
-                return null;
-            }
-        }
-        
-        try {
-            Object implInstance = sdoTypeImplClass.newInstance();
-            return (Type)getStaticTypeMethod.invoke(implInstance, null);
-        }
-        catch (Exception e) {
-            return null;
-        }
-    }
-
-    public Type define(DataObject type) {
-        if (!(type instanceof org.apache.tuscany.sdo.model.Type))
-            throw new IllegalArgumentException();
-        org.apache.tuscany.sdo.model.Type modeledType = (org.apache.tuscany.sdo.model.Type)type;
-
-        boolean isDataType = modeledType.isDataType();
-        Type definedType = SDOUtil.createType(helperContext, modeledType.getUri(), modeledType.getName(), isDataType);
-        if (definedType == null) {
-            // If type already defined, return existing Type.
-            return getType(modeledType.getUri(), modeledType.getName());
-        }
-
-        SDOUtil.setJavaClassName(definedType, modeledType.getInstanceClassName());
-
-        if (!isDataType) {
-            SDOUtil.setSequenced(definedType, modeledType.isSequenced());
-            SDOUtil.setOpen(definedType, modeledType.isOpen());
-            SDOUtil.setAbstract(definedType, modeledType.isAbstract());
-
-            for (Iterator iter = modeledType.getBaseType().iterator(); iter.hasNext();) {
-                Type baseType = getDefinedType((org.apache.tuscany.sdo.model.Type)iter.next());
-                SDOUtil.addBaseType(definedType, baseType);
-            }
-
-            for (Iterator iter = modeledType.getAliasName().iterator(); iter.hasNext();) {
-                String aliasName = (String)iter.next();
-                SDOUtil.addAliasName(definedType, aliasName);
-            }
-
-            for (Iterator iter = modeledType.getProperty().iterator(); iter.hasNext();) {
-                org.apache.tuscany.sdo.model.Property modeledProperty =
-                    (org.apache.tuscany.sdo.model.Property)iter.next();
-
-                Type propertyType = getDefinedType(modeledProperty.getType_());
-                Property definedProperty = SDOUtil.createProperty(definedType, modeledProperty.getName(), propertyType);
-
-                initializeProperty(definedProperty, modeledProperty);
-            }
-
-            // define a global property to accompany the type definition
-            if (!SDOUtil.isDocumentRoot(definedType)) {
-                String propertyName = definedType.getName();
-                if (!Character.isLowerCase(propertyName.charAt(0))) {
-                    propertyName = propertyName.substring(0, 1).toLowerCase() + propertyName.substring(1);
-                }
-                Property globalProperty =
-                    SDOUtil.createOpenContentProperty(helperContext, definedType.getURI(), propertyName, definedType);
-                SDOUtil.setContainment(globalProperty, true);
-            }
-        } // if (!isDataType)
-
-        addTypeInstanceProperties(definedType, (DataObject)modeledType);
-
-        return definedType;
-    }
-
-    protected void addTypeInstanceProperties(Type definedType, DataObject modeledType) {
-        List instanceProperties = SDOUtil.getOpenContentProperties(modeledType);
-        for (Iterator iter = instanceProperties.iterator(); iter.hasNext();) {
-            Property property = (Property)iter.next();
-            SDOUtil.addTypeInstanceProperty(definedType, property, modeledType.get(property));
-        }
-    }
-
-    protected void addPropertyInstanceProperties(Property definedProperty, DataObject modeledProperty) {
-        List instanceProperties = SDOUtil.getOpenContentProperties(modeledProperty);
-        for (Iterator iter = instanceProperties.iterator(); iter.hasNext();) {
-            Property property = (Property)iter.next();
-            SDOUtil.addPropertyInstanceProperty(definedProperty, property, modeledProperty.get(property));
-        }
-    }
-
-    public List /* Type */define(List /* DataObject */types) {
-        int count = types.size();
-        List definedTypes = new ArrayList(count);
-        for (int i = 0; i < count; i++) {
-            definedTypes.add(define((DataObject)types.get(i)));
-        }
-        return definedTypes;
-    }
-
-    protected Type getDefinedType(org.apache.tuscany.sdo.model.Type modeledType) {
-        if (modeledType instanceof Type) {
-            return (Type)modeledType;
-        } else {
-            EClassifier eClassifier = extendedMetaData.getType(modeledType.getUri(), modeledType.getName());
-            if (eClassifier != null) {
-                return (Type)eClassifier;
-            } else {
-                return define((DataObject)modeledType);
-            }
-        }
-    }
-
-    protected Property getDefinedProperty(org.apache.tuscany.sdo.model.Property modeledProperty) {
-        if (modeledProperty instanceof Property) {
-            return (Property)modeledProperty;
-        } else {
-            DataObject modeledContainingType = ((DataObject)modeledProperty).getContainer();
-
-            Type definedContainingType = getDefinedType((org.apache.tuscany.sdo.model.Type)modeledContainingType);
-            String propertyName = modeledProperty.getName();
-
-            return definedContainingType.getProperty(propertyName);
-        }
-    }
-
-    protected void initializeProperty(Property newProperty, org.apache.tuscany.sdo.model.Property modeledProperty) {
-        SDOUtil.setMany(newProperty, modeledProperty.isMany());
-        SDOUtil.setDefault(newProperty, modeledProperty.getDefault_());
-        SDOUtil.setReadOnly(newProperty, modeledProperty.isReadOnly());
-        for (Iterator iter = modeledProperty.getAliasName().iterator(); iter.hasNext();) {
-            String aliasName = (String)iter.next();
-            SDOUtil.addAliasName(newProperty, aliasName);
-        }
-    
-    if (newProperty.getType().isDataType()) {
-        // Setting xmlElement to FALSE only makes sense here
-        Boolean isXmlElement = Boolean.TRUE;    // By default, a SDO property is an XSD element
-        Sequence anyAttr = modeledProperty.getAnyAttribute();
-        for (int i=0; i<anyAttr.size(); i++) {
-            Property anyProp = anyAttr.getProperty(i);
-            if (XMLFactoryImpl.NAMESPACE_URI.equals(anyProp.getContainingType().getURI())) {
-                String propName = anyProp.getName();
-                if ("xmlElement".equals(propName)) {
-                    isXmlElement = (Boolean)anyAttr.getValue(i);
-                }
-            }
-        }
-        if (!isXmlElement.booleanValue()) {
-            SDOUtil.setPropertyXMLKind(newProperty, false);
-        }
-    }
-    else
-    {
-            SDOUtil.setContainment(newProperty, modeledProperty.isContainment());
-            if (modeledProperty.getOpposite_() != null) {
-                SDOUtil.setOpposite(newProperty, getDefinedProperty(modeledProperty.getOpposite_()));
-            }
-        }
-        addPropertyInstanceProperties(newProperty, (DataObject)modeledProperty);
-    }
-
-    public static final String TUSCANY_NO_URI = "http://tuscany-no-uri";
-
-    public Property defineOpenContentProperty(String uri, DataObject property) {
-        // validate property and get type
-        if (!(property instanceof org.apache.tuscany.sdo.model.impl.PropertyImpl))
-            throw new IllegalArgumentException();
-        org.apache.tuscany.sdo.model.Property modeledProperty = (org.apache.tuscany.sdo.model.Property)property;
-        Type propertyType = getDefinedType(modeledProperty.getType_());
-
-        if (uri == null)
-            uri = TUSCANY_NO_URI;
-
-        Property newProperty = SDOUtil.createOpenContentProperty(helperContext, uri, modeledProperty.getName(), propertyType);
-
-        // Propagate the modeled property's attributes
-        initializeProperty(newProperty, modeledProperty);
-
-        return newProperty;
-    }
-
-
-    public Property getOpenContentProperty(String uri, String propertyName) {
-        EClass documentRoot = (EClass)extendedMetaData.getType(uri, "");
-        return documentRoot != null ? (Property)documentRoot.getEStructuralFeature(propertyName) : null;
-    }
-
-    public HelperContext getHelperContext() {
-        return helperContext;
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeTable.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeTable.java
deleted file mode 100644
index a28492e28e..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeTable.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.helper;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import javax.xml.namespace.QName;
-
-//import org.apache.axiom.om.OMElement;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Element;
-
-
-
-public class TypeTable 
-{
-    public static final String XML_SCHEMA_URI = "http://www.w3.org/2001/XMLSchema";
-    public static final String XS_URI_PREFIX = "xs";
-    public static final QName XS_QNAME = new QName(XML_SCHEMA_URI, "schema", XS_URI_PREFIX);
-    public static final String DELIMITER = "#";
-    
-    private Hashtable simpleXSDTypes;
-    private Hashtable complexXSDTypes;
-    private Hashtable xsdTypeDefs; 
-    
-    public static String asQualifiedName(String uri, String typeName)
-    {
-        return (uri + DELIMITER + typeName);
-    }
-
-    
-    public  TypeTable() 
-    {
-        simpleXSDTypes = new Hashtable();
-        complexXSDTypes = new Hashtable();
-        xsdTypeDefs = new Hashtable();
-        populateSimpleXSDTypes();
-        populateStdSDOTypes();
-    }
-
-    private void populateStdSDOTypes() 
-    {
-        simpleXSDTypes.put("Boolean",
-                new QName(XML_SCHEMA_URI, "boolean", XS_URI_PREFIX));
-        simpleXSDTypes.put("Byte",
-                new QName(XML_SCHEMA_URI, "byte", XS_URI_PREFIX));
-        simpleXSDTypes.put("Bytes",
-                new QName(XML_SCHEMA_URI, "hexBinary", XS_URI_PREFIX));
-        simpleXSDTypes.put("Character",
-                new QName(XML_SCHEMA_URI, "string", XS_URI_PREFIX));
-        simpleXSDTypes.put("DataObject",
-                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
-        simpleXSDTypes.put("Date",
-                new QName(XML_SCHEMA_URI, "dateTime", XS_URI_PREFIX));
-        simpleXSDTypes.put("Day",
-                new QName(XML_SCHEMA_URI, "gDay", XS_URI_PREFIX));
-        simpleXSDTypes.put("Decimal",
-                new QName(XML_SCHEMA_URI, "decimal", XS_URI_PREFIX));
-        simpleXSDTypes.put("Double",
-                new QName(XML_SCHEMA_URI, "double", XS_URI_PREFIX));
-        simpleXSDTypes.put("Duration",
-                new QName(XML_SCHEMA_URI, "duration", XS_URI_PREFIX));
-        simpleXSDTypes.put("Float",
-                new QName(XML_SCHEMA_URI, "float", XS_URI_PREFIX));
-        simpleXSDTypes.put("Int",
-                new QName(XML_SCHEMA_URI, "int", XS_URI_PREFIX));
-        simpleXSDTypes.put("Integer",
-                new QName(XML_SCHEMA_URI, "integer", XS_URI_PREFIX));
-        simpleXSDTypes.put("Long",
-                new QName(XML_SCHEMA_URI, "long", XS_URI_PREFIX));
-        simpleXSDTypes.put("Month",
-                new QName(XML_SCHEMA_URI, "gMonth", XS_URI_PREFIX));
-        simpleXSDTypes.put("monthDay",
-                new QName(XML_SCHEMA_URI, "gMonthDay", XS_URI_PREFIX));
-        simpleXSDTypes.put("Object",
-                new QName(XML_SCHEMA_URI, "anySimpleType", XS_URI_PREFIX));
-        simpleXSDTypes.put("Short",
-                new QName(XML_SCHEMA_URI, "short", XS_URI_PREFIX));
-        simpleXSDTypes.put("String",
-                new QName(XML_SCHEMA_URI, "string", XS_URI_PREFIX));
-        simpleXSDTypes.put("Strings",
-                new QName(XML_SCHEMA_URI, "string", XS_URI_PREFIX));
-        simpleXSDTypes.put("Time",
-                new QName(XML_SCHEMA_URI, "time", XS_URI_PREFIX));
-        simpleXSDTypes.put("Year",
-                new QName(XML_SCHEMA_URI, "gYear", XS_URI_PREFIX));
-        simpleXSDTypes.put("YearMonth",
-                new QName(XML_SCHEMA_URI, "gYearMonth", XS_URI_PREFIX));
-        simpleXSDTypes.put("YearMonthDay",
-                new QName(XML_SCHEMA_URI, "date", XS_URI_PREFIX));
-        simpleXSDTypes.put("URI",
-                new QName(XML_SCHEMA_URI, "anyURI", XS_URI_PREFIX));
-    }
-    
-    private void populateSimpleXSDTypes() {
-        //todo pls use the types from org.apache.ws.commons.schema.constants.Constants
-        simpleXSDTypes.put("int",
-                new QName(XML_SCHEMA_URI, "int", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.lang.String",
-                new QName(XML_SCHEMA_URI, "string", XS_URI_PREFIX));
-        simpleXSDTypes.put("boolean",
-                new QName(XML_SCHEMA_URI, "boolean", XS_URI_PREFIX));
-        simpleXSDTypes.put("float",
-                new QName(XML_SCHEMA_URI, "float", XS_URI_PREFIX));
-        simpleXSDTypes.put("double",
-                new QName(XML_SCHEMA_URI, "double", XS_URI_PREFIX));
-        simpleXSDTypes.put("short",
-                new QName(XML_SCHEMA_URI, "short", XS_URI_PREFIX));
-        simpleXSDTypes.put("long",
-                new QName(XML_SCHEMA_URI, "long", XS_URI_PREFIX));
-        simpleXSDTypes.put("byte",
-                new QName(XML_SCHEMA_URI, "byte", XS_URI_PREFIX));
-        simpleXSDTypes.put("char",
-                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.lang.Integer",
-                new QName(XML_SCHEMA_URI, "int", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.lang.Double",
-                new QName(XML_SCHEMA_URI, "double", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.lang.Float",
-                new QName(XML_SCHEMA_URI, "float", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.lang.Long",
-                new QName(XML_SCHEMA_URI, "long", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.lang.Character",
-                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.lang.Boolean",
-                new QName(XML_SCHEMA_URI, "boolean", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.lang.Byte",
-                new QName(XML_SCHEMA_URI, "byte", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.lang.Short",
-                new QName(XML_SCHEMA_URI, "short", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.util.Date",
-                new QName(XML_SCHEMA_URI, "dateTime", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.util.Calendar",
-                new QName(XML_SCHEMA_URI, "dateTime", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.lang.Object",
-                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
-        simpleXSDTypes.put("java.math.BigDecimal",
-                new QName(XML_SCHEMA_URI, "decimal", XS_URI_PREFIX));
-
-        // Any types
-        simpleXSDTypes.put(Element.class.getName(),
-                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
-        simpleXSDTypes.put(ArrayList.class.getName(),
-                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
-        simpleXSDTypes.put(Vector.class.getName(),
-                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
-        simpleXSDTypes.put(List.class.getName(),
-                new QName(XML_SCHEMA_URI, "anyType", XS_URI_PREFIX));
-    }
-    
-    public QName getStdSdoType(String typename) 
-    {
-        return (QName) simpleXSDTypes.get(typename);
-    }
-
-    public QName getComplexSchemaTypeName(String sdoURI, String sdoTypeName) 
-    {
-        return (QName) complexXSDTypes.get(asQualifiedName(sdoURI, sdoTypeName));
-    }    
-    
-    public boolean isSimpleType(String typeName) 
-    {
-        Iterator keys = simpleXSDTypes.keySet().iterator();
-        while (keys.hasNext()) {
-            String s = (String) keys.next();
-            if (s.equals(typeName)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    public QName getSimpleSchemaTypeName(String typename) 
-    {
-        return (QName) simpleXSDTypes.get(typename);
-    }
-    
-    public void addSimpleSchemaType(String typeName, QName schemaType) 
-    {
-        simpleXSDTypes.put(typeName, schemaType);
-    }
-    
-    
-    public void addComplexSchemaType(String namespaceURI, String name, QName schemaType) 
-    {
-        complexXSDTypes.put(asQualifiedName(namespaceURI, name), schemaType);
-    }
-
-    
-    public QName getQNamefortheType(String namespaceURI, String typeName) 
-    {
-        if ( XML_SCHEMA_URI.equals(namespaceURI))
-        {
-            return getSimpleSchemaTypeName(typeName);
-        }
-        else
-        {
-            return getComplexSchemaTypeName(namespaceURI, typeName);
-        }
-    }
-    
-    public void addXSDTypeDef(String namespaceURI, String typeName, XSDTypeDefinition aTypeDef)
-    {
-        if ( namespaceURI != null && typeName != null && aTypeDef != null )
-        {
-            xsdTypeDefs.put(asQualifiedName(namespaceURI, typeName), aTypeDef);
-        }
-    }
-    
-    public XSDTypeDefinition getXSDTypeDef(String namespaceURI, String typeName) 
-    {
-        XSDTypeDefinition typeDef = null;
-        if ( namespaceURI != null && typeName != null  )
-        {
-            if ( XML_SCHEMA_URI.equals(namespaceURI) )
-            {
-                if ( ( typeDef = (XSDTypeDefinition)xsdTypeDefs.get(asQualifiedName(namespaceURI, typeName)) ) == null )
-                {
-                    typeDef = XSDFactory.eINSTANCE.createXSDSimpleTypeDefinition();
-                    typeDef.setName(typeName);
-                    typeDef.setTargetNamespace(namespaceURI);
-                    addXSDTypeDef(namespaceURI, typeName, typeDef);
-                }
-            }
-            else
-            {
-                typeDef = (XSDTypeDefinition)xsdTypeDefs.get(asQualifiedName(namespaceURI, typeName));
-            }
-        }
-      return typeDef;
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
deleted file mode 100644
index bff8375e44..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
+++ /dev/null
@@ -1,574 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.helper;
-
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sdo.SimpleAnyTypeDataObject;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.apache.tuscany.sdo.util.SDOUtil;
-import org.apache.tuscany.sdo.util.resource.SDOXMLResourceImpl;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-import commonj.sdo.helper.XMLDocument;
-
-
-/**
- * Represents an XML Document containing a tree of DataObjects.
- * 
- * An example XMLDocument fragment is:
- * <?xml version="1.0"?>
- * <purchaseOrder orderDate="1999-10-20">
- * 
- * created from this XML Schema fragment:
- * <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- *   <xsd:element name="purchaseOrder" type="PurchaseOrderType"/>
- *   <xsd:complexType name="PurchaseOrderType">
- *
- * Upon loading this XMLDocument:
- *   DataObject is an instance of Type PurchaseOrderType.
- *   RootElementURI is null because the XSD has no targetNamespace URI.
- *   RootElementName is purchaseOrder.
- *   Encoding is null because the document did not specify an encoding.
- *   XMLDeclaration is true because the document contained an XML declaration.
- *   XMLVersion is 1.0
- *   SchemaLocation and noNamespaceSchemaLocation are null because they are
- *     not specified in the document.
- * 
- * When saving the root element, if the type of the root dataObject is not the
- *   type of global element specified by rootElementURI and rootElementName, 
- *   or if a global element does not exist for rootElementURI and rootElementName,
- *   then an xsi:type declaration is written to record the root DataObject's Type.
- * 
- * When loading the root element and an xsi:type declaration is found
- *   it is used as the type of the root DataObject.  In this case,
- *   if validation is not being performed, it is not an error if the
- *   rootElementName is not a global element.
- */
-public class XMLDocumentImpl implements XMLDocument
-{
-  protected ExtendedMetaData extendedMetaData;
-
-  protected EObject rootObject;
-
-  protected XMLResource resource;
-
-  protected EStructuralFeature rootElement;
-
-  protected EObject documentRoot;
-  
-  protected final static String WHITESPACE_REGEX = "\\s";
-  
-  //TODO clean up the options thing
-  protected XMLDocumentImpl(ExtendedMetaData extendedMetaData, Object options)
-  {
-    this.extendedMetaData = extendedMetaData;
-    ResourceSet resourceSet = DataObjectUtil.createResourceSet();
-    
-    if (options instanceof Map)
-    {
-      Class resourceFactoryClass = (Class)((Map)options).get("GENERATED_LOADER");
-      if (resourceFactoryClass != null)
-      {
-        try
-        {
-          Object resourceFactory = resourceFactoryClass.newInstance();
-          resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("*", resourceFactory);
-        }
-        catch (Exception e)
-        {
-          e.printStackTrace();
-        }
-      }
-    }
-  
-    resource = (XMLResource)resourceSet.createResource(URI.createURI("http:///temp.xml"));
-    DataObjectUtil.configureXMLResource(resource, extendedMetaData);
-  }
-
-  protected XMLDocumentImpl(ExtendedMetaData extendedMetaData)
-  {
-    this(extendedMetaData, null);
-  }
-
-  protected XMLDocumentImpl(ExtendedMetaData extendedMetaData, DataObject dataObject, String rootElementURI, String rootElementName)
-  {
-    this(extendedMetaData);
-
-    rootObject = (EObject)dataObject;
-
-    rootElement = extendedMetaData.getElement(rootElementURI, rootElementName);
-    if (rootElement == null)
-    {
-      rootElement = ExtendedMetaData.INSTANCE.demandFeature(rootElementURI, rootElementName, true);
-    }
-
-    EClass documentRootClass = rootElement.getEContainingClass();
-    documentRoot = EcoreUtil.create(documentRootClass);
-    resource.getContents().add(documentRoot);
-  }
-
-  protected void save(OutputStream outputStream, Object options) throws IOException
-  {
-    save(outputStream, null, options);
-  }
-    
-  protected void save(Writer outputWriter, Object options) throws IOException
-  {
-    // TODO temporary brute-force implementation ... to be replaced
-    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-    save(outputStream, options);
-    outputWriter.write(new String(outputStream.toByteArray()));
-  }
-
-  protected void save(Node node, Object options) throws IOException
-  {
-    save(null, (Document)node, options);
-  }
-  
-  protected void save(OutputStream outputStream, Document document, Object options) throws IOException
-  {
-    EObject oldContainer = null;
-    Resource oldResource = null;
-    EReference oldContainmentReference = null;
-    int oldContainmentIndex = -1;
-
-    if (documentRoot != null)
-    {
-      oldContainer = rootObject.eContainer();
-      if (oldContainer != null)
-        oldContainmentReference = rootObject.eContainmentFeature();
-      else
-        oldResource = rootObject.eResource();
-      if (oldContainer != documentRoot || oldContainmentReference != rootElement)
-      {
-        if (oldResource != null)
-        {
-          oldContainmentIndex = oldResource.getContents().indexOf(rootObject);
-          oldResource.getContents().remove(oldContainmentIndex);
-        }
-        else if (oldContainmentReference != null && FeatureMapUtil.isMany(oldContainer, oldContainmentReference))
-          oldContainmentIndex = ((List)oldContainer.eGet(oldContainmentReference)).indexOf(rootObject);
-        
-        Object rootValue =
-          rootElement instanceof EAttribute && rootObject instanceof SimpleAnyTypeDataObject ?
-            ((SimpleAnyTypeDataObject)rootObject).getValue() : rootObject;
-            
-        documentRoot.eSet(rootElement, rootValue);
-      }
-    }
-
-    if (outputStream != null)
-      resource.save(outputStream, (Map)options);
-    else // if (document != null)
-      resource.save(document, (Map)options, null);
-
-    if (oldResource != null)
-    {
-      oldResource.getContents().add(oldContainmentIndex, rootObject);
-    }
-    if (rootElement instanceof EReference)
-    {
-      if (oldContainer != null)
-      {
-        if (oldContainer != documentRoot || oldContainmentReference != rootElement)
-        {
-          if (FeatureMapUtil.isMany(oldContainer, oldContainmentReference))
-            ((List)oldContainer.eGet(oldContainmentReference)).add(oldContainmentIndex, rootObject);
-          else
-            oldContainer.eSet(oldContainmentReference, rootObject);
-        }
-      }
-      else if (documentRoot != null)
-      {
-        documentRoot.eSet(rootElement, null);
-      }
-    }
-  }
-
-  protected void load(InputStream inputStream, String locationURI, Object options) throws IOException
-  {
-    InputSource inputSource = new InputSource(inputStream);
-    load(inputSource, locationURI, options);
-  }
-
-  protected void load(Reader inputReader, String locationURI, Object options) throws IOException
-  {
-    InputSource inputSource = new InputSource(inputReader);
-    load(inputSource, locationURI, options);
-  }
-  
-  protected final void load(Node node, Object options) throws IOException {
-      resource.load(node, (Map)options);
-      initLoadedRoot();
-  }
-
-  protected final void load(XMLStreamReader reader, Map options) throws IOException
-  {
-    ((SDOXMLResourceImpl)resource).load(reader, options);
-    initLoadedRoot();
-  }
-
-  protected void load(InputSource inputSource, String locationURI, Object options) throws IOException
-  {
-    if (locationURI != null)
-    {
-      inputSource.setSystemId(locationURI);
-      resource.setURI(URI.createURI(locationURI));
-    }
-    resource.load(inputSource, (Map)options);
-    initLoadedRoot();
-  }
-
-  /**
-   * @return a Map object with key-value pair where key is the DataObject and value contains the info 
-   * about the unknown properties for the DataObject
-   */
-  public Map getUnknownProperties(){
-      return resource.getEObjectToExtensionMap();
-  }
-  
-  private void initLoadedRoot()
-  {
-    rootObject = null;
-    rootElement = null;
-    documentRoot = null;
-
-    if (!resource.getContents().isEmpty())
-    {
-      documentRoot = (EObject)resource.getContents().get(0);
-      EClass documentRootClass = documentRoot.eClass();
-      if ("".equals(extendedMetaData.getName(documentRootClass))) //TODO efficient way to check this? Maybe DataObject.getContainer should also check this?
-      {
-        FeatureMap featureMap = (FeatureMap)documentRoot.eGet(documentRootClass.getEStructuralFeature(0)); // get mixed feature
-        int size = featureMap.size();
-        for (int index = 0; index < size; index++)
-        {
-          EStructuralFeature feature = featureMap.getEStructuralFeature(index);
-          boolean isText = 
-            feature == XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT ||
-            feature == XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA ||    
-            feature == XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT;
-          if (!isText)
-          {
-            if (feature instanceof EReference)
-            {
-              rootObject = (EObject)featureMap.getValue(index);
-              documentRoot.eUnset(feature);
-            }
-            else //EAttribute
-            {
-              rootObject = (EObject)SDOUtil.createDataTypeWrapper((Type)feature.getEType(), featureMap.getValue(index));
-            }
-            rootElement = feature;
-            break;
-          }
-        } //for
-        if (rootObject == null)
-          rootObject = ((SDOXMLResourceImpl) resource).root;
-      }
-      else
-      {
-        rootObject = documentRoot;
-        documentRoot = null;
-      }
-    }
-  }
-  
-  public DataObject getRootObject()
-  {
-    return (DataObject)rootObject;
-  }
-
-  public String getRootElementURI()
-  {
-    if (rootElement != null)
-    {
-      return extendedMetaData.getNamespace(rootElement);
-    }
-    else if (rootObject != null)
-    {
-      return extendedMetaData.getNamespace(rootObject.eClass());
-    }
-    return null;
-  }
-
-  public String getRootElementName()
-  {
-    if (rootElement != null)
-    {
-      return extendedMetaData.getName(rootElement);
-    }
-    else if (rootObject != null)
-    {
-      return extendedMetaData.getName(rootObject.eClass());
-    }
-    return null;
-  }
-
-  public String getEncoding()
-  {
-    return resource.getEncoding();
-  }
-
-  public void setEncoding(String encoding)
-  {
-    resource.setEncoding(encoding);
-  }
-
-  public boolean isXMLDeclaration()
-  {
-    return Boolean.FALSE.equals(resource.getDefaultSaveOptions().get(XMLResource.OPTION_DECLARE_XML));
-  }
-
-  public void setXMLDeclaration(boolean xmlDeclaration)
-  {
-    resource.getDefaultSaveOptions().put(XMLResource.OPTION_DECLARE_XML, xmlDeclaration ? Boolean.TRUE : Boolean.FALSE);
-  }
-
-  public String getXMLVersion()
-  {
-    return resource.getXMLVersion();
-  }
-
-  public void setXMLVersion(String xmlVersion)
-  {
-    resource.setXMLVersion(xmlVersion);
-  }
-
-  /**
-   * @return an EMap containing the schema locations or null when no map
-   */
-  protected EMap getSchemaLocationMap()
-  {
-    EMap result = null;
-    if ((documentRoot != null) && (extendedMetaData != null))
-    {
-      EReference xsiSchemaLocationMapFeature = extendedMetaData
-          .getXSISchemaLocationMapFeature(documentRoot.eClass());
-      if (xsiSchemaLocationMapFeature != null)
-      {
-        result = (EMap) documentRoot.eGet(xsiSchemaLocationMapFeature);
-      }
-    }
-    return result;
-  }
-
-  /**
-   * @param value
-   *          from schema location map.
-   * @return string form of URI from provided value, deresolved if appropriate.
-   */
-  protected String deresolve(String value)
-  {
-    URI location = URI.createURI(value);
-    URI resourceURI = resource.getURI();
-    boolean shouldDeresolve = resourceURI != null && !resourceURI.isRelative()
-        && resourceURI.isHierarchical();
-    if (shouldDeresolve && !location.isRelative())
-    {
-      URI deresolvedURI = location.deresolve(resourceURI, true, true, false);
-      if (deresolvedURI.hasRelativePath())
-      {
-        location = deresolvedURI;
-      }
-    }
-    return location.toString();
-  }
-
-  /**
-   * @param value
-   *          for schema location from input parameter.
-   * @return string form of URI from provided value, resolved if appropriate.
-   */
-  protected String resolve(String value)
-  {
-    URI location = URI.createURI(value);
-    URI resourceURI = resource.getURI();
-    boolean shouldResolve = resourceURI != null && resourceURI.isHierarchical()
-        && !resourceURI.isRelative();
-    if (shouldResolve && location.isRelative() && location.hasRelativePath())
-    {
-      location = location.resolve(resourceURI, false);
-    }
-    return location.toString();
-  }
-
-  public String getSchemaLocation()
-  {
-    EMap xsiSchemaLocationMap = getSchemaLocationMap();
-    if (xsiSchemaLocationMap != null)
-    {
-      if (!xsiSchemaLocationMap.isEmpty())
-      {
-        StringBuffer xsiSchemaLocation = new StringBuffer();
-        for (Iterator i = xsiSchemaLocationMap.entrySet().iterator(); i
-            .hasNext();)
-        {
-          Map.Entry entry = (Map.Entry) i.next();
-          String namespace = (String) entry.getKey();
-          if (namespace != null)
-          {
-            if (xsiSchemaLocation.length() > 0)
-            {
-              xsiSchemaLocation.append(' ');
-            }
-            xsiSchemaLocation.append(namespace);
-            xsiSchemaLocation.append(' ');
-            String value = entry.getValue().toString();
-            xsiSchemaLocation.append(deresolve(value));
-          }
-        }
-        return xsiSchemaLocation.toString().equals("") ? null
-            : xsiSchemaLocation.toString();
-      }
-    }
-    return null;
-  }
-
-  public void setSchemaLocation(String schemaLocation)
-  {
-    EMap xsiSchemaLocationMap = getSchemaLocationMap();
-    if (xsiSchemaLocationMap != null)
-    {
-      // only remove the entries from xsiSchemaLocationMap that contain a
-      // non-null key
-      for (Iterator i = xsiSchemaLocationMap.entrySet().iterator(); i.hasNext();)
-      {
-        Map.Entry entry = (Map.Entry) i.next();
-        if (entry.getKey() != null)
-        {
-          i.remove();
-        }
-      }
-      if (xsiSchemaLocationMap.size() == 0)
-      {
-        resource.getDefaultSaveOptions().put(
-            XMLResource.OPTION_SCHEMA_LOCATION, Boolean.FALSE);
-      }
-      if (schemaLocation != null)
-      {
-        String[] values = schemaLocation.split(WHITESPACE_REGEX);
-        for (int i = 0; i < values.length; i++) // note: also incremented in
-        // loop
-        {
-          String key = values[i++];
-          if (i < values.length)
-          {
-            xsiSchemaLocationMap.put(key, resolve(values[i]));
-          }
-        }
-        if (xsiSchemaLocationMap.size() != 0)
-        {
-          resource.getDefaultSaveOptions().put(
-              XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-        }
-      }
-    }
-  }
-
-  public String getNoNamespaceSchemaLocation()
-  {
-    EMap xsiSchemaLocationMap = getSchemaLocationMap();
-    if (xsiSchemaLocationMap != null)
-    {
-      StringBuffer xsiSchemaLocation = new StringBuffer();
-      if (!xsiSchemaLocationMap.isEmpty())
-      {
-        Object valueObject = xsiSchemaLocationMap.get(null);
-        if (valueObject != null)
-        {
-          String valueString = (String) valueObject;
-          String[] values = valueString.split(WHITESPACE_REGEX);
-          for (int i = 0; i < values.length; i++)
-          {
-            if (xsiSchemaLocation.length() > 0)
-            {
-              xsiSchemaLocation.append(' ');
-            }
-            xsiSchemaLocation.append(deresolve(values[i]));
-          }
-        }
-        String result = xsiSchemaLocation.toString();
-        return result.equals("") ? null : result;
-      }
-    }
-    return null;
-  }
-
-  public void setNoNamespaceSchemaLocation(String schemaLocation)
-  {
-    EMap xsiSchemaLocationMap = getSchemaLocationMap();
-    if (xsiSchemaLocationMap != null)
-    {
-      // only remove the entries from xsiSchemaLocationMap that contain a null
-      // key
-      xsiSchemaLocationMap.removeKey(null);
-      if (xsiSchemaLocationMap.size() == 0)
-      {
-        resource.getDefaultSaveOptions().put(
-            XMLResource.OPTION_SCHEMA_LOCATION, Boolean.FALSE);
-      }
-      if (schemaLocation != null)
-      {
-        String[] values = schemaLocation.split(WHITESPACE_REGEX);
-        for (int i = 0; i < values.length; i++)
-        {
-          xsiSchemaLocationMap.put(null, resolve(values[i]));
-        }
-        if (xsiSchemaLocationMap.size() != 0)
-        {
-          resource.getDefaultSaveOptions().put(
-              XMLResource.OPTION_SCHEMA_LOCATION, Boolean.TRUE);
-        }
-      }
-    }
-  }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
deleted file mode 100644
index 4d0f3d7de8..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.helper;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.Map;
-
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.sax.SAXResult;
-import javax.xml.transform.sax.SAXSource;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.xml.sax.InputSource;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XMLHelper;
-
-/**
- * A helper to convert XML documents into DataObects and DataObjects into XML
- * documnets.
- */
-public class XMLHelperImpl implements XMLHelper {
-    protected HelperContext helperContext;
-    private ExtendedMetaData extendedMetaData;
-
-
-    public XMLHelperImpl(HelperContext hc) {
-        this.helperContext = hc;
-        this.extendedMetaData = ((HelperContextImpl)hc).extendedMetaData;
-    }
-
-    public XMLDocument load(String inputString) {
-        try {
-            return load(new StringReader(inputString), null, null);
-        } catch (IOException e) {
-            throw new RuntimeException(e); // should never happen
-        }
-    }
-
-    public XMLDocument load(String inputString, Object options) {
-        try {
-            return load(new StringReader(inputString), null, options);
-        } catch (IOException e) {
-            throw new RuntimeException(e); // should never happen
-        }
-    }
-
-    public XMLDocument load(InputStream inputStream) throws IOException {
-        return load(inputStream, null, null);
-    }
-
-    private Object checkSetOptions(Object options) throws IOException {
-        if (options != null && !(options instanceof Map)) {
-            throw new IOException("Invalid load options!");
-        }
-
-        if (helperContext != null) {
-            return ((HelperContextImpl)helperContext).getMergedOption((Map)options);
-        } else {// null is acceptable as it will be ignored
-            return options;
-        }
-    }
-
-    public XMLDocument load(InputStream inputStream, String locationURI, Object options) throws IOException {
-        options = checkSetOptions(options);
-        XMLDocumentImpl document = new XMLDocumentImpl(extendedMetaData, options);
-        document.load(inputStream, locationURI, options);
-        return document;
-    }
-
-    public XMLDocument load(Reader inputReader, String locationURI, Object options) throws IOException {
-        XMLDocumentImpl document = new XMLDocumentImpl(extendedMetaData, options);
-        options = checkSetOptions(options);
-        document.load(inputReader, locationURI, options);
-        return document;
-    }
-
-    public XMLDocument load(Source source, String locationURI, Object options) throws IOException {
-        options = checkSetOptions(options);
-        if (source instanceof DOMSource) {
-            DOMSource domSource = (DOMSource)source;
-            XMLDocumentImpl document = new XMLDocumentImpl(extendedMetaData, options);
-            document.load(domSource.getNode(), options);
-            return document;
-        } else if (source instanceof SAXSource) {
-            XMLDocumentImpl document = new XMLDocumentImpl(extendedMetaData, options);
-            InputSource inputSource = SAXSource.sourceToInputSource(source);
-            document.load(inputSource, locationURI, options);
-            return document;
-        } else if (source instanceof StreamSource) {
-            return load(((StreamSource)source).getInputStream(), locationURI, options);
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    public String save(DataObject dataObject, String rootElementURI, String rootElementName) {
-        StringWriter stringWriter = new StringWriter();
-        try {
-            save(createDocument(dataObject, rootElementURI, rootElementName), stringWriter, null);
-            return stringWriter.toString();
-        } catch (IOException e) {
-            throw new RuntimeException(e); // should never happen
-        }
-    }
-
-    public String save(DataObject dataObject, String rootElementURI, String rootElementName, Object options) {
-        StringWriter stringWriter = new StringWriter();
-        try {
-            save(createDocument(dataObject, rootElementURI, rootElementName), stringWriter, options);
-            return stringWriter.toString();
-        } catch (IOException e) {
-            throw new RuntimeException(e); // should never happen
-        }
-    }
-
-    public void save(DataObject dataObject, String rootElementURI, String rootElementName, OutputStream outputStream)
-        throws IOException {
-        save(createDocument(dataObject, rootElementURI, rootElementName), outputStream, null);
-    }
-
-
-    public void save(DataObject dataObject,
-                     String rootElementURI,
-                     String rootElementName,
-                     OutputStream outputStream,
-                     Object options) throws IOException {
-        save(createDocument(dataObject, rootElementURI, rootElementName), outputStream, null);
-    }
-
-    public void save(XMLDocument xmlDocument, OutputStream outputStream, Object options) throws IOException {
-        options = checkSetOptions(options);
-        ((XMLDocumentImpl)xmlDocument).save(outputStream, options);
-    }
-
-    public void save(XMLDocument xmlDocument, Writer outputWriter, Object options) throws IOException {
-        options = checkSetOptions(options);
-        ((XMLDocumentImpl)xmlDocument).save(outputWriter, options);
-    }
-
-    public void save(XMLDocument xmlDocument, Result outputResult, Object options) throws IOException {
-        options = checkSetOptions(options);
-        if (outputResult instanceof DOMResult) {
-            ((XMLDocumentImpl)xmlDocument).save(((DOMResult)outputResult).getNode(), options);
-        } else if (outputResult instanceof SAXResult) {
-            throw new UnsupportedOperationException();
-        } else if (outputResult instanceof StreamResult) {
-            save(xmlDocument, ((StreamResult)outputResult).getOutputStream(), options);
-        } else {
-            throw new UnsupportedOperationException();
-        }
-    }
-
-    public XMLDocument createDocument(DataObject dataObject, String rootElementURI, String rootElementName) {
-        XMLDocument xmlDocument = new XMLDocumentImpl(extendedMetaData, dataObject, rootElementURI, rootElementName);
-        xmlDocument.setEncoding("UTF-8");
-        return xmlDocument;
-    }
-
-    public HelperContext getHelperContext() {
-        return helperContext;
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelper.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelper.java
deleted file mode 100644
index 851c7d93dd..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelper.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.helper;
-
-/**
- * @deprecated
- */
-public interface XMLStreamHelper extends org.apache.tuscany.sdo.api.XMLStreamHelper {
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java
deleted file mode 100644
index a07b9b6a71..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLStreamHelperImpl.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.helper;
-
-import java.util.Map;
-
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sdo.util.resource.DataObjectXMLStreamReader;
-import org.apache.tuscany.sdo.util.resource.XMLDocumentStreamReader;
-import org.apache.tuscany.sdo.util.resource.XMLStreamSerializer;
-import org.eclipse.emf.ecore.resource.Resource;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-
-/**
- * @version $Rev$ $Date$
- */
-public class XMLStreamHelperImpl implements XMLStreamHelper {
-    protected HelperContext helperContext;
-
-    public XMLStreamHelperImpl(HelperContext hc) {
-        this.helperContext = hc;
-    }
-
-    private Map checkSetOptions(Map options) {
-        if (helperContext != null) {
-            return ((HelperContextImpl)helperContext).getMergedOption(options);
-        } else {// null is acceptable as it will be ignored
-            return options;
-        }
-    }
-
-    public XMLDocument load(XMLStreamReader reader) throws XMLStreamException, IllegalStateException {
-        if (reader.getEventType() != XMLStreamConstants.START_DOCUMENT)
-            throw new IllegalStateException();
-
-        return loadDocument(reader, null);
-    }
-
-    public void save(XMLDocument document, XMLStreamWriter writer) throws XMLStreamException {
-        XMLStreamReader reader = createXMLStreamReader(document);
-        new XMLStreamSerializer().serialize(reader, writer);
-    }
-
-    public void save(XMLDocument document, XMLStreamWriter writer, Map options) throws XMLStreamException {
-        XMLStreamReader reader = createXMLStreamReader(document);
-        options = checkSetOptions(options);
-        new XMLStreamSerializer().serialize(reader, writer, options);
-    }
-
-    public XMLStreamReader createXMLStreamReader(XMLDocument document) throws XMLStreamException {
-        XMLStreamReader reader =
-            new DataObjectXMLStreamReader(document.getRootObject(), document.getRootElementURI(), document
-                .getRootElementName(), helperContext.getTypeHelper());
-        // Wrap the reader so that its position will be START_ELEMENT
-        return new XMLDocumentStreamReader(reader);
-
-    }
-
-    public final DataObject loadObject(XMLStreamReader reader, Map options) throws XMLStreamException,
-        IllegalStateException {
-        if (reader.getEventType() != XMLStreamConstants.START_ELEMENT)
-            throw new IllegalStateException();
-
-        // StAX2SAXAdapter won't produce START_DOCUMENT if the reader is
-        // posisitioned at START_ELEMENT and the EMF loader will fail
-        // Wrap the reader so it represents a document
-        reader = new XMLDocumentStreamReader(reader);
-
-        return loadDocument(reader, options).getRootObject();
-    }
-
-    public DataObject loadObject(XMLStreamReader reader) throws XMLStreamException, IllegalStateException {
-        return loadObject(reader, null);
-    }
-
-    public void saveObject(DataObject sdo, XMLStreamWriter writer) throws XMLStreamException {
-        XMLStreamReader reader = createXMLStreamReader(sdo);
-        new XMLStreamSerializer().serialize(new XMLDocumentStreamReader(reader), writer);
-    }
-
-    public void saveObject(DataObject sdo, XMLStreamWriter writer, Map options) throws XMLStreamException {
-        XMLStreamReader reader = createXMLStreamReader(sdo);
-        options = checkSetOptions(options);
-        new XMLStreamSerializer().serialize(new XMLDocumentStreamReader(reader), writer, options);
-    }
-
-    public XMLStreamReader createXMLStreamReader(DataObject dataObject) {
-        if (dataObject == null) {
-            return null;
-        }
-        String rootElementURI;
-        String rootElementName;
-
-        Property property = dataObject.getContainmentProperty();
-        if (property != null) {
-            rootElementName = property.getName();
-            rootElementURI = property.getType().getURI();
-        } else {
-            rootElementName = dataObject.getType().getName();
-            rootElementURI = dataObject.getType().getURI();
-        }
-
-        return new DataObjectXMLStreamReader(dataObject, rootElementURI, rootElementName, helperContext.getTypeHelper());
-    }
-
-    protected XMLDocument loadDocument(XMLStreamReader reader, Map options) throws XMLStreamException {
-        try {
-            XMLDocumentImpl document = new XMLDocumentImpl(((HelperContextImpl)helperContext).extendedMetaData, null);
-            options = checkSetOptions(options);
-            document.load(reader, options);
-            return document;
-        } catch (Exception e) {
-            if (e instanceof Resource.IOWrappedException) {
-                Resource.IOWrappedException ioe = (Resource.IOWrappedException)e;
-                if (ioe.getWrappedException() instanceof XMLStreamException) {
-                    throw (XMLStreamException)ioe.getWrappedException();
-                }
-            }
-            throw new RuntimeException(e); // ????
-        }
-    }
-
-    public HelperContext getHelperContext() {
-        return helperContext;
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
deleted file mode 100644
index 829acd38f4..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.helper;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.Reader;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.apache.tuscany.sdo.impl.DynamicDataObjectImpl;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.ecore.XSDEcoreBuilder;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-import org.eclipse.xsd.util.XSDResourceImpl;
-import org.xml.sax.InputSource;
-
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XSDHelper;
-
-/**
- * Provides access to additional information when the Type or Property is
- * defined by an XML Schema (XSD). Methods return null/false otherwise or if the
- * information is unavailable. Defines Types from an XSD.
- */
-public class XSDHelperImpl implements XSDHelper {
-    protected boolean extensibleNamespaces = false;
-    protected HelperContext helperContext;
-    protected SDOXSDEcoreBuilder nondelegatingEcoreBuilder = null;
-    protected HashMap tcclToEcoreBuilderMap = null;
-    private ExtendedMetaData extendedMetaData;
-
-    public XSDHelperImpl(HelperContext hc, String redefineBuiltIn, boolean extensibleNamespaces) {
-        this.helperContext = hc;
-        this.extensibleNamespaces = extensibleNamespaces;
-        extendedMetaData = ((HelperContextImpl)helperContext).extendedMetaData;
-
-        SDOXSDEcoreBuilder ecoreBuilder = createEcoreBuilder();
-
-        if (extendedMetaData instanceof SDOExtendedMetaDataImpl && ((SDOExtendedMetaDataImpl)extendedMetaData)
-            .getRegistry() instanceof EPackageRegistryImpl.Delegator) {
-            tcclToEcoreBuilderMap = new HashMap();
-            putTCCLEcoreBuilder(ecoreBuilder);
-        } else {
-            nondelegatingEcoreBuilder = ecoreBuilder;
-        }
-
-        if (redefineBuiltIn != null) { // Redefining/regenerating this built-in
-                                        // model
-            ecoreBuilder.getTargetNamespaceToEPackageMap().remove(redefineBuiltIn);
-        }
-    }
-
-    public XSDHelperImpl(HelperContext hc) {
-        this(hc, null, false);
-    }
-
-    /**
-     * Redefine/regenerating the built-in model
-     * @param redefineBuiltIn
-     */
-    public void setRedefineBuiltIn(String redefineBuiltIn) {
-        if (redefineBuiltIn != null) {
-            getEcoreBuilder().getTargetNamespaceToEPackageMap().remove(redefineBuiltIn);
-        }
-    }
-    
-    public void setExtensibleNamespaces(boolean extensibleNamespaces) {
-        this.extensibleNamespaces = extensibleNamespaces;
-    }
-
-    protected SDOXSDEcoreBuilder createEcoreBuilder() {
-        SDOXSDEcoreBuilder ecoreBuilder = new SDOXSDEcoreBuilder(extendedMetaData, extensibleNamespaces);
-
-        // Add the built-in models to the targetNamespaceToEPackageMap so they
-        // can't be (re)defined/overridden
-        for (Iterator iter = TypeHelperImpl.getBuiltInModels().iterator(); iter.hasNext();) {
-            EPackage ePackage = (EPackage)iter.next();
-            ecoreBuilder.getTargetNamespaceToEPackageMap().put(ePackage.getNsURI(), ePackage);
-        }
-
-        return ecoreBuilder;
-    }
-
-    protected void putTCCLEcoreBuilder(XSDEcoreBuilder ecoreBuilder) {
-        ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-        if (tcclToEcoreBuilderMap.get(tccl) == null) {
-            tcclToEcoreBuilderMap.put(tccl, ecoreBuilder);
-        }
-    }
-
-    protected SDOXSDEcoreBuilder getEcoreBuilder() {
-        if (nondelegatingEcoreBuilder != null)
-            return nondelegatingEcoreBuilder;
-
-        SDOXSDEcoreBuilder result = null;
-        try {
-            for (ClassLoader tccl = Thread.currentThread().getContextClassLoader(); tccl != null; tccl =
-                tccl.getParent()) {
-                result = (SDOXSDEcoreBuilder)tcclToEcoreBuilderMap.get(tccl);
-                if (result != null)
-                    return result;
-            } // for
-        } catch (SecurityException exception) {
-            // exception.printStackTrace();
-        }
-
-        result = createEcoreBuilder();
-        putTCCLEcoreBuilder(result);
-
-        return result;
-    }
-
-    public String getLocalName(Type type) {
-        return extendedMetaData.getName((EClassifier)type);
-    }
-
-    public String getLocalName(Property property) {
-        return extendedMetaData.getName((EStructuralFeature)property);
-    }
-
-    public String getNamespaceURI(Property property) {
-        return extendedMetaData.getNamespace((EStructuralFeature)property);
-    }
-
-    public boolean isAttribute(Property property) {
-        return extendedMetaData.getFeatureKind((EStructuralFeature)property) == ExtendedMetaData.ATTRIBUTE_FEATURE;
-    }
-
-    public boolean isElement(Property property) {
-        return extendedMetaData.getFeatureKind((EStructuralFeature)property) == ExtendedMetaData.ELEMENT_FEATURE;
-    }
-
-    public boolean isMixed(Type type) {
-        if (type instanceof EClass) {
-            return extendedMetaData.getContentKind((EClass)type) == ExtendedMetaData.MIXED_CONTENT;
-        } else {
-            return false;
-        }
-    }
-
-    public boolean isXSD(Type type) {
-        return ((EModelElement)type).getEAnnotation(ExtendedMetaData.ANNOTATION_URI) != null;
-    }
-
-    public Property getGlobalProperty(String uri, String propertyName, boolean isElement) {
-        if (isElement) {
-            return (Property)extendedMetaData.getElement(uri, propertyName);
-        } else {
-            return (Property)extendedMetaData.getAttribute(uri, propertyName);
-        }
-    }
-
-    public String getAppinfo(Type type, String source) {
-        return getAppinfo((EModelElement)type, source);
-    }
-
-    public String getAppinfo(Property property, String source) {
-        return getAppinfo((EModelElement)property, source);
-    }
-
-    protected String getAppinfo(EModelElement eModelElement, String source) {
-        return (String)eModelElement.getEAnnotation(source).getDetails().get("appinfo");
-    }
-
-    public List /* Type */define(String xsd) {
-        InputStream inputStream = new ByteArrayInputStream(xsd.getBytes());
-        return define(inputStream, "*.xsd");
-    }
-
-    public List /* Type */define(Reader xsdReader, String schemaLocation) {
-        InputSource inputSource = new InputSource(xsdReader);
-        return define(inputSource, schemaLocation);
-
-    }
-
-    public List /* Type */define(InputStream xsdInputStream, String schemaLocation) {
-        InputSource inputSource = new InputSource(xsdInputStream);
-        return define(inputSource, schemaLocation);
-    }
-
-    protected List /* Type */define(InputSource inputSource, String schemaLocation) {
-        try {
-            SDOXSDEcoreBuilder ecoreBuilder = getEcoreBuilder();
-            ResourceSet resourceSet = ecoreBuilder.createResourceSet();
-            Resource model =
-                resourceSet.createResource(URI.createURI(schemaLocation != null ? schemaLocation : "null.xsd"));
-            ((XSDResourceImpl)model).load(inputSource, null);
-
-            List newTypes = new ArrayList();
-            for (Iterator schemaIter = model.getContents().iterator(); schemaIter.hasNext();) {
-                XSDSchema schema = (XSDSchema)schemaIter.next();
-
-                String targetNamespace = schema.getTargetNamespace();
-                EPackage ePackage = extendedMetaData.getPackage(targetNamespace);
-                if (extensibleNamespaces || ePackage == null || TypeHelperImpl.getBuiltInModels().contains(ePackage)) {
-                    Map targetNamespaceToEPackageMap = ecoreBuilder.getTargetNamespaceToEPackageMap();
-                    targetNamespaceToEPackageMap.remove(targetNamespace);
-
-                    Collection originalEPackages = new HashSet(targetNamespaceToEPackageMap.values());
-                    ecoreBuilder.generate(schema);
-                    Collection newEPackages = ecoreBuilder.getTargetNamespaceToEPackageMap().values();
-
-                    for (Iterator iter = newEPackages.iterator(); iter.hasNext();) {
-                        EPackage currentPackage = (EPackage)iter.next();
-                        if (!originalEPackages.contains(currentPackage)) {
-                            currentPackage.setEFactoryInstance(new DynamicDataObjectImpl.FactoryImpl());
-                            EcoreUtil.freeze(currentPackage);
-                            newTypes.addAll(currentPackage.getEClassifiers());
-                        }
-                    }
-                }
-            }
-
-            return newTypes;
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw new IllegalArgumentException(e.getMessage());
-        }
-    }
-
-    public String generate(List /* Type */types) throws IllegalArgumentException {
-        return generate(types, new Hashtable());
-    }
-
-    public String generate(List /* Type */types, Map /* String, String */namespaceToSchemaLocation)
-        throws IllegalArgumentException {
-        if (types != null && !types.isEmpty()) {
-            Hashtable schemaMap = new Hashtable();
-            Hashtable nsPrefixMap = new Hashtable();
-            TypeTable typeTable = new TypeTable();
-
-            SchemaBuilder schemaBuilder =
-                new SchemaBuilder(schemaMap, nsPrefixMap, typeTable, namespaceToSchemaLocation);
-
-            Iterator iterator = types.iterator();
-            Type dataType = null;
-
-            try {
-                while (iterator.hasNext()) {
-                    dataType = (Type)iterator.next();
-                    schemaBuilder.buildSchema(dataType);
-                }
-
-                XSDSchema xmlSchema = null;
-                iterator = schemaMap.values().iterator();
-                StringWriter writer = new StringWriter();
-
-                TransformerFactory transformerFactory = TransformerFactory.newInstance();
-                Transformer transformer = transformerFactory.newTransformer();
-                transformer.setOutputProperty(OutputKeys.INDENT, "yes");
-                transformer.setOutputProperty(OutputKeys.METHOD, "xml");
-                transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
-
-                while (iterator.hasNext()) {
-                    xmlSchema = (XSDSchema)iterator.next();
-
-                    if (xmlSchema.getElement() == null) {
-                        xmlSchema.updateElement();
-                    }
-
-                    transformer.transform(new DOMSource(xmlSchema.getElement().getOwnerDocument()),
-                                          new StreamResult(writer));
-                }
-                writer.close();
-                return writer.getBuffer().toString();
-            } catch (Exception e) {
-                // System.out.println("Unable to generate schema due to ..." +
-                // e);
-                // e.printStackTrace();
-                throw new IllegalArgumentException(e.getMessage());
-            }
-        } else {
-            // System.out.println("No SDO Types to generate schema ...");
-            return "";
-        }
-    }
-
-    public HelperContext getHelperContext() {
-        return helperContext;
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java
deleted file mode 100644
index b7d22c3be0..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-import org.apache.tuscany.sdo.AnyTypeDataObject;
-import org.apache.tuscany.sdo.SDOPackage;
-import org.apache.tuscany.sdo.util.BasicSequence;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.emf.ecore.xml.type.AnyType;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>EData Object Any Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.impl.AnyTypeDataObjectImpl#getMixed <em>Mixed</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.impl.AnyTypeDataObjectImpl#getAny <em>Any</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.impl.AnyTypeDataObjectImpl#getAnyAttribute <em>Any Attribute</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AnyTypeDataObjectImpl extends DataObjectImpl implements AnyTypeDataObject
-{
-  /**
-   * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getMixed()
-   * @generated
-   * @ordered
-   */
-  protected FeatureMap mixed = null;
-
-  /**
-   * The cached value of the '{@link #getAnyAttribute() <em>Any Attribute</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAnyAttribute()
-   * @generated
-   * @ordered
-   */
-  protected FeatureMap anyAttribute = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected AnyTypeDataObjectImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return SDOPackage.eINSTANCE.getAnyTypeDataObject();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public FeatureMap getMixed()
-  {
-    if (mixed == null)
-    {
-      //mixed = new BasicFeatureMap(this, SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED);
-      mixed = new BasicSequence(new BasicFeatureMap(this, SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED)).featureMap();
-    }
-    return mixed;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public FeatureMap getAny()
-  {
-    //return (FeatureMap)((FeatureMap)getMixed()).list(XMLTypePackage.eINSTANCE.getAnyType_Any());
-    return new BasicSequence((FeatureMap.Internal)((FeatureMap)getMixed()).list(XMLTypePackage.eINSTANCE.getAnyType_Any())).featureMap();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public FeatureMap getAnyAttribute()
-  {
-    if (anyAttribute == null)
-    {
-      //anyAttribute = new BasicFeatureMap(this, SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE);
-      anyAttribute = new BasicSequence(new BasicFeatureMap(this, SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE)).featureMap();
-    }
-    return anyAttribute;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED:
-          return ((InternalEList)getMixed()).basicRemove(otherEnd, msgs);
-        case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY:
-          return ((InternalEList)getAny()).basicRemove(otherEnd, msgs);
-        case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE:
-          return ((InternalEList)getAnyAttribute()).basicRemove(otherEnd, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED:
-        if (coreType) return getMixed();
-        return ((FeatureMap.Internal)getMixed()).getWrapper();
-      case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY:
-        if (coreType) return getAny();
-        return ((FeatureMap.Internal)getAny()).getWrapper();
-      case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE:
-        if (coreType) return getAnyAttribute();
-        return ((FeatureMap.Internal)getAnyAttribute()).getWrapper();
-    }
-    return eDynamicGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED:
-        ((FeatureMap.Internal)getMixed()).set(newValue);
-        return;
-      case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY:
-        ((FeatureMap.Internal)getAny()).set(newValue);
-        return;
-      case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE:
-        ((FeatureMap.Internal)getAnyAttribute()).set(newValue);
-        return;
-    }
-    eDynamicSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED:
-        getMixed().clear();
-        return;
-      case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY:
-        getAny().clear();
-        return;
-      case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE:
-        getAnyAttribute().clear();
-        return;
-    }
-    eDynamicUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED:
-        return mixed != null && !mixed.isEmpty();
-      case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY:
-        return !getAny().isEmpty();
-      case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE:
-        return anyAttribute != null && !anyAttribute.isEmpty();
-    }
-    return eDynamicIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass)
-  {
-    if (baseClass == AnyType.class)
-    {
-      switch (derivedFeatureID)
-      {
-        case SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED: return XMLTypePackage.ANY_TYPE__MIXED;
-        case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY: return XMLTypePackage.ANY_TYPE__ANY;
-        case SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE: return XMLTypePackage.ANY_TYPE__ANY_ATTRIBUTE;
-        default: return -1;
-      }
-    }
-    return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass)
-  {
-    if (baseClass == AnyType.class)
-    {
-      switch (baseFeatureID)
-      {
-        case XMLTypePackage.ANY_TYPE__MIXED: return SDOPackage.ANY_TYPE_DATA_OBJECT__MIXED;
-        case XMLTypePackage.ANY_TYPE__ANY: return SDOPackage.ANY_TYPE_DATA_OBJECT__ANY;
-        case XMLTypePackage.ANY_TYPE__ANY_ATTRIBUTE: return SDOPackage.ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE;
-        default: return -1;
-      }
-    }
-    return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (mixed: ");
-    result.append(mixed);
-    result.append(", anyAttribute: ");
-    result.append(anyAttribute);
-    result.append(')');
-    return result.toString();
-  }
-
-} //EDataObjectAnyTypeImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
deleted file mode 100644
index e02977e0e8..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
+++ /dev/null
@@ -1,836 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-import java.util.List;
-
-import org.apache.tuscany.sdo.SDOPackage;
-import org.apache.tuscany.sdo.model.ModelFactory;
-import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
-import org.apache.tuscany.sdo.model.internal.InternalFactory;
-import org.apache.tuscany.sdo.model.internal.impl.InternalFactoryImpl;
-import org.apache.tuscany.sdo.util.BasicSequence;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.apache.tuscany.sdo.util.SDOUtil;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EAttributeImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-import commonj.sdo.Property;
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Attribute</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class AttributeImpl extends EAttributeImpl implements Property, org.apache.tuscany.sdo.model.Property/*, DataObject*/
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected AttributeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  protected EClass eStaticClass()
-  {
-    return SDOPackage.eINSTANCE.getAttribute();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Object getDefault()
-  {
-    return getDefaultValue();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isReadOnly()
-  {
-    //return "true".equals(EcoreUtil.getAnnotation(this, "commonj.sdo", "readOnly"));
-    return !isChangeable(); //TODO semantics don't exactly match?
-  }
-  
-  /**
-   * Single-valued SDO properties behave as EMF unsettable, multi-valued properties as EMF !unsettable
-   */
-  public boolean isUnsettable()
-  {
-    return !isMany();
-  }
-  
-  public boolean isUnique()
-  {
-    return false;
-  }
-  
-  protected List aliasNames = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getAliasNames()
-  {
-    if (aliasNames == null)
-    {
-      aliasNames = DataObjectUtil.getAliasNames(this);
-    }
-    return aliasNames;
-  }
-  
-  public static Type INTERNAL_BASE64_BYTES = ((InternalFactoryImpl)InternalFactory.INSTANCE).getBase64Bytes();
-  public static Type INTERNAL_QNAME = ((InternalFactoryImpl)InternalFactory.INSTANCE).getQName();
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Type getType()
-  {
-    EClassifier eType = getEType();
-    if (eType == INTERNAL_BASE64_BYTES)
-      return ((ModelFactoryImpl)ModelFactory.INSTANCE).getBytes();
-    else if (eType == INTERNAL_QNAME)
-        return ((ModelFactoryImpl)ModelFactory.INSTANCE).getURI();
-    return (Type)eType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Type getContainingType()
-  {
-    return (Type)getEContainingClass();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Property getOpposite()
-  {
-    return null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isContainment()
-  {
-    return false;
-  }
-  
-  protected EStructuralFeature.Internal.SettingDelegate createFeatureMapSettingDelegate()
-  {
-    return new InternalSettingDelegateSequence(this);
-  }
-
-  public static class InternalSettingDelegateSequence extends InternalSettingDelegateMany
-  {
-    InternalSettingDelegateSequence(EStructuralFeature feature)
-    {
-      super(InternalSettingDelegateMany.FEATURE_MAP, feature);
-    }
-
-    protected EStructuralFeature.Setting createDynamicSetting(InternalEObject owner)
-    {
-      FeatureMap.Internal featureMap = (FeatureMap.Internal)super.createDynamicSetting(owner);
-      new BasicSequence(featureMap);
-      return featureMap;
-    }
-  }
-  
-  public boolean isNullable()
-  {
-    String isNillable = EcoreUtil.getAnnotation(this, ExtendedMetaData.ANNOTATION_URI, "nillable");
-    return isNillable != null && "true".equals(isNillable);
-  }
-
-  public boolean isOpenContent()
-  {
-    return SDOUtil.isDocumentRoot(getContainingType());
-  }
-
-  public List getInstanceProperties() {
-    return DataObjectUtil.getMetaObjectInstanceProperties(this);
-  }
-
-  public Object get(Property property) {
-    return DataObjectUtil.getMetaObjectInstanceProperty(this, property);
-  }
-
-  /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  // org.apache.tuscany.sdo.model.Property methods
-  /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  
-  public List getAliasName() {
-    return this.getAliasNames();
-  }
-
-  public Sequence getAny() {
-    throw new UnsupportedOperationException();
-  }
-
-  public void unsetContainment() {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSetContainment() {
-    return false;
-  }
-  
-  public void setMany(boolean value) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public void unsetMany() {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSetMany() {
-    return isMany();
-  }
-
-  public void setReadOnly(boolean value) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public void unsetReadOnly() {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSetReadOnly() {
-    return isReadOnly();
-  }
-  
-  public org.apache.tuscany.sdo.model.Type getType_() {
-    return (org.apache.tuscany.sdo.model.Type)getType();
-  }
-
-  public void setType(org.apache.tuscany.sdo.model.Type value) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public Sequence getAnyAttribute() {
-    throw new UnsupportedOperationException();
-  }
-
-  public String getDefault_() {
-    return (String) this.getDefault();
-  }
-
-  public void setDefault_(String value) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public org.apache.tuscany.sdo.model.Property getOpposite_() {
-    return (org.apache.tuscany.sdo.model.Property) getOpposite();
-  }
-
-  public void setOpposite_(org.apache.tuscany.sdo.model.Property value) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public void setContainment(boolean value) {
-    throw new UnsupportedOperationException();
-  }
-  
-  public void setNullable(boolean value) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public void unsetNullable() {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSetNullable() {
-    return isUnsettable();
-  }
-  
-  public void unsetName()
-  {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSetName()
-  {
-    return true;
-  }
-  
-  public void unsetOpposite()
-  {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSetOpposite()
-  {
-    return getOpposite() != null;
-  }
-  
-  public void unsetType()
-  {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSetType()
-  {
-    return true;
-  }
-  
-  public void unsetDefault()
-  {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSetDefault()
-  {
-    return getDefault() != null;
-  }
-  
-
-  /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  // DataObject method implementations
-  /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  /*
-  public Object get(int propertyIndex) {
-    return DataObjectUtil.get(this, propertyIndex);
-  }
-  
-  public void set(int propertyIndex, Object value) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSet(int propertyIndex) {
-    return DataObjectUtil.isSet(this, propertyIndex);
-  }
-
-  public void unset(int propertyIndex) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-  
-  public Object get(Property property) {
-    return DataObjectUtil.get(this, ((EStructuralFeature)property).getFeatureID());
-  }
-  
-  public void set(Property property, Object value) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSet(Property property) {
-    return DataObjectUtil.isSet(this, ((EStructuralFeature)property).getFeatureID());
-  }
-
-  public void unset(Property property) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-  
-  public DataObject getContainer() {
-    return (DataObject)eContainer();
-  }
-
-  public Property getContainmentProperty() {
-    return (Property)eContainmentFeature();
-  }  
-
-  // Remaining DataObject methods are (will be) implemented as straight delegation to DataObjectUtil
-
-  public Object get(String path) {
-    return DataObjectUtil.get(this, path);
-  }
-  
-  public void set(String path, Object value) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSet(String path) {
-    return DataObjectUtil.isSet(this, path);
-  }
-
-  public void unset(String path) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean getBoolean(String path) {
-    return DataObjectUtil.getBoolean(get(path));
-  }
-
-  public byte getByte(String path) {
-    return DataObjectUtil.getByte(get(path));
-  }
-
-  public char getChar(String path) {
-    return DataObjectUtil.getChar(get(path));
-  }
-
-  public double getDouble(String path) {
-    return DataObjectUtil.getDouble(get(path));
-  }
-
-  public float getFloat(String path) {
-    return DataObjectUtil.getFloat(get(path));
-  }
-
-  public int getInt(String path) {
-    return DataObjectUtil.getInt(get(path));
-  }
-
-  public long getLong(String path) {
-    return DataObjectUtil.getLong(get(path));
-  }
-
-  public short getShort(String path) {
-    return DataObjectUtil.getShort(get(path));
-  }
-
-  public byte[] getBytes(String path) {
-    return DataObjectUtil.getBytes(get(path));
-  }
-
-  public BigDecimal getBigDecimal(String path) {
-    return DataObjectUtil.getBigDecimal(get(path));
-  }
-
-  public BigInteger getBigInteger(String path) {
-    return DataObjectUtil.getBigInteger(get(path));
-  }
-
-  public DataObject getDataObject(String path) {
-    return (DataObject)get(path);
-  }
-
-  public Date getDate(String path) {
-    return DataObjectUtil.getDate(get(path));
-  }
-
-  public String getString(String path) {
-    return DataObjectUtil.getString(get(path));
-  }
-
-  public List getList(String path) {
-    return (List)get(path);
-  }
-
-  public Sequence getSequence(String path) {
-    return (Sequence)get(path);
-  }
-
-  public void setBoolean(String path, boolean value) {
-    set(path, new Boolean(value));
-  }
-
-  public void setByte(String path, byte value) {
-    set(path, new Byte(value));
-  }
-
-  public void setChar(String path, char value) {
-    set(path, new Character(value));
-  }
-
-  public void setDouble(String path, double value) {
-    set(path, new Double(value));
-  }
-
-  public void setFloat(String path, float value) {
-    set(path, new Float(value));
-  }
-
-  public void setInt(String path, int value) {
-    set(path, new Integer(value));
-  }
-
-  public void setLong(String path, long value) {
-    set(path, new Long(value));
-  }
-
-  public void setShort(String path, short value) {
-    set(path, new Short(value));
-  }
-
-  public void setBytes(String path, byte[] value) {
-    set(path, value);
-  }
-
-  public void setBigDecimal(String path, BigDecimal value) {
-    set(path, value);
-  }
-
-  public void setBigInteger(String path, BigInteger value) {
-    set(path, value);
-  }
-
-  public void setDataObject(String path, DataObject value) {
-    set(path, value);
-  }
-
-  public void setDate(String path, Date value) {
-    set(path, value);
-  }
-
-  public void setString(String path, String value) {
-    set(path, value);
-  }
-
-  public void setList(String path, List value) {
-    set(path, value);
-  }
-
-  public boolean getBoolean(int propertyIndex) {
-    return DataObjectUtil.getBoolean(this, propertyIndex);
-  }
-
-  public byte getByte(int propertyIndex) {
-    return DataObjectUtil.getByte(this, propertyIndex);
-  }
-
-  public char getChar(int propertyIndex) {
-    return DataObjectUtil.getChar(this, propertyIndex);
-  }
-
-  public double getDouble(int propertyIndex) {
-    return DataObjectUtil.getDouble(this, propertyIndex);
-  }
-
-  public float getFloat(int propertyIndex) {
-    return DataObjectUtil.getFloat(this, propertyIndex);
-  }
-
-  public int getInt(int propertyIndex) {
-    return DataObjectUtil.getInt(this, propertyIndex);
-  }
-
-  public long getLong(int propertyIndex) {
-    return DataObjectUtil.getLong(this, propertyIndex);
-  }
-
-  public short getShort(int propertyIndex) {
-    return DataObjectUtil.getShort(this, propertyIndex);
-  }
-
-  public byte[] getBytes(int propertyIndex) {
-    return DataObjectUtil.getBytes(this, propertyIndex);
-  }
-
-  public BigDecimal getBigDecimal(int propertyIndex) {
-    return DataObjectUtil.getBigDecimal(this, propertyIndex);
-  }
-
-  public BigInteger getBigInteger(int propertyIndex) {
-    return DataObjectUtil.getBigInteger(this, propertyIndex);
-  }
-
-  public DataObject getDataObject(int propertyIndex) {
-    return DataObjectUtil.getDataObject(this, propertyIndex);
-  }
-
-  public Date getDate(int propertyIndex) {
-    return DataObjectUtil.getDate(this, propertyIndex);
-  }
-
-  public String getString(int propertyIndex) {
-    return DataObjectUtil.getString(this, propertyIndex);
-  }
-
-  public List getList(int propertyIndex) {
-    return DataObjectUtil.getList(this, propertyIndex);
-  }
-
-  public Sequence getSequence(int propertyIndex) {
-    return DataObjectUtil.getSequence(this, propertyIndex);
-  }
-
-  public void setBoolean(int propertyIndex, boolean value) {
-    set(propertyIndex, new Boolean(value));
-  }
-
-  public void setByte(int propertyIndex, byte value) {
-    set(propertyIndex, new Byte(value));
-  }
-
-  public void setChar(int propertyIndex, char value) {
-    set(propertyIndex, new Character(value));
-  }
-
-  public void setDouble(int propertyIndex, double value) {
-    set(propertyIndex, new Double(value));
-  }
-
-  public void setFloat(int propertyIndex, float value) {
-    set(propertyIndex, new Float(value));
-  }
-
-  public void setInt(int propertyIndex, int value) {
-    set(propertyIndex, new Integer(value));
-  }
-
-  public void setLong(int propertyIndex, long value) {
-    set(propertyIndex, new Long(value));
-  }
-
-  public void setShort(int propertyIndex, short value) {
-    set(propertyIndex, new Short(value));
-  }
-
-  public void setBytes(int propertyIndex, byte[] value) {
-    set(propertyIndex, value);
-  }
-
-  public void setBigDecimal(int propertyIndex, BigDecimal value) {
-    set(propertyIndex, value);
-  }
-
-  public void setBigInteger(int propertyIndex, BigInteger value) {
-    set(propertyIndex, value);
-  }
-
-  public void setDataObject(int propertyIndex, DataObject value) {
-    set(propertyIndex, value);
-  }
-
-  public void setDate(int propertyIndex, Date value) {
-    set(propertyIndex, value);
-  }
-
-  public void setString(int propertyIndex, String value) {
-    set(propertyIndex, value);
-  }
-
-  public void setList(int propertyIndex, List value) {
-    set(propertyIndex, value);
-  }
-
-  public boolean getBoolean(Property property) {
-    return DataObjectUtil.getBoolean(this, property);
-  }
-
-  public byte getByte(Property property) {
-    return DataObjectUtil.getByte(this, property);
-  }
-
-  public char getChar(Property property) {
-    return DataObjectUtil.getChar(this, property);
-  }
-
-  public double getDouble(Property property) {
-    return DataObjectUtil.getDouble(this, property);
-  }
-
-  public float getFloat(Property property) {
-    return DataObjectUtil.getFloat(this, property);
-  }
-
-  public int getInt(Property property) {
-    return DataObjectUtil.getInt(this, property);
-  }
-
-  public long getLong(Property property) {
-    return DataObjectUtil.getLong(this, property);
-  }
-
-  public short getShort(Property property) {
-    return DataObjectUtil.getShort(this, property);
-  }
-
-  public byte[] getBytes(Property property) {
-    return DataObjectUtil.getBytes(this, property);
-  }
-
-  public BigDecimal getBigDecimal(Property property) {
-    return DataObjectUtil.getBigDecimal(this, property);
-  }
-
-  public BigInteger getBigInteger(Property property) {
-    return DataObjectUtil.getBigInteger(this, property);
-  }
-
-  public DataObject getDataObject(Property property) {
-    return DataObjectUtil.getDataObject(this, property);
-  }
-
-  public Date getDate(Property property) {
-    return DataObjectUtil.getDate(this, property);
-  }
-
-  public String getString(Property property) {
-    return DataObjectUtil.getString(this, property);
-  }
-
-  public List getList(Property property) {
-    return DataObjectUtil.getList(this, property);
-  }
-
-  public Sequence getSequence(Property property) {
-    return DataObjectUtil.getSequence(this, property);
-  }
-
-  public void setBoolean(Property property, boolean value) {
-    set(property, new Boolean(value));
-  }
-
-  public void setByte(Property property, byte value) {
-    set(property, new Byte(value));
-  }
-
-  public void setChar(Property property, char value) {
-    set(property, new Character(value));
-  }
-
-  public void setDouble(Property property, double value) {
-    set(property, new Double(value));
-  }
-
-  public void setFloat(Property property, float value) {
-    set(property, new Float(value));
-  }
-
-  public void setInt(Property property, int value) {
-    set(property, new Integer(value));
-  }
-
-  public void setLong(Property property, long value) {
-    set(property, new Long(value));
-  }
-
-  public void setShort(Property property, short value) {
-    set(property, new Short(value));
-  }
-
-  public void setBytes(Property property, byte[] value) {
-    set(property, value);
-  }
-
-  public void setBigDecimal(Property property, BigDecimal value) {
-    set(property, value);
-  }
-
-  public void setBigInteger(Property property, BigInteger value) {
-    set(property, value);
-  }
-
-  public void setDataObject(Property property, DataObject value) {
-    set(property, value);
-  }
-
-  public void setDate(Property property, Date value) {
-    set(property, value);
-  }
-
-  public void setString(Property property, String value) {
-    set(property, value);
-  }
-
-  public void setList(Property property, List value) {
-    set(property, value);
-  }
-
-  public DataObject createDataObject(String propertyName) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public DataObject createDataObject(int propertyIndex) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public DataObject createDataObject(Property property) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public DataObject createDataObject(String propertyName, String namespaceURI, String typeName) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public DataObject createDataObject(int propertyIndex, String namespaceURI, String typeName) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public DataObject createDataObject(Property property, Type type) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public void delete() {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public DataGraph getDataGraph() {
-    return DataObjectUtil.getDataGraph(this);
-  }
-
-  public Sequence getSequence() {
-    EAttribute mixedFeature = BasicExtendedMetaData.INSTANCE.getMixedFeature(eClass());
-    return mixedFeature != null ? (Sequence)eGet(mixedFeature, true, false) : null;
-  }
-
-  public List getInstanceProperties() {
-    return DataObjectUtil.getInstanceProperties(this);
-  }
-
-  public DataObject getRootObject() {
-    return DataObjectUtil.getRootObject(this);
-  }
-
-  public ChangeSummary getChangeSummary() {
-    // TODO: implement this method
-    throw new UnsupportedOperationException();
-  }
-
-  public void detach() {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-    //DataObjectUtil.detach(this);
-  }
-
-  public Property getProperty(String propertyName) {
-    return DataObjectUtil.getProperty(this, propertyName);
-  }
-  */
-  
-} //AttributeImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java
deleted file mode 100644
index 55f3d5449d..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java
+++ /dev/null
@@ -1,876 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.tuscany.sdo.SDOFactory;
-import org.apache.tuscany.sdo.SDOPackage;
-import org.apache.tuscany.sdo.util.BasicSequence;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.UniqueEList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.change.ChangeDescription;
-import org.eclipse.emf.ecore.change.FeatureChange;
-import org.eclipse.emf.ecore.change.impl.ChangeDescriptionImpl;
-import org.eclipse.emf.ecore.change.util.ChangeRecorder;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.BasicExtendedMetaData;
-import org.eclipse.emf.ecore.util.DelegatingFeatureMap;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.DataGraph;
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Sequence;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>EChange Summary</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.impl.ChangeSummaryImpl#getEDataGraph <em>EData Graph</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ChangeSummaryImpl extends ChangeDescriptionImpl implements ChangeSummary
-{
-  /**
-   * The cached value of the '{@link #getEDataGraph() <em>EData Graph</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEDataGraph()
-   * @generated
-   * @ordered
-   */
-  protected DataGraph eDataGraph = null;
-  
-  protected DataObject dataObject = null;
-  protected SDOChangeRecorder changeRecorder = null;
-  
-  protected Set cachedDeletedObjects = null;
-  protected List cachedCreatedObjects = null;
-  protected Map cachedSDOObjectChanges = null;  
-  protected boolean isStale = false;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ChangeSummaryImpl()
-  {
-    super();
-    cachedSDOObjectChanges = createThreadSafeMap();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return SDOPackage.eINSTANCE.getChangeSummary();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isLogging()
-  {
-    return changeRecorder != null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public DataGraph getEDataGraph()
-  {
-    return eDataGraph;
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetEDataGraph(DataGraph newEDataGraph, NotificationChain msgs)
-  {
-    DataGraph oldEDataGraph = eDataGraph;
-    eDataGraph = newEDataGraph;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH, oldEDataGraph, newEDataGraph);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEDataGraph(DataGraph newEDataGraph)
-  {
-    if (newEDataGraph != eDataGraph)
-    {
-      NotificationChain msgs = null;
-      if (eDataGraph != null)
-        msgs = ((InternalEObject)eDataGraph).eInverseRemove(this, SDOPackage.DATA_GRAPH__ECHANGE_SUMMARY, DataGraph.class, msgs);
-      if (newEDataGraph != null)
-        msgs = ((InternalEObject)newEDataGraph).eInverseAdd(this, SDOPackage.DATA_GRAPH__ECHANGE_SUMMARY, DataGraph.class, msgs);
-      msgs = basicSetEDataGraph(newEDataGraph, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH, newEDataGraph, newEDataGraph));
-  }
-
-  public DataObject getDataObject()
-  {
-    return dataObject;
-  }
-
-  public void setDataObject(DataObject newDataObject)
-  {
-    dataObject = newDataObject;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void beginLogging()
-  {
-    if (isLogging())
-    {
-      throw new IllegalStateException("Already logging");
-    }
-
-    getObjectsToAttach().clear();
-    getObjectChanges().clear();
-    getResourceChanges().clear();
-    oldContainmentInformation = null;
-
-    beginRecording();
-//    if (eNotificationRequired())
-//      eNotify(new ENotificationImpl(this, Notification.SET, SDOPackage.ECHANGE_SUMMARY__LOGGING, false, true));
-  }
-  
-  /**
-   * 
-   */
-  private void beginRecording() {
-    changeRecorder = new SDOChangeRecorder();
-    if (eDataGraph != null) 
-    {
-      changeRecorder.beginRecording(Collections.singleton(((DataGraphImpl)eDataGraph).getRootResource()));
-    }
-    else if (dataObject != null)
-    {
-      changeRecorder.beginRecording(Collections.singleton(dataObject));
-    }
-    else
-    {
-      throw new IllegalStateException("ChangeSummary not attached to any data objects");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void resumeLogging()
-  {
-    if (isLogging())
-    {
-      throw new IllegalStateException("Already logging");
-    }
-
-    oldContainmentInformation = null;
-    
-    beginRecording();
-//    if (eNotificationRequired())
-//      eNotify(new ENotificationImpl(this, Notification.SET, SDOPackage.ECHANGE_SUMMARY__LOGGING, false, true));
-  }  
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH:
-          if (eDataGraph != null)
-            msgs = ((InternalEObject)eDataGraph).eInverseRemove(this, SDOPackage.DATA_GRAPH__ECHANGE_SUMMARY, DataGraph.class, msgs);
-          return basicSetEDataGraph((DataGraph)otherEnd, msgs);
-        default:
-          return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    if (eInternalContainer() != null)
-      msgs = eBasicRemoveFromContainer(msgs);
-    return eBasicSetContainer(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case SDOPackage.CHANGE_SUMMARY__OBJECT_CHANGES:
-          return ((InternalEList)getObjectChanges()).basicRemove(otherEnd, msgs);
-        case SDOPackage.CHANGE_SUMMARY__OBJECTS_TO_ATTACH:
-          return ((InternalEList)getObjectsToAttach()).basicRemove(otherEnd, msgs);
-        case SDOPackage.CHANGE_SUMMARY__RESOURCE_CHANGES:
-          return ((InternalEList)getResourceChanges()).basicRemove(otherEnd, msgs);
-        case SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH:
-          return basicSetEDataGraph(null, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SDOPackage.CHANGE_SUMMARY__OBJECT_CHANGES:
-        if (coreType) return getObjectChanges();
-        else return getObjectChanges().map();
-      case SDOPackage.CHANGE_SUMMARY__OBJECTS_TO_DETACH:
-        return getObjectsToDetach();
-      case SDOPackage.CHANGE_SUMMARY__OBJECTS_TO_ATTACH:
-        return getObjectsToAttach();
-      case SDOPackage.CHANGE_SUMMARY__RESOURCE_CHANGES:
-        return getResourceChanges();
-      case SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH:
-        return getEDataGraph();
-//      case SDOPackage.CHANGE_SUMMARY__EDATA_OBJECT:
-//        return getEDataObject();
-    }
-    return eDynamicGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case SDOPackage.CHANGE_SUMMARY__OBJECT_CHANGES:
-        ((EStructuralFeature.Setting)getObjectChanges()).set(newValue);
-        return;
-      case SDOPackage.CHANGE_SUMMARY__OBJECTS_TO_DETACH:
-        getObjectsToDetach().clear();
-        getObjectsToDetach().addAll((Collection)newValue);
-        return;
-      case SDOPackage.CHANGE_SUMMARY__OBJECTS_TO_ATTACH:
-        getObjectsToAttach().clear();
-        getObjectsToAttach().addAll((Collection)newValue);
-        return;
-      case SDOPackage.CHANGE_SUMMARY__RESOURCE_CHANGES:
-        getResourceChanges().clear();
-        getResourceChanges().addAll((Collection)newValue);
-        return;
-      case SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH:
-        setEDataGraph((DataGraph)newValue);
-        return;
-    }
-    eDynamicSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case SDOPackage.CHANGE_SUMMARY__OBJECT_CHANGES:
-        getObjectChanges().clear();
-        return;
-      case SDOPackage.CHANGE_SUMMARY__OBJECTS_TO_DETACH:
-        getObjectsToDetach().clear();
-        return;
-      case SDOPackage.CHANGE_SUMMARY__OBJECTS_TO_ATTACH:
-        getObjectsToAttach().clear();
-        return;
-      case SDOPackage.CHANGE_SUMMARY__RESOURCE_CHANGES:
-        getResourceChanges().clear();
-        return;
-      case SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH:
-        setEDataGraph((DataGraph)null);
-        return;
-    }
-    eDynamicUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case SDOPackage.CHANGE_SUMMARY__OBJECT_CHANGES:
-        return objectChanges != null && !objectChanges.isEmpty();
-      case SDOPackage.CHANGE_SUMMARY__OBJECTS_TO_DETACH:
-        return objectsToDetach != null && !objectsToDetach.isEmpty();
-      case SDOPackage.CHANGE_SUMMARY__OBJECTS_TO_ATTACH:
-        return objectsToAttach != null && !objectsToAttach.isEmpty();
-      case SDOPackage.CHANGE_SUMMARY__RESOURCE_CHANGES:
-        return resourceChanges != null && !resourceChanges.isEmpty();
-      case SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH:
-        return eDataGraph != null;
-    }
-    return eDynamicIsSet(featureID);
-  }
-
-  protected void uncache()
-  {
-    cachedDeletedObjects = null;
-    cachedCreatedObjects = null;
-    cachedSDOObjectChanges.clear();
-  }
-
-  protected class SDOChangeRecorder extends ChangeRecorder
-  {
-    public SDOChangeRecorder()
-    {
-      super();
-    }
-    
-    public void beginRecording(ChangeDescription changeDescription, Collection rootObjects)
-    {
-      uncache();
-      super.beginRecording(changeDescription, rootObjects);
-    }
-
-    protected ChangeDescription createChangeDescription()
-    {
-      return ChangeSummaryImpl.this;
-    }
-
-    protected FeatureChange createFeatureChange(EObject eObject, EStructuralFeature eStructuralFeature, Object value, boolean isSet)
-    {
-      Property property = (Property)eStructuralFeature;
-      if (property.isReadOnly())
-      {
-        if (((DataObject)eObject).getDataGraph() != null)
-        {
-          throw 
-            new IllegalStateException
-              ("The property '" + property.getName() + "' of type '" + 
-                 property.getContainingType().getName() + "' is read only");
-        }
-      }
-      return (FeatureChange)SDOFactory.eINSTANCE.createChangeSummarySetting(eStructuralFeature, value, isSet);
-    }
-    
-    protected void consolidateChanges()
-    {
-      uncache();
-      isStale = false;
-      
-      // TODO remove this fixup when https://bugs.eclipse.org/bugs/show_bug.cgi?id=177235 is
-      // available to us (i.e. we update to EMF 2.3) -- see Tuscany-1164
-      boolean isUncontainedRoot = dataObject != null
-        && ((EObject)dataObject).eContainer() == null
-        && ((EObject)dataObject).eResource() == null;
-      
-      super.consolidateChanges();
-      
-      if(isUncontainedRoot && changeDescription.getObjectsToAttach().contains(dataObject)) {
-        changeDescription.getObjectsToAttach().remove(dataObject);
-      }
-      
-    }
-
-    protected void addAdapter(Notifier notifier)
-    {
-      if (!loadingTargets) return; // Optimize ChangeSummary to not record changes in newly created DOs
-
-      if (notifier instanceof DataObjectImpl)
-        ((DataObjectImpl)notifier).setChangeRecorder(this);
-      else
-        super.addAdapter(notifier);
-    }
-
-    protected void removeAdapter(Notifier notifier)
-    {
-      if (notifier instanceof DataObjectImpl)
-        ((DataObjectImpl)notifier).setChangeRecorder(null);
-      else
-        super.removeAdapter(notifier);
-    }
-    
-    public void notifyChanged(Notification notification) 
-    { 
-      super.notifyChanged(notification);
-
-      Object notifier = notification.getNotifier();
-      if (notifier instanceof EObject)
-      {
-        cachedSDOObjectChanges.remove(notifier);
-        Object feature = notification.getFeature();
-        if (feature instanceof Property && ((Property)feature).isContainment())
-        {
-          cachedCreatedObjects = null;
-          cachedDeletedObjects = null;
-          oldContainmentInformation = null;
-        }
-        isStale = true;
-      }
-    }
-
-  } 
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void endLogging()
-  {
-    if (!isLogging())
-    {
-      throw new IllegalStateException("Not currently logging");
-    }
-    
-    changeRecorder.endRecording();
-    changeRecorder.dispose();
-    changeRecorder = null;
-//    if (eNotificationRequired())
-//      eNotify(new ENotificationImpl(this, Notification.SET, SDOPackage.ECHANGE_SUMMARY__LOGGING, true, false));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isCreated(DataObject dataObject)
-  {
-    return getCachedCreatedObjects().contains(dataObject);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isDeleted(DataObject dataObject)
-  {
-    return getCachedDeletedObjects().contains(dataObject);
-  }
-
-  protected Set getCachedDeletedObjects()
-  {
-    if (cachedDeletedObjects == null)
-    {
-      if (isStale()) changeRecorder.consolidateChanges();
-      cachedDeletedObjects = new HashSet();
-      for (Iterator i = EcoreUtil.getAllContents(getObjectsToAttach()); i.hasNext(); )
-      {
-        cachedDeletedObjects.add(i.next());
-      }
-    }
-    return cachedDeletedObjects;
-  }
-
-  protected List getCachedCreatedObjects()
-  {
-    if (cachedCreatedObjects == null)
-    {
-      if (isStale()) changeRecorder.consolidateChanges();
-      cachedCreatedObjects = super.getObjectsToDetach();
-    }
-    return cachedCreatedObjects;
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getChangedDataObjects()
-  {
-    EList result = new UniqueEList.FastCompare(getCachedDeletedObjects());
-    result.addAll(getCachedCreatedObjects());
-    for (Iterator i = getObjectChanges().iterator(); i.hasNext(); )
-    {
-      Map.Entry entry = (Map.Entry)i.next();
-      result.add(entry.getKey());
-    }
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getOldValues(DataObject dataObject)
-  {
-    List sdoSettings = (List)cachedSDOObjectChanges.get(dataObject);
-    if (sdoSettings != null)
-    {
-      return sdoSettings;
-    }
-
-    if (isStale()) changeRecorder.consolidateChanges();
-    List settings = (List)getObjectChanges().get(dataObject);
-    if (settings == null)
-    {
-      settings = Collections.EMPTY_LIST;
-    }
-    else
-    {
-      for (int i = 0; i < settings.size(); i++)
-      {
-        FeatureChange change = (FeatureChange)settings.get(i);
-        EStructuralFeature feature = change.getFeature();
-        if (FeatureMapUtil.isFeatureMap(feature))
-        {
-          final List values = (List)change.getValue();
-          if (sdoSettings == null)
-          {
-            sdoSettings = new BasicEList(settings);
-          }
-          DelegatingFeatureMap featureMap = new DelegatingFeatureMap(((InternalEObject)dataObject), feature)
-            {
-              protected final List theList = values;
-  
-              protected List delegateList()
-              {
-                return theList;
-              }
-            };
-  
-          // create new settings and replace the setting for mixed feature
-          sdoSettings.set(i, SDOFactory.eINSTANCE.createChangeSummarySetting(feature, new BasicSequence(featureMap), change.isSet()));
-          // add all derived features
-          for (int k = 0; k < featureMap.size(); k++)
-          {
-            EStructuralFeature f = featureMap.getEStructuralFeature(k);
-            sdoSettings.add(SDOFactory.eINSTANCE.createChangeSummarySetting(f, featureMap.get(f, false), true));
-          }
-        }
-      }
-    }
-    sdoSettings = (sdoSettings != null) ? sdoSettings : settings;
-    cachedSDOObjectChanges.put(dataObject, sdoSettings);
-    return sdoSettings;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isModified(DataObject dataObject)
-  {
-    return getObjectChanges().containsKey(dataObject) && !isDeleted(dataObject) && !isCreated(dataObject);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void summarize()
-  {
-    if (!isLogging())
-    {
-      throw new IllegalStateException("Not currently logging");
-    }
-    
-    changeRecorder.summarize();
-  }
-
-  public Setting getOldValue(DataObject dataObject, Property property)
-  {
-    for (Iterator i = getOldValues(dataObject).iterator(); i.hasNext(); )
-    {
-      Setting setting = (Setting)i.next();
-      if (setting.getProperty() == property)
-      {
-        return setting;
-      }
-    }
-
-    return null;
-  }
-
-  public DataObject getOldContainer(DataObject dataObject)
-  {
-    return (DataObject)getOldContainer((EObject)dataObject);
-  }
-
-  public Property getOldContainmentProperty(DataObject dataObject)
-  {
-    return (Property)getOldContainmentFeature((EObject)dataObject);
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Sequence getOldSequence(DataObject dataObject)
-  {
-    EAttribute mixedFeature = BasicExtendedMetaData.INSTANCE.getMixedFeature((EClass)dataObject.getType());
-    if (mixedFeature != null)
-    {
-      return (Sequence)getOldValue(dataObject, (Property)mixedFeature).getValue();
-    }
-    return null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void undoChanges()
-  {
-    if (isLogging())
-    {
-      changeRecorder.summarize();
-    }
-    else
-    {
-      uncache();
-    }
-    apply();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataGraph getDataGraph()
-  {
-    return getEDataGraph();
-  }
-  
-  protected Map getOldContainmentInformation()
-  {
-    if (oldContainmentInformation == null)
-    {
-      if (isStale()) changeRecorder.consolidateChanges();
-      super.getOldContainmentInformation();
-    }
-    return oldContainmentInformation;
-  }
-
-  protected boolean isStale()
-  {
-    return isLogging() && isStale;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject getRootObject()
-  {
-    if (eDataGraph != null)
-    {
-      return eDataGraph.getRootObject();
-    }
-    if (dataObject != null)
-    {
-      return dataObject;
-    }
-    return null;
-  }
-
-  static protected boolean isContainmentReference(Object feature)
-  {
-    return feature instanceof EReference && ((EReference) feature).isContainment();
-  }  
-  
-  public DataObject getOldDataObject(DataObject dataObject)
-  {
-    //TODO: Fix this method. Currently, it has the side effect of undoing the unset of contained children references
-    //      of root deleted objects - i.e., when featureChange.apply(oldDataObject) is called.
-    //
-    List changes = (List) getObjectChanges().get(dataObject);
-    if (changes == null) 
-      return dataObject;
-    EObject oldDataObject = EcoreUtil.copy((EObject)dataObject);
-    for (Iterator fIter = changes.iterator(); fIter.hasNext(); )
-    {
-      FeatureChange featureChange = (FeatureChange)fIter.next();
-      featureChange.apply(oldDataObject);
-      EStructuralFeature feature = featureChange.getFeature();
-      if (FeatureMapUtil.isFeatureMap(feature))
-      {
-        FeatureMap featureMap = (FeatureMap) oldDataObject.eGet(feature);
-        for (int index = featureMap.size(); index != 0;)
-          if (isContainmentReference(featureMap.getEStructuralFeature(--index)))
-            featureMap.setValue(index, getOldDataObject((DataObject) featureMap.getValue(index)));
-      }
-      else if (isContainmentReference(feature))
-      {
-        Object value = oldDataObject.eGet(feature);
-        if (feature.isMany())
-        {
-          changes = (List) value;
-          for (int index = changes.size(); index != 0;)
-            changes.set(--index, getOldDataObject((DataObject) changes.get(index))); // Java pushes stack from left to right
-        }
-        else
-          oldDataObject.eSet(feature, getOldDataObject((DataObject) value));
-      }
-    }
-
-    return (DataObject)oldDataObject;
-  }
-  
-  private static Class concurrentHashMapClazz = null;
-  private static boolean isThreadSafeMapClazzIdentified = false;
-
-  private Map createThreadSafeMap() 
-  {
-    if (!isThreadSafeMapClazzIdentified) 
-    {
-      concurrentHashMapClazz = loadConcurrentHashMapClazz();
-      isThreadSafeMapClazzIdentified = true;
-    }
-    Map threadSafeMap = null;
-    if (concurrentHashMapClazz == null) 
-    {
-      threadSafeMap = Collections.synchronizedMap(new HashMap());
-    } 
-    else 
-    {
-      try 
-      {
-        threadSafeMap = (Map)concurrentHashMapClazz.newInstance();
-      } 
-      catch (InstantiationException e) 
-      {
-        throw new RuntimeException(e);
-      } 
-      catch (IllegalAccessException e) 
-      {
-        throw new RuntimeException(e);
-      }
-    }
-    return threadSafeMap;
-  }
-
-  private static String[] concurrentHashMapClazzNames = new String[] {
-      "java.util.concurrent.ConcurrentHashMap", 
-      "edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap"};
-
-  private static Class loadConcurrentHashMapClazz() 
-  {
-    Class mapClazz = null;
-    for (int i = 0; i < concurrentHashMapClazzNames.length; i++) 
-    {
-      String concurrentHashMapClazzName = concurrentHashMapClazzNames[i];
-      try 
-      {
-        mapClazz = Class.forName(concurrentHashMapClazzName, true, Thread.currentThread().getContextClassLoader());
-      } 
-      catch (Exception ignored) {}
-      if (mapClazz != null) 
-      {
-        break;
-      }
-      try 
-      {
-        mapClazz = Class.forName(concurrentHashMapClazzName);
-      } 
-      catch (Exception ignored) {}
-      if (mapClazz != null) 
-      {
-        break;
-      }
-    }
-    return mapClazz;
-  }
-  
-} //ChangeSummaryImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java
deleted file mode 100644
index d1cd1d3e05..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-
-import java.util.Map;
-
-import org.apache.tuscany.sdo.SDOPackage;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.change.impl.FeatureChangeImpl;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.Property;
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>EChange Summary Setting</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ChangeSummarySettingImpl extends FeatureChangeImpl implements ChangeSummary.Setting
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ChangeSummarySettingImpl()
-  {
-    super();
-  }
-
-  protected ChangeSummarySettingImpl(EStructuralFeature feature, Object value, boolean isSet)
-  {
-    super(feature, value, isSet);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return SDOPackage.eINSTANCE.getChangeSummarySetting();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Object getValue()
-  {
-    EStructuralFeature feature = getFeature();
-    if (feature.isMany())
-    {
-      if (value == null)
-      {
-        EObject eObject = (EObject)((Map.Entry)eContainer()).getKey();
-        value = getListValue((EList)eObject.eGet(feature));
-      }
-      return value;
-    }
-    else
-    {
-      return super.getValue();
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Property getProperty()
-  {
-    return (Property)getFeature();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isSet()
-  {
-    return super.isSet();
-  }
-
-} //EChangeSummarySettingImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
deleted file mode 100644
index cd37620f4c..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
+++ /dev/null
@@ -1,1127 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.tuscany.sdo.SDOFactory;
-import org.apache.tuscany.sdo.SDOPackage;
-import org.apache.tuscany.sdo.model.ModelFactory;
-import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
-import org.apache.tuscany.sdo.util.BasicSequence;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.UniqueEList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EClassImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-
-import commonj.sdo.Property;
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Class</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ClassImpl extends EClassImpl implements Type, org.apache.tuscany.sdo.model.Type/*, DataObject*/
-{
-  private static final long serialVersionUID = 1L;
-	
-  private static final Property UNINITIALIZED_PROPERTY = SDOFactory.eINSTANCE.createAttribute();
-  
-  private Property changeSummaryPropertyCache = UNINITIALIZED_PROPERTY;
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ClassImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  protected EClass eStaticClass()
-  {
-    return SDOPackage.eINSTANCE.getClass_();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String getURI()
-  {
-    return getEPackage().getNsURI();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isDataType()
-  {
-    return false;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isOpen()
-  {
-    final List properties = getExtendedProperties();
-    if (properties != Collections.EMPTY_LIST)
-    {
-      for (int i = 0, count = properties.size(); i < count; ++i)
-      {
-        EStructuralFeature eStructuralFeature = (EStructuralFeature)properties.get(i);
-        if (isOpenFeatureMap(eStructuralFeature))
-          return true;
-      }
-    }
-
-    for (final Iterator iterator = getBaseTypes().iterator() ; iterator.hasNext(); )
-    {
-      Type baseType = (Type)iterator.next();
-      if (baseType.isOpen())
-        return true;
-    }
-
-    return false;
-  }
-
-  private static final EStructuralFeature UNINITIALIZED_SEQUENCE_FEATURE = (EAttribute)SDOFactory.eINSTANCE.createAttribute();
-  protected static final EStructuralFeature VIRTUAL_SEQUENCE_FEATURE = (EAttribute)SDOFactory.eINSTANCE.createAttribute();
-  
-  private EStructuralFeature sequenceFeature = UNINITIALIZED_SEQUENCE_FEATURE;
-
-  public EStructuralFeature getSequenceFeature()
-  {
-    if (sequenceFeature == UNINITIALIZED_SEQUENCE_FEATURE)
-    {
-      EStructuralFeature sequenceFeatureCandidate = null;
-      boolean hasNonDerivedFeatures = false;
-      
-      for (Iterator iterator = getEAllStructuralFeatures().iterator(); iterator.hasNext(); ) 
-      {
-        EStructuralFeature eStructuralFeature = (EStructuralFeature)iterator.next();
-        if (!eStructuralFeature.isDerived()) {
-          if (sequenceFeatureCandidate == null && isSequenceFeatureMap(eStructuralFeature))
-            sequenceFeatureCandidate = eStructuralFeature;
-          else if (isElementFeature(eStructuralFeature) && !DataObjectUtil.isInternalProperty(eStructuralFeature))
-            hasNonDerivedFeatures = true;
-        }
-      }
-      
-      sequenceFeature = 
-        sequenceFeatureCandidate != null && hasNonDerivedFeatures ? 
-          VIRTUAL_SEQUENCE_FEATURE : 
-          sequenceFeatureCandidate;
-    }
-    
-    return sequenceFeature;
-  }
-  
-  protected boolean isSequenceFeatureMap(EStructuralFeature eStructuralFeature)
-  {
-    switch (ExtendedMetaData.INSTANCE.getFeatureKind(eStructuralFeature))
-    {
-      case ExtendedMetaData.ELEMENT_WILDCARD_FEATURE:
-        return eStructuralFeature.getUpperBound() != 1;
-      case ExtendedMetaData.GROUP_FEATURE:
-        return true;
-    }
-    return false;
-  }
-
-  protected boolean isElementFeature(EStructuralFeature eStructuralFeature)
-  {
-    switch (ExtendedMetaData.INSTANCE.getFeatureKind(eStructuralFeature))
-    {
-      case ExtendedMetaData.ATTRIBUTE_FEATURE:
-      case ExtendedMetaData.ATTRIBUTE_WILDCARD_FEATURE:
-        return false;
-    }
-    return true;
-  }
-  
-  public List getVirtualSequenceProperties()
-  {
-    List result = new ArrayList();
-    for (Iterator iterator = getEAllStructuralFeatures().iterator(); iterator.hasNext(); ) 
-    {
-      EStructuralFeature eStructuralFeature = (EStructuralFeature)iterator.next();
-      if (!eStructuralFeature.isDerived() && isElementFeature(eStructuralFeature))
-        result.add(eStructuralFeature);
-    }
-    return result;
-  }
-  
-  public void setSequenceFeature(EAttribute sequenceFeature)
-  {
-    getEStructuralFeatures().add(sequenceFeature);
-    this.sequenceFeature = sequenceFeature;
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isSequenced()
-  {
-    return getSequenceFeature() != null;      
-  }
-  
-  protected List aliasNames = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getAliasNames()
-  {
-    if (aliasNames == null)
-    {
-      aliasNames = DataObjectUtil.getAliasNames(this);
-    }
-    return aliasNames;
-  }
-  
-  protected List declaredProperties = null;
-  
-  public List getDeclaredProperties()
-  {
-    if (declaredProperties == null) {
-      initPropertyLists();
-    }
-    return declaredProperties;
-  }
-  
-  protected List extendedProperties = null;
-  
-  public List getExtendedProperties()
-  {
-    if (extendedProperties == null) {
-      initPropertyLists();
-    }
-    return extendedProperties;
-  }
-  
-  protected List getTypeFeatures()
-  {
-    return getEStructuralFeatures();    
-  }
-  
-  protected void initPropertyLists()
-  {
-    List declaredProperties = new ArrayList();
-    List extendedProperties = Collections.EMPTY_LIST;
-    
-    for (Iterator i = getTypeFeatures().iterator(); i.hasNext(); ) {
-      EStructuralFeature eStructuralFeature = (EStructuralFeature)i.next();
-      boolean isExtendedProperty = DataObjectUtil.isInternalProperty(eStructuralFeature);
-      if (isExtendedProperty) {
-        if (extendedProperties == Collections.EMPTY_LIST)
-          extendedProperties = new ArrayList();
-        extendedProperties.add(eStructuralFeature);
-      }
-      else
-        declaredProperties.add(eStructuralFeature);
-    }
-    this.declaredProperties = declaredProperties;
-    this.extendedProperties = extendedProperties;
-  }
-  
-  public EList getEStructuralFeatures()
-  {
-    if (eStructuralFeatures == null)
-    {
-      eStructuralFeatures = 
-        new EObjectContainmentWithInverseEList(EStructuralFeature.class, this, EcorePackage.ECLASS__ESTRUCTURAL_FEATURES, EcorePackage.ESTRUCTURAL_FEATURE__ECONTAINING_CLASS)
-        {
-          protected void didChange()
-          {
-            declaredProperties = extendedProperties = null;
-          }
-        };
-    }
-    return eStructuralFeatures;
-  }
-
-  protected List allProperties = null;
-  protected List allExtendedProperties = null;
-  protected EList allFeaturesCache = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getProperties()
-  {
-    final EList allFeatures = getEAllStructuralFeatures();
-    if (allFeatures != allFeaturesCache) 
-    {
-      allFeaturesCache = allFeatures;
-      allProperties = allExtendedProperties = null;
-    }
-    if (allProperties == null)
-    { 
-      List allProperties = new UniqueEList();
-      for (final Iterator iterator = getBaseTypes().iterator(); iterator.hasNext(); )
-      {
-        Type baseType = (Type)iterator.next();
-        allProperties.addAll(baseType.getProperties());
-      }
-      allProperties.addAll(getDeclaredProperties());     
-      this.allProperties = allProperties;
-    }
-    return allProperties;
-  }
-
-  public List getAllExtendedProperties()
-  {
-    final EList allFeatures = getEAllStructuralFeatures();
-    if (allFeatures != allFeaturesCache) 
-    {
-      allFeaturesCache = allFeatures;
-      allProperties = allExtendedProperties = null;
-    }
-    if (allExtendedProperties == null)
-    {
-      List allExtendedProperties = new UniqueEList();
-      for (final Iterator iterator = getBaseTypes().iterator(); iterator.hasNext(); )
-      {
-        Type baseType = (Type)iterator.next();
-        allExtendedProperties.addAll(((ClassImpl)baseType).getAllExtendedProperties());
-      }
-      allExtendedProperties.addAll(getExtendedProperties());     
-      this.allExtendedProperties = allExtendedProperties;
-    }
-    return allExtendedProperties;
-  }
-  
-  protected boolean isOpenFeatureMap(EStructuralFeature eStructuralFeature)
-  {
-    switch (ExtendedMetaData.INSTANCE.getFeatureKind(eStructuralFeature))
-    {
-      case ExtendedMetaData.ELEMENT_WILDCARD_FEATURE:
-        return eStructuralFeature != ExtendedMetaData.INSTANCE.getMixedFeature(this);
-      case ExtendedMetaData.ATTRIBUTE_WILDCARD_FEATURE:
-      //FB I think this is wrong ... case ExtendedMetaData.GROUP_FEATURE:
-        return true;
-    }
-    return false;
-  }
-
-  public void addOpenProperties(EObject dataObject, Collection propertyList)
-  {
-    for (final Iterator iterator = getBaseTypes().iterator(); iterator.hasNext(); )
-    {
-      ClassImpl baseType = (ClassImpl)iterator.next();
-      baseType.addOpenProperties(dataObject, propertyList);
-    }
-
-    for (final Iterator iter = getExtendedProperties().iterator(); iter.hasNext(); )
-    {
-      EStructuralFeature eStructuralFeature = (EStructuralFeature)iter.next();
-      if (isOpenFeatureMap(eStructuralFeature))
-      {
-        List features = (List)dataObject.eGet(eStructuralFeature);
-        for (int j = 0, size = features.size(); j < size; ++j)
-        {
-          FeatureMap.Entry entry = (FeatureMap.Entry)features.get(j);
-          EStructuralFeature entryFeature = entry.getEStructuralFeature();
-          Property property = BasicSequence.getFeatureProperty(entryFeature);
-          if (property != null) propertyList.add(entryFeature);
-        }
-      }
-    }
-  }
-  
-  public Property getOpenProperty(EObject dataObject, String featureName)
-  {
-    for (final Iterator iterator = getBaseTypes().iterator(); iterator.hasNext(); )
-    {
-      ClassImpl baseType = (ClassImpl)iterator.next();
-      Property result = baseType.getOpenProperty(dataObject, featureName);
-      if (result != null) return result;
-    }
-    
-    Set openFeatureSet = new HashSet();
-    for (final Iterator iter = getExtendedProperties().iterator(); iter.hasNext(); )
-    {
-      EStructuralFeature eStructuralFeature = (EStructuralFeature)iter.next();
-      //if (isOpenFeatureMap(eStructuralFeature)) 
-      //FB The above check excludes subsitition groups - i.e., doesn't support dObj.get("element.substitution")
-      if (FeatureMapUtil.isFeatureMap(eStructuralFeature))
-      {
-        List features = (List)dataObject.eGet(eStructuralFeature);
-        for (int j = 0, size = features.size(); j < size; ++j)
-        {
-          FeatureMap.Entry entry = (FeatureMap.Entry)features.get(j);
-          EStructuralFeature entryFeature = entry.getEStructuralFeature();
-          if (openFeatureSet.add(entryFeature))
-          {
-            Property property = BasicSequence.getFeatureProperty(entryFeature);
-            if (property != null)
-            {
-              if (property.getName().equals(featureName)) return (Property)entryFeature;
-               List aliasNames = property.getAliasNames();
-              for (int aliasCount = aliasNames.size(); aliasCount > 0; )
-              {
-                if (aliasNames.get(--aliasCount).equals(featureName)) return (Property)entryFeature;
-              }
-            }
-          }
-        }
-      }
-    }
-    
-    return null;
-  }
-  
-  /*
-  public Property getOpenProperty(DataObject dataObject, String featureName)
-  {
-    EObject eObject = (EObject)dataObject;
-    EClass eClass = eObject.eClass();
-    Set openFeatureSet = new HashSet();
-    for (int i = 0, count = eClass.getEAllStructuralFeatures().size(); i < count; ++i)
-    {
-      EStructuralFeature eStructuralFeature = eClass.getEStructuralFeature(i);
-      if (FeatureMapUtil.isFeatureMap(eStructuralFeature))
-      {
-        List features = (List)eObject.eGet(eStructuralFeature);
-        for (int j = 0, size = features.size(); j < size; ++j)
-        {
-          FeatureMap.Entry entry = (FeatureMap.Entry)features.get(j);
-          EStructuralFeature entryFeature = entry.getEStructuralFeature();
-          if (openFeatureSet.add(entryFeature))
-          {
-            Property property = (Property)entryFeature;
-            if (property.getName().equals(featureName)) return (Property)entryFeature;
-  
-            List aliasNames = property.getAliasNames();
-            for (int aliasCount = aliasNames.size(); aliasCount > 0; )
-            {
-              if (aliasNames.get(--aliasCount).equals(featureName)) return (Property)entryFeature;
-            }
-          }
-        }
-      }
-    }
-    return null;
-  }
-  */
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getBaseTypes()
-  {
-    return getESuperTypes();
-  }
-
-  private void initAliasNames() {
-    Map result = new HashMap();
-    for (Iterator i = getProperties().iterator(); i.hasNext();)
-    {
-      Property property = (Property)i.next();
-      result.put(property.getName(), property);
-
-      List aliasNames = property.getAliasNames();
-      for (int count = aliasNames.size(); count > 0;)
-      {
-        result.put(aliasNames.get(--count), property);
-      }
-    }
-    propertyNameToPropertyMap = result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Property getProperty(String propertyName)
-  {
-    if (propertyNameToPropertyMap == null) initAliasNames();
-    Property property = (Property)propertyNameToPropertyMap.get(propertyName);
-    if (property == null && !isOpen()) {
-      initAliasNames();
-      property = (Property)propertyNameToPropertyMap.get(propertyName);
-    }
-    return property;
-  }
-  
-  protected Map propertyNameToPropertyMap;
-  
-  public List getInstanceProperties() {
-    return DataObjectUtil.getMetaObjectInstanceProperties(this);
-  }
-
-  public Object get(Property property) {
-    return DataObjectUtil.getMetaObjectInstanceProperty(this, property);
-  }
-  
-  /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  // org.apache.tuscany.sdo.model.Type method implementations
-  /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  
-  public List getBaseType() {
-    return this.getBaseTypes();
-  }
-
-  public List getProperty() {
-    return this.getProperties();
-  }
-
-  public List getAliasName() {
-    return this.getAliasNames();
-  }
-
-  public void unsetAbstract() {
-    eUnset(EcorePackage.eINSTANCE.getEClass_Abstract());
-  }
-
-  public boolean isSetAbstract() {
-    return eIsSet(EcorePackage.eINSTANCE.getEClass_Abstract());
-  }
-  
-  public Sequence getAny() {
-    throw new UnsupportedOperationException();
-  }
-
-  public Sequence getAnyAttribute() {
-    throw new UnsupportedOperationException();
-  }
-  
-  public void setDataType(boolean value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public void unsetDataType() {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSetDataType() {
-    return false;
-  }
-
-  public void setOpen(boolean value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public void unsetOpen() {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSetOpen() {
-    return isOpen();
-  }
-
-  public void setSequenced(boolean value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public void unsetSequenced() {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSetSequenced() {
-    return isSequenced();
-  }
-
-  public void unsetName()
-  {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSetName()
-  {
-    return true;
-  }
-  
-  public void unsetUri()
-  {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSetUri()
-  {
-    return true;
-  }
-
-  public void setUri(String value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-  
-  public String getUri() {
-    return getURI();
-  }
-
-  public Property getChangeSummaryProperty() {
-    if (changeSummaryPropertyCache == UNINITIALIZED_PROPERTY) {
-      changeSummaryPropertyCache = null;
-
-      // Find property of type ChangeSummaryType, if one exists
-      Type csType = ((ModelFactoryImpl)ModelFactory.INSTANCE).getChangeSummaryType();
-      for (Iterator props = getProperties().iterator(); props.hasNext(); ) {
-        Property p = (Property)props.next();
-        if(csType == p.getType()) {
-          changeSummaryPropertyCache = p;
-          break;
-        }
-      }
-    }
-
-    return changeSummaryPropertyCache;
-  }
-
-  /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  // DataObject method implementations
-  /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  /*
-  public Object get(int propertyIndex) {
-    return DataObjectUtil.get(this, propertyIndex);
-  }
-  
-  public void set(int propertyIndex, Object value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSet(int propertyIndex) {
-    return DataObjectUtil.isSet(this, propertyIndex);
-  }
-
-  public void unset(int propertyIndex) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-  
-  public Object get(Property property) {
-    return DataObjectUtil.get(this, ((EStructuralFeature)property).getFeatureID());
-  }
-  
-  public void set(Property property, Object value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSet(Property property) {
-    return DataObjectUtil.isSet(this, ((EStructuralFeature)property).getFeatureID());
-  }
-
-  public void unset(Property property) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-  
-  public DataObject getContainer() {
-    return (DataObject)eContainer();
-  }
-
-  public Property getContainmentProperty() {
-    return (Property)eContainmentFeature();
-  }
-
-  public Type getType() {
-    return (Type)ModelPackageImpl.eINSTANCE.getType();
-  }
-  
-  // Remaining DataObject methods are (will be) implemented as straight delegation to DataObjectUtil
-
-  public Object get(String path) {
-    return DataObjectUtil.get(this, path);
-  }
-  
-  public void set(String path, Object value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSet(String path) {
-    return DataObjectUtil.isSet(this, path);
-  }
-
-  public void unset(String path) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean getBoolean(String path) {
-    return DataObjectUtil.getBoolean(get(path));
-  }
-
-  public byte getByte(String path) {
-    return DataObjectUtil.getByte(get(path));
-  }
-
-  public char getChar(String path) {
-    return DataObjectUtil.getChar(get(path));
-  }
-
-  public double getDouble(String path) {
-    return DataObjectUtil.getDouble(get(path));
-  }
-
-  public float getFloat(String path) {
-    return DataObjectUtil.getFloat(get(path));
-  }
-
-  public int getInt(String path) {
-    return DataObjectUtil.getInt(get(path));
-  }
-
-  public long getLong(String path) {
-    return DataObjectUtil.getLong(get(path));
-  }
-
-  public short getShort(String path) {
-    return DataObjectUtil.getShort(get(path));
-  }
-
-  public byte[] getBytes(String path) {
-    return DataObjectUtil.getBytes(get(path));
-  }
-
-  public BigDecimal getBigDecimal(String path) {
-    return DataObjectUtil.getBigDecimal(get(path));
-  }
-
-  public BigInteger getBigInteger(String path) {
-    return DataObjectUtil.getBigInteger(get(path));
-  }
-
-  public DataObject getDataObject(String path) {
-    return (DataObject)get(path);
-  }
-
-  public Date getDate(String path) {
-    return DataObjectUtil.getDate(get(path));
-  }
-
-  public String getString(String path) {
-    return DataObjectUtil.getString(get(path));
-  }
-
-  public List getList(String path) {
-    return (List)get(path);
-  }
-
-  public Sequence getSequence(String path) {
-    return (Sequence)get(path);
-  }
-
-  public void setBoolean(String path, boolean value) {
-    set(path, new Boolean(value));
-  }
-
-  public void setByte(String path, byte value) {
-    set(path, new Byte(value));
-  }
-
-  public void setChar(String path, char value) {
-    set(path, new Character(value));
-  }
-
-  public void setDouble(String path, double value) {
-    set(path, new Double(value));
-  }
-
-  public void setFloat(String path, float value) {
-    set(path, new Float(value));
-  }
-
-  public void setInt(String path, int value) {
-    set(path, new Integer(value));
-  }
-
-  public void setLong(String path, long value) {
-    set(path, new Long(value));
-  }
-
-  public void setShort(String path, short value) {
-    set(path, new Short(value));
-  }
-
-  public void setBytes(String path, byte[] value) {
-    set(path, value);
-  }
-
-  public void setBigDecimal(String path, BigDecimal value) {
-    set(path, value);
-  }
-
-  public void setBigInteger(String path, BigInteger value) {
-    set(path, value);
-  }
-
-  public void setDataObject(String path, DataObject value) {
-    set(path, value);
-  }
-
-  public void setDate(String path, Date value) {
-    set(path, value);
-  }
-
-  public void setString(String path, String value) {
-    set(path, value);
-  }
-
-  public void setList(String path, List value) {
-    set(path, value);
-  }
-
-  public boolean getBoolean(int propertyIndex) {
-    return DataObjectUtil.getBoolean(this, propertyIndex);
-  }
-
-  public byte getByte(int propertyIndex) {
-    return DataObjectUtil.getByte(this, propertyIndex);
-  }
-
-  public char getChar(int propertyIndex) {
-    return DataObjectUtil.getChar(this, propertyIndex);
-  }
-
-  public double getDouble(int propertyIndex) {
-    return DataObjectUtil.getDouble(this, propertyIndex);
-  }
-
-  public float getFloat(int propertyIndex) {
-    return DataObjectUtil.getFloat(this, propertyIndex);
-  }
-
-  public int getInt(int propertyIndex) {
-    return DataObjectUtil.getInt(this, propertyIndex);
-  }
-
-  public long getLong(int propertyIndex) {
-    return DataObjectUtil.getLong(this, propertyIndex);
-  }
-
-  public short getShort(int propertyIndex) {
-    return DataObjectUtil.getShort(this, propertyIndex);
-  }
-
-  public byte[] getBytes(int propertyIndex) {
-    return DataObjectUtil.getBytes(this, propertyIndex);
-  }
-
-  public BigDecimal getBigDecimal(int propertyIndex) {
-    return DataObjectUtil.getBigDecimal(this, propertyIndex);
-  }
-
-  public BigInteger getBigInteger(int propertyIndex) {
-    return DataObjectUtil.getBigInteger(this, propertyIndex);
-  }
-
-  public DataObject getDataObject(int propertyIndex) {
-    return DataObjectUtil.getDataObject(this, propertyIndex);
-  }
-
-  public Date getDate(int propertyIndex) {
-    return DataObjectUtil.getDate(this, propertyIndex);
-  }
-
-  public String getString(int propertyIndex) {
-    return DataObjectUtil.getString(this, propertyIndex);
-  }
-
-  public List getList(int propertyIndex) {
-    return DataObjectUtil.getList(this, propertyIndex);
-  }
-
-  public Sequence getSequence(int propertyIndex) {
-    return DataObjectUtil.getSequence(this, propertyIndex);
-  }
-
-  public void setBoolean(int propertyIndex, boolean value) {
-    set(propertyIndex, new Boolean(value));
-  }
-
-  public void setByte(int propertyIndex, byte value) {
-    set(propertyIndex, new Byte(value));
-  }
-
-  public void setChar(int propertyIndex, char value) {
-    set(propertyIndex, new Character(value));
-  }
-
-  public void setDouble(int propertyIndex, double value) {
-    set(propertyIndex, new Double(value));
-  }
-
-  public void setFloat(int propertyIndex, float value) {
-    set(propertyIndex, new Float(value));
-  }
-
-  public void setInt(int propertyIndex, int value) {
-    set(propertyIndex, new Integer(value));
-  }
-
-  public void setLong(int propertyIndex, long value) {
-    set(propertyIndex, new Long(value));
-  }
-
-  public void setShort(int propertyIndex, short value) {
-    set(propertyIndex, new Short(value));
-  }
-
-  public void setBytes(int propertyIndex, byte[] value) {
-    set(propertyIndex, value);
-  }
-
-  public void setBigDecimal(int propertyIndex, BigDecimal value) {
-    set(propertyIndex, value);
-  }
-
-  public void setBigInteger(int propertyIndex, BigInteger value) {
-    set(propertyIndex, value);
-  }
-
-  public void setDataObject(int propertyIndex, DataObject value) {
-    set(propertyIndex, value);
-  }
-
-  public void setDate(int propertyIndex, Date value) {
-    set(propertyIndex, value);
-  }
-
-  public void setString(int propertyIndex, String value) {
-    set(propertyIndex, value);
-  }
-
-  public void setList(int propertyIndex, List value) {
-    set(propertyIndex, value);
-  }
-
-  public boolean getBoolean(Property property) {
-    return DataObjectUtil.getBoolean(this, property);
-  }
-
-  public byte getByte(Property property) {
-    return DataObjectUtil.getByte(this, property);
-  }
-
-  public char getChar(Property property) {
-    return DataObjectUtil.getChar(this, property);
-  }
-
-  public double getDouble(Property property) {
-    return DataObjectUtil.getDouble(this, property);
-  }
-
-  public float getFloat(Property property) {
-    return DataObjectUtil.getFloat(this, property);
-  }
-
-  public int getInt(Property property) {
-    return DataObjectUtil.getInt(this, property);
-  }
-
-  public long getLong(Property property) {
-    return DataObjectUtil.getLong(this, property);
-  }
-
-  public short getShort(Property property) {
-    return DataObjectUtil.getShort(this, property);
-  }
-
-  public byte[] getBytes(Property property) {
-    return DataObjectUtil.getBytes(this, property);
-  }
-
-  public BigDecimal getBigDecimal(Property property) {
-    return DataObjectUtil.getBigDecimal(this, property);
-  }
-
-  public BigInteger getBigInteger(Property property) {
-    return DataObjectUtil.getBigInteger(this, property);
-  }
-
-  public DataObject getDataObject(Property property) {
-    return DataObjectUtil.getDataObject(this, property);
-  }
-
-  public Date getDate(Property property) {
-    return DataObjectUtil.getDate(this, property);
-  }
-
-  public String getString(Property property) {
-    return DataObjectUtil.getString(this, property);
-  }
-
-  public List getList(Property property) {
-    return DataObjectUtil.getList(this, property);
-  }
-
-  public Sequence getSequence(Property property) {
-    return DataObjectUtil.getSequence(this, property);
-  }
-
-  public void setBoolean(Property property, boolean value) {
-    set(property, new Boolean(value));
-  }
-
-  public void setByte(Property property, byte value) {
-    set(property, new Byte(value));
-  }
-
-  public void setChar(Property property, char value) {
-    set(property, new Character(value));
-  }
-
-  public void setDouble(Property property, double value) {
-    set(property, new Double(value));
-  }
-
-  public void setFloat(Property property, float value) {
-    set(property, new Float(value));
-  }
-
-  public void setInt(Property property, int value) {
-    set(property, new Integer(value));
-  }
-
-  public void setLong(Property property, long value) {
-    set(property, new Long(value));
-  }
-
-  public void setShort(Property property, short value) {
-    set(property, new Short(value));
-  }
-
-  public void setBytes(Property property, byte[] value) {
-    set(property, value);
-  }
-
-  public void setBigDecimal(Property property, BigDecimal value) {
-    set(property, value);
-  }
-
-  public void setBigInteger(Property property, BigInteger value) {
-    set(property, value);
-  }
-
-  public void setDataObject(Property property, DataObject value) {
-    set(property, value);
-  }
-
-  public void setDate(Property property, Date value) {
-    set(property, value);
-  }
-
-  public void setString(Property property, String value) {
-    set(property, value);
-  }
-
-  public void setList(Property property, List value) {
-    set(property, value);
-  }
-
-  public DataObject createDataObject(String propertyName) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public DataObject createDataObject(int propertyIndex) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public DataObject createDataObject(Property property) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public DataObject createDataObject(String propertyName, String namespaceURI, String typeName) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public DataObject createDataObject(int propertyIndex, String namespaceURI, String typeName) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public DataObject createDataObject(Property property, Type type) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public void delete() {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public DataGraph getDataGraph() {
-    return DataObjectUtil.getDataGraph(this);
-  }
-
-  public Sequence getSequence() {
-    EAttribute mixedFeature = BasicExtendedMetaData.INSTANCE.getMixedFeature(eClass());
-    return mixedFeature != null ? (Sequence)eGet(mixedFeature, true, false) : null;
-  }
-
-  public List getInstanceProperties() {
-    return DataObjectUtil.getInstanceProperties(this);
-  }
-
-  public DataObject getRootObject() {
-    return DataObjectUtil.getRootObject(this);
-  }
-
-  public ChangeSummary getChangeSummary() {
-    // TODO: implement this method
-    throw new UnsupportedOperationException();
-  }
-
-  public void detach() {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-    //DataObjectUtil.detach(this);
-  }
-  */
-
-} //ClassTypeImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java
deleted file mode 100644
index d61b7fd05e..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java
+++ /dev/null
@@ -1,852 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.tuscany.sdo.SDOFactory;
-import org.apache.tuscany.sdo.SDOPackage;
-import org.apache.tuscany.sdo.helper.TypeHelperImpl;
-import org.apache.tuscany.sdo.lib.SDOObjectInputStream;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.BasicExtendedMetaData;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.DataGraph;
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-import commonj.sdo.helper.TypeHelper;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>EData Graph</b></em>'.
- * @extends DataGraph, Adapter, Serializable
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.impl.DataGraphImpl#getResourceSet <em>Resource Set</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.impl.DataGraphImpl#getRootResource <em>Root Resource</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.impl.DataGraphImpl#getEChangeSummary <em>EChange Summary</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.impl.DataGraphImpl#getERootObject <em>ERoot Object</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DataGraphImpl extends EObjectImpl implements DataGraph, Adapter, Serializable
-{
-  /**
-   * The default value of the '{@link #getResourceSet() <em>Resource Set</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceSet()
-   * @generated
-   * @ordered
-   */
-  protected static final ResourceSet RESOURCE_SET_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getResourceSet() <em>Resource Set</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getResourceSet()
-   * @generated
-   * @ordered
-   */
-  protected ResourceSet resourceSet = RESOURCE_SET_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getRootResource() <em>Root Resource</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getRootResource()
-   * @generated
-   * @ordered
-   */
-  protected static final Resource ROOT_RESOURCE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getEChangeSummary() <em>EChange Summary</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getEChangeSummary()
-   * @generated
-   * @ordered
-   */
-  protected ChangeSummary eChangeSummary = null;
-
-  /**
-   * The cached value of the '{@link #getERootObject() <em>ERoot Object</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getERootObject()
-   * @generated
-   * @ordered
-   */
-  protected EObject eRootObject = null;
-
-  /**
-   * The cached extended metadata to wrap the resource set's package registry.
-   */
-  protected ExtendedMetaData extendedMetaData;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected DataGraphImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return SDOPackage.eINSTANCE.getDataGraph();
-  }
-
-  public boolean isAdapterForType(Object type)
-  {
-    return type == DataGraph.class;
-  }
-
-  public void notifyChanged(Notification msg)
-  {
-  }
-
-  public Notifier getTarget()
-  {
-    return getResourceSet();
-  }
-
-  public void setTarget(Notifier newTarget)
-  {
-  }
-
-  protected ExtendedMetaData getExtendedMetaData()
-  {
-    if (extendedMetaData == null)
-    {
-      getResourceSet();
-    }
-    return extendedMetaData;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public ResourceSet getResourceSet()
-  {
-    if (resourceSet == null)
-    {
-      if (eResource() != null)
-      {
-        resourceSet = eResource().getResourceSet();
-      }
-      if (resourceSet == null)
-      {
-        resourceSet = createResourceSet();
-      }
-      initializeResourceSet(resourceSet);
-    }
-    return resourceSet;
-  }
-
-  protected ResourceSet createResourceSet()
-  {
-    return DataObjectUtil.createResourceSet();
-  }
-
-  protected Resource createRootResource()
-  {
-    Resource result = resourceSet.createResource(URI.createURI("root.xml"));
-    result.getContents().clear();
-    return result;
-  }
-
-  protected Resource createChangeSummaryResource()
-  {
-    Resource result = resourceSet.createResource(URI.createURI("change-summary.xml"));
-    result.getContents().clear();
-    return result;
-  }
-
-  protected void initializeResourceSet(ResourceSet resourceSet)
-  {
-    if (resourceSet == null)
-    {
-      extendedMetaData = null;
-    }
-    else
-    {
-      extendedMetaData = new BasicExtendedMetaData(resourceSet.getPackageRegistry());
-      resourceSet.eAdapters().add(this);
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setResourceSetGen(ResourceSet newResourceSet)
-  {
-    ResourceSet oldResourceSet = resourceSet;
-    resourceSet = newResourceSet;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SDOPackage.DATA_GRAPH__RESOURCE_SET, oldResourceSet, resourceSet));
-  }
-
-  public void setResourceSet(ResourceSet newResourceSet)
-  {
-    if (resourceSet != null)
-    {
-      resourceSet.eAdapters().remove(this);
-    }
-    setResourceSetGen(newResourceSet);
-    initializeResourceSet(newResourceSet);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Resource getRootResource()
-  {
-    if (eRootObject == null)
-    {
-      Resource result = getResourceSet().getResource(URI.createURI("root.xml"), false);
-      if (result == null)
-      {
-        result = createRootResource();
-      }
-
-      return result;
-    }
-    else
-    {
-      return eRootObject.eResource();
-    }
-  }
-
-  public Resource getDataGraphResource()
-  {
-    Resource result = eResource();
-    if (result == null)
-    {
-      result = getResourceSet().createResource(URI.createURI("all.datagraph"));
-      result.getContents().add(this);
-    }
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeSummary getEChangeSummary()
-  {
-    return eChangeSummary;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain basicSetEChangeSummary(ChangeSummary newEChangeSummary, NotificationChain msgs)
-  {
-    ChangeSummary oldEChangeSummary = eChangeSummary;
-    eChangeSummary = newEChangeSummary;
-    if (eNotificationRequired())
-    {
-      ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, SDOPackage.DATA_GRAPH__ECHANGE_SUMMARY, oldEChangeSummary, newEChangeSummary);
-      if (msgs == null) msgs = notification; else msgs.add(notification);
-    }
-    return msgs;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setEChangeSummary(ChangeSummary newEChangeSummary)
-  {
-    if (newEChangeSummary != eChangeSummary)
-    {
-      NotificationChain msgs = null;
-      if (eChangeSummary != null)
-        msgs = ((InternalEObject)eChangeSummary).eInverseRemove(this, SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH, ChangeSummary.class, msgs);
-      if (newEChangeSummary != null)
-        msgs = ((InternalEObject)newEChangeSummary).eInverseAdd(this, SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH, ChangeSummary.class, msgs);
-      msgs = basicSetEChangeSummary(newEChangeSummary, msgs);
-      if (msgs != null) msgs.dispatch();
-    }
-    else if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SDOPackage.DATA_GRAPH__ECHANGE_SUMMARY, newEChangeSummary, newEChangeSummary));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EObject getERootObject()
-  {
-    return eRootObject;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setERootObjectGen(EObject newERootObject)
-  {
-    EObject oldERootObject = eRootObject;
-    eRootObject = newERootObject;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SDOPackage.DATA_GRAPH__EROOT_OBJECT, oldERootObject, eRootObject));
-  }
-
-  public void setERootObject(EObject newERootObject)
-  {
-    // If there is a resource set already...
-    //
-    if (resourceSet != null)
-    {
-      // Get the root resource and if there's a root object in it already, clear it.
-      // Then set the root object and add it to the root resource.
-      //
-      List contents = getRootResource().getContents();
-      if (eRootObject != null)
-      {
-        contents.clear();
-      }
-      setERootObjectGen(newERootObject);
-      if (newERootObject != null)
-      {
-        contents.add(newERootObject);
-      }
-    }
-    else
-    {
-      // Set the root object and see if it has a resource we can reuse.
-      //
-      setERootObjectGen(newERootObject);
-      Resource rootResource = newERootObject.eResource();
-      if (rootResource != null)
-      {
-        // If there is no resource set
-        //
-        if (rootResource.getResourceSet() == null)
-        {
-          // Demand create one and add this resource to it.
-          //
-          getResourceSet().getResources().add(rootResource);
-        }
-        else
-        {
-          // Reuse the existing resource set.
-          //
-          setResourceSet(rootResource.getResourceSet());
-        }
-      }
-      else
-      {
-        // Demand create the resource set and the root resource, and add to it's contents.
-        //
-        getResourceSet();
-        createRootResource().getContents().add(newERootObject);
-      }
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public EClassifier getEClassifier(String namespaceURI, String typeName)
-  {
-    ExtendedMetaData extendedMetaData = getExtendedMetaData();
-    EPackage ePackage = extendedMetaData.getPackage(namespaceURI);
-    if (ePackage != null)
-    {
-      EClassifier eClassifier = ePackage.getEClassifier(typeName);
-      if (eClassifier == null)
-      {
-        eClassifier = extendedMetaData.getType(ePackage, typeName);
-      }
-      return eClassifier;
-    }
-    else
-    {
-      return null;
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Type getType(String namespaceURI, String typeName)
-  {
-    return TypeHelper.INSTANCE.getType(namespaceURI, typeName);
-    //EClassifier eClassifier = getEClassifier(namespaceURI, typeName);
-    //return eClassifier == null ? null : SDOUtil.getType(eClassifier);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case SDOPackage.DATA_GRAPH__ECHANGE_SUMMARY:
-          if (eChangeSummary != null)
-            msgs = ((InternalEObject)eChangeSummary).eInverseRemove(this, SDOPackage.CHANGE_SUMMARY__EDATA_GRAPH, ChangeSummary.class, msgs);
-          return basicSetEChangeSummary((ChangeSummary)otherEnd, msgs);
-        default:
-          return eDynamicInverseAdd(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    if (eInternalContainer() != null)
-      msgs = eBasicRemoveFromContainer(msgs);
-    return eBasicSetContainer(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, Class baseClass, NotificationChain msgs)
-  {
-    if (featureID >= 0)
-    {
-      switch (eDerivedStructuralFeatureID(featureID, baseClass))
-      {
-        case SDOPackage.DATA_GRAPH__ECHANGE_SUMMARY:
-          return basicSetEChangeSummary(null, msgs);
-        default:
-          return eDynamicInverseRemove(otherEnd, featureID, baseClass, msgs);
-      }
-    }
-    return eBasicSetContainer(null, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SDOPackage.DATA_GRAPH__RESOURCE_SET:
-        return getResourceSet();
-      case SDOPackage.DATA_GRAPH__ROOT_RESOURCE:
-        return getRootResource();
-      case SDOPackage.DATA_GRAPH__ECHANGE_SUMMARY:
-        return getEChangeSummary();
-      case SDOPackage.DATA_GRAPH__EROOT_OBJECT:
-        return getERootObject();
-    }
-    return eDynamicGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case SDOPackage.DATA_GRAPH__RESOURCE_SET:
-        setResourceSet((ResourceSet)newValue);
-        return;
-      case SDOPackage.DATA_GRAPH__ECHANGE_SUMMARY:
-        setEChangeSummary((ChangeSummary)newValue);
-        return;
-      case SDOPackage.DATA_GRAPH__EROOT_OBJECT:
-        setERootObject((EObject)newValue);
-        return;
-    }
-    eDynamicSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case SDOPackage.DATA_GRAPH__RESOURCE_SET:
-        setResourceSet(RESOURCE_SET_EDEFAULT);
-        return;
-      case SDOPackage.DATA_GRAPH__ECHANGE_SUMMARY:
-        setEChangeSummary((ChangeSummary)null);
-        return;
-      case SDOPackage.DATA_GRAPH__EROOT_OBJECT:
-        setERootObject((EObject)null);
-        return;
-    }
-    eDynamicUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case SDOPackage.DATA_GRAPH__RESOURCE_SET:
-        return RESOURCE_SET_EDEFAULT == null ? resourceSet != null : !RESOURCE_SET_EDEFAULT.equals(resourceSet);
-      case SDOPackage.DATA_GRAPH__ROOT_RESOURCE:
-        return ROOT_RESOURCE_EDEFAULT == null ? getRootResource() != null : !ROOT_RESOURCE_EDEFAULT.equals(getRootResource());
-      case SDOPackage.DATA_GRAPH__ECHANGE_SUMMARY:
-        return eChangeSummary != null;
-      case SDOPackage.DATA_GRAPH__EROOT_OBJECT:
-        return eRootObject != null;
-    }
-    return eDynamicIsSet(featureID);
-  }
-
-  public DataObject createEDataObject(Type type)
-  {
-    return DataObjectUtil.create(type);
-  }
-
-  public DataObject getRootObject()
-  {
-    return (DataObject)getERootObject();
-  }
-
-  public DataObject createRootObject(String namespaceURI, String typeName)
-  {
-    Type type = getType(namespaceURI, typeName);
-    if (type == null) {
-        throw new IllegalArgumentException(
-                "createRootObject given invalid parameters: getType("+
-                namespaceURI+", "+typeName+") returned null type");
-    }
-    if (getERootObject() != null) {
-        throw new IllegalStateException(
-                "createRootObject was called when a root object already exists");
-    }
-    DataObject dataObject = DataObjectUtil.create(type);
-    setERootObject((EObject)dataObject);
-    return dataObject;
-  }
-
-  public DataObject createRootObject(Type type)
-  {
-    if (type == null) {
-      throw new IllegalArgumentException(
-              "createRootObject must be provided a non-null type");
-    }
-    if (getERootObject() != null) {
-        throw new IllegalStateException(
-                "createRootObject was called when a root object already exists");
-    }
-    DataObject dataObject = DataObjectUtil.create(type);
-    setERootObject((EObject)dataObject);
-    return dataObject;
-  }
-
-  public ChangeSummary getChangeSummary()
-  {
-    //FB is this the right place to create the resources?
-    ChangeSummary changeSummary = getEChangeSummary();
-    if (changeSummary == null)
-    {
-      getRootResource();
-      changeSummary = createEChangeSummary();
-      setEChangeSummary(changeSummary);
-    }
-
-    if (((ChangeSummaryImpl)changeSummary).eResource() == null)
-    {
-      Resource changeSummaryResource = createChangeSummaryResource();
-      changeSummaryResource.getContents().add(changeSummary);
-    }
-
-    return changeSummary;
-  }
-
-  protected ChangeSummaryImpl createEChangeSummary()
-  {
-    return (ChangeSummaryImpl)SDOFactory.eINSTANCE.createChangeSummary();
-  }
-
-  public static class EDataGraphExternalizable implements Externalizable
-  {
-    protected DataGraphImpl eDataGraph;
-    //protected Map writeReplacements = new HashMap();
-
-    public EDataGraphExternalizable()
-    {
-    }
-
-    public EDataGraphExternalizable(DataGraphImpl eDataGraph)
-    {
-      this.eDataGraph = eDataGraph;
-    }
-
-    public void writeExternal(ObjectOutput objectOutput) throws IOException
-    {
-      ByteArrayOutputStream byteArrayOutputStream =
-        new ByteArrayOutputStream()
-        {
-          public byte [] toByteArray()
-          {
-            return super.toByteArray();
-          }
-        };
-
-      eDataGraph.getDataGraphResource().save(byteArrayOutputStream, null);
-      objectOutput.writeInt(byteArrayOutputStream.toByteArray().length);
-      objectOutput.write(byteArrayOutputStream.toByteArray());
-    }
-
-    public void readExternal(ObjectInput objectInput) throws IOException
-    {
-      int length = objectInput.readInt();
-      byte [] bytes = new byte [length];
-      objectInput.readFully(bytes);
-
-      ResourceSet resourceSet = createResourceSet();
-      Resource resource = resourceSet.createResource(URI.createURI("all.datagraph"));
-
-      HashMap map = null;
-      if(objectInput instanceof SDOObjectInputStream)
-      {
-         TypeHelperImpl th = (TypeHelperImpl)((SDOObjectInputStream)objectInput).getHelperContext().getTypeHelper();
-         map = new HashMap();
-         map.put("EXTENDED_META_DATA", th.getExtendedMetaData());
-      }
-      resource.load(new ByteArrayInputStream(bytes), map);
-      eDataGraph = (DataGraphImpl)resource.getContents().get(0);
-    }
-
-    protected ResourceSet createResourceSet()
-    {
-      return DataObjectUtil.createResourceSet();
-    }
-
-    /*
-    public Object getWriteReplacement(EObject eObject)
-    {
-      Object result = writeReplacements.get(eObject);
-      if (result == null)
-      {
-        result = new EDataObjectExternalizable(eDataGraph, eObject);
-        writeReplacements.put(eObject, result);
-      }
-      return result;
-    }
-    */
-
-    protected Object readResolve()
-    {
-      return eDataGraph;
-    }
-  }
-
-  /*
-  public static class EDataObjectExternalizable implements Externalizable
-  {
-    protected EObject eObject;
-    protected DataGraphImpl eDataGraph;
-
-    public EDataObjectExternalizable()
-    {
-    }
-
-    public EDataObjectExternalizable(DataGraphImpl eDataGraph, EObject eObject)
-    {
-      this.eDataGraph = eDataGraph;
-      this.eObject = eObject;
-    }
-
-    public void writeExternal(ObjectOutput objectOutput) throws IOException
-    {
-      // Write the data object reference too.
-      String uri = eObject.eResource().getURIFragment(eObject);
-      objectOutput.writeUTF(uri);
-      objectOutput.writeObject(eDataGraph.getWriteReplacement());
-    }
-
-    public void readExternal(ObjectInput objectInput) throws IOException, ClassNotFoundException
-    {
-      String uri = objectInput.readUTF();
-      eDataGraph = (DataGraphImpl)objectInput.readObject();
-      eObject = eDataGraph.getRootResource().getEObject(uri);
-    }
-
-    protected Object readResolve()
-    {
-      return eObject;
-    }
-  }
-  */
-  
-  protected EDataGraphExternalizable eDataGraphExternalizable;
-  //protected Adapter modificationTracker;
-
-  public Object getWriteReplacement()
-  {
-    if (eDataGraphExternalizable == null)
-    {
-      eDataGraphExternalizable = createEDataGraphExternalizable();
-      /*
-      getRootResource().setTrackingModification(true);
-      modificationTracker = 
-        new AdapterImpl()
-        {
-          public void notifyChanged(Notification notification)
-          {
-            if (notification.getFeatureID(Resource.class) == Resource.RESOURCE__IS_MODIFIED && notification.getNewBooleanValue())
-            {
-              eDataGraphExternalizable = null;
-              modificationTracker = null;
-              ((Resource)target).eAdapters().remove(this);
-            }
-          }
-        };
-      getRootResource().eAdapters().add(modificationTracker);
-      */
-    }
-    return eDataGraphExternalizable;
-  }
-
-  protected EDataGraphExternalizable createEDataGraphExternalizable()
-  {
-    return new EDataGraphExternalizable(this);
-  }
-
-  /*
-  public Object getWriteReplacement(EObject eObject)
-  {
-    return ((EDataGraphExternalizable)getWriteReplacement()).getWriteReplacement(eObject);
-  }
-  */
-
-  public Object writeReplace()
-  {
-    return getWriteReplacement();
-  }
-
-  public EObject eObjectForURIFragmentSegment(String uriFragmentSegment)
-  {
-    if (uriFragmentSegment.startsWith("@models."))
-    {
-      if (resourceSet != null)
-      {
-        int count = Integer.parseInt(uriFragmentSegment.substring(8));
-        for (Iterator i = resourceSet.getResources().iterator(); i.hasNext(); )
-        {
-          Resource ePackageResource =  (Resource)i.next();
-          List resourceContents =  ePackageResource.getContents();
-          if (resourceContents.size() == 1 && resourceContents.get(0) instanceof EPackage && count-- == 0)
-          {
-            return (EObject)resourceContents.get(0);
-          }
-        }
-      }
-
-      return null;
-    }
-    else
-    {
-      return super.eObjectForURIFragmentSegment(uriFragmentSegment);
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (resourceSet: ");
-    result.append(resourceSet);
-    result.append(')');
-    return result.toString();
-  }
-
-} //EDataGraphImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
deleted file mode 100644
index 34216bc1e2..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectBase.java
+++ /dev/null
@@ -1,536 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-
-import java.util.List;
-
-import org.apache.tuscany.sdo.SDOFactory;
-import org.apache.tuscany.sdo.helper.HelperContextImpl;
-import org.apache.tuscany.sdo.util.BasicSequence;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.EStructuralFeature.Setting;
-import org.eclipse.emf.ecore.EStructuralFeature.Internal.SettingDelegate;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.EDataTypeEList;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EObjectEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.EObjectWithInverseEList;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import commonj.sdo.Property;
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-
-
-/**
- * Base implementation of the SDO DataObject interface. Used as base class for generated (static) SDO classes
- */
-public abstract class DataObjectBase extends ExtensibleDataObjectImpl
-{
-  
-  protected int OPPOSITE_FEATURE_BASE = EOPPOSITE_FEATURE_BASE; 
-  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-  // Following methods should be proposed SPI for generated subclasses to use
-  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-  protected boolean isNotifying()
-  {
-    return changeRecorder != null;
-  }
-  
-  protected interface ChangeKind
-  {
-    int SET = Notification.SET;
-    int UNSET = Notification.UNSET;
-    int RESOLVE = Notification.RESOLVE;
-  }
-
-  /**
-   * notify methods for types: boolean, byte, char, double, float, int, long, short, and Object 
-   */
-  
-  protected void notify(int changeKind, int property, boolean oldBooleanValue, boolean newBooleanValue)
-  {
-  	eNotify(new ENotificationImpl(this, Notification.SET, property, oldBooleanValue, newBooleanValue));
-  }
-  
-  protected void notify(int changeKind, int property, boolean oldBooleanValue, boolean newBooleanValue, boolean isSetChange)
-  {
-  	eNotify(new ENotificationImpl(this, Notification.SET, property, oldBooleanValue, newBooleanValue, isSetChange));
-  }
-  
-  protected void notify(int changeKind, int property, byte oldByteValue, byte newByteValue)
-  {
-  	eNotify(new ENotificationImpl(this, Notification.SET, property, oldByteValue, newByteValue));
-  }
-  
-  protected void notify(int changeKind, int property, byte oldByteValue, byte newByteValue, boolean isSetChange)
-  {
-  	eNotify(new ENotificationImpl(this, Notification.SET, property, oldByteValue, newByteValue, isSetChange));
-  }
-  
-  protected void notify(int changeKind, int property, char oldCharValue, char newCharValue)
-  {
-  	eNotify(new ENotificationImpl(this, Notification.SET, property, oldCharValue, newCharValue));
-  }
-  
-  protected void notify(int changeKind, int property, char oldCharValue, char newCharValue, boolean isSetChange)
-  {
-  	eNotify(new ENotificationImpl(this, Notification.SET, property, oldCharValue, newCharValue, isSetChange));
-  }
-  
-  protected void notify(int changeKind, int property, double oldDoubleValue, double newDoubleValue)
-  {
-    eNotify(new ENotificationImpl(this, Notification.SET, property, oldDoubleValue, newDoubleValue));
-  }
-  
-  protected void notify(int changeKind, int property, double oldDoubleValue, double newDoubleValue, boolean isSetChange)
-  {
-    eNotify(new ENotificationImpl(this, Notification.SET, property, oldDoubleValue, newDoubleValue, isSetChange));
-  }
-  
-  protected void notify(int changeKind, int property, float oldFloatValue, float newFloatValue)
-  {
-    eNotify(new ENotificationImpl(this, Notification.SET, property, oldFloatValue, newFloatValue));
-  }
-  
-  protected void notify(int changeKind, int property, float oldFloatValue, float newFloatValue, boolean isSetChange)
-  {
-    eNotify(new ENotificationImpl(this, Notification.SET, property, oldFloatValue, newFloatValue, isSetChange));
-  }
-  
-  protected void notify(int changeKind, int property, int oldIntValue, int newIntValue)
-  {
-  	eNotify(new ENotificationImpl(this, Notification.SET, property, oldIntValue, newIntValue));
-  }
-  
-  protected void notify(int changeKind, int property, int oldIntValue, int newIntValue, boolean isSetChange)
-  {
-  	eNotify(new ENotificationImpl(this, Notification.SET, property, oldIntValue, newIntValue, isSetChange));
-  }
-  
-  protected void notify(int changeKind, int property, long oldLongValue, long newLongValue)
-  {
-  	eNotify(new ENotificationImpl(this, Notification.SET, property, oldLongValue, newLongValue));
-  }
-  
-  protected void notify(int changeKind, int property, long oldLongValue, long newLongValue, boolean isSetChange)
-  {
-  	eNotify(new ENotificationImpl(this, Notification.SET, property, oldLongValue, newLongValue, isSetChange));
-  }
-  
-  protected void notify(int changeKind, int property, short oldShortValue, short newShortValue)
-  {
-  	eNotify(new ENotificationImpl(this, Notification.SET, property, oldShortValue, newShortValue));
-  }
-  
-  protected void notify(int changeKind, int property, short oldShortValue, short newShortValue, boolean isSetChange)
-  {
-  	eNotify(new ENotificationImpl(this, Notification.SET, property, oldShortValue, newShortValue, isSetChange));
-  }
-  
-  protected void notify(int changeKind, int property, Object oldValue, Object newValue)
-  {
-  	eNotify(new ENotificationImpl(this, Notification.SET, property, oldValue, newValue));
-  }
-  
-  protected void notify(int changeKind, int property, Object oldValue, Object newValue, boolean isSetChange)
-  {
-  	eNotify(new ENotificationImpl(this, Notification.SET, property, oldValue, newValue, isSetChange));
-  }
-  
-  public interface ListKind
-  {
-    int CONTAINMENT = 0;
-    int CONTAINMENT_UNSETTABLE = 1;
-    int CONTAINMENT_RESOLVING = 2;
-    int CONTAINMENT_RESOLVING_UNSETTABLE = 3;
-    int CONTAINMENT_INVERSE = 4;
-    int CONTAINMENT_INVERSE_UNSETTABLE = 5;
-    int CONTAINMENT_INVERSE_RESOLVING = 6;
-    int CONTAINMENT_INVERSE_RESOLVING_UNSETTABLE = 7;
-
-    int NONCONTAINMENT = 8;
-    int NONCONTAINMENT_UNSETTABLE = 9;
-    int NONCONTAINMENT_RESOLVING = 10;
-    int NONCONTAINMENT_RESOLVING_UNSETTABLE = 11;
-    int NONCONTAINMENT_INVERSE = 12;
-    int NONCONTAINMENT_INVERSE_UNSETTABLE = 13;
-    int NONCONTAINMENT_MANYINVERSE = 14;
-    int NONCONTAINMENT_MANYINVERSE_UNSETTABLE = 15;
-    int NONCONTAINMENT_INVERSE_RESOLVING = 16;
-    int NONCONTAINMENT_INVERSE_RESOLVING_UNSETTABLE = 17;
-    int NONCONTAINMENT_MANYINVERSE_RESOLVING = 18;
-    int NONCONTAINMENT_MANYINVERSE_RESOLVING_UNSETTABLE = 19;
-    
-    int DATATYPE = 20;
-    int DATATYPE_UNSETTABLE = 21;
-    int DATATYPE_UNIQUE = 22;
-    int DATATYPE_UNIQUE_UNSETTABLE = 23;
-    
-    int BASIC = 24;
-  }
-  
-  /**
-   * @deprecated
-   */
-  protected List createPropertyList(int listKind, Class dataClass, int property)
-  {
-    return createPropertyList(listKind, dataClass, property, 0);
-  }
-  
-  protected List createPropertyList(int listKind, Class dataClass, int property, int reverseProperty)
-  {
-    switch (listKind)
-    {
-      case ListKind.CONTAINMENT:
-        return new EObjectContainmentEList(dataClass, this, property);
-      case ListKind.CONTAINMENT_INVERSE_RESOLVING_UNSETTABLE:
-        return new EObjectContainmentWithInverseEList.Unsettable.Resolving(dataClass, this, property, reverseProperty);
-      case ListKind.CONTAINMENT_INVERSE_RESOLVING:
-        return new EObjectContainmentWithInverseEList.Resolving(dataClass, this, property, reverseProperty);
-      case ListKind.CONTAINMENT_INVERSE_UNSETTABLE:
-        return new EObjectContainmentWithInverseEList.Unsettable(dataClass, this, property, reverseProperty);
-      case ListKind.CONTAINMENT_INVERSE:
-        return new EObjectContainmentWithInverseEList(dataClass, this, property, reverseProperty);
-      case ListKind.CONTAINMENT_RESOLVING_UNSETTABLE:
-        return new EObjectContainmentEList.Unsettable.Resolving(dataClass, this, property);
-      case ListKind.CONTAINMENT_RESOLVING:
-        return new EObjectContainmentEList.Resolving(dataClass, this, property);
-      case ListKind.CONTAINMENT_UNSETTABLE:
-        return new EObjectContainmentEList.Unsettable(dataClass, this, property);
-      case ListKind.NONCONTAINMENT_MANYINVERSE_RESOLVING_UNSETTABLE:
-        return new EObjectWithInverseResolvingEList.Unsettable.ManyInverse(dataClass, this, property, reverseProperty);
-      case ListKind.NONCONTAINMENT_MANYINVERSE_RESOLVING:
-        return new EObjectWithInverseResolvingEList.ManyInverse(dataClass, this, property, reverseProperty);
-      case ListKind.NONCONTAINMENT_INVERSE_RESOLVING_UNSETTABLE:
-        return new EObjectWithInverseResolvingEList.Unsettable(dataClass, this, property, reverseProperty);
-      case ListKind.NONCONTAINMENT_INVERSE_RESOLVING:
-        return new EObjectWithInverseResolvingEList(dataClass, this, property, reverseProperty);
-      case ListKind.NONCONTAINMENT_MANYINVERSE_UNSETTABLE:
-        return new EObjectWithInverseEList.Unsettable.ManyInverse(dataClass, this, property, reverseProperty);
-      case ListKind.NONCONTAINMENT_MANYINVERSE:
-        return new EObjectWithInverseEList.ManyInverse(dataClass, this, property, reverseProperty);
-      case ListKind.NONCONTAINMENT_INVERSE_UNSETTABLE:
-        return new EObjectWithInverseEList.Unsettable(dataClass, this, property, reverseProperty);
-      case ListKind.NONCONTAINMENT_INVERSE:
-        return new EObjectWithInverseEList(dataClass, this, property, reverseProperty);
-      case ListKind.NONCONTAINMENT_RESOLVING_UNSETTABLE:
-        return new EObjectResolvingEList.Unsettable(dataClass, this, property);
-      case ListKind.NONCONTAINMENT_RESOLVING:
-        return new EObjectResolvingEList(dataClass, this, property);
-      case ListKind.NONCONTAINMENT_UNSETTABLE:
-        return new EObjectEList.Unsettable(dataClass, this, property);
-      case ListKind.NONCONTAINMENT:
-        return new EObjectEList(dataClass, this, property);
-      case ListKind.DATATYPE_UNIQUE_UNSETTABLE:
-        return new EDataTypeUniqueEList.Unsettable(dataClass, this, property);
-      case ListKind.DATATYPE_UNIQUE:
-        return new EDataTypeUniqueEList(dataClass, this, property);
-      case ListKind.DATATYPE_UNSETTABLE:
-        return new EDataTypeEList.Unsettable(dataClass, this, property);
-      case ListKind.DATATYPE:
-        return new EDataTypeEList(dataClass, this, property);
-    }
-    return null;
-  }
-  
-  protected BasicSequence createSequence(int property) {
-    return new BasicSequence(new BasicFeatureMap(this, property));
-  }
-  
-  protected Sequence createSequence(Sequence sequence, Type type, int propertyIndex) {
-    return new BasicSequence((FeatureMap.Internal)((FeatureMap.Internal.Wrapper)sequence).featureMap().list(((EClass)type).getEStructuralFeature(propertyIndex)));
-  }
-  
-  protected void createChangeSummary(int property) {
-    ChangeSummaryImpl changeSummary = (ChangeSummaryImpl)SDOFactory.eINSTANCE.createChangeSummary();
-    set(property, changeSummary);
-    changeSummary.setDataObject(this);
-  }
-  
-  /*
-   * get the value of the type's property at propertyIndex via the sequence  
-   * @param seq
-   * @param type
-   * @param propertyIndex
-   * @return
-   */
-  protected Object get(Sequence seq, Type type, int propertyIndex) {
-    return ((FeatureMap.Internal.Wrapper)seq).featureMap().get(((EClass)type).getEStructuralFeature(propertyIndex), true);
-  }
-  
-  protected List getList(Sequence seq, Type type, int propertyIndex) {
-    return ((FeatureMap.Internal.Wrapper)seq).featureMap().list(((EClass)type).getEStructuralFeature(propertyIndex));
-  }
-  
-  protected void set(Sequence seq, Type type, int propertyIndex, Object newValue) {
-    ((FeatureMap.Internal)((FeatureMap.Internal.Wrapper)seq).featureMap()).set(((EClass)type).getEStructuralFeature(propertyIndex), newValue);
-  }
-  
-  protected void unset(Sequence seq, Type type, int propertyIndex) {
-    ((FeatureMap.Internal)((FeatureMap.Internal.Wrapper)seq).featureMap()).clear(((EClass)type).getEStructuralFeature(propertyIndex));
-     
-  }
-  protected boolean isSet(Sequence seq, Type type, int propertyIndex) {
-    return !((FeatureMap.Internal)((FeatureMap.Internal.Wrapper)seq).featureMap()).isEmpty(((EClass)type).getEStructuralFeature(propertyIndex));     
-  }
-  
-  protected boolean isSequenceEmpty(Sequence sequence) {
-    return ((FeatureMap.Internal.Wrapper)sequence).featureMap().isEmpty();  
-  }
-  
-  protected void setSequence(Sequence seq, Object newValue) {
-    ((FeatureMap.Internal)((FeatureMap.Internal.Wrapper)seq).featureMap()).set(newValue);
-  }
-  
-  protected void unsetSequence(Sequence seq) {
-    ((FeatureMap.Internal.Wrapper)seq).featureMap().clear();
-  }
-
-  protected ChangeContext basicAdd(Sequence seq, Type type, int propertyIndex, Object newValue, ChangeContext changeContext) {
-    ChangeContextImpl changeContextImpl = (ChangeContextImpl)changeContext;
-    changeContextImpl.notificationChain = ((FeatureMap.Internal)((FeatureMap.Internal.Wrapper)seq).featureMap()).basicAdd(((EClass)type).getEStructuralFeature(propertyIndex), newValue, changeContextImpl.notificationChain);
-    return changeContextImpl;
-  }
-  
-  private ChangeContextImpl initializeChangeContext(ChangeContext changeContext)
-  {
-    ChangeContextImpl changeContextImpl;
-    if (changeContext == null) 
-    {
-      changeContextImpl = new ChangeContextImpl(null);
-    } else 
-    {
-      changeContextImpl = (ChangeContextImpl)changeContext;
-    }
-    return changeContextImpl;
-  }
-  
-  protected interface ChangeContext {}
-
-  
-  protected ChangeContext inverseRemove(Object otherEnd, int propertyIndex, ChangeContext changeContext)
-  {
-    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
-    changeContextImpl.notificationChain = super.eInverseRemove((InternalEObject)otherEnd, propertyIndex, changeContextImpl.notificationChain);
-    return changeContextImpl;
-  }
-  
-  protected ChangeContext inverseAdd(Object otherEnd, int propertyIndex, ChangeContext changeContext)
-  {
-    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
-    changeContextImpl.notificationChain = super.eInverseAdd((InternalEObject)otherEnd, propertyIndex, changeContextImpl.notificationChain);
-    return changeContextImpl;
-  }
-
-  protected ChangeContext inverseRemove(Object thisEnd, Object otherEnd, int propertyIndex, Class baseClass, ChangeContext changeContext)
-  {
-    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
-    changeContextImpl.notificationChain = ((InternalEObject)thisEnd).eInverseRemove((InternalEObject)otherEnd, propertyIndex, baseClass, changeContextImpl.notificationChain);
-    return changeContextImpl;
-  }
-
-  protected ChangeContext inverseAdd(Object thisEnd, Object otherEnd, int propertyIndex, Class baseClass, ChangeContext changeContext)
-  {
-    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
-    changeContextImpl.notificationChain = ((InternalEObject)thisEnd).eInverseAdd((InternalEObject)otherEnd, propertyIndex, baseClass, changeContextImpl.notificationChain);
-    return changeContextImpl;
-  }
-  
-  protected ChangeContext addNotification(Object notifier, int eventType, int featureID, Object oldValue, Object newValue, boolean isSetChanged, ChangeContext changeContext) 
-  {
-    ENotificationImpl notification = new ENotificationImpl((InternalEObject)notifier, eventType, featureID, oldValue, newValue, isSetChanged );
-    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
-    if (changeContextImpl.notificationChain == null) changeContextImpl.notificationChain = notification; else changeContextImpl.notificationChain.add(notification);
-    return changeContextImpl;
-  }
-  
-  protected ChangeContext addNotification(Object notifier, int eventType, int featureID, Object oldValue, Object newValue, ChangeContext changeContext) 
-  {
-    ENotificationImpl notification = new ENotificationImpl((InternalEObject)notifier, eventType, featureID, oldValue, newValue);
-    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
-    if (changeContextImpl.notificationChain == null) changeContextImpl.notificationChain = notification; else changeContextImpl.notificationChain.add(notification);
-    return changeContextImpl;
-  }
-  
-  protected ChangeContext removeFromList(List propertyList, Object objectToRemove, ChangeContext changeContext)
-  {
-    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
-    changeContextImpl.notificationChain = ((InternalEList)propertyList).basicRemove(objectToRemove, changeContextImpl.notificationChain); 
-    return changeContextImpl;
-  }
-  
-  protected ChangeContext removeFromSequence(Sequence sequence, Object otherEnd, ChangeContext changeContext) 
-  {
-    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
-    changeContextImpl.notificationChain = ((InternalEList)((FeatureMap.Internal.Wrapper)sequence).featureMap()).basicRemove(otherEnd, changeContextImpl.notificationChain);
-    return changeContextImpl;
-  }
-  
-  protected void dispatch(ChangeContext changeContext)
-  {
-    ChangeContextImpl changeContextImpl = initializeChangeContext(changeContext);
-    if (changeContextImpl.notificationChain != null)
-    {
-      changeContextImpl.notificationChain.dispatch();
-    }
-  }
-
-  protected boolean isProxy() // FB TODO : regen models and then remove this method
-  {
-    return eIsProxy();
-  }
-  
-  protected boolean isProxy(Object object)
-  {
-    return ((EObject)object).eIsProxy();
-  }
-  
-  protected Object resolveProxy(Object proxy)
-  {
-    Resource resource = this.eResource();
-    ResourceSet resourceSet = resource != null ? resource.getResourceSet() : null;
-    if (resourceSet != null) return EcoreUtil.resolve((EObject)proxy, resourceSet);
-      
-    URI proxyURI = ((InternalEObject)proxy).eProxyURI();
-    if (proxyURI != null)
-    {
-      EPackage ePackage = HelperContextImpl.getBuiltInModelRegistry().getEPackage(proxyURI.trimFragment().toString());
-      if (ePackage != null)
-      {
-        resource = ePackage.eResource();
-        if (resource != null)
-        {
-          return resource.getEObject(proxyURI.fragment().toString());
-        }
-      }
-    }
-    return null;
-  }
-  
-
-  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-  // Following methods override EMF methods to work with pure SDO generated subclasses
-  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-  
-  public EClass eStaticClass()
-  {
-    return (EClass)getStaticType();
-  }
-  
-  public Type getStaticType() // must be overridden in subclasses
-  {
-    throw new UnsupportedOperationException();
-  }
-  
-  public int eStaticFeatureCount()
-  {
-    return getStaticPropertyCount();  
-  }
-  
-  public int getStaticPropertyCount() // must be overridden in subclasses
-  {
-    throw new UnsupportedOperationException();
-  }
-  
-  protected int internalConvertIndex(int internalIndex)
-  {
-    return internalIndex;
-  }
-  
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    Object result = get(internalConvertIndex(featureID), resolve);
-    if (coreType)
-    {
-      if (result instanceof FeatureMap.Internal.Wrapper) result = ((FeatureMap.Internal.Wrapper)result).featureMap();
-    }
-    return result;
-  }
-
-  public void eSet(int featureID, Object newValue)
-  {
-    set(internalConvertIndex(featureID), newValue);
-  } 
-
-  public void eUnset(int featureID)
-  {
-    unset(internalConvertIndex(featureID));
-  }
-  
-  public boolean eIsSet(int featureID)
-  {
-    return isSet(internalConvertIndex(featureID));
-  }
-  
-  private class ChangeContextImpl implements ChangeContext
-  {
-    protected NotificationChain notificationChain;
-    public ChangeContextImpl(NotificationChain notificationChain) {
-      this.notificationChain = notificationChain;
-    }
-  }
-  
-  //FB TODO ... review this? ... what about eInverseAdd?
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int internalIndex, NotificationChain msgs)
-  {
-    return ((ChangeContextImpl)inverseRemove(otherEnd, internalConvertIndex(internalIndex), new ChangeContextImpl(msgs))).notificationChain;
-  }
-  
-  public String toString()
-  {
-    StringBuffer result = new StringBuffer(getClass().getName());
-    result.append('@');
-    result.append(Integer.toHexString(hashCode()));
-    if (eIsProxy())
-    {
-      result.append(" (proxyURI: ");
-      result.append(eProxyURI());
-      result.append(')');
-    }
-    return result.toString();
-  }
-  
-} //DataObjectBase
-
-
-
-
-
-
-
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java
deleted file mode 100644
index d97f677d34..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java
+++ /dev/null
@@ -1,1562 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-
-import java.io.ObjectStreamException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.tuscany.sdo.SDOPackage;
-import org.apache.tuscany.sdo.impl.ChangeSummaryImpl.SDOChangeRecorder;
-import org.apache.tuscany.sdo.lib.UnknownPropertyList;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.apache.tuscany.sdo.util.VirtualSequence;
-import org.apache.tuscany.sdo.util.DataObjectUtil.Accessor;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.EStructuralFeature.Internal.DynamicValueHolder;
-import org.eclipse.emf.ecore.impl.BasicEObjectImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EContentsEList;
-import org.eclipse.emf.ecore.util.ECrossReferenceEList;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.DataGraph;
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-import commonj.sdo.impl.ExternalizableDelegator;
-
-
-/**
- * <!-- begin-user-doc -->
- * Base implementation of the SDO DataObject interface. This implementation allocates the minimum storage
- * overhead needed for SDO. It provides a complete implementation of the API, but does not, however, allocate
- * any storage for the actual properties of the data object. It instead requires subclasses for this purpose.
- * The subclass, DynamicDataObjectImpl serves as a concrete implementation class for dynamic data objects.
- * Static data object storage is provided by generated classes, which also directly or indirectly derive from
- * this class. 
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class DataObjectImpl extends BasicEObjectImpl implements DataObject
-{
-  protected InternalEObject eContainer;
-  protected int eContainerFeatureID;
-  protected SDOChangeRecorder changeRecorder;
-  protected Object location; // Resource.Internal (if object is directly contained in a resource) or URI (if it is a proxy)
-  protected BasicEList eAdapters;
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected DataObjectImpl()
-  {
-    super();
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Object get(int propertyIndex)
-  {
-    return get(DataObjectUtil.getProperty(this, propertyIndex));  
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void set(int propertyIndex, Object value)
-  {
-    set(DataObjectUtil.getProperty(this, propertyIndex), value);  
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    return isSet(DataObjectUtil.getProperty(this, propertyIndex));  
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void unset(int propertyIndex)
-  {
-    unset(DataObjectUtil.getProperty(this, propertyIndex));  
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Object get(Property property)
-  {
-    return eGet((EStructuralFeature)property, true, false);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void set(Property property, Object value)
-  {
-    eSet((EStructuralFeature)property, value);
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isSet(Property property)
-  {
-    return eIsSet((EStructuralFeature)property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void unset(Property property)
-  {
-    eUnset((EStructuralFeature)property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject getContainer()
-  {
-    return (DataObject)eContainer();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Property getContainmentProperty()
-  {
-    return (Property)eContainmentFeature();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Type getType()
-  {
-    return (Type)eClass();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Object writeReplace() throws ObjectStreamException
-  {
-    return new ExternalizableDelegator(this);
-  }
-
-  
-  // Remaining DataObject methods are implemented as straight delegation to DataObjectUtil
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Object get(String path)
-  {
-    return DataObjectUtil.get(this, path);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void set(String path, Object value)
-  {
-    DataObjectUtil.set(this, path, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isSet(String path)
-  {
-    return DataObjectUtil.isSet(this, path);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void unset(String path)
-  {
-    DataObjectUtil.unset(this, path);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataGraph getDataGraph()
-  {
-    return DataObjectUtil.getDataGraph(this);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public BigDecimal getBigDecimal(String path)
-  {
-    return DataObjectUtil.getBigDecimal(get(path));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public BigInteger getBigInteger(String path)
-  {
-    return DataObjectUtil.getBigInteger(get(path));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean getBoolean(String path)
-  {
-    return DataObjectUtil.getBoolean(get(path));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public byte getByte(String path)
-  {
-    return DataObjectUtil.getByte(get(path));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public byte[] getBytes(String path)
-  {
-    return DataObjectUtil.getBytes(get(path));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public char getChar(String path)
-  {
-    return DataObjectUtil.getChar(get(path));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject getDataObject(String path)
-  {
-    return (DataObject)get(path);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Date getDate(String path)
-  {
-    return DataObjectUtil.getDate(get(path));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public double getDouble(String path)
-  {
-    return DataObjectUtil.getDouble(get(path));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public float getFloat(String path)
-  {
-    return DataObjectUtil.getFloat(get(path));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public int getInt(String path)
-  {
-    return DataObjectUtil.getInt(get(path));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getList(String path)
-  {
-    List result = (List)get(path);
-    if (result == null) {
-    	result = new UnknownPropertyList(this, path);
-    }
-    
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public long getLong(String path)
-  {
-    return DataObjectUtil.getLong(get(path));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Sequence getSequence(String path)
-  {
-    return (Sequence)get(path);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public short getShort(String path)
-  {
-    return DataObjectUtil.getShort(get(path));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String getString(String path)
-  {
-    return DataObjectUtil.getString(get(path));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBigDecimal(String path, BigDecimal value)
-  {
-    DataObjectUtil.setBigDecimal(this, path, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBigInteger(String path, BigInteger value)
-  {
-    DataObjectUtil.setBigInteger(this, path, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBoolean(String path, boolean value)
-  {
-    DataObjectUtil.setBoolean(this, path, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setByte(String path, byte value)
-  {
-    DataObjectUtil.setByte(this, path, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBytes(String path, byte[] value)
-  {
-    DataObjectUtil.setBytes(this, path, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setChar(String path, char value)
-  {
-    DataObjectUtil.setChar(this, path, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDataObject(String path, DataObject value)
-  {
-    DataObjectUtil.set(this, path, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDate(String path, Date value)
-  {
-    DataObjectUtil.setDate(this,path,value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDouble(String path, double value)
-  {
-    DataObjectUtil.setDouble(this, path, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setFloat(String path, float value)
-  {
-    DataObjectUtil.setFloat(this, path, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setInt(String path, int value)
-  {
-    DataObjectUtil.setInt(this, path, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setList(String path, List value)
-  {
-    DataObjectUtil.set(this, path, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setLong(String path, long value)
-  {
-    DataObjectUtil.setLong(this, path, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setShort(String path, short value)
-  {
-    DataObjectUtil.setShort(this, path, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setString(String path, String value)
-  {
-    DataObjectUtil.setString(this, path, value);
-  } 
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public BigDecimal getBigDecimal(int propertyIndex)
-  {
-    return DataObjectUtil.getBigDecimal(this, propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public BigInteger getBigInteger(int propertyIndex)
-  {
-    return DataObjectUtil.getBigInteger(this,propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean getBoolean(int propertyIndex)
-  {
-    return DataObjectUtil.getBoolean(this, propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public byte getByte(int propertyIndex)
-  {
-    return DataObjectUtil.getByte(this, propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public byte[] getBytes(int propertyIndex)
-  {
-    return DataObjectUtil.getBytes(this, propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public char getChar(int propertyIndex)
-  {
-    return DataObjectUtil.getChar(this, propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject getDataObject(int propertyIndex)
-  {
-    return DataObjectUtil.getDataObject(this, propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Date getDate(int propertyIndex)
-  {
-    return DataObjectUtil.getDate(this,propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public double getDouble(int propertyIndex)
-  {
-    return DataObjectUtil.getDouble(this, propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public float getFloat(int propertyIndex)
-  {
-    return DataObjectUtil.getFloat(this,propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public int getInt(int propertyIndex)
-  {
-    return DataObjectUtil.getInt(this,propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getList(int propertyIndex)
-  {
-    return DataObjectUtil.getList(this, propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public long getLong(int propertyIndex)
-  {
-    return DataObjectUtil.getLong(this,propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Sequence getSequence(int propertyIndex)
-  {
-    return DataObjectUtil.getSequence(this, propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public short getShort(int propertyIndex)
-  {
-    return DataObjectUtil.getShort(this,propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String getString(int propertyIndex)
-  {
-    return DataObjectUtil.getString(this,propertyIndex);
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBigDecimal(int propertyIndex, BigDecimal value)
-  {
-    DataObjectUtil.setBigDecimal(this, propertyIndex, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBigInteger(int propertyIndex, BigInteger value)
-  {
-    DataObjectUtil.setBigInteger(this, propertyIndex, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBoolean(int propertyIndex, boolean value)
-  {
-    DataObjectUtil.setBoolean(this, propertyIndex, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setByte(int propertyIndex, byte value)
-  {
-    DataObjectUtil.setByte(this, propertyIndex, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBytes(int propertyIndex, byte[] value)
-  {
-    DataObjectUtil.setBytes(this, propertyIndex, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setChar(int propertyIndex, char value)
-  {
-    DataObjectUtil.setChar(this, propertyIndex, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDataObject(int propertyIndex, DataObject value)
-  {
-    DataObjectUtil.setDataObject(this, propertyIndex, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDate(int propertyIndex, Date value)
-  {
-    DataObjectUtil.setDate(this, propertyIndex, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDouble(int propertyIndex, double value)
-  {
-    DataObjectUtil.setDouble(this, propertyIndex, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setFloat(int propertyIndex, float value)
-  {
-    DataObjectUtil.setFloat(this, propertyIndex, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setInt(int propertyIndex, int value)
-  {
-    DataObjectUtil.setInt(this, propertyIndex, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setList(int propertyIndex, List value)
-  {
-    DataObjectUtil.setList(this, propertyIndex, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setLong(int propertyIndex, long value)
-  {
-    DataObjectUtil.setLong(this, propertyIndex, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setShort(int propertyIndex, short value)
-  {
-    DataObjectUtil.setShort(this, propertyIndex, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setString(int propertyIndex, String value)
-  {
-    DataObjectUtil.setString(this, propertyIndex, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public BigDecimal getBigDecimal(Property property)
-  {
-    return DataObjectUtil.getBigDecimal(this, property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public BigInteger getBigInteger(Property property)
-  {
-    return DataObjectUtil.getBigInteger(this, property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean getBoolean(Property property)
-  {
-    return DataObjectUtil.getBoolean(this, property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public byte getByte(Property property)
-  {
-    return DataObjectUtil.getByte(this, property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public byte[] getBytes(Property property)
-  {
-    return DataObjectUtil.getBytes(this, property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public char getChar(Property property)
-  {
-    return DataObjectUtil.getChar(this, property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject getDataObject(Property property)
-  {
-    return (DataObject)DataObjectUtil.getDataObject(this,property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Date getDate(Property property)
-  {
-    return DataObjectUtil.getDate(this, property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public double getDouble(Property property)
-  {
-    return DataObjectUtil.getDouble(this, property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public float getFloat(Property property)
-  {
-    return DataObjectUtil.getFloat(this, property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public int getInt(Property property)
-  {
-    return DataObjectUtil.getInt(this, property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getList(Property property)
-  {
-    return (List)DataObjectUtil.getList(this, property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public long getLong(Property property)
-  {
-    return DataObjectUtil.getLong(this, property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Sequence getSequence(Property property)
-  {
-    return (Sequence)DataObjectUtil.getSequence(this, property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public short getShort(Property property)
-  {
-    return DataObjectUtil.getShort(this, property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String getString(Property property)
-  {
-    return DataObjectUtil.getString(this, property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBigDecimal(Property property, BigDecimal value)
-  {
-    DataObjectUtil.setBigDecimal(this,property, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBigInteger(Property property, BigInteger value)
-  {
-    DataObjectUtil.setBigInteger(this,property, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBoolean(Property property, boolean value)
-  {
-    DataObjectUtil.setBoolean(this,property, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setByte(Property property, byte value)
-  {
-    DataObjectUtil.setByte(this,property, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBytes(Property property, byte[] value)
-  {
-    DataObjectUtil.setBytes(this,property, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setChar(Property property, char value)
-  {
-    DataObjectUtil.setChar(this,property, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDataObject(Property property, DataObject value)
-  {
-    DataObjectUtil.setDataObject(this,property, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDate(Property property, Date value)
-  {
-    DataObjectUtil.setDate(this,property, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDouble(Property property, double value)
-  {
-    DataObjectUtil.setDouble(this,property, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setFloat(Property property, float value)
-  {
-    DataObjectUtil.setFloat(this,property, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setInt(Property property, int value)
-  {
-    DataObjectUtil.setInt(this,property, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setList(Property property, List value)
-  {
-    DataObjectUtil.setList(this,property, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setLong(Property property, long value)
-  {
-    DataObjectUtil.setLong(this,property, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setShort(Property property, short value)
-  {
-    DataObjectUtil.setShort(this,property, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setString(Property property, String value)
-  {
-    DataObjectUtil.setString(this,property, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject createDataObject(String propertyName)
-  {
-    return DataObjectUtil.createDataObject(this, propertyName);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject createDataObject(int propertyIndex)
-  {
-    return DataObjectUtil.createDataObject(this, propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject createDataObject(Property property)
-  {
-    return DataObjectUtil.createDataObject(this,property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject createDataObject(String propertyName, String namespaceURI, String typeName)
-  {
-    return DataObjectUtil.createDataObject(this, propertyName, namespaceURI, typeName);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject createDataObject(int propertyIndex, String namespaceURI, String typeName)
-  {
-    return DataObjectUtil.createDataObject(this, propertyIndex, namespaceURI, typeName);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject createDataObject(Property property, Type type)
-  {
-    return DataObjectUtil.createDataObject(this, property, type);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void delete()
-  {
-    DataObjectUtil.delete(this);
-  }
-  
-  protected Sequence sequence = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Sequence getSequence()
-  {
-    if (sequence == null)
-    {
-      EStructuralFeature sequenceFeature = ((ClassImpl)eClass()).getSequenceFeature();
-      if (sequenceFeature == null) return null;
-      if (sequenceFeature == ClassImpl.VIRTUAL_SEQUENCE_FEATURE)
-        sequence = new VirtualSequence(this);
-      else
-        sequence = (Sequence)eGet(sequenceFeature, true, false);
-    }
-    return sequence;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getInstanceProperties()
-  {
-    return DataObjectUtil.getInstanceProperties(this);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Property getInstanceProperty(String propertyName)
-  {
-    return DataObjectUtil.getInstanceProperty(this, propertyName);
-  }
-
-  /**
-   * @deprecated
-   */
-  public Property getProperty(String propertyName)
-  {
-    return DataObjectUtil.getInstanceProperty(this, propertyName);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject getRootObject()
-  {
-    return DataObjectUtil.getRootObject(this);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public ChangeSummary getChangeSummary()
-  {
-    return DataObjectUtil.getChangeSummary(this);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void detach()
-  {
-    DataObjectUtil.detach(this);
-  }
-  
-  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-  // Following methods customize BasicEObjectImpl, optimized for SDO 
-  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return SDOPackage.eINSTANCE.getDataObject();
-  }
-
-  public boolean eNotificationRequired()
-  {
-    return changeRecorder != null || super.eNotificationRequired();
-  }
-
-  public boolean eDeliver()
-  {
-    return true;
-  }
-  
-  public void eNotify(Notification notification)
-  {
-    if(changeRecorder != null) changeRecorder.notifyChanged(notification);
-    super.eNotify(notification);
-  }
-
-  public void setChangeRecorder(SDOChangeRecorder changeRecorder)
-  {
-    if (this.changeRecorder != null)
-    {
-      this.changeRecorder.unsetTarget(this);
-    }
-
-    if (changeRecorder != null)
-    {
-      changeRecorder.setTarget(this);
-    }
-    
-    this.changeRecorder = changeRecorder;
-  }
-
-  public InternalEObject eInternalContainer()
-  {
-    return eContainer;
-  }
-
-  public int eContainerFeatureID()
-  {
-    return eContainerFeatureID;
-  }
-
-  protected void eBasicSetContainer(InternalEObject newContainer, int newContainerFeatureID)
-  {
-    eContainer = newContainer;
-    eContainerFeatureID = newContainerFeatureID;
-  }
-
-  public EClass eClass()
-  {
-    return eStaticClass();
-  }
-
-  public EList eContents()
-  {
-    return new EContentsEList(this);
-  }
-
-  public EList eCrossReferences()
-  {
-    return new ECrossReferenceEList(this);
-  }
-
-  public Resource.Internal eDirectResource()
-  {
-    return location instanceof Resource.Internal ? (Resource.Internal)location : null;
-  }
-
-  protected EClass eDynamicClass()
-  {
-    return null;
-  }
-
-  protected boolean eHasSettings()
-  {
-    return false;
-  }
-
-  public boolean eIsProxy()
-  {
-    return location instanceof URI;
-  }
-
-  public URI eProxyURI()
-  {
-    return location instanceof URI ? (URI)location : null;
-  }
-
-  public void eSetClass(EClass eClass)
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  protected void eSetDirectResource(Resource.Internal resource)
-  {
-    location = resource;
-  }
-
-  public void eSetProxyURI(URI uri)
-  {
-    location = uri;
-  }
-
-  protected DynamicValueHolder eSettings()
-  {
-    return null;
-  }
-  
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    return eDynamicGet(featureID, resolve, coreType);
-  }
-
-  public void eSet(int featureID, Object newValue)
-  {
-    eDynamicSet(featureID, newValue);
-  }
-
-  public void eUnset(int featureID)
-  {
-    eDynamicUnset(featureID);
-  }
-
-  public boolean eIsSet(int featureID)
-  {
-    return eDynamicIsSet(featureID);
-  }
-  
-  public Object eDynamicGet(int featureID, boolean resolve, boolean coreType)
-  {
-    return eOpenGet(DataObjectUtil.getOpenFeature(this, featureID), resolve);
-  }
-  
-  public void eDynamicSet(int featureID, Object newValue)
-  {
-    eOpenSet(DataObjectUtil.getOpenFeature(this, featureID), newValue);
-  }
-
-  public void eDynamicUnset(int featureID)
-  {
-    eOpenUnset(DataObjectUtil.getOpenFeature(this, featureID));
-  }
-
-  public boolean eDynamicIsSet(int featureID)
-  {
-    return eOpenIsSet(DataObjectUtil.getOpenFeature(this, featureID));
-  }
-  
-  public EList eAdapters()
-  {
-    if (eAdapters == null)
-    {
-      eAdapters =  new EAdapterList(this);
-    }
-    return eAdapters;
-  }
-
-  public BasicEList eBasicAdapters()
-  {
-    return eAdapters;
-  }
-
-  
-  /*
-  public int eDerivedStructuralFeatureID(EStructuralFeature eStructuralFeature)
-  {
-    Class containerClass = eStructuralFeature.getContainerClass();
-    return 
-      containerClass == null ? 
-        eClass().getFeatureID(eStructuralFeature) : 
-          containerClass.isInstance(this) ?
-            eDerivedStructuralFeatureID(eStructuralFeature.getFeatureID(), containerClass) : 
-              -1;
-  }
-  
-  public void eOpenSet(EStructuralFeature eFeature, Object newValue) 
-  {
-    EStructuralFeature openFeature = ExtendedMetaData.INSTANCE.getAffiliation(eClass(), eFeature);
-    if (openFeature == null)
-    {
-      openFeature = (EStructuralFeature)eClass().getEStructuralFeature("any");
-    }
-    if (openFeature != null)
-    {
-      if (!FeatureMapUtil.isFeatureMap(openFeature))
-      {
-        openFeature = ExtendedMetaData.INSTANCE.getGroup(openFeature);
-      }
-      FeatureMap featureMap = (FeatureMap)eGet(openFeature);
-      ((FeatureMap.Internal)featureMap).set(eFeature, newValue);
-    }
-    else
-    {
-      throw new IllegalArgumentException("The feature '" + eFeature.getName() + "' is not a valid changeable feature");
-    }
-  }
-  */
-
-} //DataObjectImpl
-
-
-
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
deleted file mode 100644
index dee124429f..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
+++ /dev/null
@@ -1,781 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.tuscany.sdo.SDOPackage;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.impl.EDataTypeImpl;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-
-import commonj.sdo.Property;
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Data Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class DataTypeImpl extends EDataTypeImpl implements Type, org.apache.tuscany.sdo.model.Type/*, DataObject*/
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected DataTypeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  protected EClass eStaticClass()
-  {
-    return SDOPackage.eINSTANCE.getDataType();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String getURI()
-  {
-    return getEPackage().getNsURI();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isDataType()
-  {
-    return true;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isOpen()
-  {
-    return false;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isSequenced()
-  {
-    return false;
-  }
-
-  protected List aliasNames = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getAliasNames()
-  {
-    if (aliasNames == null)
-    {
-      aliasNames = DataObjectUtil.getAliasNames(this);
-    }
-    return aliasNames;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getDeclaredProperties()
-  {
-    return Collections.EMPTY_LIST;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getProperties()
-  {
-    return Collections.EMPTY_LIST;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getBaseTypes()
-  {
-    EDataType dataType = ExtendedMetaData.INSTANCE.getBaseType(this);
-    if (dataType == null)
-    {
-      return Collections.EMPTY_LIST;
-    }
-    else
-    {
-      return Collections.singletonList(dataType);
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Property getProperty(String propertyName)
-  {
-    return null;
-  }
-  
-  public List getInstanceProperties() {
-    return DataObjectUtil.getMetaObjectInstanceProperties(this);
-  }
-
-  public Object get(Property property) {
-    return DataObjectUtil.getMetaObjectInstanceProperty(this, property);
-  }
-  
-  /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  // org.apache.tuscany.sdo.model.Type method implementations
-  /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  
-  public List getBaseType() {
-    return this.getBaseTypes();
-  }
-
-  public List getProperty() {
-    return this.getProperties();
-  }
-
-  public List getAliasName() {
-    return this.getAliasNames();
-  }
-
-  public Sequence getAny() {
-    throw new UnsupportedOperationException();
-  }
-  
-  public Sequence getAnyAttribute() {
-    throw new UnsupportedOperationException();
-  }
-  
-  public boolean isAbstract()
-  {
-    return false;
-  }
-
-  public void setAbstract(boolean value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSetAbstract() {
-    return false;
-  }
-
-  public void unsetAbstract() {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public void setDataType(boolean value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public void unsetDataType() {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSetDataType() {
-    return true;
-  }
-
-  public void setOpen(boolean value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public void unsetOpen() {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSetOpen() {
-    return false;
-  }
-
-  public void setSequenced(boolean value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public void unsetSequenced() {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSetSequenced() {
-    return false;
-  }
-
-  public void unsetName()
-  {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSetName()
-  {
-    return true;
-  }
-  
-  public void unsetUri()
-  {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSetUri()
-  {
-    return true;
-  }
-
-  public void setUri(String value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-  
-  public String getUri() {
-    return getURI();
-  }
-
-  /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  // DataObject method implementations
-  /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  /*
-  public Object get(int propertyIndex) {
-    Object ret = DataObjectUtil.get(this, propertyIndex);
-    return (ret != null) ? 
-        ret : eGet(propertyIndex, true, false);  
-  }
-  
-  public void set(int propertyIndex, Object value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSet(int propertyIndex) {
-    return eIsSet(propertyIndex);
-  }
-
-  public void unset(int propertyIndex) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public Object get(Property property) {
-    Object ret = DataObjectUtil.get(this, ((EStructuralFeature)property).getFeatureID());
-    return (ret != null) ? 
-      ret : eGet((EStructuralFeature)property, true, false);
-  }
-  
-  public void set(Property property, Object value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSet(Property property) {
-    return eIsSet((EStructuralFeature)property);
-  }
-
-  public void unset(Property property) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public DataObject getContainer() {
-    return (DataObject)eContainer();
-  }
-
-  public Property getContainmentProperty() {
-    return (Property)eContainmentFeature();
-  }
-
-  public Type getType() {
-    return (Type)ModelPackageImpl.eINSTANCE.getType();
-  }
-  
-  // Remaining DataObject methods are (will be) implemented as straight delegation to DataObjectUtil
-
-  public Object get(String path) {
-    return DataObjectUtil.get(this, path);
-  }
-  
-  public void set(String path, Object value) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean isSet(String path) {
-    return DataObjectUtil.isSet(this, path);
-  }
-
-  public void unset(String path) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public boolean getBoolean(String path) {
-    return DataObjectUtil.getBoolean(get(path));
-  }
-
-  public byte getByte(String path) {
-    return DataObjectUtil.getByte(get(path));
-  }
-
-  public char getChar(String path) {
-    return DataObjectUtil.getChar(get(path));
-  }
-
-  public double getDouble(String path) {
-    return DataObjectUtil.getDouble(get(path));
-  }
-
-  public float getFloat(String path) {
-    return DataObjectUtil.getFloat(get(path));
-  }
-
-  public int getInt(String path) {
-    return DataObjectUtil.getInt(get(path));
-  }
-
-  public long getLong(String path) {
-    return DataObjectUtil.getLong(get(path));
-  }
-
-  public short getShort(String path) {
-    return DataObjectUtil.getShort(get(path));
-  }
-
-  public byte[] getBytes(String path) {
-    return DataObjectUtil.getBytes(get(path));
-  }
-
-  public BigDecimal getBigDecimal(String path) {
-    return DataObjectUtil.getBigDecimal(get(path));
-  }
-
-  public BigInteger getBigInteger(String path) {
-    return DataObjectUtil.getBigInteger(get(path));
-  }
-
-  public DataObject getDataObject(String path) {
-    return (DataObject)get(path);
-  }
-
-  public Date getDate(String path) {
-    return DataObjectUtil.getDate(get(path));
-  }
-
-  public String getString(String path) {
-    return DataObjectUtil.getString(get(path));
-  }
-
-  public List getList(String path) {
-    return (List)get(path);
-  }
-
-  public Sequence getSequence(String path) {
-    return (Sequence)get(path);
-  }
-
-  public void setBoolean(String path, boolean value) {
-    set(path, new Boolean(value));
-  }
-
-  public void setByte(String path, byte value) {
-    set(path, new Byte(value));
-  }
-
-  public void setChar(String path, char value) {
-    set(path, new Character(value));
-  }
-
-  public void setDouble(String path, double value) {
-    set(path, new Double(value));
-  }
-
-  public void setFloat(String path, float value) {
-    set(path, new Float(value));
-  }
-
-  public void setInt(String path, int value) {
-    set(path, new Integer(value));
-  }
-
-  public void setLong(String path, long value) {
-    set(path, new Long(value));
-  }
-
-  public void setShort(String path, short value) {
-    set(path, new Short(value));
-  }
-
-  public void setBytes(String path, byte[] value) {
-    set(path, value);
-  }
-
-  public void setBigDecimal(String path, BigDecimal value) {
-    set(path, value);
-  }
-
-  public void setBigInteger(String path, BigInteger value) {
-    set(path, value);
-  }
-
-  public void setDataObject(String path, DataObject value) {
-    set(path, value);
-  }
-
-  public void setDate(String path, Date value) {
-    set(path, value);
-  }
-
-  public void setString(String path, String value) {
-    set(path, value);
-  }
-
-  public void setList(String path, List value) {
-    set(path, value);
-  }
-
-  public boolean getBoolean(int propertyIndex) {
-    return DataObjectUtil.getBoolean(this, propertyIndex);
-  }
-
-  public byte getByte(int propertyIndex) {
-    return DataObjectUtil.getByte(this, propertyIndex);
-  }
-
-  public char getChar(int propertyIndex) {
-    return DataObjectUtil.getChar(this, propertyIndex);
-  }
-
-  public double getDouble(int propertyIndex) {
-    return DataObjectUtil.getDouble(this, propertyIndex);
-  }
-
-  public float getFloat(int propertyIndex) {
-    return DataObjectUtil.getFloat(this, propertyIndex);
-  }
-
-  public int getInt(int propertyIndex) {
-    return DataObjectUtil.getInt(this, propertyIndex);
-  }
-
-  public long getLong(int propertyIndex) {
-    return DataObjectUtil.getLong(this, propertyIndex);
-  }
-
-  public short getShort(int propertyIndex) {
-    return DataObjectUtil.getShort(this, propertyIndex);
-  }
-
-  public byte[] getBytes(int propertyIndex) {
-    return DataObjectUtil.getBytes(this, propertyIndex);
-  }
-
-  public BigDecimal getBigDecimal(int propertyIndex) {
-    return DataObjectUtil.getBigDecimal(this, propertyIndex);
-  }
-
-  public BigInteger getBigInteger(int propertyIndex) {
-    return DataObjectUtil.getBigInteger(this, propertyIndex);
-  }
-
-  public DataObject getDataObject(int propertyIndex) {
-    return DataObjectUtil.getDataObject(this, propertyIndex);
-  }
-
-  public Date getDate(int propertyIndex) {
-    return DataObjectUtil.getDate(this, propertyIndex);
-  }
-
-  public String getString(int propertyIndex) {
-    return DataObjectUtil.getString(this, propertyIndex);
-  }
-
-  public List getList(int propertyIndex) {
-    return DataObjectUtil.getList(this, propertyIndex);
-  }
-
-  public Sequence getSequence(int propertyIndex) {
-    return DataObjectUtil.getSequence(this, propertyIndex);
-  }
-
-  public void setBoolean(int propertyIndex, boolean value) {
-    set(propertyIndex, new Boolean(value));
-  }
-
-  public void setByte(int propertyIndex, byte value) {
-    set(propertyIndex, new Byte(value));
-  }
-
-  public void setChar(int propertyIndex, char value) {
-    set(propertyIndex, new Character(value));
-  }
-
-  public void setDouble(int propertyIndex, double value) {
-    set(propertyIndex, new Double(value));
-  }
-
-  public void setFloat(int propertyIndex, float value) {
-    set(propertyIndex, new Float(value));
-  }
-
-  public void setInt(int propertyIndex, int value) {
-    set(propertyIndex, new Integer(value));
-  }
-
-  public void setLong(int propertyIndex, long value) {
-    set(propertyIndex, new Long(value));
-  }
-
-  public void setShort(int propertyIndex, short value) {
-    set(propertyIndex, new Short(value));
-  }
-
-  public void setBytes(int propertyIndex, byte[] value) {
-    set(propertyIndex, value);
-  }
-
-  public void setBigDecimal(int propertyIndex, BigDecimal value) {
-    set(propertyIndex, value);
-  }
-
-  public void setBigInteger(int propertyIndex, BigInteger value) {
-    set(propertyIndex, value);
-  }
-
-  public void setDataObject(int propertyIndex, DataObject value) {
-    set(propertyIndex, value);
-  }
-
-  public void setDate(int propertyIndex, Date value) {
-    set(propertyIndex, value);
-  }
-
-  public void setString(int propertyIndex, String value) {
-    set(propertyIndex, value);
-  }
-
-  public void setList(int propertyIndex, List value) {
-    set(propertyIndex, value);
-  }
-
-  public boolean getBoolean(Property property) {
-    return DataObjectUtil.getBoolean(this, property);
-  }
-
-  public byte getByte(Property property) {
-    return DataObjectUtil.getByte(this, property);
-  }
-
-  public char getChar(Property property) {
-    return DataObjectUtil.getChar(this, property);
-  }
-
-  public double getDouble(Property property) {
-    return DataObjectUtil.getDouble(this, property);
-  }
-
-  public float getFloat(Property property) {
-    return DataObjectUtil.getFloat(this, property);
-  }
-
-  public int getInt(Property property) {
-    return DataObjectUtil.getInt(this, property);
-  }
-
-  public long getLong(Property property) {
-    return DataObjectUtil.getLong(this, property);
-  }
-
-  public short getShort(Property property) {
-    return DataObjectUtil.getShort(this, property);
-  }
-
-  public byte[] getBytes(Property property) {
-    return DataObjectUtil.getBytes(this, property);
-  }
-
-  public BigDecimal getBigDecimal(Property property) {
-    return DataObjectUtil.getBigDecimal(this, property);
-  }
-
-  public BigInteger getBigInteger(Property property) {
-    return DataObjectUtil.getBigInteger(this, property);
-  }
-
-  public DataObject getDataObject(Property property) {
-    return DataObjectUtil.getDataObject(this, property);
-  }
-
-  public Date getDate(Property property) {
-    return DataObjectUtil.getDate(this, property);
-  }
-
-  public String getString(Property property) {
-    return DataObjectUtil.getString(this, property);
-  }
-
-  public List getList(Property property) {
-    return DataObjectUtil.getList(this, property);
-  }
-
-  public Sequence getSequence(Property property) {
-    return DataObjectUtil.getSequence(this, property);
-  }
-
-  public void setBoolean(Property property, boolean value) {
-    set(property, new Boolean(value));
-  }
-
-  public void setByte(Property property, byte value) {
-    set(property, new Byte(value));
-  }
-
-  public void setChar(Property property, char value) {
-    set(property, new Character(value));
-  }
-
-  public void setDouble(Property property, double value) {
-    set(property, new Double(value));
-  }
-
-  public void setFloat(Property property, float value) {
-    set(property, new Float(value));
-  }
-
-  public void setInt(Property property, int value) {
-    set(property, new Integer(value));
-  }
-
-  public void setLong(Property property, long value) {
-    set(property, new Long(value));
-  }
-
-  public void setShort(Property property, short value) {
-    set(property, new Short(value));
-  }
-
-  public void setBytes(Property property, byte[] value) {
-    set(property, value);
-  }
-
-  public void setBigDecimal(Property property, BigDecimal value) {
-    set(property, value);
-  }
-
-  public void setBigInteger(Property property, BigInteger value) {
-    set(property, value);
-  }
-
-  public void setDataObject(Property property, DataObject value) {
-    set(property, value);
-  }
-
-  public void setDate(Property property, Date value) {
-    set(property, value);
-  }
-
-  public void setString(Property property, String value) {
-    set(property, value);
-  }
-
-  public void setList(Property property, List value) {
-    set(property, value);
-  }
-
-  public DataObject createDataObject(String propertyName) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public DataObject createDataObject(int propertyIndex) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public DataObject createDataObject(Property property) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public DataObject createDataObject(String propertyName, String namespaceURI, String typeName) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public DataObject createDataObject(int propertyIndex, String namespaceURI, String typeName) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public DataObject createDataObject(Property property, Type type) {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public void delete() {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-
-  public DataGraph getDataGraph() {
-    return DataObjectUtil.getDataGraph(this);
-  }
-
-  public Sequence getSequence() {
-    EAttribute mixedFeature = BasicExtendedMetaData.INSTANCE.getMixedFeature(eClass());
-    return mixedFeature != null ? (Sequence)eGet(mixedFeature, true, false) : null;
-  }
-
-  public List getInstanceProperties() {
-    return DataObjectUtil.getInstanceProperties(this);
-  }
-
-  public DataObject getRootObject() {
-    return DataObjectUtil.getRootObject(this);
-  }
-
-  public ChangeSummary getChangeSummary() {
-    // TODO: implement this method
-    throw new UnsupportedOperationException();
-  }
-
-  public void detach() {
-    throw new UnsupportedOperationException("Type is frozen and cannot be modified");
-  }
-  */
-  
-} //DataTypeImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java
deleted file mode 100644
index 153ef18444..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-import org.apache.tuscany.sdo.SDOFactory;
-import org.apache.tuscany.sdo.SDOPackage;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Dynamic Data Object</b></em>'.
- * @extends EStructuralFeature.Internal.DynamicValueHolder
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class DynamicDataObjectImpl extends DataObjectImpl implements DataObject, EStructuralFeature.Internal.DynamicValueHolder
-{
-  protected EClass eClass;
-  protected Object [] eSettings;
-
-  protected static final Object [] ENO_SETTINGS = new Object [0];
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected DynamicDataObjectImpl()
-  {
-    super();
-  }
-
-  /**
-   * Creates a dynamic DataObject.
-   */
-  public DynamicDataObjectImpl(EClass eClass) 
-  {
-    super();
-    eSetClass(eClass);
-    Property csp = ((ClassImpl)eClass).getChangeSummaryProperty();
-    if (csp != null)
-    {
-      ChangeSummaryImpl changeSummary = (ChangeSummaryImpl)SDOFactory.eINSTANCE.createChangeSummary();
-      set(csp, changeSummary);
-      changeSummary.setDataObject(this);
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return SDOPackage.eINSTANCE.getDynamicDataObject();
-  }
-
-  protected int eStaticFeatureCount()
-  {
-    return 0;
-  }
-
-  public int eDerivedStructuralFeatureID(EStructuralFeature eStructuralFeature)
-  {
-    return eClass().getFeatureID(eStructuralFeature);
-  }
-
-  protected boolean eHasSettings()
-  {
-    return eSettings != null;
-  }
-
-  protected EStructuralFeature.Internal.DynamicValueHolder eSettings()
-  {
-    if (eSettings == null)
-    {
-      int size = eClass().getFeatureCount() - eStaticFeatureCount();
-      eSettings = size == 0 ? ENO_SETTINGS : new Object [size];
-    }
-
-    return this;
-  }
-
-  protected EClass eDynamicClass()
-  {
-    return eClass;
-  }
-
-  public EClass eClass()
-  {
-    return eClass;
-  }
-
-  public void eSetClass(EClass eClass)
-  {
-    this.eClass = eClass;
-  }
-
-  public Object dynamicGet(int dynamicFeatureID)
-  {
-    return eSettings[dynamicFeatureID];
-  }
-
-  public void dynamicSet(int dynamicFeatureID, Object value)
-  {
-    eSettings[dynamicFeatureID] = value;
-  }
-
-  public void dynamicUnset(int dynamicFeatureID)
-  {
-    eSettings[dynamicFeatureID] = null;
-  }
-  
-  public Object eDynamicGet(int featureID, boolean resolve, boolean coreType)
-  {
-    if (featureID < eClass().getFeatureCount())
-    {
-      EStructuralFeature eFeature = eClass().getEStructuralFeature(featureID);
-      return eSettingDelegate(eFeature).dynamicGet(this, eSettings(), featureID, resolve, coreType);
-    }
-    else
-    {
-      return super.eDynamicGet(featureID, resolve, coreType);
-    }
-  }
-  
-  public void eDynamicSet(int featureID, Object newValue)
-  {
-    if (featureID < eClass().getFeatureCount())
-    {
-      EStructuralFeature eFeature = eClass().getEStructuralFeature(featureID);
-      try {
-        eDynamicSet(featureID, eFeature, newValue); 
-      } catch (IllegalArgumentException e) {
-        throw new UnsupportedOperationException(e.getMessage());
-      }
-    }
-    else
-    {
-      super.eDynamicSet(featureID, newValue);
-    }
-  }
-
-  public void eDynamicUnset(int featureID)
-  {
-    if (featureID < eClass().getFeatureCount())
-    {
-      EStructuralFeature eFeature = eClass().getEStructuralFeature(featureID);
-      try {
-        eDynamicUnset(featureID, eFeature);
-      } catch (IllegalArgumentException e) {
-        throw new UnsupportedOperationException(e.getMessage());
-      }
-    }
-    else
-    {
-      super.eDynamicUnset(featureID);
-    }
-  }
-
-  public boolean eDynamicIsSet(int featureID)
-  {
-    if (featureID < eClass().getFeatureCount())
-    {
-      EStructuralFeature eFeature = eClass().getEStructuralFeature(featureID);
-      return eSettingDelegate(eFeature).dynamicIsSet(this, eSettings(), featureID);
-    }
-    else
-    {
-      return super.eDynamicIsSet(featureID);
-    }
-  }
-
-  /**
-   * An EFactoryImpl that creates DynamicEDataObjectImpl instances.
-   */
-  public static class FactoryImpl extends EFactoryImpl
-  {
-    public FactoryImpl()
-    {
-    }
-
-    public EObject basicCreate(EClass eClass)
-    {
-      return new DynamicDataObjectImpl(eClass);
-    }
-  }
-
-} //DynamicDataObjectImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java
deleted file mode 100644
index d9d39bad49..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-import org.apache.tuscany.sdo.SDOPackage;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import commonj.sdo.DataObject;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Dynamic Store Data Object</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class DynamicStoreDataObjectImpl extends StoreDataObjectImpl implements DataObject
-{
-  protected EClass eClass;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected DynamicStoreDataObjectImpl()
-  {
-    super();
-  }
-
-  public DynamicStoreDataObjectImpl(InternalEObject.EStore eStore)
-  {
-    super(eStore);
-  }
-
-  public DynamicStoreDataObjectImpl(EClass eClass)
-  {
-    super(eClass);
-  }
-  
-  public DynamicStoreDataObjectImpl(EClass eClass, InternalEObject.EStore eStore)
-  {
-    super(eClass, eStore);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return SDOPackage.eINSTANCE.getDynamicStoreDataObject();
-  }
-
-  protected EClass eDynamicClass()
-  {
-    return eClass;
-  }
-
-  public EClass eClass()
-  {
-    return eClass;
-  }
-
-  public void eSetClass(EClass eClass)
-  {
-    this.eClass = eClass;
-  }
-
-} //DynamicStoreDataObjectImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
deleted file mode 100644
index 54f642d8cf..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-import java.util.Collections;
-import java.util.List;
-
-//import org.apache.tuscany.sdo.SDOPackage;
-
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EEnumImpl;
-
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Enum</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- * @deprecated SDO doesn't support Enum types
- */
-public class EnumImpl extends EEnumImpl implements Type
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EnumImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  protected EClass eStaticClass()
-  {
-    return EcorePackage.eINSTANCE.getEEnum();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String getURI()
-  {
-    return getEPackage().getNsURI();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isDataType()
-  {
-    return true;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isOpen()
-  {
-    return false;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isSequenced()
-  {
-    return false;
-  }
-
-  protected List aliasNames = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getAliasNames()
-  {
-    if (aliasNames == null)
-    {
-      aliasNames = DataObjectUtil.getAliasNames(this);
-    }
-    return aliasNames;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getDeclaredProperties()
-  {
-    return Collections.EMPTY_LIST;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getProperties()
-  {
-    return Collections.EMPTY_LIST;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getBaseTypes()
-  {
-    return Collections.EMPTY_LIST;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Property getProperty(String propertyName)
-  {
-    return null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isAbstract()
-  {
-    return false;
-  }
-  
-  public List getInstanceProperties()
-  {
-    throw new UnsupportedOperationException();
-  }
-
-  public Object get(Property property)
-  {
-    throw new UnsupportedOperationException();
-  }
-  
-} //EnumTypeImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/EventImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/EventImpl.java
deleted file mode 100644
index 206a3c1fbf..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/EventImpl.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-import org.apache.tuscany.sdo.api.Event;
-import org.eclipse.emf.common.notify.Notification;
-
-import commonj.sdo.Property;
-
-
-public class EventImpl implements Event {
-
-  protected Notification emfEvent;
-  protected Object notifier;
-
-  public EventImpl(Notification notification)
-  {
-    this.emfEvent = notification;
-  }
-  
-  public Object getNotifier()
-  {
-    return notifier == null ? emfEvent.getNotifier() : notifier;
-  }
-
-  public int getEventType()
-  {
-    return emfEvent.getEventType();
-  }
-
-
-  public Property getProperty()
-  {
-    return (Property)emfEvent.getFeature();
-  }
-
-  public Object getOldValue()
-  {
-    return emfEvent.getOldValue();
-  }
-
-  public Object getNewValue()
-  {
-    return emfEvent.getNewValue();
-  }
-
-  public boolean wasSet()
-  {
-    return emfEvent.wasSet();
-  }
-
-  public boolean isTouch()
-  {
-    return emfEvent.isTouch();
-  }
-
-  public int getPosition()
-  {
-    return emfEvent.getPosition();
-  }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ExtensibleDataObjectImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ExtensibleDataObjectImpl.java
deleted file mode 100644
index 93825f7873..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ExtensibleDataObjectImpl.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-import org.apache.tuscany.sdo.SDOFactory;
-import org.apache.tuscany.sdo.SDOPackage;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Extensible Data Object</b></em>'.
- * @extends EStructuralFeature.Internal.DynamicValueHolder
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ExtensibleDataObjectImpl extends DataObjectImpl implements DataObject, EStructuralFeature.Internal.DynamicValueHolder
-{
-  protected EClass eClass;
-  protected Object [] eSettings;
-
-  protected static final Object [] ENO_SETTINGS = new Object [0];
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ExtensibleDataObjectImpl()
-  {
-    super();
-  }
-
-  /**
-   * Creates an extensible DataObject.
-   */
-  public ExtensibleDataObjectImpl(EClass eClass) 
-  {
-    super();
-    eSetClass(eClass);
-    Property csp = ((ClassImpl)eClass).getChangeSummaryProperty();
-    if (csp != null)
-    {
-      ChangeSummaryImpl changeSummary = (ChangeSummaryImpl)SDOFactory.eINSTANCE.createChangeSummary();
-      set(csp, changeSummary);
-      changeSummary.setDataObject(this);
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return SDOPackage.eINSTANCE.getExtensibleDataObject();
-  }
-
-  public int eDerivedStructuralFeatureID(EStructuralFeature eStructuralFeature)
-  {
-    return eClass().getFeatureID(eStructuralFeature);
-  }
-
-  protected boolean eHasSettings()
-  {
-    return eSettings != null;
-  }
-
-  protected EStructuralFeature.Internal.DynamicValueHolder eSettings()
-  {
-    if (eSettings == null)
-    {
-      int size = eClass().getFeatureCount() - eStaticFeatureCount();
-      eSettings = size == 0 ? ENO_SETTINGS : new Object [size];
-    }
-
-    return this;
-  }
-
-  protected EClass eDynamicClass()
-  {
-    return eClass;
-  }
-
-  protected boolean isDynamic()
-  {
-    return (eClass != null);
-  }
-
-  public Object get(int featureID, boolean resolve)
-  {
-    return get(featureID, resolve, true);  
-  }
-  
-  public Object get(int featureID, boolean resolve, boolean coreType)
-  {
-    Object result = null;
-    if (isDynamic() || featureID >= eStaticFeatureCount())
-    {
-      result = super.eGet(featureID, resolve, coreType);
-    } 
-    else
-    {
-      result = super.get(featureID);
-    }
-    return result;
-  }
-  
-  public void set(int featureID, Object newValue)
-  {
-    if (isDynamic() || featureID >= eStaticFeatureCount())
-    {
-      super.eSet(featureID, newValue);
-    } 
-    else 
-    {
-      super.set(featureID, newValue);
-    }
-  } 
-
-  public void unset(int featureID)
-  {
-    if (isDynamic() || featureID >= eStaticFeatureCount())
-    {
-      super.eUnset(featureID);
-    } 
-    else 
-    {
-      super.unset(featureID);
-    }
-  }
-  
-  public boolean isSet(int featureID)
-  {
-    if (isDynamic() || featureID >= eStaticFeatureCount())
-    {
-      return super.eIsSet(featureID);
-    } 
-    else
-    {
-      return super.isSet(featureID);
-    }
-  }
-  
-  public EClass eClass()
-  {
-    return isDynamic() ? eClass : eStaticClass();
-  }
-
-  public void eSetClass(EClass eClass)
-  {
-    this.eClass = eClass;
-  }
-
-  public Object dynamicGet(int dynamicFeatureID)
-  {
-    return eSettings[dynamicFeatureID];
-  }
-
-  public void dynamicSet(int dynamicFeatureID, Object value)
-  {
-    eSettings[dynamicFeatureID] = value;
-  }
-
-  public void dynamicUnset(int dynamicFeatureID)
-  {
-    eSettings[dynamicFeatureID] = null;
-  }
-  
-  public Object eDynamicGet(int featureID, boolean resolve, boolean coreType)
-  {
-    int dynamicFeatureID = featureID - eStaticFeatureCount();
-    if (featureID < eClass().getFeatureCount())
-    {
-      EStructuralFeature eFeature = eClass().getEStructuralFeature(featureID);
-      return eSettingDelegate(eFeature).dynamicGet(this, eSettings(), dynamicFeatureID, resolve, coreType);
-    }
-    else
-    {
-      return super.eDynamicGet(dynamicFeatureID, resolve, coreType);
-    }
-  }
-  
-  public void eDynamicSet(int featureID, Object newValue)
-  {
-    int dynamicFeatureID = featureID - eStaticFeatureCount();
-    if (featureID < eClass().getFeatureCount())
-    {
-      EStructuralFeature eFeature = eClass().getEStructuralFeature(featureID);
-      eDynamicSet(dynamicFeatureID, eFeature, newValue);
-    }
-    else
-    {
-      super.eDynamicSet(dynamicFeatureID, newValue);
-    }
-  }
-
-  public void eDynamicUnset(int featureID)
-  {
-    int dynamicFeatureID = featureID - eStaticFeatureCount();
-    if (featureID < eClass().getFeatureCount())
-    {
-      EStructuralFeature eFeature = eClass().getEStructuralFeature(featureID);
-      eDynamicUnset(dynamicFeatureID, eFeature);
-    }
-    else
-    {
-      super.eDynamicUnset(dynamicFeatureID);
-    }
-  }
-
-  public boolean eDynamicIsSet(int featureID)
-  {
-    int dynamicFeatureID = featureID - eStaticFeatureCount();
-    if (featureID < eClass().getFeatureCount())
-    {
-      EStructuralFeature eFeature = eClass().getEStructuralFeature(featureID);
-      return eSettingDelegate(eFeature).dynamicIsSet(this, eSettings(), dynamicFeatureID);
-    }
-    else
-    {
-      return super.eDynamicIsSet(dynamicFeatureID);
-    }
-  }
-
-  /**
-   * An EFactoryImpl that creates ExtensibleDataObjectImpl instances.
-   */
-  public static class FactoryImpl extends EFactoryImpl
-  {
-    public FactoryImpl()
-    {
-    }
-
-    public EObject basicCreate(EClass eClass)
-    {
-      return new ExtensibleDataObjectImpl(eClass);
-    }
-  }
-
-} //ExtensibleDataObjectImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
deleted file mode 100644
index e344a6ffde..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/FactoryBase.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-import org.apache.tuscany.sdo.SDOFactory;
-import org.apache.tuscany.sdo.impl.SDOFactoryImpl.SDOEcoreFactory;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EClassImpl;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-
-/**
- * Base class for generated (static) SDO factories
- */
-public class FactoryBase extends EPackageImpl
-{
-  
-  public static final boolean IS_ATTRIBUTE = true;
-  
-  protected FactoryBase(String namespaceURI, String namespacePrefix)
-  {
-    super(new SDOEFactoryImpl());
-    ecoreFactory = new SDOEcoreFactory();
-    
-    int index = namespacePrefix.lastIndexOf(".");
-    setName(index != -1 ? namespacePrefix.substring(index + 1) : namespacePrefix);
-    setNsPrefix(namespacePrefix);
-
-    createResource(namespaceURI);
-    setNsURI(namespaceURI);
-    
-    ((SDOEFactoryImpl)getEFactoryInstance()).sdoFactory = this;
-  }
-  
-  protected FactoryBase(String namespaceURI, String namespacePrefix, String interfacePackage)
-  {
-    super(new SDOEFactoryImpl());
-    ecoreFactory = new SDOEcoreFactory();
-    
-    int index = interfacePackage.lastIndexOf(".");
-    setName(index != -1 ? interfacePackage.substring(index + 1) : interfacePackage);
-    setNsPrefix(namespacePrefix);
-
-    createResource(namespaceURI);
-    setNsURI(namespaceURI);
-    
-    ((SDOEFactoryImpl)getEFactoryInstance()).sdoFactory = this;
-  }
-
- 
-
-  public DataObject create(int typeNumber)
-  {
-    return null;
-  }
-  
-  public Object createFromString(int typeNumber, String stringValue)
-  {
-    return ((SDOEFactoryImpl)getEFactoryInstance()).createFromString(typeNumber, stringValue);
-  }
-  
-  public String convertToString(int typeNumber, Object objectValue)
-  {
-    return ((SDOEFactoryImpl)getEFactoryInstance()).convertToString(typeNumber, objectValue);
-  }
-  
-  protected Type createType(boolean isDataType, int typeNumber)
-  {
-    if (isDataType)
-      return (Type)createEDataType(typeNumber);
-    else
-      return (Type)createEClass(typeNumber);
-  }
-  
-  protected void createProperty(boolean isDataType, Type containingType, int internalPropertyNumber)
-  {
-    if (isDataType)
-      createEAttribute((EClass)containingType, internalPropertyNumber);
-    else
-      createEReference((EClass)containingType, internalPropertyNumber);
-  }
-  
-  /**
-   * @deprecated - use getLocalProperty instead, since getProperty causes
-   * caching of structural features. 
-   */
-  protected Property getProperty(Type type, int internalPropertyNumber)
-  {
-    return (Property)((EClass)type).getEAllStructuralFeatures().get(internalPropertyNumber);
-  }
-  
-  protected Property getLocalProperty(Type type, int localPropertyIndex)
-  {
-    return (Property)((EClass)type).getEStructuralFeatures().get(localPropertyIndex);
-  }
-  
-  
-  protected void initializeType(Type type, Class instanceClass, String name)
-  {
-    initEClass((EClass)type, instanceClass, name, !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);   
-  }
-
-  protected void initializeType(Type type, Class instanceClass, String name, boolean isAbstract)
-  {
-    initEClass((EClass)type, instanceClass, name, isAbstract, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);   
-  }
-
-  protected void initializeType(Type type, Class instanceClass, String name, boolean isSerializable, boolean isGenerated)
-  {
-    initEDataType((EDataType)type, instanceClass, name, isSerializable, isGenerated);   
-  }
-  
-  protected void initializeProperty(Property property, Type type, String name, String defaultValue, int lower, int upper, Class containerClass, boolean isReadonly, boolean isUnsettable, boolean isDerived)
-  {
-    initEAttribute((EAttribute)property, type != sequence ? (EClassifier)type : ecorePackage.getEFeatureMapEntry(), name, defaultValue, lower, upper, containerClass, isDerived, isDerived, !isReadonly, isUnsettable, !IS_ID, !IS_UNIQUE, isDerived, IS_ORDERED);
-  }
-  
-  protected void initializeProperty(Property property, Type type, String name, String defaultValue, int lower, int upper, Class containerClass, boolean isReadonly, boolean isUnsettable, boolean isDerived, boolean isComposite, Property oppositeProperty)
-  {
-    initEReference((EReference)property, (EClassifier)type, (EReference)oppositeProperty, name, defaultValue, lower, upper, containerClass, isDerived, isDerived, !isReadonly, isComposite, !isComposite /*resolve*/, isUnsettable, IS_UNIQUE, isDerived, IS_ORDERED);
-  }
-  
-  protected void initXSD()
-  {
-    createDocumentRoot();
-  }
-
-  protected void addXSDMapping(String[] xsdMappings, String annotationSource)
-  {
-    addAnnotation((ENamedElement)this, annotationSource, xsdMappings);
-  }
-
-  protected void addXSDMapping(Type type, String[] xsdMappings)
-  {
-    addAnnotation((ENamedElement)type, ANNOTATION_SOURCE, xsdMappings);
-  }
-  
-  protected void addXSDMapping(Property property, String[] xsdMappings)
-  {
-    addAnnotation((ENamedElement)property, ANNOTATION_SOURCE, xsdMappings);
-  }
-  
-  protected void setInstanceProperty(Type type, String namespaceURI, String propertyName, String propertyValue)
-  {
-    setInstanceProperty((ENamedElement)type, namespaceURI, propertyName, propertyValue);
-  }
-
-  protected void setInstanceProperty(Property property, String namespaceURI, String propertyName, String propertyValue)
-  {
-    setInstanceProperty((ENamedElement)property, namespaceURI, propertyName, propertyValue); 
-  }
-  
-  private void setInstanceProperty(ENamedElement eNamedElement, String namespaceURI, String propertyName, String propertyValue)
-  {
-    EAnnotation annotation = eNamedElement.getEAnnotation(namespaceURI);
-    if (annotation == null)
-    {
-      addAnnotation(eNamedElement, namespaceURI, new String[]{propertyName, propertyValue});
-	  } else 
-    {
-      annotation.getDetails().put(propertyName, propertyValue);
-    }
-  }
-
-  protected Property createGlobalProperty(String name, Type type, String[] xsdMappings)
-  {
-    return createGlobalProperty(name, type, xsdMappings, false);
-  }
-  
-  protected Property createGlobalProperty(String name, Type type, String[] xsdMappings, boolean asAttribute)
-  {
-    return createGlobalProperty(name, type, xsdMappings, asAttribute, ANNOTATION_SOURCE);
-  }
-
-  protected Property createGlobalProperty(String name, Type type, String[] xsdMappings, boolean asAttribute, String annotationSource)
-  {
-    int propertyNumber = documentRootEClass.getEStructuralFeatures().size();
-
-    EStructuralFeature globalProperty;
-    if(asAttribute) {
-      createEAttribute(documentRootEClass, propertyNumber);
-      EAttribute gatt = (EAttribute)documentRootEClass.getEStructuralFeatures().get(propertyNumber);
-      initEAttribute(gatt, (EDataType)type, name, null, 0, -2, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-      globalProperty = gatt;
-    } else {
-      createEReference(documentRootEClass, propertyNumber);
-      EReference gref = (EReference)documentRootEClass.getEStructuralFeatures().get(propertyNumber);
-      initEReference(gref, (EClass)type, null, name, null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-      globalProperty = gref;
-    } 
-    addAnnotation((ENamedElement)globalProperty, annotationSource, xsdMappings);
-    return (Property) globalProperty;
-  }
-  
-  private static final Type sequence = SDOFactory.eINSTANCE.createDataType(); // dummy type
-
-  protected Type getSequence() 
-  {
-    return sequence;
-  }
-  
-  protected void addSuperType(Type subType, Type superType) 
-  {
-	((EClass)subType).getESuperTypes().add((EClass)superType);
-  }
-  
- /***
-   * @param namespaceURI
-   * @return Static factory (from the global scope) for the provided URI
-   * 
-   * @deprecated - Use of the global scope is no longer encouraged.  This method uses the
-   * global scope for retrieving the URI's factory.  Instead, it is now possible to simply 
-   * access SomeFactoryInterface.INSTANCE object directly.
-   * 
-   */
-  public static Object getStaticFactory(String namespaceURI)
-  {
-    EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(namespaceURI);
-    //return (FactoryBase)ePackage;
-    return ePackage instanceof FactoryBase ? (Object)ePackage : (Object)ePackage.getEFactoryInstance(); 
-  }
-  
-  // private EMF-specific methods
-
-  private static class SDOEFactoryImpl extends DynamicDataObjectImpl.FactoryImpl
-  {
-    protected FactoryBase sdoFactory;
-    
-    public SDOEFactoryImpl()
-    {
-      super();
-    }
-    
-    public EObject create(EClass eClass)
-    {
-      DataObject result = sdoFactory.create(eClass.getClassifierID());
-      if (result == null) {
-        if (eClass.isAbstract()) {
-          Class instanceClass = eClass.getInstanceClass();
-          try {
-            Class concreteInstanceClass = DataObjectUtil.getImplementationClass(instanceClass, true);
-            return (EObject)concreteInstanceClass.newInstance();          
-          }
-          catch (Exception e)
-          {
-            //System.out.println("Error: " + e);
-          }
-        }
-        return super.create(eClass);
-      }
-      return (EObject)result;
-    }
-    
-    public Object createFromString(EDataType eDataType, String stringValue)
-    {
-      return sdoFactory.createFromString(eDataType.getClassifierID(), stringValue);
-    }
-    
-    public String convertToString(EDataType eDataType, Object objectValue)
-    {
-      return sdoFactory.convertToString(eDataType.getClassifierID(), objectValue);
-    }
-    
-    protected Object createFromString(int typeNumber, String stringValue)
-    {
-      return super.createFromString((EDataType)sdoFactory.getEClassifiers().get(typeNumber), stringValue);
-    }
-    
-    protected String convertToString(int typeNumber, Object objectValue)
-    {
-      return super.convertToString((EDataType)sdoFactory.getEClassifiers().get(typeNumber), objectValue);
-    }
-  }
-  
-  private static final int DOCUMENT_ROOT = 0;
-  private static final int DOCUMENT_ROOT__MIXED = 0;
-  private static final int DOCUMENT_ROOT__XMLNS_PREFIX_MAP = 1;
-  private static final int DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = 2;
-  private static final String ANNOTATION_SOURCE = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";
-  private EClass documentRootEClass = null;
-  
-  private void createDocumentRoot()
-  {
-    documentRootEClass = ecoreFactory.createEClass();
-    ((EClassImpl)documentRootEClass).setClassifierID(DOCUMENT_ROOT);
-    getEClassifiers().add(DOCUMENT_ROOT, documentRootEClass);
-
-    createEAttribute(documentRootEClass, DOCUMENT_ROOT__MIXED);
-    createEReference(documentRootEClass, DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
-    createEReference(documentRootEClass, DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
-    
-    initEClass(documentRootEClass, null, "DocumentRoot", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute((EAttribute)documentRootEClass.getEStructuralFeatures().get(DOCUMENT_ROOT__MIXED), ecorePackage.getEFeatureMapEntry(), "mixed", null, 0, -1, null, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference((EReference)documentRootEClass.getEStructuralFeatures().get(DOCUMENT_ROOT__XMLNS_PREFIX_MAP), ecorePackage.getEStringToStringMapEntry(), null, "xMLNSPrefixMap", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference((EReference)documentRootEClass.getEStructuralFeatures().get(DOCUMENT_ROOT__XSI_SCHEMA_LOCATION), ecorePackage.getEStringToStringMapEntry(), null, "xSISchemaLocation", null, 0, -1, null, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    addAnnotation
-      (documentRootEClass, 
-       ANNOTATION_SOURCE, 
-       new String[] 
-       {
-       "name", "",
-       "kind", "mixed"
-       });      
-    addAnnotation
-      ((EAttribute)documentRootEClass.getEStructuralFeatures().get(DOCUMENT_ROOT__MIXED), 
-       ANNOTATION_SOURCE, 
-       new String[] 
-       {
-       "kind", "elementWildcard",
-       "name", ":mixed"
-       });      
-    addAnnotation
-      ((EReference)documentRootEClass.getEStructuralFeatures().get(DOCUMENT_ROOT__XMLNS_PREFIX_MAP), 
-       ANNOTATION_SOURCE, 
-       new String[] 
-       {
-       "kind", "attribute",
-       "name", "xmlns:prefix"
-       });      
-    addAnnotation
-      ((EReference)documentRootEClass.getEStructuralFeatures().get(DOCUMENT_ROOT__XSI_SCHEMA_LOCATION), 
-       ANNOTATION_SOURCE, 
-       new String[] 
-       {
-       "kind", "attribute",
-       "name", "xsi:schemaLocation"
-       });      
-  }
-  
-  /**
-   * Initialize SDO runtime.
-   */
-  static
-  {
-    DataObjectUtil.initRuntime();
-  }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ListenerBase.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ListenerBase.java
deleted file mode 100644
index 986628bbc9..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ListenerBase.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-import org.apache.tuscany.sdo.api.Event;
-import org.apache.tuscany.sdo.api.EventListener;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-
-public abstract class ListenerBase extends AdapterImpl implements EventListener  {
-
-  public void notifyChanged(Notification msg) {
-    Event e = new EventImpl(msg);
-    eventNotification(e);
-  }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
deleted file mode 100644
index 19fb89bbd3..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
+++ /dev/null
@@ -1,785 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-import java.util.List;
-
-import org.apache.tuscany.sdo.SDOPackage;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.apache.tuscany.sdo.util.SDOUtil;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EReferenceImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-
-import commonj.sdo.Property;
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Reference</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ReferenceImpl extends EReferenceImpl implements Property,/* DataObject,*/ org.apache.tuscany.sdo.model.Property
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ReferenceImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  protected EClass eStaticClass()
-  {
-    return SDOPackage.eINSTANCE.getReference();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Object getDefault()
-  {
-    return getDefaultValue();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isReadOnly()
-  {
-    //return "true".equals(EcoreUtil.getAnnotation(this, "commonj.sdo", "readOnly"));
-    return !isChangeable(); //TODO semantics don't exactly match?
-  }
-
-  /**
-   * Single-valued SDO properties behave as EMF unsettable, multi-valued properties as EMF !unsettable
-   */
-  public boolean isUnsettable()
-  {
-    return !isMany();
-  }
-
-  protected List aliasNames = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getAliasNames()
-  {
-    if (aliasNames == null)
-    {
-      aliasNames = DataObjectUtil.getAliasNames(this);
-    }
-    return aliasNames;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Type getType()
-  {
-    return (Type)getEType();
-    /*
-    EClassifier eType = getEType();
-    //FB More temporary hacks
-    return eType instanceof Type ? (Type)getEType() : null;
-    */
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Type getContainingType()
-  {
-    return (Type)getEContainingClass();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Property getOpposite()
-  {
-    return (Property)getEOpposite();
-  }
-  
-  public boolean isNullable()
-  {
-    String isNillable = EcoreUtil.getAnnotation(this, ExtendedMetaData.ANNOTATION_URI, "nillable");
-    return isNillable != null && "true".equals(isNillable);
-  }
-
-  public boolean isOpenContent()
-  {
-    return SDOUtil.isDocumentRoot(getContainingType());
-  }
-
-  public List getInstanceProperties() {
-    return DataObjectUtil.getMetaObjectInstanceProperties(this);
-  }
-
-  public Object get(Property property) {
-    return DataObjectUtil.getMetaObjectInstanceProperty(this, property);
-  }
-  
-  /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  // org.apache.tuscany.sdo.model.Property methods
-  /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  
-  public List getAliasName() {
-    return this.getAliasNames();
-  }
-
-  public Sequence getAny() {
-    throw new UnsupportedOperationException();
-  }
-
-  public void setMany(boolean value) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public void unsetMany() {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSetMany() {
-    return isMany();
-  }
-
-  public void setReadOnly(boolean value) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public void unsetReadOnly() {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSetReadOnly() {
-    return isReadOnly();
-  }
-
-  public org.apache.tuscany.sdo.model.Type getType_() {
-    return (org.apache.tuscany.sdo.model.Type)getType();
-  }
-
-  public void setType(org.apache.tuscany.sdo.model.Type value) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public Sequence getAnyAttribute() {
-    throw new UnsupportedOperationException();
-  }
-
-  public String getDefault_() {
-    return (String) this.getDefault();
-  }
-
-  public void setDefault_(String value) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public org.apache.tuscany.sdo.model.Property getOpposite_() {
-    return (org.apache.tuscany.sdo.model.Property) getOpposite();
-  }
-
-  public void setOpposite_(org.apache.tuscany.sdo.model.Property value) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public void unsetContainment() {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSetContainment() {
-    return isContainment();
-  }
-  
-  public void setNullable(boolean value) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public void unsetNullable() {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSetNullable() {
-    return isNullable();
-  }
-
-  public void unsetName()
-  {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSetName()
-  {
-    return true;
-  }
-  
-  public void unsetOpposite()
-  {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSetOpposite()
-  {
-    return getOpposite() != null;
-  }
-  
-  public void unsetType()
-  {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSetType()
-  {
-    return true;
-  }
-  
-  public void unsetDefault()
-  {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSetDefault()
-  {
-    return getDefault() != null;
-  }
-  
-  
-  /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  // DataObject method implementations
-  /////////////////////////////////////////////////////////////////////////////////////////////////////////
-  /*
-  public Object get(int propertyIndex) {
-    return DataObjectUtil.get(this, propertyIndex);
-  }
-  
-  public void set(int propertyIndex, Object value) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSet(int propertyIndex) {
-    return DataObjectUtil.isSet(this, propertyIndex);
-  }
-
-  public void unset(int propertyIndex) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-  
-  public Object get(Property property) {
-    return DataObjectUtil.get(this, ((EStructuralFeature)property).getFeatureID());
-  }
-  
-  public void set(Property property, Object value) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSet(Property property) {
-    return DataObjectUtil.isSet(this, ((EStructuralFeature)property).getFeatureID());
-  }
-
-  public void unset(Property property) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-  
-  public DataObject getContainer() {
-    return (DataObject)eContainer();
-  }
-
-  public Property getContainmentProperty() {
-    return (Property)eContainmentFeature();
-  }  
-
-  // Remaining DataObject methods are (will be) implemented as straight delegation to DataObjectUtil
-
-  public Object get(String path) {
-    return DataObjectUtil.get(this, path);
-  }
-  
-  public void set(String path, Object value) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean isSet(String path) {
-    return DataObjectUtil.isSet(this, path);
-  }
-
-  public void unset(String path) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public boolean getBoolean(String path) {
-    return DataObjectUtil.getBoolean(get(path));
-  }
-
-  public byte getByte(String path) {
-    return DataObjectUtil.getByte(get(path));
-  }
-
-  public char getChar(String path) {
-    return DataObjectUtil.getChar(get(path));
-  }
-
-  public double getDouble(String path) {
-    return DataObjectUtil.getDouble(get(path));
-  }
-
-  public float getFloat(String path) {
-    return DataObjectUtil.getFloat(get(path));
-  }
-
-  public int getInt(String path) {
-    return DataObjectUtil.getInt(get(path));
-  }
-
-  public long getLong(String path) {
-    return DataObjectUtil.getLong(get(path));
-  }
-
-  public short getShort(String path) {
-    return DataObjectUtil.getShort(get(path));
-  }
-
-  public byte[] getBytes(String path) {
-    return DataObjectUtil.getBytes(get(path));
-  }
-
-  public BigDecimal getBigDecimal(String path) {
-    return DataObjectUtil.getBigDecimal(get(path));
-  }
-
-  public BigInteger getBigInteger(String path) {
-    return DataObjectUtil.getBigInteger(get(path));
-  }
-
-  public DataObject getDataObject(String path) {
-    return (DataObject)get(path);
-  }
-
-  public Date getDate(String path) {
-    return DataObjectUtil.getDate(get(path));
-  }
-
-  public String getString(String path) {
-    return DataObjectUtil.getString(get(path));
-  }
-
-  public List getList(String path) {
-    return (List)get(path);
-  }
-
-  public Sequence getSequence(String path) {
-    return (Sequence)get(path);
-  }
-
-  public void setBoolean(String path, boolean value) {
-    set(path, new Boolean(value));
-  }
-
-  public void setByte(String path, byte value) {
-    set(path, new Byte(value));
-  }
-
-  public void setChar(String path, char value) {
-    set(path, new Character(value));
-  }
-
-  public void setDouble(String path, double value) {
-    set(path, new Double(value));
-  }
-
-  public void setFloat(String path, float value) {
-    set(path, new Float(value));
-  }
-
-  public void setInt(String path, int value) {
-    set(path, new Integer(value));
-  }
-
-  public void setLong(String path, long value) {
-    set(path, new Long(value));
-  }
-
-  public void setShort(String path, short value) {
-    set(path, new Short(value));
-  }
-
-  public void setBytes(String path, byte[] value) {
-    set(path, value);
-  }
-
-  public void setBigDecimal(String path, BigDecimal value) {
-    set(path, value);
-  }
-
-  public void setBigInteger(String path, BigInteger value) {
-    set(path, value);
-  }
-
-  public void setDataObject(String path, DataObject value) {
-    set(path, value);
-  }
-
-  public void setDate(String path, Date value) {
-    set(path, value);
-  }
-
-  public void setString(String path, String value) {
-    set(path, value);
-  }
-
-  public void setList(String path, List value) {
-    set(path, value);
-  }
-
-  public boolean getBoolean(int propertyIndex) {
-    return DataObjectUtil.getBoolean(this, propertyIndex);
-  }
-
-  public byte getByte(int propertyIndex) {
-    return DataObjectUtil.getByte(this, propertyIndex);
-  }
-
-  public char getChar(int propertyIndex) {
-    return DataObjectUtil.getChar(this, propertyIndex);
-  }
-
-  public double getDouble(int propertyIndex) {
-    return DataObjectUtil.getDouble(this, propertyIndex);
-  }
-
-  public float getFloat(int propertyIndex) {
-    return DataObjectUtil.getFloat(this, propertyIndex);
-  }
-
-  public int getInt(int propertyIndex) {
-    return DataObjectUtil.getInt(this, propertyIndex);
-  }
-
-  public long getLong(int propertyIndex) {
-    return DataObjectUtil.getLong(this, propertyIndex);
-  }
-
-  public short getShort(int propertyIndex) {
-    return DataObjectUtil.getShort(this, propertyIndex);
-  }
-
-  public byte[] getBytes(int propertyIndex) {
-    return DataObjectUtil.getBytes(this, propertyIndex);
-  }
-
-  public BigDecimal getBigDecimal(int propertyIndex) {
-    return DataObjectUtil.getBigDecimal(this, propertyIndex);
-  }
-
-  public BigInteger getBigInteger(int propertyIndex) {
-    return DataObjectUtil.getBigInteger(this, propertyIndex);
-  }
-
-  public DataObject getDataObject(int propertyIndex) {
-    return DataObjectUtil.getDataObject(this, propertyIndex);
-  }
-
-  public Date getDate(int propertyIndex) {
-    return DataObjectUtil.getDate(this, propertyIndex);
-  }
-
-  public String getString(int propertyIndex) {
-    return DataObjectUtil.getString(this, propertyIndex);
-  }
-
-  public List getList(int propertyIndex) {
-    return DataObjectUtil.getList(this, propertyIndex);
-  }
-
-  public Sequence getSequence(int propertyIndex) {
-    return DataObjectUtil.getSequence(this, propertyIndex);
-  }
-
-  public void setBoolean(int propertyIndex, boolean value) {
-    set(propertyIndex, new Boolean(value));
-  }
-
-  public void setByte(int propertyIndex, byte value) {
-    set(propertyIndex, new Byte(value));
-  }
-
-  public void setChar(int propertyIndex, char value) {
-    set(propertyIndex, new Character(value));
-  }
-
-  public void setDouble(int propertyIndex, double value) {
-    set(propertyIndex, new Double(value));
-  }
-
-  public void setFloat(int propertyIndex, float value) {
-    set(propertyIndex, new Float(value));
-  }
-
-  public void setInt(int propertyIndex, int value) {
-    set(propertyIndex, new Integer(value));
-  }
-
-  public void setLong(int propertyIndex, long value) {
-    set(propertyIndex, new Long(value));
-  }
-
-  public void setShort(int propertyIndex, short value) {
-    set(propertyIndex, new Short(value));
-  }
-
-  public void setBytes(int propertyIndex, byte[] value) {
-    set(propertyIndex, value);
-  }
-
-  public void setBigDecimal(int propertyIndex, BigDecimal value) {
-    set(propertyIndex, value);
-  }
-
-  public void setBigInteger(int propertyIndex, BigInteger value) {
-    set(propertyIndex, value);
-  }
-
-  public void setDataObject(int propertyIndex, DataObject value) {
-    set(propertyIndex, value);
-  }
-
-  public void setDate(int propertyIndex, Date value) {
-    set(propertyIndex, value);
-  }
-
-  public void setString(int propertyIndex, String value) {
-    set(propertyIndex, value);
-  }
-
-  public void setList(int propertyIndex, List value) {
-    set(propertyIndex, value);
-  }
-
-  public boolean getBoolean(Property property) {
-    return DataObjectUtil.getBoolean(this, property);
-  }
-
-  public byte getByte(Property property) {
-    return DataObjectUtil.getByte(this, property);
-  }
-
-  public char getChar(Property property) {
-    return DataObjectUtil.getChar(this, property);
-  }
-
-  public double getDouble(Property property) {
-    return DataObjectUtil.getDouble(this, property);
-  }
-
-  public float getFloat(Property property) {
-    return DataObjectUtil.getFloat(this, property);
-  }
-
-  public int getInt(Property property) {
-    return DataObjectUtil.getInt(this, property);
-  }
-
-  public long getLong(Property property) {
-    return DataObjectUtil.getLong(this, property);
-  }
-
-  public short getShort(Property property) {
-    return DataObjectUtil.getShort(this, property);
-  }
-
-  public byte[] getBytes(Property property) {
-    return DataObjectUtil.getBytes(this, property);
-  }
-
-  public BigDecimal getBigDecimal(Property property) {
-    return DataObjectUtil.getBigDecimal(this, property);
-  }
-
-  public BigInteger getBigInteger(Property property) {
-    return DataObjectUtil.getBigInteger(this, property);
-  }
-
-  public DataObject getDataObject(Property property) {
-    return DataObjectUtil.getDataObject(this, property);
-  }
-
-  public Date getDate(Property property) {
-    return DataObjectUtil.getDate(this, property);
-  }
-
-  public String getString(Property property) {
-    return DataObjectUtil.getString(this, property);
-  }
-
-  public List getList(Property property) {
-    return DataObjectUtil.getList(this, property);
-  }
-
-  public Sequence getSequence(Property property) {
-    return DataObjectUtil.getSequence(this, property);
-  }
-
-  public void setBoolean(Property property, boolean value) {
-    set(property, new Boolean(value));
-  }
-
-  public void setByte(Property property, byte value) {
-    set(property, new Byte(value));
-  }
-
-  public void setChar(Property property, char value) {
-    set(property, new Character(value));
-  }
-
-  public void setDouble(Property property, double value) {
-    set(property, new Double(value));
-  }
-
-  public void setFloat(Property property, float value) {
-    set(property, new Float(value));
-  }
-
-  public void setInt(Property property, int value) {
-    set(property, new Integer(value));
-  }
-
-  public void setLong(Property property, long value) {
-    set(property, new Long(value));
-  }
-
-  public void setShort(Property property, short value) {
-    set(property, new Short(value));
-  }
-
-  public void setBytes(Property property, byte[] value) {
-    set(property, value);
-  }
-
-  public void setBigDecimal(Property property, BigDecimal value) {
-    set(property, value);
-  }
-
-  public void setBigInteger(Property property, BigInteger value) {
-    set(property, value);
-  }
-
-  public void setDataObject(Property property, DataObject value) {
-    set(property, value);
-  }
-
-  public void setDate(Property property, Date value) {
-    set(property, value);
-  }
-
-  public void setString(Property property, String value) {
-    set(property, value);
-  }
-
-  public void setList(Property property, List value) {
-    set(property, value);
-  }
-
-  public DataObject createDataObject(String propertyName) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public DataObject createDataObject(int propertyIndex) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public DataObject createDataObject(Property property) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public DataObject createDataObject(String propertyName, String namespaceURI, String typeName) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public DataObject createDataObject(int propertyIndex, String namespaceURI, String typeName) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public DataObject createDataObject(Property property, Type type) {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public void delete() {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-  }
-
-  public DataGraph getDataGraph() {
-    return DataObjectUtil.getDataGraph(this);
-  }
-
-  public Sequence getSequence() {
-    EAttribute mixedFeature = BasicExtendedMetaData.INSTANCE.getMixedFeature(eClass());
-    return mixedFeature != null ? (Sequence)eGet(mixedFeature, true, false) : null;
-  }
-
-  public List getInstanceProperties() {
-    return DataObjectUtil.getInstanceProperties(this);
-  }
-
-  public DataObject getRootObject() {
-    return DataObjectUtil.getRootObject(this);
-  }
-
-  public ChangeSummary getChangeSummary() {
-    // TODO: implement this method
-    throw new UnsupportedOperationException();
-  }
-
-  public void detach() {
-    throw new UnsupportedOperationException("Property is frozen and cannot be modified");
-    //DataObjectUtil.detach(this);
-  }
-  
-  public Property getProperty(String propertyName) {
-    return DataObjectUtil.getProperty(this, propertyName);
-  }
-  */
-  
-} //ReferenceImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java
deleted file mode 100644
index bb0f5ccd2a..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-import org.apache.tuscany.sdo.AnyTypeDataObject;
-import org.apache.tuscany.sdo.SDOFactory;
-import org.apache.tuscany.sdo.SDOPackage;
-import org.apache.tuscany.sdo.SimpleAnyTypeDataObject;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.impl.EcoreFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.DataGraph;
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SDOFactoryImpl extends EFactoryImpl implements SDOFactory
-{
-  /**
-   * Creates the default factory implementation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public static SDOFactory init()
-  {
-    try
-    {
-      SDOFactory theSDOFactory = (SDOFactory)EPackage.Registry.INSTANCE.getEFactory(SDOPackage.eNS_URI); 
-      if (theSDOFactory != null)
-      {
-        return theSDOFactory;
-      }
-    }
-    catch (Exception exception)
-    {
-      EcorePlugin.INSTANCE.log(exception);
-    }
-    return new SDOFactoryImpl();
-  }
-
-  public static class SDOEcoreFactory extends EcoreFactoryImpl
-  {
-    public EClass createEClass() { return new ClassImpl(); }
-    public EDataType createEDataType() { return new DataTypeImpl(); }
-    //public EEnum createEEnum() { return new EnumImpl(); }
-    public EAttribute createEAttribute() { return new AttributeImpl(); }
-    public EReference createEReference() { return new ReferenceImpl(); }
-    
-//    public EFactory createEFactory()
-//    {
-//      EFactoryImpl eFactory = new EFactoryImpl() { OVERRIDE basicCreate(); } // TODO think about doing this 
-//      return eFactory;
-//    }  
-  }
-  
-  /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public SDOFactoryImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EObject create(EClass eClass)
-  {
-    switch (eClass.getClassifierID())
-    {
-      case SDOPackage.CHANGE_SUMMARY: return (EObject)createChangeSummary();
-      case SDOPackage.CHANGE_SUMMARY_SETTING: return (EObject)createChangeSummarySetting();
-      case SDOPackage.DATA_GRAPH: return (EObject)createDataGraph();
-      case SDOPackage.ANY_TYPE_DATA_OBJECT: return createAnyTypeDataObject();
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT: return createSimpleAnyTypeDataObject();
-      case SDOPackage.CLASS: return (EObject)createClass();
-      case SDOPackage.DATA_TYPE: return (EObject)createDataType();
-      case SDOPackage.ATTRIBUTE: return (EObject)createAttribute();
-      case SDOPackage.REFERENCE: return (EObject)createReference();
-      case SDOPackage.ENUM: return (EObject)createEnum();
-      case SDOPackage.DYNAMIC_DATA_OBJECT: return (EObject)createDynamicDataObject();
-      case SDOPackage.STORE_DATA_OBJECT: return (EObject)createStoreDataObject();
-      case SDOPackage.DYNAMIC_STORE_DATA_OBJECT: return (EObject)createDynamicStoreDataObject();
-      case SDOPackage.EXTENSIBLE_DATA_OBJECT: return (EObject)createExtensibleDataObject();
-      default:
-        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-    }
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object createFromString(EDataType eDataType, String initialValue)
-  {
-    switch (eDataType.getClassifierID())
-    {
-      default:
-        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertToString(EDataType eDataType, Object instanceValue)
-  {
-    switch (eDataType.getClassifierID())
-    {
-      default:
-        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeSummary createChangeSummary()
-  {
-    ChangeSummaryImpl changeSummary = new ChangeSummaryImpl();
-    return changeSummary;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeSummary.Setting createChangeSummarySetting()
-  {
-    ChangeSummarySettingImpl changeSummarySetting = new ChangeSummarySettingImpl();
-    return changeSummarySetting;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public DataGraph createDataGraph()
-  {
-    DataGraphImpl dataGraph = new DataGraphImpl();
-    return dataGraph;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public AnyTypeDataObject createAnyTypeDataObject()
-  {
-    AnyTypeDataObjectImpl anyTypeDataObject = new AnyTypeDataObjectImpl();
-    return anyTypeDataObject;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public SimpleAnyTypeDataObject createSimpleAnyTypeDataObject()
-  {
-    SimpleAnyTypeDataObjectImpl simpleAnyTypeDataObject = new SimpleAnyTypeDataObjectImpl();
-    return simpleAnyTypeDataObject;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type createClass()
-  {
-    ClassImpl class_ = new ClassImpl();
-    return class_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type createDataType()
-  {
-    DataTypeImpl dataType = new DataTypeImpl();
-    return dataType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Property createAttribute()
-  {
-    AttributeImpl attribute = new AttributeImpl();
-    return attribute;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Property createReference()
-  {
-    ReferenceImpl reference = new ReferenceImpl();
-    return reference;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type createEnum()
-  {
-    EnumImpl enum_ = new EnumImpl();
-    return enum_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public DataObject createDynamicDataObject()
-  {
-    DynamicDataObjectImpl dynamicDataObject = new DynamicDataObjectImpl();
-    return dynamicDataObject;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public DataObject createStoreDataObject()
-  {
-    StoreDataObjectImpl storeDataObject = new StoreDataObjectImpl();
-    return storeDataObject;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public DataObject createDynamicStoreDataObject()
-  {
-    DynamicStoreDataObjectImpl dynamicStoreDataObject = new DynamicStoreDataObjectImpl();
-    return dynamicStoreDataObject;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public DataObject createExtensibleDataObject()
-  {
-    ExtensibleDataObjectImpl extensibleDataObject = new ExtensibleDataObjectImpl();
-    return extensibleDataObject;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public SDOPackage getSDOPackage()
-  {
-    return (SDOPackage)getEPackage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @deprecated
-   * @generated
-   */
-  public static SDOPackage getPackage()
-  {
-    return SDOPackage.eINSTANCE;
-  }
-
-  public ChangeSummary.Setting createChangeSummarySetting(EStructuralFeature eStructuralFeature, Object value, boolean isSet)
-  {
-    ChangeSummarySettingImpl eChangeSummarySetting = new ChangeSummarySettingImpl(eStructuralFeature, value, isSet);
-    return eChangeSummarySetting;
-  }
-
-} //SDOFactoryImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java
deleted file mode 100644
index 25bdab16fe..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java
+++ /dev/null
@@ -1,2207 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-import java.io.ObjectStreamException;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.tuscany.sdo.AnyTypeDataObject;
-import org.apache.tuscany.sdo.SDOFactory;
-import org.apache.tuscany.sdo.SDOPackage;
-import org.apache.tuscany.sdo.SimpleAnyTypeDataObject;
-import org.apache.tuscany.sdo.impl.SDOFactoryImpl.SDOEcoreFactory;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.change.ChangePackage;
-import org.eclipse.emf.ecore.change.impl.ChangePackageImpl;
-import org.eclipse.emf.ecore.impl.EClassImpl;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.ecore.impl.EcorePackageImpl;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.emf.ecore.xml.type.impl.XMLTypePackageImpl;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.DataGraph;
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SDOPackageImpl extends EPackageImpl implements SDOPackage
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass changeSummaryEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass changeSummarySettingEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass dataGraphEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass dataObjectEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass propertyEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass sequenceEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass typeEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass anyTypeDataObjectEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass simpleAnyTypeDataObjectEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass classEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass dataTypeEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass attributeEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass referenceEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass enumEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass dynamicDataObjectEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass storeDataObjectEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass dynamicStoreDataObjectEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass extensibleDataObjectEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EDataType eJavaListEDataType = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EDataType eObjectStreamExceptionEDataType = null;
-
-  /**
-   * Creates an instance of the model <b>Package</b>, registered with
-   * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-   * package URI value.
-   * <p>Note: the correct way to create the package is via the static
-   * factory method {@link #init init()}, which also performs
-   * initialization of the package, or returns the registered package,
-   * if one already exists.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see org.eclipse.emf.ecore.EPackage.Registry
-   * @see org.apache.tuscany.sdo.SDOPackage#eNS_URI
-   * @see #init()
-   * @generated NOT
-   */
-  private SDOPackageImpl()
-  {
-    super(eNS_URI, SDOFactory.eINSTANCE);
-    ecoreFactory = new SDOEcoreFactory();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private static boolean isInited = false;
-
-  /**
-   * Creates, registers, and initializes the <b>Package</b> for this
-   * model, and for any others upon which it depends.  Simple
-   * dependencies are satisfied by calling this method on all
-   * dependent packages before doing anything else.  This method drives
-   * initialization for interdependent packages directly, in parallel
-   * with this package, itself.
-   * <p>Of this package and its interdependencies, all packages which
-   * have not yet been registered by their URI values are first created
-   * and registered.  The packages are then initialized in two steps:
-   * meta-model objects for all of the packages are created before any
-   * are initialized, since one package's meta-model objects may refer to
-   * those of another.
-   * <p>Invocation of this method will not affect any packages that have
-   * already been initialized.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #eNS_URI
-   * @see #createPackageContents()
-   * @see #initializePackageContents()
-   * @generated
-   */
-  public static SDOPackage init()
-  {
-    if (isInited) return (SDOPackage)EPackage.Registry.INSTANCE.getEPackage(SDOPackage.eNS_URI);
-
-    // Obtain or create and register package
-    SDOPackageImpl theSDOPackage = (SDOPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof SDOPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new SDOPackageImpl());
-
-    isInited = true;
-
-    // Initialize simple dependencies
-    EcorePackageImpl.init();
-    XMLTypePackageImpl.init();
-    ChangePackageImpl.init();
-
-    // Create package meta-data objects
-    theSDOPackage.createPackageContents();
-
-    // Initialize created meta-data
-    theSDOPackage.initializePackageContents();
-
-    // Mark meta-data to indicate it can't be changed
-    theSDOPackage.freeze();
-
-    return theSDOPackage;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getChangeSummary()
-  {
-    return changeSummaryEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getChangeSummary_EDataGraph()
-  {
-    return (EReference)changeSummaryEClass.getEStructuralFeatures().get(0);
-  }
-
-//  /**
-//   * <!-- begin-user-doc -->
-//   * <!-- end-user-doc -->
-//   * <hand coded but could be generated>
-//   */
-//  public EReference getChangeSummary_EDataObject()
-//  {
-//    return (EReference)changeSummaryEClass.getEStructuralFeatures().get(1);
-//  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getChangeSummarySetting()
-  {
-    return changeSummarySettingEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getDataGraph()
-  {
-    return dataGraphEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getDataGraph_ResourceSet()
-  {
-    return (EAttribute)dataGraphEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EAttribute getDataGraph_RootResource()
-  {
-    return (EAttribute)dataGraphEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getDataGraph_EChangeSummary()
-  {
-    return (EReference)dataGraphEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EReference getDataGraph_ERootObject()
-  {
-    return (EReference)dataGraphEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getDataObject()
-  {
-    return dataObjectEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getProperty()
-  {
-    return propertyEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getSequence()
-  {
-    return sequenceEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getType()
-  {
-    return typeEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getAnyTypeDataObject()
-  {
-    return anyTypeDataObjectEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getSimpleAnyTypeDataObject()
-  {
-    return simpleAnyTypeDataObjectEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getClass_()
-  {
-    return classEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getDataType()
-  {
-    return dataTypeEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getAttribute()
-  {
-    return attributeEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getReference()
-  {
-    return referenceEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getEnum()
-  {
-    return enumEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getDynamicDataObject()
-  {
-    return dynamicDataObjectEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getStoreDataObject()
-  {
-    return storeDataObjectEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getDynamicStoreDataObject()
-  {
-    return dynamicStoreDataObjectEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EClass getExtensibleDataObject()
-  {
-    return extensibleDataObjectEClass;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EDataType getEJavaList()
-  {
-    return eJavaListEDataType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EDataType getEObjectStreamException()
-  {
-    return eObjectStreamExceptionEDataType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public SDOFactory getSDOFactory()
-  {
-    return (SDOFactory)getEFactoryInstance();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private boolean isCreated = false;
-
-  /**
-   * Creates the meta-model objects for the package.  This method is
-   * guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void createPackageContents()
-  {
-    if (isCreated) return;
-    isCreated = true;
-
-    // Create classes and their features
-    changeSummaryEClass = createEClass(CHANGE_SUMMARY);
-    createEReference(changeSummaryEClass, CHANGE_SUMMARY__EDATA_GRAPH);
-
-    changeSummarySettingEClass = createEClass(CHANGE_SUMMARY_SETTING);
-
-    dataGraphEClass = createEClass(DATA_GRAPH);
-    createEAttribute(dataGraphEClass, DATA_GRAPH__RESOURCE_SET);
-    createEAttribute(dataGraphEClass, DATA_GRAPH__ROOT_RESOURCE);
-    createEReference(dataGraphEClass, DATA_GRAPH__ECHANGE_SUMMARY);
-    createEReference(dataGraphEClass, DATA_GRAPH__EROOT_OBJECT);
-
-    dataObjectEClass = createEClass(DATA_OBJECT);
-
-    propertyEClass = createEClass(PROPERTY);
-
-    sequenceEClass = createEClass(SEQUENCE);
-
-    typeEClass = createEClass(TYPE);
-
-    anyTypeDataObjectEClass = createEClass(ANY_TYPE_DATA_OBJECT);
-
-    simpleAnyTypeDataObjectEClass = createEClass(SIMPLE_ANY_TYPE_DATA_OBJECT);
-
-    classEClass = createEClass(CLASS);
-
-    dataTypeEClass = createEClass(DATA_TYPE);
-
-    attributeEClass = createEClass(ATTRIBUTE);
-
-    referenceEClass = createEClass(REFERENCE);
-
-    enumEClass = createEClass(ENUM);
-
-    dynamicDataObjectEClass = createEClass(DYNAMIC_DATA_OBJECT);
-
-    storeDataObjectEClass = createEClass(STORE_DATA_OBJECT);
-
-    dynamicStoreDataObjectEClass = createEClass(DYNAMIC_STORE_DATA_OBJECT);
-
-    extensibleDataObjectEClass = createEClass(EXTENSIBLE_DATA_OBJECT);
-
-    // Create data types
-    eJavaListEDataType = createEDataType(EJAVA_LIST);
-    eObjectStreamExceptionEDataType = createEDataType(EOBJECT_STREAM_EXCEPTION);
-  }
-  
-  protected EClass createEClass(int id)
-  {
-    EClassImpl c;
-    switch(id) {
-      case ANY_TYPE_DATA_OBJECT:
-        c = new ClassImpl() {
-          List baseTypes = null;
-          public List getBaseTypes() {
-            if (baseTypes == null)
-              baseTypes = Collections.singletonList(getDataObject());
-            return baseTypes;
-          }
-          public List getTypeFeatures() {
-            return getEAllStructuralFeatures();
-          }
-        };
-        break;
-      case SIMPLE_ANY_TYPE_DATA_OBJECT:
-        c = new ClassImpl() {
-          List baseTypes = null;
-          public List getBaseTypes() {
-            if (baseTypes == null)
-              baseTypes = Collections.singletonList(getAnyTypeDataObject());
-            return baseTypes;
-          }
-        };
-        break;
-      default:
-        c = (EClassImpl)ecoreFactory.createEClass();
-    }
-    c.setClassifierID(id);
-    getEClassifiers().add(c);
-    return c;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private boolean isInitialized = false;
-
-  /**
-   * Complete the initialization of the package and its meta-model.  This
-   * method is guarded to have no affect on any invocation but its first.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void initializePackageContents()
-  {
-    if (isInitialized) return;
-    isInitialized = true;
-
-    // Initialize package
-    setName(eNAME);
-    setNsPrefix(eNS_PREFIX);
-    setNsURI(eNS_URI);
-
-    // Obtain other dependent packages
-    ChangePackageImpl theChangePackage = (ChangePackageImpl)EPackage.Registry.INSTANCE.getEPackage(ChangePackage.eNS_URI);
-    EcorePackageImpl theEcorePackage = (EcorePackageImpl)EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);
-    XMLTypePackageImpl theXMLTypePackage = (XMLTypePackageImpl)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-
-    // Add supertypes to classes
-    changeSummaryEClass.getESuperTypes().add(theChangePackage.getChangeDescription());
-    changeSummarySettingEClass.getESuperTypes().add(theChangePackage.getFeatureChange());
-    dataGraphEClass.getESuperTypes().add(theEcorePackage.getEObject());
-    anyTypeDataObjectEClass.getESuperTypes().add(this.getDataObject());
-    anyTypeDataObjectEClass.getESuperTypes().add(theXMLTypePackage.getAnyType());
-    simpleAnyTypeDataObjectEClass.getESuperTypes().add(this.getAnyTypeDataObject());
-    simpleAnyTypeDataObjectEClass.getESuperTypes().add(theXMLTypePackage.getSimpleAnyType());
-    classEClass.getESuperTypes().add(theEcorePackage.getEClass());
-    classEClass.getESuperTypes().add(this.getType());
-    dataTypeEClass.getESuperTypes().add(theEcorePackage.getEDataType());
-    dataTypeEClass.getESuperTypes().add(this.getType());
-    attributeEClass.getESuperTypes().add(theEcorePackage.getEAttribute());
-    attributeEClass.getESuperTypes().add(this.getProperty());
-    referenceEClass.getESuperTypes().add(theEcorePackage.getEReference());
-    referenceEClass.getESuperTypes().add(this.getProperty());
-    enumEClass.getESuperTypes().add(theEcorePackage.getEEnum());
-    enumEClass.getESuperTypes().add(this.getType());
-    dynamicDataObjectEClass.getESuperTypes().add(this.getDataObject());
-    storeDataObjectEClass.getESuperTypes().add(this.getDataObject());
-    dynamicStoreDataObjectEClass.getESuperTypes().add(this.getStoreDataObject());
-    extensibleDataObjectEClass.getESuperTypes().add(this.getDataObject());
-
-    // Initialize classes and features; add operations and parameters
-    initEClass(changeSummaryEClass, ChangeSummary.class, "ChangeSummary", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-    initEReference(getChangeSummary_EDataGraph(), this.getDataGraph(), this.getDataGraph_EChangeSummary(), "eDataGraph", null, 1, 1, ChangeSummary.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    addEOperation(changeSummaryEClass, null, "beginLogging");
-
-    addEOperation(changeSummaryEClass, null, "endLogging");
-
-    EOperation op = addEOperation(changeSummaryEClass, ecorePackage.getEBoolean(), "isCreated");
-    addEParameter(op, this.getDataObject(), "dataObject");
-
-    op = addEOperation(changeSummaryEClass, ecorePackage.getEBoolean(), "isDeleted");
-    addEParameter(op, this.getDataObject(), "dataObject");
-
-    op = addEOperation(changeSummaryEClass, this.getEJavaList(), "getOldValues");
-    addEParameter(op, this.getDataObject(), "dataObject");
-
-    op = addEOperation(changeSummaryEClass, ecorePackage.getEBoolean(), "isModified");
-    addEParameter(op, this.getDataObject(), "dataObject");
-
-    op = addEOperation(changeSummaryEClass, this.getChangeSummarySetting(), "getOldValue");
-    addEParameter(op, this.getDataObject(), "dataObject");
-    addEParameter(op, this.getProperty(), "property");
-
-    op = addEOperation(changeSummaryEClass, this.getDataObject(), "getOldContainer");
-    addEParameter(op, this.getDataObject(), "dataObject");
-
-    op = addEOperation(changeSummaryEClass, this.getProperty(), "getOldContainmentProperty");
-    addEParameter(op, this.getDataObject(), "dataObject");
-
-    op = addEOperation(changeSummaryEClass, this.getSequence(), "getOldSequence");
-    addEParameter(op, this.getDataObject(), "dataObject");
-
-    addEOperation(changeSummaryEClass, null, "undoChanges");
-
-    addEOperation(changeSummaryEClass, ecorePackage.getEBoolean(), "isLogging");
-
-    addEOperation(changeSummaryEClass, this.getDataGraph(), "getDataGraph");
-
-    addEOperation(changeSummaryEClass, this.getEJavaList(), "getChangedObjects");
-
-    addEOperation(changeSummaryEClass, this.getDataObject(), "getRootObject");
-
-    initEClass(changeSummarySettingEClass, ChangeSummary.Setting.class, "ChangeSummarySetting", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-    addEOperation(changeSummarySettingEClass, ecorePackage.getEBoolean(), "isSet");
-
-    addEOperation(changeSummarySettingEClass, theEcorePackage.getEJavaObject(), "getValue");
-
-    addEOperation(changeSummarySettingEClass, this.getProperty(), "getProperty");
-
-    initEClass(dataGraphEClass, DataGraph.class, "DataGraph", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getDataGraph_ResourceSet(), theEcorePackage.getEResourceSet(), "resourceSet", null, 0, 1, DataGraph.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getDataGraph_RootResource(), theEcorePackage.getEResource(), "rootResource", null, 0, 1, DataGraph.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-    initEReference(getDataGraph_EChangeSummary(), this.getChangeSummary(), this.getChangeSummary_EDataGraph(), "eChangeSummary", null, 1, 1, DataGraph.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getDataGraph_ERootObject(), theEcorePackage.getEObject(), null, "eRootObject", null, 1, 1, DataGraph.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    op = addEOperation(dataGraphEClass, this.getDataObject(), "createRootObject");
-    addEParameter(op, ecorePackage.getEString(), "namespaceURI");
-    addEParameter(op, ecorePackage.getEString(), "typeName");
-
-    op = addEOperation(dataGraphEClass, this.getDataObject(), "createRootObject");
-    addEParameter(op, this.getType(), "type");
-
-    op = addEOperation(dataGraphEClass, this.getType(), "getType");
-    addEParameter(op, ecorePackage.getEString(), "namespaceURI");
-    addEParameter(op, ecorePackage.getEString(), "typeName");
-
-    addEOperation(dataGraphEClass, this.getDataObject(), "getRootObject");
-
-    addEOperation(dataGraphEClass, this.getChangeSummary(), "getChangeSummary");
-
-    initEClass(dataObjectEClass, DataObject.class, "DataObject", IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-    op = addEOperation(dataObjectEClass, theEcorePackage.getEJavaObject(), "get");
-    addEParameter(op, ecorePackage.getEString(), "path");
-
-    op = addEOperation(dataObjectEClass, null, "set");
-    addEParameter(op, ecorePackage.getEString(), "path");
-    addEParameter(op, theEcorePackage.getEJavaObject(), "value");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEBoolean(), "isSet");
-    addEParameter(op, ecorePackage.getEString(), "path");
-
-    op = addEOperation(dataObjectEClass, null, "unset");
-    addEParameter(op, ecorePackage.getEString(), "path");
-
-    op = addEOperation(dataObjectEClass, theEcorePackage.getEJavaObject(), "get");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-
-    op = addEOperation(dataObjectEClass, null, "set");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-    addEParameter(op, theEcorePackage.getEJavaObject(), "value");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEBoolean(), "isSet");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-
-    op = addEOperation(dataObjectEClass, null, "unset");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-
-    op = addEOperation(dataObjectEClass, theEcorePackage.getEJavaObject(), "get");
-    addEParameter(op, this.getProperty(), "property");
-
-    op = addEOperation(dataObjectEClass, null, "set");
-    addEParameter(op, this.getProperty(), "property");
-    addEParameter(op, theEcorePackage.getEJavaObject(), "value");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEBoolean(), "isSet");
-    addEParameter(op, this.getProperty(), "property");
-
-    op = addEOperation(dataObjectEClass, null, "unset");
-    addEParameter(op, this.getProperty(), "property");
-
-    addEOperation(dataObjectEClass, this.getDataObject(), "getContainer");
-
-    addEOperation(dataObjectEClass, this.getProperty(), "getContainmentProperty");
-
-    addEOperation(dataObjectEClass, this.getDataGraph(), "getDataGraph");
-
-    addEOperation(dataObjectEClass, this.getType(), "getType");
-
-    op = addEOperation(dataObjectEClass, theEcorePackage.getEBigDecimal(), "getBigDecimal");
-    addEParameter(op, ecorePackage.getEString(), "path");
-
-    op = addEOperation(dataObjectEClass, theEcorePackage.getEBigInteger(), "getBigInteger");
-    addEParameter(op, ecorePackage.getEString(), "path");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEBoolean(), "getBoolean");
-    addEParameter(op, ecorePackage.getEString(), "path");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEByte(), "getByte");
-    addEParameter(op, ecorePackage.getEString(), "path");
-
-    op = addEOperation(dataObjectEClass, theEcorePackage.getEByteArray(), "getBytes");
-    addEParameter(op, ecorePackage.getEString(), "path");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEChar(), "getChar");
-    addEParameter(op, ecorePackage.getEString(), "path");
-
-    op = addEOperation(dataObjectEClass, this.getDataObject(), "getDataObject");
-    addEParameter(op, ecorePackage.getEString(), "path");
-
-    op = addEOperation(dataObjectEClass, theEcorePackage.getEDate(), "getDate");
-    addEParameter(op, ecorePackage.getEString(), "path");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEDouble(), "getDouble");
-    addEParameter(op, ecorePackage.getEString(), "path");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEFloat(), "getFloat");
-    addEParameter(op, ecorePackage.getEString(), "path");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEInt(), "getInt");
-    addEParameter(op, ecorePackage.getEString(), "path");
-
-    op = addEOperation(dataObjectEClass, this.getEJavaList(), "getList");
-    addEParameter(op, ecorePackage.getEString(), "path");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getELong(), "getLong");
-    addEParameter(op, ecorePackage.getEString(), "path");
-
-    op = addEOperation(dataObjectEClass, this.getSequence(), "getSequence");
-    addEParameter(op, ecorePackage.getEString(), "path");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEShort(), "getShort");
-    addEParameter(op, ecorePackage.getEString(), "path");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEString(), "getString");
-    addEParameter(op, ecorePackage.getEString(), "path");
-
-    op = addEOperation(dataObjectEClass, null, "setBigDecimal");
-    addEParameter(op, ecorePackage.getEString(), "path");
-    addEParameter(op, theEcorePackage.getEBigDecimal(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setBigInteger");
-    addEParameter(op, ecorePackage.getEString(), "path");
-    addEParameter(op, theEcorePackage.getEBigInteger(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setBoolean");
-    addEParameter(op, ecorePackage.getEString(), "path");
-    addEParameter(op, ecorePackage.getEBoolean(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setByte");
-    addEParameter(op, ecorePackage.getEString(), "path");
-    addEParameter(op, ecorePackage.getEByte(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setBytes");
-    addEParameter(op, ecorePackage.getEString(), "path");
-    addEParameter(op, theEcorePackage.getEByteArray(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setChar");
-    addEParameter(op, ecorePackage.getEString(), "path");
-    addEParameter(op, ecorePackage.getEChar(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setDataObject");
-    addEParameter(op, ecorePackage.getEString(), "path");
-    addEParameter(op, this.getDataObject(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setDate");
-    addEParameter(op, ecorePackage.getEString(), "path");
-    addEParameter(op, theEcorePackage.getEDate(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setDouble");
-    addEParameter(op, ecorePackage.getEString(), "path");
-    addEParameter(op, ecorePackage.getEDouble(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setFloat");
-    addEParameter(op, ecorePackage.getEString(), "path");
-    addEParameter(op, ecorePackage.getEFloat(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setInt");
-    addEParameter(op, ecorePackage.getEString(), "path");
-    addEParameter(op, ecorePackage.getEInt(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setList");
-    addEParameter(op, ecorePackage.getEString(), "path");
-    addEParameter(op, this.getEJavaList(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setLong");
-    addEParameter(op, ecorePackage.getEString(), "path");
-    addEParameter(op, ecorePackage.getELong(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setShort");
-    addEParameter(op, ecorePackage.getEString(), "path");
-    addEParameter(op, ecorePackage.getEShort(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setString");
-    addEParameter(op, ecorePackage.getEString(), "path");
-    addEParameter(op, ecorePackage.getEString(), "value");
-
-    op = addEOperation(dataObjectEClass, theEcorePackage.getEBigDecimal(), "getBigDecimal");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-
-    op = addEOperation(dataObjectEClass, theEcorePackage.getEBigInteger(), "getBigInteger");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEBoolean(), "getBoolean");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEByte(), "getByte");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-
-    op = addEOperation(dataObjectEClass, theEcorePackage.getEByteArray(), "getBytes");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEChar(), "getChar");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-
-    op = addEOperation(dataObjectEClass, this.getDataObject(), "getDataObject");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-
-    op = addEOperation(dataObjectEClass, theEcorePackage.getEDate(), "getDate");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEDouble(), "getDouble");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEFloat(), "getFloat");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEInt(), "getInt");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-
-    op = addEOperation(dataObjectEClass, this.getEJavaList(), "getList");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getELong(), "getLong");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-
-    op = addEOperation(dataObjectEClass, this.getSequence(), "getSequence");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEShort(), "getShort");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEString(), "getString");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-
-    op = addEOperation(dataObjectEClass, null, "setBigDecimal");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-    addEParameter(op, theEcorePackage.getEBigDecimal(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setBigInteger");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-    addEParameter(op, theEcorePackage.getEBigInteger(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setBoolean");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-    addEParameter(op, ecorePackage.getEBoolean(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setByte");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-    addEParameter(op, ecorePackage.getEByte(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setBytes");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-    addEParameter(op, theEcorePackage.getEByteArray(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setChar");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-    addEParameter(op, ecorePackage.getEChar(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setDataObject");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-    addEParameter(op, this.getDataObject(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setDate");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-    addEParameter(op, theEcorePackage.getEDate(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setDouble");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-    addEParameter(op, ecorePackage.getEDouble(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setFloat");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-    addEParameter(op, ecorePackage.getEFloat(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setInt");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-    addEParameter(op, ecorePackage.getEInt(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setList");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-    addEParameter(op, this.getEJavaList(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setLong");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-    addEParameter(op, ecorePackage.getELong(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setShort");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-    addEParameter(op, ecorePackage.getEShort(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setString");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-    addEParameter(op, ecorePackage.getEString(), "value");
-
-    op = addEOperation(dataObjectEClass, theEcorePackage.getEBigDecimal(), "getBigDecimal");
-    addEParameter(op, this.getProperty(), "property");
-
-    op = addEOperation(dataObjectEClass, theEcorePackage.getEBigInteger(), "getBigInteger");
-    addEParameter(op, this.getProperty(), "property");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEBoolean(), "getBoolean");
-    addEParameter(op, this.getProperty(), "property");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEByte(), "getByte");
-    addEParameter(op, this.getProperty(), "property");
-
-    op = addEOperation(dataObjectEClass, theEcorePackage.getEByteArray(), "getBytes");
-    addEParameter(op, this.getProperty(), "property");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEChar(), "getChar");
-    addEParameter(op, this.getProperty(), "property");
-
-    op = addEOperation(dataObjectEClass, this.getDataObject(), "getDataObject");
-    addEParameter(op, this.getProperty(), "property");
-
-    op = addEOperation(dataObjectEClass, theEcorePackage.getEDate(), "getDate");
-    addEParameter(op, this.getProperty(), "property");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEDouble(), "getDouble");
-    addEParameter(op, this.getProperty(), "property");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEFloat(), "getFloat");
-    addEParameter(op, this.getProperty(), "property");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEInt(), "getInt");
-    addEParameter(op, this.getProperty(), "property");
-
-    op = addEOperation(dataObjectEClass, this.getEJavaList(), "getList");
-    addEParameter(op, this.getProperty(), "property");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getELong(), "getLong");
-    addEParameter(op, this.getProperty(), "property");
-
-    op = addEOperation(dataObjectEClass, this.getSequence(), "getSequence");
-    addEParameter(op, this.getProperty(), "property");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEShort(), "getShort");
-    addEParameter(op, this.getProperty(), "property");
-
-    op = addEOperation(dataObjectEClass, ecorePackage.getEString(), "getString");
-    addEParameter(op, this.getProperty(), "property");
-
-    op = addEOperation(dataObjectEClass, null, "setBigDecimal");
-    addEParameter(op, this.getProperty(), "property");
-    addEParameter(op, theEcorePackage.getEBigDecimal(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setBigInteger");
-    addEParameter(op, this.getProperty(), "property");
-    addEParameter(op, theEcorePackage.getEBigInteger(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setBoolean");
-    addEParameter(op, this.getProperty(), "property");
-    addEParameter(op, ecorePackage.getEBoolean(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setByte");
-    addEParameter(op, this.getProperty(), "property");
-    addEParameter(op, ecorePackage.getEByte(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setBytes");
-    addEParameter(op, this.getProperty(), "property");
-    addEParameter(op, theEcorePackage.getEByteArray(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setChar");
-    addEParameter(op, this.getProperty(), "property");
-    addEParameter(op, ecorePackage.getEChar(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setDataObject");
-    addEParameter(op, this.getProperty(), "property");
-    addEParameter(op, this.getDataObject(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setDate");
-    addEParameter(op, this.getProperty(), "property");
-    addEParameter(op, theEcorePackage.getEDate(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setDouble");
-    addEParameter(op, this.getProperty(), "property");
-    addEParameter(op, ecorePackage.getEDouble(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setFloat");
-    addEParameter(op, this.getProperty(), "property");
-    addEParameter(op, ecorePackage.getEFloat(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setInt");
-    addEParameter(op, this.getProperty(), "property");
-    addEParameter(op, ecorePackage.getEInt(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setList");
-    addEParameter(op, this.getProperty(), "property");
-    addEParameter(op, this.getEJavaList(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setLong");
-    addEParameter(op, this.getProperty(), "property");
-    addEParameter(op, ecorePackage.getELong(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setShort");
-    addEParameter(op, this.getProperty(), "property");
-    addEParameter(op, ecorePackage.getEShort(), "value");
-
-    op = addEOperation(dataObjectEClass, null, "setString");
-    addEParameter(op, this.getProperty(), "property");
-    addEParameter(op, ecorePackage.getEString(), "value");
-
-    op = addEOperation(dataObjectEClass, this.getDataObject(), "createDataObject");
-    addEParameter(op, ecorePackage.getEString(), "propertyName");
-
-    op = addEOperation(dataObjectEClass, this.getDataObject(), "createDataObject");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-
-    op = addEOperation(dataObjectEClass, this.getDataObject(), "createDataObject");
-    addEParameter(op, this.getProperty(), "property");
-
-    op = addEOperation(dataObjectEClass, this.getDataObject(), "createDataObject");
-    addEParameter(op, ecorePackage.getEString(), "propertyName");
-    addEParameter(op, ecorePackage.getEString(), "namespaceURI");
-    addEParameter(op, ecorePackage.getEString(), "typeName");
-
-    op = addEOperation(dataObjectEClass, this.getDataObject(), "createDataObject");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-    addEParameter(op, ecorePackage.getEString(), "namespaceURI");
-    addEParameter(op, ecorePackage.getEString(), "typeName");
-
-    op = addEOperation(dataObjectEClass, this.getDataObject(), "createDataObject");
-    addEParameter(op, this.getProperty(), "property");
-    addEParameter(op, this.getType(), "type");
-
-    addEOperation(dataObjectEClass, null, "delete");
-
-    addEOperation(dataObjectEClass, this.getSequence(), "getSequence");
-
-    addEOperation(dataObjectEClass, this.getEJavaList(), "getInstanceProperties");
-
-    op = addEOperation(dataObjectEClass, this.getProperty(), "getProperty");
-    addEParameter(op, ecorePackage.getEString(), "propertyName");
-
-    addEOperation(dataObjectEClass, this.getDataObject(), "getRootObject");
-
-    addEOperation(dataObjectEClass, this.getChangeSummary(), "getChangeSummary");
-
-    addEOperation(dataObjectEClass, null, "detach");
-
-    initEClass(propertyEClass, Property.class, "Property", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-    addEOperation(propertyEClass, ecorePackage.getEString(), "getName");
-
-    addEOperation(propertyEClass, this.getType(), "getType");
-
-    addEOperation(propertyEClass, ecorePackage.getEBoolean(), "isMany");
-
-    addEOperation(propertyEClass, ecorePackage.getEBoolean(), "isContainment");
-
-    addEOperation(propertyEClass, ecorePackage.getEBoolean(), "isReadOnly");
-
-    addEOperation(propertyEClass, this.getType(), "getContainingType");
-
-    addEOperation(propertyEClass, this.getEJavaList(), "getAliasNames");
-
-    addEOperation(propertyEClass, this.getProperty(), "getOpposite");
-
-    addEOperation(propertyEClass, theEcorePackage.getEJavaObject(), "getDefault");
-
-    initEClass(sequenceEClass, Sequence.class, "Sequence", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-    addEOperation(sequenceEClass, ecorePackage.getEInt(), "size");
-
-    op = addEOperation(sequenceEClass, this.getProperty(), "getProperty");
-    addEParameter(op, ecorePackage.getEInt(), "index");
-
-    op = addEOperation(sequenceEClass, theEcorePackage.getEJavaObject(), "getValue");
-    addEParameter(op, ecorePackage.getEInt(), "index");
-
-    op = addEOperation(sequenceEClass, theEcorePackage.getEJavaObject(), "setValue");
-    addEParameter(op, ecorePackage.getEInt(), "index");
-    addEParameter(op, theEcorePackage.getEJavaObject(), "value");
-
-    op = addEOperation(sequenceEClass, ecorePackage.getEBoolean(), "add");
-    addEParameter(op, ecorePackage.getEString(), "propertyName");
-    addEParameter(op, theEcorePackage.getEJavaObject(), "value");
-
-    op = addEOperation(sequenceEClass, ecorePackage.getEBoolean(), "add");
-    addEParameter(op, ecorePackage.getEInt(), "propertIndex");
-    addEParameter(op, theEcorePackage.getEJavaObject(), "value");
-
-    op = addEOperation(sequenceEClass, ecorePackage.getEBoolean(), "add");
-    addEParameter(op, this.getProperty(), "property");
-    addEParameter(op, theEcorePackage.getEJavaObject(), "value");
-
-    op = addEOperation(sequenceEClass, null, "add");
-    addEParameter(op, ecorePackage.getEInt(), "index");
-    addEParameter(op, ecorePackage.getEString(), "propertyName");
-    addEParameter(op, theEcorePackage.getEJavaObject(), "value");
-
-    op = addEOperation(sequenceEClass, null, "add");
-    addEParameter(op, ecorePackage.getEInt(), "index");
-    addEParameter(op, ecorePackage.getEInt(), "propertyIndex");
-    addEParameter(op, theEcorePackage.getEJavaObject(), "value");
-
-    op = addEOperation(sequenceEClass, null, "add");
-    addEParameter(op, ecorePackage.getEInt(), "index");
-    addEParameter(op, this.getProperty(), "property");
-    addEParameter(op, theEcorePackage.getEJavaObject(), "value");
-
-    op = addEOperation(sequenceEClass, null, "add");
-    addEParameter(op, ecorePackage.getEString(), "text");
-
-    op = addEOperation(sequenceEClass, null, "add");
-    addEParameter(op, ecorePackage.getEInt(), "index");
-    addEParameter(op, ecorePackage.getEString(), "text");
-
-    initEClass(typeEClass, Type.class, "Type", IS_ABSTRACT, IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-    addEOperation(typeEClass, ecorePackage.getEString(), "getName");
-
-    addEOperation(typeEClass, ecorePackage.getEString(), "getURI");
-
-    addEOperation(typeEClass, theEcorePackage.getEJavaClass(), "getInstanceClass");
-
-    op = addEOperation(typeEClass, ecorePackage.getEBoolean(), "isInstance");
-    addEParameter(op, theEcorePackage.getEJavaObject(), "object");
-
-    addEOperation(typeEClass, ecorePackage.getEBoolean(), "isDataType");
-
-    addEOperation(typeEClass, ecorePackage.getEBoolean(), "isSequenced");
-
-    addEOperation(typeEClass, ecorePackage.getEBoolean(), "isOpen");
-
-    addEOperation(typeEClass, ecorePackage.getEBoolean(), "isAbstract");
-
-    addEOperation(typeEClass, this.getEJavaList(), "getBaseTypes");
-
-    addEOperation(typeEClass, this.getEJavaList(), "getAliasNames");
-
-    addEOperation(typeEClass, this.getEJavaList(), "getProperties");
-
-    addEOperation(typeEClass, this.getEJavaList(), "getDeclaredProperties");
-
-    op = addEOperation(typeEClass, this.getProperty(), "getProperty");
-    addEParameter(op, ecorePackage.getEString(), "propertyName");
-
-    initEClass(anyTypeDataObjectEClass, AnyTypeDataObject.class, "AnyTypeDataObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(simpleAnyTypeDataObjectEClass, SimpleAnyTypeDataObject.class, "SimpleAnyTypeDataObject", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(classEClass, Type.class, "Class", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(dataTypeEClass, Type.class, "DataType", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(attributeEClass, Property.class, "Attribute", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(referenceEClass, Property.class, "Reference", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(enumEClass, Type.class, "Enum", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(dynamicDataObjectEClass, DataObject.class, "DynamicDataObject", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(storeDataObjectEClass, DataObject.class, "StoreDataObject", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(dynamicStoreDataObjectEClass, DataObject.class, "DynamicStoreDataObject", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-    initEClass(extensibleDataObjectEClass, DataObject.class, "ExtensibleDataObject", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-
-    // Initialize data types
-    initEDataType(eJavaListEDataType, List.class, "EJavaList", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-    initEDataType(eObjectStreamExceptionEDataType, ObjectStreamException.class, "EObjectStreamException", !IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
-    // Create resource
-    createResource(eNS_URI);
-
-    // Create annotations
-    // http://www.eclipse.org/emf/2002/GenModel
-    createGenModelAnnotations();
-    // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
-    createExtendedMetaDataAnnotations();
-  }
-
-  /**
-   * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/GenModel</b>.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected void createGenModelAnnotations()
-  {
-    String source = "http://www.eclipse.org/emf/2002/GenModel";		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(0), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.get(this, path);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(1), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.set(this, path, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(2), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.isSet(this, path);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(3), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.unset(this, path);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(4), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.get(this, propertyIndex);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(5), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.set(this, propertyIndex, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(6), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.isSet(this, propertyIndex);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(7), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.unset(this, propertyIndex);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(8), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.get(this, property);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(9), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.set(this, property, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(10), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.isSet(this, property);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(11), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.unset(this, property);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(12), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getContainer(this);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(13), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getContainmentProperty(this);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(14), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getDataGraph(this);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(15), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getType(this);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(16), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getBigDecimal(this, path);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(17), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getBigInteger(this, path);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(18), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getBoolean(this, path);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(19), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getByte(this, path);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(20), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getBytes(this, path);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(21), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getChar(this, path);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(22), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getDataObject(this, path);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(23), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getDate(this, path);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(24), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getDouble(this, path);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(25), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getFloat(this, path);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(26), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getInt(this, path);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(27), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getList(this, path);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(28), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getLong(this, path);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(29), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getSequence(this, path);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(30), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getShort(this, path);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(31), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getString(this, path);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(32), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setBigDecimal(this, path, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(33), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setBigInteger(this, path, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(34), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setBoolean(this, path, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(35), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setByte(this, path, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(36), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setBytes(this, path, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(37), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setChar(this, path, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(38), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setDataObject(this, path, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(39), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setDate(this, path, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(40), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setDouble(this, path, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(41), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setFloat(this, path, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(42), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setInt(this, path, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(43), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setList(this, path, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(44), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setLong(this, path, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(45), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setShort(this, path, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(46), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setString(this, path, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(47), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getBigDecimal(this, propertyIndex);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(48), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getBigInteger(this, propertyIndex);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(49), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getBoolean(this, propertyIndex);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(50), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getByte(this, propertyIndex);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(51), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getBytes(this, propertyIndex);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(52), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getChar(this, propertyIndex);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(53), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getDataObject(this, propertyIndex);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(54), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getDate(this, propertyIndex);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(55), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getDouble(this, propertyIndex);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(56), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getFloat(this, propertyIndex);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(57), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getInt(this, propertyIndex);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(58), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getList(this, propertyIndex);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(59), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getLong(this, propertyIndex);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(60), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getSequence(this, propertyIndex);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(61), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getShort(this, propertyIndex);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(62), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getString(this, propertyIndex);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(63), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setBigDecimal(this, propertyIndex, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(64), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setBigInteger(this, propertyIndex, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(65), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setBoolean(this, propertyIndex, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(66), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setByte(this, propertyIndex, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(67), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setBytes(this, propertyIndex, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(68), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setChar(this, propertyIndex, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(69), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setDataObject(this, propertyIndex, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(70), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setDate(this, propertyIndex, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(71), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setDouble(this, propertyIndex, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(72), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setFloat(this, propertyIndex, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(73), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setInt(this, propertyIndex, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(74), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setList(this, propertyIndex, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(75), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setLong(this, propertyIndex, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(76), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setShort(this, propertyIndex, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(77), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setString(this, propertyIndex, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(78), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getBigDecimal(this, property);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(79), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getBigInteger(this, property);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(80), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getBoolean(this, property);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(81), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getByte(this, property);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(82), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getBytes(this, property);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(83), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getChar(this, property);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(84), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getDataObject(this, property);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(85), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getDate(this, property);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(86), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getDouble(this, property);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(87), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getFloat(this, property);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(88), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getInt(this, property);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(89), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getList(this, property);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(90), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getLong(this, property);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(91), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getSequence(this, property);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(92), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getShort(this, property);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(93), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getString(this, property);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(94), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setBigDecimal(this, property, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(95), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setBigInteger(this, property, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(96), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setBoolean(this, property, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(97), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setByte(this, property, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(98), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setBytes(this, property, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(99), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setChar(this, property, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(100), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setDataObject(this, property, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(101), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setDate(this, property, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(102), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setDouble(this, property, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(103), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setFloat(this, property, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(104), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setInt(this, property, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(105), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setList(this, property, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(106), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setLong(this, property, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(107), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setShort(this, property, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(108), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.setString(this, property, value);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(109), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.createDataObject(this, propertyName);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(110), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.createDataObject(this, propertyIndex);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(111), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.createDataObject(this, property);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(112), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.createDataObject(this, propertyName, namespaceURI, typeName);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(113), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.createDataObject(this, propertyIndex, namespaceURI, typeName);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(114), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.createDataObject(this, property, type);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(115), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.delete(this);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(116), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getSequence(this);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(117), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getInstanceProperties(this);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(118), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getProperty(this, propertyName);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(119), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getRootObject(this);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(120), 
-       source, 
-       new String[] 
-       {
-       "body", "return <%org.apache.sdo.util.SDOUtil%>.getChangeSummary(this);"
-       });		
-    addAnnotation
-      ((EOperation)dataObjectEClass.getEOperations().get(121), 
-       source, 
-       new String[] 
-       {
-       "body", "<%org.apache.sdo.util.SDOUtil%>.detach(this);"
-       });		
-  }
-
-  /**
-   * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected void createExtendedMetaDataAnnotations()
-  {
-    String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";																																																																																																																												
-    addAnnotation
-      (anyTypeDataObjectEClass, 
-       source, 
-       new String[] 
-       {
-       "kind", "mixed"
-       });		
-    addAnnotation
-      (simpleAnyTypeDataObjectEClass, 
-       source, 
-       new String[] 
-       {
-       "kind", "simple"
-       });
-  }
-
-} //SDOPackageImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java
deleted file mode 100644
index e257e30d27..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-import java.util.Iterator;
-
-import org.apache.tuscany.sdo.SDOPackage;
-import org.apache.tuscany.sdo.SimpleAnyTypeDataObject;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.xml.type.SimpleAnyType;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>EData Object Simple Any Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.impl.SimpleAnyTypeDataObjectImpl#getRawValue <em>Raw Value</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.impl.SimpleAnyTypeDataObjectImpl#getValue <em>Value</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.impl.SimpleAnyTypeDataObjectImpl#getInstanceType <em>Instance Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SimpleAnyTypeDataObjectImpl extends AnyTypeDataObjectImpl implements SimpleAnyTypeDataObject
-{
-  /**
-   * The default value of the '{@link #getRawValue() <em>Raw Value</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getRawValue()
-   * @generated
-   * @ordered
-   */
-  protected static final String RAW_VALUE_EDEFAULT = null;
-
-  /**
-   * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getValue()
-   * @generated
-   * @ordered
-   */
-  protected static final Object VALUE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getInstanceType() <em>Instance Type</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getInstanceType()
-   * @generated
-   * @ordered
-   */
-  protected EDataType instanceType = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected SimpleAnyTypeDataObjectImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return SDOPackage.eINSTANCE.getSimpleAnyTypeDataObject();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String getRawValue()
-  {
-    StringBuffer value = new StringBuffer();
-    for (Iterator i = getMixed().iterator(); i.hasNext(); )
-    {
-      FeatureMap.Entry entry = (FeatureMap.Entry)i.next();
-      if (entry.getEStructuralFeature() == XMLTypePackage.eINSTANCE.getXMLTypeDocumentRoot_Text())
-      {
-        value.append(entry.getValue());
-      }
-    }
-    return value.toString();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setRawValue(String newRawValue)
-  {
-    getMixed().clear();
-    if (newRawValue != null)
-    {
-      getMixed().add(XMLTypePackage.eINSTANCE.getXMLTypeDocumentRoot_Text(), newRawValue);
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Object getValue()
-  {
-    return EcoreUtil.createFromString(instanceType, getRawValue());
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setValue(Object newValue)
-  {
-    setRawValue(EcoreUtil.convertToString(instanceType, newValue));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EDataType getInstanceType()
-  {
-    return instanceType;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setInstanceType(EDataType newInstanceType)
-  {
-    EDataType oldInstanceType = instanceType;
-    instanceType = newInstanceType;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__INSTANCE_TYPE, oldInstanceType, instanceType));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__MIXED:
-        if (coreType) return getMixed();
-        return ((FeatureMap.Internal)getMixed()).getWrapper();
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__ANY:
-        if (coreType) return getAny();
-        return ((FeatureMap.Internal)getAny()).getWrapper();
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE:
-        if (coreType) return getAnyAttribute();
-        return ((FeatureMap.Internal)getAnyAttribute()).getWrapper();
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__RAW_VALUE:
-        return getRawValue();
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__VALUE:
-        return getValue();
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__INSTANCE_TYPE:
-        return getInstanceType();
-    }
-    return eDynamicGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__MIXED:
-        ((FeatureMap.Internal)getMixed()).set(newValue);
-        return;
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__ANY:
-        ((FeatureMap.Internal)getAny()).set(newValue);
-        return;
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE:
-        ((FeatureMap.Internal)getAnyAttribute()).set(newValue);
-        return;
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__RAW_VALUE:
-        setRawValue((String)newValue);
-        return;
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__VALUE:
-        setValue((Object)newValue);
-        return;
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__INSTANCE_TYPE:
-        setInstanceType((EDataType)newValue);
-        return;
-    }
-    eDynamicSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__MIXED:
-        getMixed().clear();
-        return;
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__ANY:
-        getAny().clear();
-        return;
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE:
-        getAnyAttribute().clear();
-        return;
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__RAW_VALUE:
-        setRawValue(RAW_VALUE_EDEFAULT);
-        return;
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__VALUE:
-        setValue(VALUE_EDEFAULT);
-        return;
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__INSTANCE_TYPE:
-        setInstanceType((EDataType)null);
-        return;
-    }
-    eDynamicUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__MIXED:
-        return mixed != null && !mixed.isEmpty();
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__ANY:
-        return !getAny().isEmpty();
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__ANY_ATTRIBUTE:
-        return anyAttribute != null && !anyAttribute.isEmpty();
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__RAW_VALUE:
-        return RAW_VALUE_EDEFAULT == null ? getRawValue() != null : !RAW_VALUE_EDEFAULT.equals(getRawValue());
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__VALUE:
-        return VALUE_EDEFAULT == null ? getValue() != null : !VALUE_EDEFAULT.equals(getValue());
-      case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__INSTANCE_TYPE:
-        return instanceType != null;
-    }
-    return eDynamicIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass)
-  {
-    if (baseClass == SimpleAnyType.class)
-    {
-      switch (derivedFeatureID)
-      {
-        case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__RAW_VALUE: return XMLTypePackage.SIMPLE_ANY_TYPE__RAW_VALUE;
-        case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__VALUE: return XMLTypePackage.SIMPLE_ANY_TYPE__VALUE;
-        case SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__INSTANCE_TYPE: return XMLTypePackage.SIMPLE_ANY_TYPE__INSTANCE_TYPE;
-        default: return -1;
-      }
-    }
-    return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass)
-  {
-    if (baseClass == SimpleAnyType.class)
-    {
-      switch (baseFeatureID)
-      {
-        case XMLTypePackage.SIMPLE_ANY_TYPE__RAW_VALUE: return SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__RAW_VALUE;
-        case XMLTypePackage.SIMPLE_ANY_TYPE__VALUE: return SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__VALUE;
-        case XMLTypePackage.SIMPLE_ANY_TYPE__INSTANCE_TYPE: return SDOPackage.SIMPLE_ANY_TYPE_DATA_OBJECT__INSTANCE_TYPE;
-        default: return -1;
-      }
-    }
-    return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-  }
-
-} //EDataObjectSimpleAnyTypeImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java
deleted file mode 100644
index 0cf7f3586c..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.impl;
-
-import org.apache.tuscany.sdo.SDOPackage;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EStoreEObjectImpl.EStoreEList;
-import org.eclipse.emf.ecore.impl.EStoreEObjectImpl.EStoreFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-
-import commonj.sdo.DataObject;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Store Data Object</b></em>'.
- * @extends EStructuralFeature.Internal.DynamicValueHolder
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class StoreDataObjectImpl extends DataObjectImpl implements DataObject, EStructuralFeature.Internal.DynamicValueHolder
-{
-  //TODO consider factoring the eSettings code into a new base class that this and DynamicDataObjectImpl could extend
-  
-  protected static final Object [] ENO_SETTINGS = new Object [0];
-  protected static final InternalEObject EUNINITIALIZED_CONTAINER = new DynamicDataObjectImpl();
-
-  protected Object [] eSettings;
-  protected InternalEObject.EStore eStore;
-
-  /**
-   * Creates a store-based DataObject.
-   */
-  public StoreDataObjectImpl()
-  {
-    super();
-    eContainer = EUNINITIALIZED_CONTAINER;
-  }
-
-  /**
-   * Creates a store-based DataObject.
-   */
-  public StoreDataObjectImpl(InternalEObject.EStore eStore) 
-  {
-    super();
-    eSetStore(eStore);
-    eContainer = EUNINITIALIZED_CONTAINER;
-  }
-
-  /**
-   * Creates a store-based DataObject.
-   */
-  public StoreDataObjectImpl(EClass eClass)
-  {
-    super();
-    eSetClass(eClass);
-    eContainer = EUNINITIALIZED_CONTAINER;
-  }
-
-  /**
-   * Creates a store-based DataObject.
-   */
-  public StoreDataObjectImpl(EClass eClass, InternalEObject.EStore eStore) 
-  {
-    super();
-    eSetClass(eClass);
-    eSetStore(eStore);
-    eContainer = EUNINITIALIZED_CONTAINER;
-  }
-
-  protected boolean eIsCaching()
-  {
-    return true;
-  }
-
-  public Object dynamicGet(int dynamicFeatureID)
-  {
-    Object result = eSettings[dynamicFeatureID];
-    if (result == null)
-    {
-      EStructuralFeature eStructuralFeature = eDynamicFeature(dynamicFeatureID);
-      if (!eStructuralFeature.isTransient())
-      {
-        if (FeatureMapUtil.isFeatureMap(eStructuralFeature))
-        {
-          eSettings[dynamicFeatureID] = result = createFeatureMap(eStructuralFeature);
-        }
-        else if (eStructuralFeature.isMany())
-        {
-          eSettings[dynamicFeatureID] = result = createList(eStructuralFeature);
-        }
-        else
-        {
-          result = eStore().get(this, eStructuralFeature, InternalEObject.EStore.NO_INDEX);
-          if (eIsCaching())
-          {
-            eSettings[dynamicFeatureID] = result;
-          }
-        }
-      }
-    }
-    return result;
-  }
-
-  public void dynamicSet(int dynamicFeatureID, Object value)
-  {
-    EStructuralFeature eStructuralFeature = eDynamicFeature(dynamicFeatureID);
-    if (eStructuralFeature.isTransient())
-    {
-      eSettings[dynamicFeatureID] = value;
-    }
-    else
-    {
-      eStore().set(this, eStructuralFeature, InternalEObject.EStore.NO_INDEX, value == NIL ? null : value);
-      if (eIsCaching())
-      {
-        eSettings[dynamicFeatureID] = value;
-      }
-    }
-  }
-
-  public void dynamicUnset(int dynamicFeatureID)
-  {
-    eStore().unset(this, eDynamicFeature(dynamicFeatureID));
-    eSettings[dynamicFeatureID] = null;
-  }
-
-  public Object eDynamicGet(int featureID, boolean resolve, boolean coreType)
-  {
-    if (featureID < eClass().getFeatureCount())
-    {
-      EStructuralFeature eFeature = eClass().getEStructuralFeature(featureID);
-      return eSettingDelegate(eFeature).dynamicGet(this, eSettings(), featureID, resolve, coreType);
-    }
-    else
-    {
-      return super.eDynamicGet(featureID, resolve, coreType);
-    }
-  }
-  
-  public void eDynamicSet(int featureID, Object newValue)
-  {
-    if (featureID < eClass().getFeatureCount())
-    {
-      EStructuralFeature eFeature = eClass().getEStructuralFeature(featureID);
-      eDynamicSet(featureID, eFeature, newValue);
-    }
-    else
-    {
-      super.eDynamicSet(featureID, newValue);
-    }
-  }
-
-  public void eDynamicUnset(int featureID)
-  {
-    if (featureID < eClass().getFeatureCount())
-    {
-      EStructuralFeature eFeature = eClass().getEStructuralFeature(featureID);
-      eDynamicUnset(featureID, eFeature);
-    }
-    else
-    {
-      super.eDynamicUnset(featureID);
-    }
-  }
-
-  public boolean eDynamicIsSet(int featureID)
-  {
-    if (featureID < eClass().getFeatureCount())
-    {
-      EStructuralFeature eFeature = eClass().getEStructuralFeature(featureID);
-      return eFeature.isTransient() ?
-        eSettingDelegate(eFeature).dynamicIsSet(this, eSettings(), featureID) :
-        eStore().isSet(this, eFeature);
-    }
-    else
-    {
-      return super.eDynamicIsSet(featureID);
-    }
-  }
-
-  /*
-  public boolean eDynamicIsSet(EStructuralFeature eStructuralFeature)
-  {
-    return 
-      eStructuralFeature.isTransient() ?
-        super.eDynamicIsSet(eStructuralFeature) :
-        eStore().isSet(this, eStructuralFeature);
-  }
-  */
-
-  protected EList createList(EStructuralFeature eStructuralFeature)
-  {
-    return new EStoreEList(this, eStructuralFeature, eStore());
-  }
-
-  protected FeatureMap createFeatureMap(EStructuralFeature eStructuralFeature)
-  {
-    return new EStoreFeatureMap(this, eStructuralFeature, eStore());
-  }
-
-  public EObject eContainer()
-  {
-    if (eContainer == EUNINITIALIZED_CONTAINER)
-    {
-      eInitializeContainer();
-    }
-
-    return eContainer;
-  }
-
-  public int eContainerFeatureID()
-  {
-    if (eContainer == EUNINITIALIZED_CONTAINER)
-    {
-      eInitializeContainer();
-    }
-
-    return eContainerFeatureID;
-  }
-
-  protected void eInitializeContainer()
-  {
-    eContainer = eStore().getContainer(this);
-    if (eContainer != null)
-    {
-      EStructuralFeature eContainingFeature = eStore().getContainingFeature(this);
-      if (eContainingFeature instanceof EReference)
-      {
-        EReference eContainingReference = (EReference)eContainingFeature;
-        EReference eOpposite = eContainingReference.getEOpposite();
-        if (eOpposite != null)
-        {
-          eContainerFeatureID = eClass().getFeatureID(eOpposite);
-          return;
-        }
-      }
-
-      eContainerFeatureID = EOPPOSITE_FEATURE_BASE - eContainer.eClass().getFeatureID(eContainingFeature);
-    }
-  }
-
-  public InternalEObject.EStore eStore()
-  {
-    return eStore;
-  }
-
-  public void eSetStore(InternalEObject.EStore store)
-  {
-    this.eStore = store;
-  }
-
-  protected int eStaticFeatureCount()
-  {
-    return 0;
-  }
-
-  public int eDerivedStructuralFeatureID(EStructuralFeature eStructuralFeature)
-  {
-    return eClass().getFeatureID(eStructuralFeature);
-  }
-
-  protected boolean eHasSettings()
-  {
-    return eSettings != null;
-  }
-
-  protected EStructuralFeature.Internal.DynamicValueHolder eSettings()
-  {
-    if (eSettings == null)
-    {
-      int size = eClass().getFeatureCount() - eStaticFeatureCount();
-      eSettings = size == 0 ? ENO_SETTINGS : new Object [size];
-    }
-
-    return this;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return SDOPackage.eINSTANCE.getStoreDataObject();
-  }
-
-} //StoreDataObjectImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java
deleted file mode 100644
index e57b11474b..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/BaseDataGraphType.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.Sequence;
-
-import java.io.Serializable;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Base Data Graph Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getModels <em>Models</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getXsd <em>Xsd</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getChangeSummary <em>Change Summary</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getAnyAttribute <em>Any Attribute</em>}</li>
- * </ul>
- * </p>
- *
- * @extends Serializable
- * @generated
- */
-public interface BaseDataGraphType extends Serializable
-{
-  /**
-   * Returns the value of the '<em><b>Models</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Models</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Models</em>' containment reference.
-   * @see #isSetModels()
-   * @see #unsetModels()
-   * @see #setModels(ModelsType)
-   * @generated
-   */
-  ModelsType getModels();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getModels <em>Models</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Models</em>' containment reference.
-   * @see #isSetModels()
-   * @see #unsetModels()
-   * @see #getModels()
-   * @generated
-   */
-  void setModels(ModelsType value);
-
-  /**
-   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getModels <em>Models</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetModels()
-   * @see #getModels()
-   * @see #setModels(ModelsType)
-   * @generated
-   */
-  void unsetModels();
-
-  /**
-   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getModels <em>Models</em>}' containment reference is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Models</em>' containment reference is set.
-   * @see #unsetModels()
-   * @see #getModels()
-   * @see #setModels(ModelsType)
-   * @generated
-   */
-  boolean isSetModels();
-
-  /**
-   * Returns the value of the '<em><b>Xsd</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Xsd</em>' containment reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Xsd</em>' containment reference.
-   * @see #isSetXsd()
-   * @see #unsetXsd()
-   * @see #setXsd(XSDType)
-   * @generated
-   */
-  XSDType getXsd();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getXsd <em>Xsd</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Xsd</em>' containment reference.
-   * @see #isSetXsd()
-   * @see #unsetXsd()
-   * @see #getXsd()
-   * @generated
-   */
-  void setXsd(XSDType value);
-
-  /**
-   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getXsd <em>Xsd</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetXsd()
-   * @see #getXsd()
-   * @see #setXsd(XSDType)
-   * @generated
-   */
-  void unsetXsd();
-
-  /**
-   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getXsd <em>Xsd</em>}' containment reference is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Xsd</em>' containment reference is set.
-   * @see #unsetXsd()
-   * @see #getXsd()
-   * @see #setXsd(XSDType)
-   * @generated
-   */
-  boolean isSetXsd();
-
-  /**
-   * Returns the value of the '<em><b>Change Summary</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Change Summary</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Change Summary</em>' attribute.
-   * @see #isSetChangeSummary()
-   * @see #unsetChangeSummary()
-   * @see #setChangeSummary(ChangeSummary)
-   * @generated
-   */
-  ChangeSummary getChangeSummary();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getChangeSummary <em>Change Summary</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Change Summary</em>' attribute.
-   * @see #isSetChangeSummary()
-   * @see #unsetChangeSummary()
-   * @see #getChangeSummary()
-   * @generated
-   */
-  void setChangeSummary(ChangeSummary value);
-
-  /**
-   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getChangeSummary <em>Change Summary</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetChangeSummary()
-   * @see #getChangeSummary()
-   * @see #setChangeSummary(ChangeSummary)
-   * @generated
-   */
-  void unsetChangeSummary();
-
-  /**
-   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.BaseDataGraphType#getChangeSummary <em>Change Summary</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Change Summary</em>' attribute is set.
-   * @see #unsetChangeSummary()
-   * @see #getChangeSummary()
-   * @see #setChangeSummary(ChangeSummary)
-   * @generated
-   */
-  boolean isSetChangeSummary();
-
-  /**
-   * Returns the value of the '<em><b>Any Attribute</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Any Attribute</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Any Attribute</em>' attribute list.
-   * @generated
-   */
-  Sequence getAnyAttribute();
-
-} // BaseDataGraphType
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java
deleted file mode 100644
index 2c83244789..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/DataGraphType.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model;
-
-import commonj.sdo.Sequence;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Data Graph Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.DataGraphType#getAny <em>Any</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public interface DataGraphType extends BaseDataGraphType
-{
-  /**
-   * Returns the value of the '<em><b>Any</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Any</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Any</em>' attribute list.
-   * @generated
-   */
-  Sequence getAny();
-
-} // DataGraphType
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java
deleted file mode 100644
index 9e3b2a1386..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/DataObject.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model;
-
-import java.io.Serializable;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Data Object</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @extends Serializable
- * @generated
- */
-public interface DataObject extends Serializable
-{
-} // DataObject
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java
deleted file mode 100644
index c8fe69167e..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/ModelFactory.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model;
-
-import commonj.sdo.helper.HelperContext;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @generated
- */
-public interface ModelFactory
-{
-
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  ModelFactory INSTANCE = org.apache.tuscany.sdo.model.impl.ModelFactoryImpl.init();
-
-  /**
-   * Returns a new object of class '<em>Data Graph Type</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Data Graph Type</em>'.
-   * @generated
-   */
-  DataGraphType createDataGraphType();
-
-  /**
-   * Returns a new object of class '<em>Models Type</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Models Type</em>'.
-   * @generated
-   */
-  ModelsType createModelsType();
-
-  /**
-   * Returns a new object of class '<em>Property</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Property</em>'.
-   * @generated
-   */
-  Property createProperty();
-
-  /**
-   * Returns a new object of class '<em>Type</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Type</em>'.
-   * @generated
-   */
-  Type createType();
-
-  /**
-   * Returns a new object of class '<em>Types</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Types</em>'.
-   * @generated
-   */
-  Types createTypes();
-
-  /**
-   * Returns a new object of class '<em>XSD Type</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>XSD Type</em>'.
-   * @generated
-   */
-  XSDType createXSDType();
-
-  /**
-   * Registers the types supported by this Factory within the supplied scope.argument
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param scope an instance of HelperContext used to manage the scoping of types.
-   * @generated
-   */
-  public void register(HelperContext scope);
-   
-} //ModelFactory
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java
deleted file mode 100644
index 4159ac9dc1..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/ModelsType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model;
-
-import commonj.sdo.Sequence;
-
-import java.io.Serializable;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Models Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- *         Expected type is emof:Package.
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.ModelsType#getAny <em>Any</em>}</li>
- * </ul>
- * </p>
- *
- * @extends Serializable
- * @generated
- */
-public interface ModelsType extends Serializable
-{
-  /**
-   * Returns the value of the '<em><b>Any</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Any</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Any</em>' attribute list.
-   * @generated
-   */
-  Sequence getAny();
-
-} // ModelsType
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java
deleted file mode 100644
index 15ee4c2f99..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Property.java
+++ /dev/null
@@ -1,503 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model;
-
-import commonj.sdo.Sequence;
-
-import java.io.Serializable;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Property</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.Property#getAliasName <em>Alias Name</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.Property#getAny <em>Any</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.Property#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.Property#isMany <em>Many</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.Property#isContainment <em>Containment</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.Property#getDefault <em>Default</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.Property#isReadOnly <em>Read Only</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.Property#getType_ <em>Type</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.Property#getOpposite <em>Opposite</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.Property#isNullable <em>Nullable</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.Property#getAnyAttribute <em>Any Attribute</em>}</li>
- * </ul>
- * </p>
- *
- * @extends Serializable
- * @generated
- */
-public interface Property extends Serializable
-{
-  /**
-   * Returns the value of the '<em><b>Alias Name</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.String}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Alias Name</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Alias Name</em>' attribute list.
-   * @generated
-   */
-  List getAliasName();
-
-  /**
-   * Returns the value of the '<em><b>Any</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Any</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Any</em>' attribute list.
-   * @generated
-   */
-  Sequence getAny();
-
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #isSetName()
-   * @see #unsetName()
-   * @see #setName(String)
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #isSetName()
-   * @see #unsetName()
-   * @see #getName()
-   * @generated
-   */
-  void setName(String value);
-
-  /**
-   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.Property#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetName()
-   * @see #getName()
-   * @see #setName(String)
-   * @generated
-   */
-  void unsetName();
-
-  /**
-   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.Property#getName <em>Name</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Name</em>' attribute is set.
-   * @see #unsetName()
-   * @see #getName()
-   * @see #setName(String)
-   * @generated
-   */
-  boolean isSetName();
-
-  /**
-   * Returns the value of the '<em><b>Many</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Many</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Many</em>' attribute.
-   * @see #isSetMany()
-   * @see #unsetMany()
-   * @see #setMany(boolean)
-   * @generated
-   */
-  boolean isMany();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#isMany <em>Many</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Many</em>' attribute.
-   * @see #isSetMany()
-   * @see #unsetMany()
-   * @see #isMany()
-   * @generated
-   */
-  void setMany(boolean value);
-
-  /**
-   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.Property#isMany <em>Many</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetMany()
-   * @see #isMany()
-   * @see #setMany(boolean)
-   * @generated
-   */
-  void unsetMany();
-
-  /**
-   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.Property#isMany <em>Many</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Many</em>' attribute is set.
-   * @see #unsetMany()
-   * @see #isMany()
-   * @see #setMany(boolean)
-   * @generated
-   */
-  boolean isSetMany();
-
-  /**
-   * Returns the value of the '<em><b>Containment</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Containment</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Containment</em>' attribute.
-   * @see #isSetContainment()
-   * @see #unsetContainment()
-   * @see #setContainment(boolean)
-   * @generated
-   */
-  boolean isContainment();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#isContainment <em>Containment</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Containment</em>' attribute.
-   * @see #isSetContainment()
-   * @see #unsetContainment()
-   * @see #isContainment()
-   * @generated
-   */
-  void setContainment(boolean value);
-
-  /**
-   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.Property#isContainment <em>Containment</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetContainment()
-   * @see #isContainment()
-   * @see #setContainment(boolean)
-   * @generated
-   */
-  void unsetContainment();
-
-  /**
-   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.Property#isContainment <em>Containment</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Containment</em>' attribute is set.
-   * @see #unsetContainment()
-   * @see #isContainment()
-   * @see #setContainment(boolean)
-   * @generated
-   */
-  boolean isSetContainment();
-
-  /**
-   * Returns the value of the '<em><b>Default</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Default</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Default</em>' attribute.
-   * @see #isSetDefault()
-   * @see #unsetDefault()
-   * @see #setDefault_(String)
-   * @generated
-   */
-  String getDefault_();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#getDefault <em>Default</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Default</em>' attribute.
-   * @see #isSetDefault()
-   * @see #unsetDefault()
-   * @see #getDefault_()
-   * @generated
-   */
-  void setDefault_(String value);
-
-  /**
-   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.Property#getDefault <em>Default</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetDefault()
-   * @see #getDefault_()
-   * @see #setDefault_(String)
-   * @generated
-   */
-  void unsetDefault();
-
-  /**
-   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.Property#getDefault <em>Default</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Default</em>' attribute is set.
-   * @see #unsetDefault()
-   * @see #getDefault_()
-   * @see #setDefault_(String)
-   * @generated
-   */
-  boolean isSetDefault();
-
-  /**
-   * Returns the value of the '<em><b>Read Only</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Read Only</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Read Only</em>' attribute.
-   * @see #isSetReadOnly()
-   * @see #unsetReadOnly()
-   * @see #setReadOnly(boolean)
-   * @generated
-   */
-  boolean isReadOnly();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#isReadOnly <em>Read Only</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Read Only</em>' attribute.
-   * @see #isSetReadOnly()
-   * @see #unsetReadOnly()
-   * @see #isReadOnly()
-   * @generated
-   */
-  void setReadOnly(boolean value);
-
-  /**
-   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.Property#isReadOnly <em>Read Only</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetReadOnly()
-   * @see #isReadOnly()
-   * @see #setReadOnly(boolean)
-   * @generated
-   */
-  void unsetReadOnly();
-
-  /**
-   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.Property#isReadOnly <em>Read Only</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Read Only</em>' attribute is set.
-   * @see #unsetReadOnly()
-   * @see #isReadOnly()
-   * @see #setReadOnly(boolean)
-   * @generated
-   */
-  boolean isSetReadOnly();
-
-  /**
-   * Returns the value of the '<em><b>Type</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Type</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Type</em>' reference.
-   * @see #isSetType()
-   * @see #unsetType()
-   * @see #setType(Type)
-   * @generated
-   */
-  Type getType_();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#getType_ <em>Type</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Type</em>' reference.
-   * @see #isSetType()
-   * @see #unsetType()
-   * @see #getType_()
-   * @generated
-   */
-  void setType(Type value);
-
-  /**
-   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.Property#getType_ <em>Type</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetType()
-   * @see #getType_()
-   * @see #setType(Type)
-   * @generated
-   */
-  void unsetType();
-
-  /**
-   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.Property#getType_ <em>Type</em>}' reference is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Type</em>' reference is set.
-   * @see #unsetType()
-   * @see #getType_()
-   * @see #setType(Type)
-   * @generated
-   */
-  boolean isSetType();
-
-  /**
-   * Returns the value of the '<em><b>Opposite</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Opposite</em>' reference isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Opposite</em>' reference.
-   * @see #isSetOpposite()
-   * @see #unsetOpposite()
-   * @see #setOpposite_(Property)
-   * @generated
-   */
-  Property getOpposite_();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#getOpposite <em>Opposite</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Opposite</em>' reference.
-   * @see #isSetOpposite()
-   * @see #unsetOpposite()
-   * @see #getOpposite_()
-   * @generated
-   */
-  void setOpposite_(Property value);
-
-  /**
-   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.Property#getOpposite <em>Opposite</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetOpposite()
-   * @see #getOpposite_()
-   * @see #setOpposite_(Property)
-   * @generated
-   */
-  void unsetOpposite();
-
-  /**
-   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.Property#getOpposite <em>Opposite</em>}' reference is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Opposite</em>' reference is set.
-   * @see #unsetOpposite()
-   * @see #getOpposite_()
-   * @see #setOpposite_(Property)
-   * @generated
-   */
-  boolean isSetOpposite();
-
-  /**
-   * Returns the value of the '<em><b>Nullable</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Nullable</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Nullable</em>' attribute.
-   * @see #isSetNullable()
-   * @see #unsetNullable()
-   * @see #setNullable(boolean)
-   * @generated
-   */
-  boolean isNullable();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.Property#isNullable <em>Nullable</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Nullable</em>' attribute.
-   * @see #isSetNullable()
-   * @see #unsetNullable()
-   * @see #isNullable()
-   * @generated
-   */
-  void setNullable(boolean value);
-
-  /**
-   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.Property#isNullable <em>Nullable</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetNullable()
-   * @see #isNullable()
-   * @see #setNullable(boolean)
-   * @generated
-   */
-  void unsetNullable();
-
-  /**
-   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.Property#isNullable <em>Nullable</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Nullable</em>' attribute is set.
-   * @see #unsetNullable()
-   * @see #isNullable()
-   * @see #setNullable(boolean)
-   * @generated
-   */
-  boolean isSetNullable();
-
-  /**
-   * Returns the value of the '<em><b>Any Attribute</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Any Attribute</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Any Attribute</em>' attribute list.
-   * @generated
-   */
-  Sequence getAnyAttribute();
-
-} // Property
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java
deleted file mode 100644
index 741343e5a8..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/TextType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model;
-
-import java.io.Serializable;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Text Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.TextType#getText <em>Text</em>}</li>
- * </ul>
- * </p>
- *
- * @extends Serializable
- * @generated
- */
-public interface TextType extends Serializable
-{
-  /**
-   * Returns the value of the '<em><b>Text</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.String}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Text</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Text</em>' attribute list.
-   * @generated
-   */
-  List getText();
-
-} // TextType
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java
deleted file mode 100644
index 26a02f7cc0..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Type.java
+++ /dev/null
@@ -1,431 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model;
-
-import commonj.sdo.Sequence;
-
-import java.io.Serializable;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.Type#getBaseType <em>Base Type</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.Type#getProperty <em>Property</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.Type#getAliasName <em>Alias Name</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.Type#getAny <em>Any</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.Type#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.Type#getUri <em>Uri</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.Type#isDataType <em>Data Type</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.Type#isOpen <em>Open</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.Type#isSequenced <em>Sequenced</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.Type#isAbstract <em>Abstract</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.Type#getAnyAttribute <em>Any Attribute</em>}</li>
- * </ul>
- * </p>
- *
- * @extends Serializable
- * @generated
- */
-public interface Type extends Serializable
-{
-  /**
-   * Returns the value of the '<em><b>Base Type</b></em>' reference list.
-   * The list contents are of type {@link org.apache.tuscany.sdo.model.Type}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Base Type</em>' reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Base Type</em>' reference list.
-   * @generated
-   */
-  List getBaseType();
-
-  /**
-   * Returns the value of the '<em><b>Property</b></em>' containment reference list.
-   * The list contents are of type {@link org.apache.tuscany.sdo.model.Property}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Property</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Property</em>' containment reference list.
-   * @generated
-   */
-  List getProperty();
-
-  /**
-   * Returns the value of the '<em><b>Alias Name</b></em>' attribute list.
-   * The list contents are of type {@link java.lang.String}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Alias Name</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Alias Name</em>' attribute list.
-   * @generated
-   */
-  List getAliasName();
-
-  /**
-   * Returns the value of the '<em><b>Any</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Any</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Any</em>' attribute list.
-   * @generated
-   */
-  Sequence getAny();
-
-  /**
-   * Returns the value of the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Name</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Name</em>' attribute.
-   * @see #isSetName()
-   * @see #unsetName()
-   * @see #setName(String)
-   * @generated
-   */
-  String getName();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.Type#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Name</em>' attribute.
-   * @see #isSetName()
-   * @see #unsetName()
-   * @see #getName()
-   * @generated
-   */
-  void setName(String value);
-
-  /**
-   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.Type#getName <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetName()
-   * @see #getName()
-   * @see #setName(String)
-   * @generated
-   */
-  void unsetName();
-
-  /**
-   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.Type#getName <em>Name</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Name</em>' attribute is set.
-   * @see #unsetName()
-   * @see #getName()
-   * @see #setName(String)
-   * @generated
-   */
-  boolean isSetName();
-
-  /**
-   * Returns the value of the '<em><b>Uri</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Uri</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Uri</em>' attribute.
-   * @see #isSetUri()
-   * @see #unsetUri()
-   * @see #setUri(String)
-   * @generated
-   */
-  String getUri();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.Type#getUri <em>Uri</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Uri</em>' attribute.
-   * @see #isSetUri()
-   * @see #unsetUri()
-   * @see #getUri()
-   * @generated
-   */
-  void setUri(String value);
-
-  /**
-   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.Type#getUri <em>Uri</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetUri()
-   * @see #getUri()
-   * @see #setUri(String)
-   * @generated
-   */
-  void unsetUri();
-
-  /**
-   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.Type#getUri <em>Uri</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Uri</em>' attribute is set.
-   * @see #unsetUri()
-   * @see #getUri()
-   * @see #setUri(String)
-   * @generated
-   */
-  boolean isSetUri();
-
-  /**
-   * Returns the value of the '<em><b>Data Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Data Type</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Data Type</em>' attribute.
-   * @see #isSetDataType()
-   * @see #unsetDataType()
-   * @see #setDataType(boolean)
-   * @generated
-   */
-  boolean isDataType();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.Type#isDataType <em>Data Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Data Type</em>' attribute.
-   * @see #isSetDataType()
-   * @see #unsetDataType()
-   * @see #isDataType()
-   * @generated
-   */
-  void setDataType(boolean value);
-
-  /**
-   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.Type#isDataType <em>Data Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetDataType()
-   * @see #isDataType()
-   * @see #setDataType(boolean)
-   * @generated
-   */
-  void unsetDataType();
-
-  /**
-   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.Type#isDataType <em>Data Type</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Data Type</em>' attribute is set.
-   * @see #unsetDataType()
-   * @see #isDataType()
-   * @see #setDataType(boolean)
-   * @generated
-   */
-  boolean isSetDataType();
-
-  /**
-   * Returns the value of the '<em><b>Open</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Open</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Open</em>' attribute.
-   * @see #isSetOpen()
-   * @see #unsetOpen()
-   * @see #setOpen(boolean)
-   * @generated
-   */
-  boolean isOpen();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.Type#isOpen <em>Open</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Open</em>' attribute.
-   * @see #isSetOpen()
-   * @see #unsetOpen()
-   * @see #isOpen()
-   * @generated
-   */
-  void setOpen(boolean value);
-
-  /**
-   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.Type#isOpen <em>Open</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetOpen()
-   * @see #isOpen()
-   * @see #setOpen(boolean)
-   * @generated
-   */
-  void unsetOpen();
-
-  /**
-   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.Type#isOpen <em>Open</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Open</em>' attribute is set.
-   * @see #unsetOpen()
-   * @see #isOpen()
-   * @see #setOpen(boolean)
-   * @generated
-   */
-  boolean isSetOpen();
-
-  /**
-   * Returns the value of the '<em><b>Sequenced</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Sequenced</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Sequenced</em>' attribute.
-   * @see #isSetSequenced()
-   * @see #unsetSequenced()
-   * @see #setSequenced(boolean)
-   * @generated
-   */
-  boolean isSequenced();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.Type#isSequenced <em>Sequenced</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Sequenced</em>' attribute.
-   * @see #isSetSequenced()
-   * @see #unsetSequenced()
-   * @see #isSequenced()
-   * @generated
-   */
-  void setSequenced(boolean value);
-
-  /**
-   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.Type#isSequenced <em>Sequenced</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetSequenced()
-   * @see #isSequenced()
-   * @see #setSequenced(boolean)
-   * @generated
-   */
-  void unsetSequenced();
-
-  /**
-   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.Type#isSequenced <em>Sequenced</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Sequenced</em>' attribute is set.
-   * @see #unsetSequenced()
-   * @see #isSequenced()
-   * @see #setSequenced(boolean)
-   * @generated
-   */
-  boolean isSetSequenced();
-
-  /**
-   * Returns the value of the '<em><b>Abstract</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Abstract</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Abstract</em>' attribute.
-   * @see #isSetAbstract()
-   * @see #unsetAbstract()
-   * @see #setAbstract(boolean)
-   * @generated
-   */
-  boolean isAbstract();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.Type#isAbstract <em>Abstract</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Abstract</em>' attribute.
-   * @see #isSetAbstract()
-   * @see #unsetAbstract()
-   * @see #isAbstract()
-   * @generated
-   */
-  void setAbstract(boolean value);
-
-  /**
-   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.Type#isAbstract <em>Abstract</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetAbstract()
-   * @see #isAbstract()
-   * @see #setAbstract(boolean)
-   * @generated
-   */
-  void unsetAbstract();
-
-  /**
-   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.Type#isAbstract <em>Abstract</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Abstract</em>' attribute is set.
-   * @see #unsetAbstract()
-   * @see #isAbstract()
-   * @see #setAbstract(boolean)
-   * @generated
-   */
-  boolean isSetAbstract();
-
-  /**
-   * Returns the value of the '<em><b>Any Attribute</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Any Attribute</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Any Attribute</em>' attribute list.
-   * @generated
-   */
-  Sequence getAnyAttribute();
-
-  String getInstanceClassName();
-
-} // Type
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java
deleted file mode 100644
index 26fb9c57ce..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/Types.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model;
-
-import java.io.Serializable;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Types</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.Types#getType_ <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @extends Serializable
- * @generated
- */
-public interface Types extends Serializable
-{
-  /**
-   * Returns the value of the '<em><b>Type</b></em>' containment reference list.
-   * The list contents are of type {@link org.apache.tuscany.sdo.model.Type}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Type</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Type</em>' containment reference list.
-   * @generated
-   */
-  List getType_();
-
-  List getTypeList();
-
-} // Types
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java
deleted file mode 100644
index 32cde02086..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/XSDType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model;
-
-import commonj.sdo.Sequence;
-
-import java.io.Serializable;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>XSD Type</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * 
- *         Expected type is xsd:schema.
- *       
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.XSDType#getAny <em>Any</em>}</li>
- * </ul>
- * </p>
- *
- * @extends Serializable
- * @generated
- */
-public interface XSDType extends Serializable
-{
-  /**
-   * Returns the value of the '<em><b>Any</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Any</em>' attribute list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Any</em>' attribute list.
-   * @generated
-   */
-  Sequence getAny();
-
-} // XSDType
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java
deleted file mode 100644
index e8824974a0..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/BaseDataGraphTypeImpl.java
+++ /dev/null
@@ -1,625 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model.impl;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-import org.apache.tuscany.sdo.model.BaseDataGraphType;
-import org.apache.tuscany.sdo.model.ModelFactory;
-import org.apache.tuscany.sdo.model.ModelsType;
-import org.apache.tuscany.sdo.model.XSDType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Base Data Graph Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.BaseDataGraphTypeImpl#getModels <em>Models</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.BaseDataGraphTypeImpl#getXsd <em>Xsd</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.BaseDataGraphTypeImpl#getChangeSummary <em>Change Summary</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.BaseDataGraphTypeImpl#getAnyAttribute <em>Any Attribute</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class BaseDataGraphTypeImpl extends DataObjectBase implements BaseDataGraphType
-{
-
-  public final static int MODELS = 0;
-
-  public final static int XSD = 1;
-
-  public final static int CHANGE_SUMMARY = 2;
-
-  public final static int ANY_ATTRIBUTE = -1;
-
-  public final static int SDO_PROPERTY_COUNT = 3;
-
-  public final static int EXTENDED_PROPERTY_COUNT = -1;
-
-
-  /**
-   * The internal feature id for the '<em><b>Models</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_MODELS = 0;
-
-  /**
-   * The internal feature id for the '<em><b>Xsd</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_XSD = 1;
-
-  /**
-   * The internal feature id for the '<em><b>Change Summary</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_CHANGE_SUMMARY = 2;
-
-  /**
-   * The internal feature id for the '<em><b>Any Attribute</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_ANY_ATTRIBUTE = 3;
-
-  /**
-   * The number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public final static int INTERNAL_PROPERTY_COUNT = 4;
-
-  protected int internalConvertIndex(int internalIndex)
-  {
-    switch (internalIndex)
-    {
-      case INTERNAL_MODELS: return MODELS;
-      case INTERNAL_XSD: return XSD;
-      case INTERNAL_CHANGE_SUMMARY: return CHANGE_SUMMARY;
-      case INTERNAL_ANY_ATTRIBUTE: return ANY_ATTRIBUTE;
-    }
-    return super.internalConvertIndex(internalIndex);
-  }
-
-
-  /**
-   * The cached value of the '{@link #getModels() <em>Models</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getModels()
-   * @generated
-   * @ordered
-   */
-  
-  protected ModelsType models = null;
-  
-  /**
-   * This is true if the Models containment reference has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean models_set_ = false;
-
-  /**
-   * The cached value of the '{@link #getXsd() <em>Xsd</em>}' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getXsd()
-   * @generated
-   * @ordered
-   */
-  
-  protected XSDType xsd = null;
-  
-  /**
-   * This is true if the Xsd containment reference has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean xsd_set_ = false;
-
-  /**
-   * The default value of the '{@link #getChangeSummary() <em>Change Summary</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getChangeSummary()
-   * @generated
-   * @ordered
-   */
-  protected static final ChangeSummary CHANGE_SUMMARY_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getChangeSummary() <em>Change Summary</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getChangeSummary()
-   * @generated
-   * @ordered
-   */
-  protected ChangeSummary changeSummary = CHANGE_SUMMARY_DEFAULT_;
-
-  /**
-   * This is true if the Change Summary attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean changeSummary_set_ = false;
-
-  /**
-   * The cached value of the '{@link #getAnyAttribute() <em>Any Attribute</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAnyAttribute()
-   * @generated
-   * @ordered
-   */
-  
-  protected Sequence anyAttribute = null;
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BaseDataGraphTypeImpl()
-  {
-    super();
-    createChangeSummary(CHANGE_SUMMARY);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type getStaticType()
-  {
-    return ((ModelFactoryImpl)ModelFactory.INSTANCE).getBaseDataGraphType();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ModelsType getModels()
-  {
-    return models;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeContext basicSetModels(ModelsType newModels, ChangeContext changeContext)
-  {
-    ModelsType oldModels = models;
-    models = newModels;
-    boolean oldModels_set_ = models_set_;
-    models_set_ = true;
-    if (isNotifying())
-    {
-      addNotification(this, ChangeKind.SET, INTERNAL_MODELS, oldModels, newModels, !oldModels_set_, changeContext);
-    }
-    return changeContext;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setModels(ModelsType newModels)
-  {
-    if (newModels != models)
-    {
-      ChangeContext changeContext = null;
-      if (models != null)
-        changeContext = inverseRemove(models, this, OPPOSITE_FEATURE_BASE - INTERNAL_MODELS, null, changeContext);
-      if (newModels != null)
-        changeContext = inverseAdd(newModels, this, OPPOSITE_FEATURE_BASE - INTERNAL_MODELS, null, changeContext);
-      changeContext = basicSetModels(newModels, changeContext);
-      if (changeContext != null) dispatch(changeContext);
-    }
-    else
-    {
-      boolean oldModels_set_ = models_set_;
-      models_set_ = true;
-      if (isNotifying())
-        notify(ChangeKind.SET, INTERNAL_MODELS, newModels, newModels, !oldModels_set_);
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeContext basicUnsetModels(ChangeContext changeContext)
-  {
-    ModelsType oldModels = models;
-    models = null;
-    boolean oldModels_set_ = models_set_;
-    models_set_ = false;
-    if (isNotifying())
-    {
-      addNotification(this, ChangeKind.UNSET, INTERNAL_MODELS, oldModels, null, !oldModels_set_, changeContext);
-    }
-    return changeContext;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetModels()
-  {
-    if (models != null)
-    {
-      ChangeContext changeContext = null;
-      changeContext = inverseRemove(models, this, EOPPOSITE_FEATURE_BASE - INTERNAL_MODELS, null, changeContext);
-      changeContext = basicUnsetModels(changeContext);
-      if (changeContext != null) dispatch(changeContext);
-    }
-    else
-    	{
-      boolean oldModels_set_ = models_set_;
-      models_set_ = false;
-      if (isNotifying())
-        notify(ChangeKind.UNSET, INTERNAL_MODELS, null, null, oldModels_set_);
-    	}
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetModels()
-  {
-    return models_set_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XSDType getXsd()
-  {
-    return xsd;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeContext basicSetXsd(XSDType newXsd, ChangeContext changeContext)
-  {
-    XSDType oldXsd = xsd;
-    xsd = newXsd;
-    boolean oldXsd_set_ = xsd_set_;
-    xsd_set_ = true;
-    if (isNotifying())
-    {
-      addNotification(this, ChangeKind.SET, INTERNAL_XSD, oldXsd, newXsd, !oldXsd_set_, changeContext);
-    }
-    return changeContext;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setXsd(XSDType newXsd)
-  {
-    if (newXsd != xsd)
-    {
-      ChangeContext changeContext = null;
-      if (xsd != null)
-        changeContext = inverseRemove(xsd, this, OPPOSITE_FEATURE_BASE - INTERNAL_XSD, null, changeContext);
-      if (newXsd != null)
-        changeContext = inverseAdd(newXsd, this, OPPOSITE_FEATURE_BASE - INTERNAL_XSD, null, changeContext);
-      changeContext = basicSetXsd(newXsd, changeContext);
-      if (changeContext != null) dispatch(changeContext);
-    }
-    else
-    {
-      boolean oldXsd_set_ = xsd_set_;
-      xsd_set_ = true;
-      if (isNotifying())
-        notify(ChangeKind.SET, INTERNAL_XSD, newXsd, newXsd, !oldXsd_set_);
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeContext basicUnsetXsd(ChangeContext changeContext)
-  {
-    XSDType oldXsd = xsd;
-    xsd = null;
-    boolean oldXsd_set_ = xsd_set_;
-    xsd_set_ = false;
-    if (isNotifying())
-    {
-      addNotification(this, ChangeKind.UNSET, INTERNAL_XSD, oldXsd, null, !oldXsd_set_, changeContext);
-    }
-    return changeContext;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetXsd()
-  {
-    if (xsd != null)
-    {
-      ChangeContext changeContext = null;
-      changeContext = inverseRemove(xsd, this, EOPPOSITE_FEATURE_BASE - INTERNAL_XSD, null, changeContext);
-      changeContext = basicUnsetXsd(changeContext);
-      if (changeContext != null) dispatch(changeContext);
-    }
-    else
-    	{
-      boolean oldXsd_set_ = xsd_set_;
-      xsd_set_ = false;
-      if (isNotifying())
-        notify(ChangeKind.UNSET, INTERNAL_XSD, null, null, oldXsd_set_);
-    	}
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetXsd()
-  {
-    return xsd_set_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeSummary getChangeSummary()
-  {
-    return changeSummary;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setChangeSummary(ChangeSummary newChangeSummary)
-  {
-    ChangeSummary oldChangeSummary = changeSummary;
-    changeSummary = newChangeSummary;
-    boolean oldChangeSummary_set_ = changeSummary_set_;
-    changeSummary_set_ = true;
-    if (isNotifying())
-      notify(ChangeKind.SET, INTERNAL_CHANGE_SUMMARY, oldChangeSummary, changeSummary, !oldChangeSummary_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetChangeSummary()
-  {
-    ChangeSummary oldChangeSummary = changeSummary;
-    boolean oldChangeSummary_set_ = changeSummary_set_;
-    changeSummary = CHANGE_SUMMARY_DEFAULT_;
-    changeSummary_set_ = false;
-    if (isNotifying())
-      notify(ChangeKind.UNSET, INTERNAL_CHANGE_SUMMARY, oldChangeSummary, CHANGE_SUMMARY_DEFAULT_, oldChangeSummary_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetChangeSummary()
-  {
-    return changeSummary_set_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Sequence getAnyAttribute()
-  {
-    if (anyAttribute == null)
-    {
-      anyAttribute = createSequence(INTERNAL_ANY_ATTRIBUTE);
-    }
-    return anyAttribute;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeContext inverseRemove(Object otherEnd, int propertyIndex, ChangeContext changeContext)
-  {
-    switch (propertyIndex)
-    {
-      case MODELS:
-        return basicUnsetModels(changeContext);
-      case XSD:
-        return basicUnsetXsd(changeContext);
-      case ANY_ATTRIBUTE:
-        return removeFromSequence(getAnyAttribute(), otherEnd, changeContext);
-    }
-    return super.inverseRemove(otherEnd, propertyIndex, changeContext);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object get(int propertyIndex, boolean resolve)
-  {
-    switch (propertyIndex)
-    {
-      case MODELS:
-        return getModels();
-      case XSD:
-        return getXsd();
-      case CHANGE_SUMMARY:
-        return getChangeSummary();
-      case ANY_ATTRIBUTE:
-        // XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view
-        //if (coreType) 
-        return getAnyAttribute();
-    }
-    return super.get(propertyIndex, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void set(int propertyIndex, Object newValue)
-  {
-    switch (propertyIndex)
-    {
-      case MODELS:
-        setModels((ModelsType)newValue);
-        return;
-      case XSD:
-        setXsd((XSDType)newValue);
-        return;
-      case CHANGE_SUMMARY:
-        setChangeSummary((ChangeSummary)newValue);
-        return;
-      case ANY_ATTRIBUTE:
-      	setSequence(getAnyAttribute(), newValue);
-        return;
-    }
-    super.set(propertyIndex, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unset(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case MODELS:
-        unsetModels();
-        return;
-      case XSD:
-        unsetXsd();
-        return;
-      case CHANGE_SUMMARY:
-        unsetChangeSummary();
-        return;
-      case ANY_ATTRIBUTE:
-        unsetSequence(getAnyAttribute());
-        return;
-    }
-    super.unset(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case MODELS:
-        return isSetModels();
-      case XSD:
-        return isSetXsd();
-      case CHANGE_SUMMARY:
-        return isSetChangeSummary();
-      case ANY_ATTRIBUTE:
-        return anyAttribute != null && !isSequenceEmpty(getAnyAttribute());
-    }
-    return super.isSet(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (isProxy(this)) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (changeSummary: ");
-    if (changeSummary_set_) result.append(changeSummary); else result.append("<unset>");
-    result.append(", anyAttribute: ");
-    result.append(anyAttribute);
-    result.append(')');
-    return result.toString();
-  }
-
-} //BaseDataGraphTypeImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java
deleted file mode 100644
index ef13797850..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataGraphTypeImpl.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model.impl;
-
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-
-import org.apache.tuscany.sdo.model.DataGraphType;
-import org.apache.tuscany.sdo.model.ModelFactory;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Data Graph Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.DataGraphTypeImpl#getAny <em>Any</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DataGraphTypeImpl extends BaseDataGraphTypeImpl implements DataGraphType
-{
-
-  public final static int ANY = BaseDataGraphTypeImpl.EXTENDED_PROPERTY_COUNT + -1;
-
-  public final static int SDO_PROPERTY_COUNT = BaseDataGraphTypeImpl.SDO_PROPERTY_COUNT + 0;
-
-  public final static int EXTENDED_PROPERTY_COUNT = BaseDataGraphTypeImpl.EXTENDED_PROPERTY_COUNT - 1;
-
-
-  /**
-   * The internal feature id for the '<em><b>Models</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_MODELS = BaseDataGraphTypeImpl.INTERNAL_MODELS;
-
-  /**
-   * The internal feature id for the '<em><b>Xsd</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_XSD = BaseDataGraphTypeImpl.INTERNAL_XSD;
-
-  /**
-   * The internal feature id for the '<em><b>Change Summary</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_CHANGE_SUMMARY = BaseDataGraphTypeImpl.INTERNAL_CHANGE_SUMMARY;
-
-  /**
-   * The internal feature id for the '<em><b>Any Attribute</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_ANY_ATTRIBUTE = BaseDataGraphTypeImpl.INTERNAL_ANY_ATTRIBUTE;
-
-  /**
-   * The internal feature id for the '<em><b>Any</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_ANY = BaseDataGraphTypeImpl.INTERNAL_PROPERTY_COUNT + 0;
-
-  /**
-   * The number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public final static int INTERNAL_PROPERTY_COUNT = BaseDataGraphTypeImpl.INTERNAL_PROPERTY_COUNT + 1;
-
-  protected int internalConvertIndex(int internalIndex)
-  {
-    switch (internalIndex)
-    {
-      case INTERNAL_MODELS: return MODELS;
-      case INTERNAL_XSD: return XSD;
-      case INTERNAL_CHANGE_SUMMARY: return CHANGE_SUMMARY;
-      case INTERNAL_ANY_ATTRIBUTE: return ANY_ATTRIBUTE;
-      case INTERNAL_ANY: return ANY;
-    }
-    return super.internalConvertIndex(internalIndex);
-  }
-
-
-  /**
-   * The cached value of the '{@link #getAny() <em>Any</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAny()
-   * @generated
-   * @ordered
-   */
-  
-  protected Sequence any = null;
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public DataGraphTypeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type getStaticType()
-  {
-    return ((ModelFactoryImpl)ModelFactory.INSTANCE).getDataGraphType();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Sequence getAny()
-  {
-    if (any == null)
-    {
-      any = createSequence(INTERNAL_ANY);
-    }
-    return any;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeContext inverseRemove(Object otherEnd, int propertyIndex, ChangeContext changeContext)
-  {
-    switch (propertyIndex)
-    {
-      case ANY:
-        return removeFromSequence(getAny(), otherEnd, changeContext);
-    }
-    return super.inverseRemove(otherEnd, propertyIndex, changeContext);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object get(int propertyIndex, boolean resolve)
-  {
-    switch (propertyIndex)
-    {
-      case ANY:
-        // XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view
-        //if (coreType) 
-        return getAny();
-    }
-    return super.get(propertyIndex, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void set(int propertyIndex, Object newValue)
-  {
-    switch (propertyIndex)
-    {
-      case ANY:
-      	setSequence(getAny(), newValue);
-        return;
-    }
-    super.set(propertyIndex, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unset(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case ANY:
-        unsetSequence(getAny());
-        return;
-    }
-    super.unset(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case ANY:
-        return any != null && !isSequenceEmpty(getAny());
-    }
-    return super.isSet(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (isProxy(this)) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (any: ");
-    result.append(any);
-    result.append(')');
-    return result.toString();
-  }
-
-} //DataGraphTypeImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java
deleted file mode 100644
index 0dc673907c..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/DataObjectImpl.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model.impl;
-
-import commonj.sdo.Type;
-
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-import org.apache.tuscany.sdo.model.DataObject;
-import org.apache.tuscany.sdo.model.ModelFactory;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Data Object</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class DataObjectImpl extends DataObjectBase implements DataObject
-{
-
-  public final static int SDO_PROPERTY_COUNT = 0;
-
-  public final static int EXTENDED_PROPERTY_COUNT = 0;
-
-
-  /**
-   * The number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public final static int INTERNAL_PROPERTY_COUNT = 0;
-
-  protected int internalConvertIndex(int internalIndex)
-  {
-    switch (internalIndex)
-    {
-    }
-    return super.internalConvertIndex(internalIndex);
-  }
-
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public DataObjectImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type getStaticType()
-  {
-    return ((ModelFactoryImpl)ModelFactory.INSTANCE).getDataObject();
-  }
-
-} //DataObjectImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
deleted file mode 100644
index 761efb4217..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelFactoryImpl.java
+++ /dev/null
@@ -1,2401 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model.impl;
-
-import commonj.sdo.helper.DataHelper;
-import commonj.sdo.helper.HelperContext;
-
-import org.apache.tuscany.sdo.SDOFactory;
-import org.apache.tuscany.sdo.helper.TypeHelperImpl;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.DataObject;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.TimeZone;
-
-import org.apache.tuscany.sdo.impl.FactoryBase;
-
-import org.apache.tuscany.sdo.model.*;
-import org.eclipse.emf.ecore.xml.type.XMLTypeFactory;
-import org.eclipse.emf.ecore.xml.type.util.XMLTypeUtil;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the commonj.sdo model factory.
- * This model is generated from sdoModel.xsd, in the sdo-api project.
- * Until the SDO code generator supports name conflicts and regen/merge, follow the following steps to regenerate this model:
- *   1. Regenerate the model into a temporary directory:
- *         XSD2JavaGenerator -generateBuiltIn commonj.sdo -targetDirectory <temp-dir> -javaPackage org.apache.tuscany.sdo.model <sdo-api-dir>/src/main/resources/xml/sdoModel.xsd
- *   2. Rename the following methods in the generated Property/PropertyImpl interface and implementation class:
- *         getDefault() to getDefault_();
- *         setDefault() to setDefault_();
- *         getOpposite() to getOpposite_();
- *         setOpposite() to setOpposite_();
- *   3. Copy the following method from the old to new generated Type/TypeImpl interface and implemention class (resolve any missing imports):
- *         String getInstanceClassName();
- *   4. Copy the following method from the old to new generated Types/TypesImpl interface and implemention class (resolve any missing imports):
- *         List getTypeList();
- *   5. Delete all the createXXXFromString() and convertXXXToString() methods in the newly generated ModelFactoryImpl and
- *      replace them with the ones from this file (resolve any missing imports).
- *   6. Comment out the call to registerStaticTypes of ModelFactory.class in the init() method
- *   7. Change org.apache.tuscany.sdo.model.DataObject.class to commonj.sdo.DataObject.class for the following method found in method initializeMetaData();
- *         initializeType(dataObjectType, commonj.sdo.DataObject.class, "DataObject", true); // generated as org.apache.tuscany.sdo.model.DataObject.class
- *   8. Add the following case to the generated create() method:
- *         case DATA_OBJECT: return SDOFactory.eINSTANCE.createAnyTypeDataObject();
- *   9. Make sure the top of each generated file contains the ASF License.      
- *  10. Move this JavaDoc comment into the newly generated ModelFactoryImpl class.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ModelFactoryImpl extends FactoryBase implements ModelFactory
-{
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String NAMESPACE_URI = "commonj.sdo";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String NAMESPACE_PREFIX = "sdo";
-
-  /**
-   * The version of the generator pattern used to generate this class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String PATTERN_VERSION = "1.2";
-  
-  public static final int BASE_DATA_GRAPH_TYPE = 1;	
-  public static final int DATA_GRAPH_TYPE = 2;	
-  public static final int DATA_OBJECT = 3;	
-  public static final int MODELS_TYPE = 4;	
-  public static final int PROPERTY = 5;	
-  public static final int TEXT_TYPE = 6;	
-  public static final int TYPE = 7;	
-  public static final int TYPES = 8;	
-  public static final int XSD_TYPE = 9;	
-  public static final int BOOLEAN = 10;	
-  public static final int BOOLEAN_OBJECT = 11;	
-  public static final int BYTE = 12;	
-  public static final int BYTE_OBJECT = 13;	
-  public static final int BYTES = 14;	
-  public static final int CHANGE_SUMMARY_TYPE = 15;	
-  public static final int CHARACTER = 16;	
-  public static final int CHARACTER_OBJECT = 17;	
-  public static final int DATE = 18;	
-  public static final int DATE_TIME = 19;	
-  public static final int DAY = 20;	
-  public static final int DECIMAL = 21;	
-  public static final int DOUBLE = 22;	
-  public static final int DOUBLE_OBJECT = 23;	
-  public static final int DURATION = 24;	
-  public static final int FLOAT = 25;	
-  public static final int FLOAT_OBJECT = 26;	
-  public static final int INT = 27;	
-  public static final int INTEGER = 28;	
-  public static final int INT_OBJECT = 29;	
-  public static final int LONG = 30;	
-  public static final int LONG_OBJECT = 31;	
-  public static final int MONTH = 32;	
-  public static final int MONTH_DAY = 33;	
-  public static final int OBJECT = 34;	
-  public static final int SHORT = 35;	
-  public static final int SHORT_OBJECT = 36;	
-  public static final int STRING = 37;	
-  public static final int STRINGS = 38;	
-  public static final int TIME = 39;	
-  public static final int URI = 40;	
-  public static final int YEAR = 41;	
-  public static final int YEAR_MONTH = 42;	
-  public static final int YEAR_MONTH_DAY = 43;
-  
-  /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ModelFactoryImpl()
-  {
-    super(NAMESPACE_URI, NAMESPACE_PREFIX, "org.apache.tuscany.sdo.model");
-  }
-
-  /**
-   * Registers the Factory instance so that it is available within the supplied scope.
-   * @argument scope a HelperContext instance that will make the types supported by this Factory available.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void register(HelperContext scope) 
-  {
-    if(scope == null) {
-      throw new IllegalArgumentException("Scope can not be null");
-    }
-    
-    //Register dependent packages with provided scope
-    
-    // Initialize this package   
-    TypeHelperImpl th = (TypeHelperImpl)scope.getTypeHelper();
-    th.getExtendedMetaData().putPackage(NAMESPACE_URI, this);
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject create(int typeNumber)
-  {
-    switch (typeNumber)
-    {
-      case DATA_GRAPH_TYPE: return (DataObject)createDataGraphType();
-      case MODELS_TYPE: return (DataObject)createModelsType();
-      case PROPERTY: return (DataObject)createProperty();
-      case TYPE: return (DataObject)createType();
-      case TYPES: return (DataObject)createTypes();
-      case XSD_TYPE: return (DataObject)createXSDType();
-      case DATA_OBJECT: return SDOFactory.eINSTANCE.createAnyTypeDataObject();
-      default:
-        return super.create(typeNumber);
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object createFromString(int typeNumber, String initialValue)
-  {
-    switch (typeNumber)
-    {
-      case BOOLEAN:
-        return createBooleanFromString(initialValue);
-      case BOOLEAN_OBJECT:
-        return createBooleanObjectFromString(initialValue);
-      case BYTE:
-        return createByteFromString(initialValue);
-      case BYTE_OBJECT:
-        return createByteObjectFromString(initialValue);
-      case BYTES:
-        return createBytesFromString(initialValue);
-      case CHANGE_SUMMARY_TYPE:
-        return createChangeSummaryTypeFromString(initialValue);
-      case CHARACTER:
-        return createCharacterFromString(initialValue);
-      case CHARACTER_OBJECT:
-        return createCharacterObjectFromString(initialValue);
-      case DATE:
-        return createDateFromString(initialValue);
-      case DATE_TIME:
-        return createDateTimeFromString(initialValue);
-      case DAY:
-        return createDayFromString(initialValue);
-      case DECIMAL:
-        return createDecimalFromString(initialValue);
-      case DOUBLE:
-        return createDoubleFromString(initialValue);
-      case DOUBLE_OBJECT:
-        return createDoubleObjectFromString(initialValue);
-      case DURATION:
-        return createDurationFromString(initialValue);
-      case FLOAT:
-        return createFloatFromString(initialValue);
-      case FLOAT_OBJECT:
-        return createFloatObjectFromString(initialValue);
-      case INT:
-        return createIntFromString(initialValue);
-      case INTEGER:
-        return createIntegerFromString(initialValue);
-      case INT_OBJECT:
-        return createIntObjectFromString(initialValue);
-      case LONG:
-        return createLongFromString(initialValue);
-      case LONG_OBJECT:
-        return createLongObjectFromString(initialValue);
-      case MONTH:
-        return createMonthFromString(initialValue);
-      case MONTH_DAY:
-        return createMonthDayFromString(initialValue);
-      case OBJECT:
-        return createObjectFromString(initialValue);
-      case SHORT:
-        return createShortFromString(initialValue);
-      case SHORT_OBJECT:
-        return createShortObjectFromString(initialValue);
-      case STRING:
-        return createStringFromString(initialValue);
-      case STRINGS:
-        return createStringsFromString(initialValue);
-      case TIME:
-        return createTimeFromString(initialValue);
-      case URI:
-        return createURIFromString(initialValue);
-      case YEAR:
-        return createYearFromString(initialValue);
-      case YEAR_MONTH:
-        return createYearMonthFromString(initialValue);
-      case YEAR_MONTH_DAY:
-        return createYearMonthDayFromString(initialValue);
-      default:
-        throw new IllegalArgumentException("The type number '" + typeNumber + "' is not a valid datatype");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertToString(int typeNumber, Object instanceValue)
-  {
-    switch (typeNumber)
-    {
-      case BOOLEAN:
-        return convertBooleanToString(instanceValue);
-      case BOOLEAN_OBJECT:
-        return convertBooleanObjectToString(instanceValue);
-      case BYTE:
-        return convertByteToString(instanceValue);
-      case BYTE_OBJECT:
-        return convertByteObjectToString(instanceValue);
-      case BYTES:
-        return convertBytesToString(instanceValue);
-      case CHANGE_SUMMARY_TYPE:
-        return convertChangeSummaryTypeToString(instanceValue);
-      case CHARACTER:
-        return convertCharacterToString(instanceValue);
-      case CHARACTER_OBJECT:
-        return convertCharacterObjectToString(instanceValue);
-      case DATE:
-        return convertDateToString(instanceValue);
-      case DATE_TIME:
-        return convertDateTimeToString(instanceValue);
-      case DAY:
-        return convertDayToString(instanceValue);
-      case DECIMAL:
-        return convertDecimalToString(instanceValue);
-      case DOUBLE:
-        return convertDoubleToString(instanceValue);
-      case DOUBLE_OBJECT:
-        return convertDoubleObjectToString(instanceValue);
-      case DURATION:
-        return convertDurationToString(instanceValue);
-      case FLOAT:
-        return convertFloatToString(instanceValue);
-      case FLOAT_OBJECT:
-        return convertFloatObjectToString(instanceValue);
-      case INT:
-        return convertIntToString(instanceValue);
-      case INTEGER:
-        return convertIntegerToString(instanceValue);
-      case INT_OBJECT:
-        return convertIntObjectToString(instanceValue);
-      case LONG:
-        return convertLongToString(instanceValue);
-      case LONG_OBJECT:
-        return convertLongObjectToString(instanceValue);
-      case MONTH:
-        return convertMonthToString(instanceValue);
-      case MONTH_DAY:
-        return convertMonthDayToString(instanceValue);
-      case OBJECT:
-        return convertObjectToString(instanceValue);
-      case SHORT:
-        return convertShortToString(instanceValue);
-      case SHORT_OBJECT:
-        return convertShortObjectToString(instanceValue);
-      case STRING:
-        return convertStringToString(instanceValue);
-      case STRINGS:
-        return convertStringsToString(instanceValue);
-      case TIME:
-        return convertTimeToString(instanceValue);
-      case URI:
-        return convertURIToString(instanceValue);
-      case YEAR:
-        return convertYearToString(instanceValue);
-      case YEAR_MONTH:
-        return convertYearMonthToString(instanceValue);
-      case YEAR_MONTH_DAY:
-        return convertYearMonthDayToString(instanceValue);
-      default:
-        throw new IllegalArgumentException("The type number '" + typeNumber + "' is not a valid datatype");
-    }
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public DataGraphType createDataGraphType()
-  {
-    DataGraphTypeImpl dataGraphType = new DataGraphTypeImpl();
-    return dataGraphType;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ModelsType createModelsType()
-  {
-    ModelsTypeImpl modelsType = new ModelsTypeImpl();
-    return modelsType;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Property createProperty()
-  {
-    PropertyImpl property = new PropertyImpl();
-    return property;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type createType()
-  {
-    TypeImpl type = new TypeImpl();
-    return type;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Types createTypes()
-  {
-    TypesImpl types = new TypesImpl();
-    return types;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XSDType createXSDType()
-  {
-    XSDTypeImpl xsdType = new XSDTypeImpl();
-    return xsdType;
-  }
-  
-  // Following creates and initializes SDO metadata for the supported types.		
-  protected commonj.sdo.Type baseDataGraphTypeType = null;
-
-  public commonj.sdo.Type getBaseDataGraphType()
-  {
-    return baseDataGraphTypeType;
-  }
-    
-  protected commonj.sdo.Type dataGraphTypeType = null;
-
-  public commonj.sdo.Type getDataGraphType()
-  {
-    return dataGraphTypeType;
-  }
-    
-  protected commonj.sdo.Type dataObjectType = null;
-
-  public commonj.sdo.Type getDataObject()
-  {
-    return dataObjectType;
-  }
-      
-  protected commonj.sdo.Type modelsTypeType = null;
-
-  public commonj.sdo.Type getModelsType()
-  {
-    return modelsTypeType;
-  }
-    
-  protected commonj.sdo.Type propertyType = null;
-
-  public commonj.sdo.Type getProperty()
-  {
-    return propertyType;
-  }
-    
-  protected commonj.sdo.Type textTypeType = null;
-
-  public commonj.sdo.Type getTextType()
-  {
-    return textTypeType;
-  }
-    
-  protected commonj.sdo.Type typeType = null;
-
-  public commonj.sdo.Type getType()
-  {
-    return typeType;
-  }
-    
-  protected commonj.sdo.Type typesType = null;
-
-  public commonj.sdo.Type getTypes()
-  {
-    return typesType;
-  }
-    
-  protected commonj.sdo.Type xsdTypeType = null;
-
-  public commonj.sdo.Type getXSDType()
-  {
-    return xsdTypeType;
-  }
-    
-  protected commonj.sdo.Type boolean_Type = null;
-
-  public commonj.sdo.Type getBoolean()
-  {
-    return boolean_Type;
-  }
-    
-  protected commonj.sdo.Type booleanObjectType = null;
-
-  public commonj.sdo.Type getBooleanObject()
-  {
-    return booleanObjectType;
-  }
-    
-  protected commonj.sdo.Type byte_Type = null;
-
-  public commonj.sdo.Type getByte()
-  {
-    return byte_Type;
-  }
-    
-  protected commonj.sdo.Type byteObjectType = null;
-
-  public commonj.sdo.Type getByteObject()
-  {
-    return byteObjectType;
-  }
-    
-  protected commonj.sdo.Type bytesType = null;
-
-  public commonj.sdo.Type getBytes()
-  {
-    return bytesType;
-  }
-    
-  protected commonj.sdo.Type changeSummaryTypeType = null;
-
-  public commonj.sdo.Type getChangeSummaryType()
-  {
-    return changeSummaryTypeType;
-  }
-    
-  protected commonj.sdo.Type characterType = null;
-
-  public commonj.sdo.Type getCharacter()
-  {
-    return characterType;
-  }
-    
-  protected commonj.sdo.Type characterObjectType = null;
-
-  public commonj.sdo.Type getCharacterObject()
-  {
-    return characterObjectType;
-  }
-    
-  protected commonj.sdo.Type dateType = null;
-
-  public commonj.sdo.Type getDate()
-  {
-    return dateType;
-  }
-    
-  protected commonj.sdo.Type dateTimeType = null;
-
-  public commonj.sdo.Type getDateTime()
-  {
-    return dateTimeType;
-  }
-    
-  protected commonj.sdo.Type dayType = null;
-
-  public commonj.sdo.Type getDay()
-  {
-    return dayType;
-  }
-    
-  protected commonj.sdo.Type decimalType = null;
-
-  public commonj.sdo.Type getDecimal()
-  {
-    return decimalType;
-  }
-    
-  protected commonj.sdo.Type double_Type = null;
-
-  public commonj.sdo.Type getDouble()
-  {
-    return double_Type;
-  }
-    
-  protected commonj.sdo.Type doubleObjectType = null;
-
-  public commonj.sdo.Type getDoubleObject()
-  {
-    return doubleObjectType;
-  }
-    
-  protected commonj.sdo.Type durationType = null;
-
-  public commonj.sdo.Type getDuration()
-  {
-    return durationType;
-  }
-    
-  protected commonj.sdo.Type float_Type = null;
-
-  public commonj.sdo.Type getFloat()
-  {
-    return float_Type;
-  }
-    
-  protected commonj.sdo.Type floatObjectType = null;
-
-  public commonj.sdo.Type getFloatObject()
-  {
-    return floatObjectType;
-  }
-    
-  protected commonj.sdo.Type int_Type = null;
-
-  public commonj.sdo.Type getInt()
-  {
-    return int_Type;
-  }
-    
-  protected commonj.sdo.Type integerType = null;
-
-  public commonj.sdo.Type getInteger()
-  {
-    return integerType;
-  }
-    
-  protected commonj.sdo.Type intObjectType = null;
-
-  public commonj.sdo.Type getIntObject()
-  {
-    return intObjectType;
-  }
-    
-  protected commonj.sdo.Type long_Type = null;
-
-  public commonj.sdo.Type getLong()
-  {
-    return long_Type;
-  }
-    
-  protected commonj.sdo.Type longObjectType = null;
-
-  public commonj.sdo.Type getLongObject()
-  {
-    return longObjectType;
-  }
-    
-  protected commonj.sdo.Type monthType = null;
-
-  public commonj.sdo.Type getMonth()
-  {
-    return monthType;
-  }
-    
-  protected commonj.sdo.Type monthDayType = null;
-
-  public commonj.sdo.Type getMonthDay()
-  {
-    return monthDayType;
-  }
-    
-  protected commonj.sdo.Type objectType = null;
-
-  public commonj.sdo.Type getObject()
-  {
-    return objectType;
-  }
-    
-  protected commonj.sdo.Type short_Type = null;
-
-  public commonj.sdo.Type getShort()
-  {
-    return short_Type;
-  }
-    
-  protected commonj.sdo.Type shortObjectType = null;
-
-  public commonj.sdo.Type getShortObject()
-  {
-    return shortObjectType;
-  }
-    
-  protected commonj.sdo.Type stringType = null;
-
-  public commonj.sdo.Type getString()
-  {
-    return stringType;
-  }
-    
-  protected commonj.sdo.Type stringsType = null;
-
-  public commonj.sdo.Type getStrings()
-  {
-    return stringsType;
-  }
-    
-  protected commonj.sdo.Type timeType = null;
-
-  public commonj.sdo.Type getTime()
-  {
-    return timeType;
-  }
-    
-  protected commonj.sdo.Type uriType = null;
-
-  public commonj.sdo.Type getURI()
-  {
-    return uriType;
-  }
-    
-  protected commonj.sdo.Type yearType = null;
-
-  public commonj.sdo.Type getYear()
-  {
-    return yearType;
-  }
-    
-  protected commonj.sdo.Type yearMonthType = null;
-
-  public commonj.sdo.Type getYearMonth()
-  {
-    return yearMonthType;
-  }
-    
-  protected commonj.sdo.Type yearMonthDayType = null;
-
-  public commonj.sdo.Type getYearMonthDay()
-  {
-    return yearMonthDayType;
-  }
-  
-
-  private static ModelFactoryImpl instance = null; 
-  public static ModelFactoryImpl init()
-  {
-    if (instance != null ) return instance;
-    instance = new ModelFactoryImpl();
-
-    // Initialize dependent packages
-    
-    // Create package meta-data objects
-    instance.createMetaData();
-
-    // Initialize created meta-data
-    instance.initializeMetaData();
-    
-    // Mark meta-data to indicate it can't be changed
-    //theModelFactoryImpl.freeze(); //FB do we need to freeze / should we freeze ????
-
-    return instance;
-  }
-  
-  private boolean isCreated = false;
-
-  public void createMetaData()
-  {
-    if (isCreated) return;
-    isCreated = true;	
-
-    // Create types and their properties
-    baseDataGraphTypeType = createType(false, BASE_DATA_GRAPH_TYPE);
-    createProperty(false, baseDataGraphTypeType,BaseDataGraphTypeImpl.INTERNAL_MODELS); 
-    createProperty(false, baseDataGraphTypeType,BaseDataGraphTypeImpl.INTERNAL_XSD); 
-    createProperty(true, baseDataGraphTypeType,BaseDataGraphTypeImpl.INTERNAL_CHANGE_SUMMARY); 
-    createProperty(true, baseDataGraphTypeType,BaseDataGraphTypeImpl.INTERNAL_ANY_ATTRIBUTE); 
-    dataGraphTypeType = createType(false, DATA_GRAPH_TYPE);
-    createProperty(true, dataGraphTypeType,DataGraphTypeImpl.INTERNAL_ANY); 
-    dataObjectType = createType(false, DATA_OBJECT);
-    modelsTypeType = createType(false, MODELS_TYPE);
-    createProperty(true, modelsTypeType,ModelsTypeImpl.INTERNAL_ANY); 
-    propertyType = createType(false, PROPERTY);
-    createProperty(true, propertyType,PropertyImpl.INTERNAL_ALIAS_NAME); 
-    createProperty(true, propertyType,PropertyImpl.INTERNAL_ANY); 
-    createProperty(true, propertyType,PropertyImpl.INTERNAL_NAME); 
-    createProperty(true, propertyType,PropertyImpl.INTERNAL_MANY); 
-    createProperty(true, propertyType,PropertyImpl.INTERNAL_CONTAINMENT); 
-    createProperty(true, propertyType,PropertyImpl.INTERNAL_DEFAULT); 
-    createProperty(true, propertyType,PropertyImpl.INTERNAL_READ_ONLY); 
-    createProperty(false, propertyType,PropertyImpl.INTERNAL_TYPE); 
-    createProperty(false, propertyType,PropertyImpl.INTERNAL_OPPOSITE); 
-    createProperty(true, propertyType,PropertyImpl.INTERNAL_NULLABLE); 
-    createProperty(true, propertyType,PropertyImpl.INTERNAL_ANY_ATTRIBUTE); 
-    textTypeType = createType(false, TEXT_TYPE);
-    createProperty(true, textTypeType,TextTypeImpl.INTERNAL_TEXT); 
-    typeType = createType(false, TYPE);
-    createProperty(false, typeType,TypeImpl.INTERNAL_BASE_TYPE); 
-    createProperty(false, typeType,TypeImpl.INTERNAL_PROPERTY); 
-    createProperty(true, typeType,TypeImpl.INTERNAL_ALIAS_NAME); 
-    createProperty(true, typeType,TypeImpl.INTERNAL_ANY); 
-    createProperty(true, typeType,TypeImpl.INTERNAL_NAME); 
-    createProperty(true, typeType,TypeImpl.INTERNAL_URI); 
-    createProperty(true, typeType,TypeImpl.INTERNAL_DATA_TYPE); 
-    createProperty(true, typeType,TypeImpl.INTERNAL_OPEN); 
-    createProperty(true, typeType,TypeImpl.INTERNAL_SEQUENCED); 
-    createProperty(true, typeType,TypeImpl.INTERNAL_ABSTRACT); 
-    createProperty(true, typeType,TypeImpl.INTERNAL_ANY_ATTRIBUTE); 
-    typesType = createType(false, TYPES);
-    createProperty(false, typesType,TypesImpl.INTERNAL_TYPE); 
-    xsdTypeType = createType(false, XSD_TYPE);
-    createProperty(true, xsdTypeType,XSDTypeImpl.INTERNAL_ANY); 
-
-    // Create data types
-    boolean_Type = createType(true, BOOLEAN );
-    booleanObjectType = createType(true, BOOLEAN_OBJECT );
-    byte_Type = createType(true, BYTE );
-    byteObjectType = createType(true, BYTE_OBJECT );
-    bytesType = createType(true, BYTES );
-    changeSummaryTypeType = createType(true, CHANGE_SUMMARY_TYPE );
-    characterType = createType(true, CHARACTER );
-    characterObjectType = createType(true, CHARACTER_OBJECT );
-    dateType = createType(true, DATE );
-    dateTimeType = createType(true, DATE_TIME );
-    dayType = createType(true, DAY );
-    decimalType = createType(true, DECIMAL );
-    double_Type = createType(true, DOUBLE );
-    doubleObjectType = createType(true, DOUBLE_OBJECT );
-    durationType = createType(true, DURATION );
-    float_Type = createType(true, FLOAT );
-    floatObjectType = createType(true, FLOAT_OBJECT );
-    int_Type = createType(true, INT );
-    integerType = createType(true, INTEGER );
-    intObjectType = createType(true, INT_OBJECT );
-    long_Type = createType(true, LONG );
-    longObjectType = createType(true, LONG_OBJECT );
-    monthType = createType(true, MONTH );
-    monthDayType = createType(true, MONTH_DAY );
-    objectType = createType(true, OBJECT );
-    short_Type = createType(true, SHORT );
-    shortObjectType = createType(true, SHORT_OBJECT );
-    stringType = createType(true, STRING );
-    stringsType = createType(true, STRINGS );
-    timeType = createType(true, TIME );
-    uriType = createType(true, URI );
-    yearType = createType(true, YEAR );
-    yearMonthType = createType(true, YEAR_MONTH );
-    yearMonthDayType = createType(true, YEAR_MONTH_DAY );
-  }
-  
-  private boolean isInitialized = false;
-
-  public void initializeMetaData()
-  {
-    if (isInitialized) return;
-    isInitialized = true;
-    commonj.sdo.Property property = null;
-
-    // Add supertypes to types
-    addSuperType(dataGraphTypeType, this.getBaseDataGraphType());
-
-    // Initialize types and properties
-    initializeType(baseDataGraphTypeType, BaseDataGraphType.class, "BaseDataGraphType", true);
-    property = getLocalProperty(baseDataGraphTypeType, 0);
-    initializeProperty(property, this.getModelsType(), "models", null, 0, 1, BaseDataGraphType.class, false, true, false, true , null);
-
-    property = getLocalProperty(baseDataGraphTypeType, 1);
-    initializeProperty(property, this.getXSDType(), "xsd", null, 0, 1, BaseDataGraphType.class, false, true, false, true , null);
-
-    property = getLocalProperty(baseDataGraphTypeType, 2);
-    initializeProperty(property, this.getChangeSummaryType(), "changeSummary", null, 0, 1, BaseDataGraphType.class, false, true, false);
-
-    property = getLocalProperty(baseDataGraphTypeType, 3);
-    initializeProperty(property, getSequence(), "anyAttribute", null, 0, -1, BaseDataGraphType.class, false, false, false);
-
-    initializeType(dataGraphTypeType, DataGraphType.class, "DataGraphType", false);
-    property = getLocalProperty(dataGraphTypeType, 0);
-    initializeProperty(property, getSequence(), "any", null, 0, 1, DataGraphType.class, false, false, false);
-
-    initializeType(dataObjectType, commonj.sdo.DataObject.class, "DataObject", true); // generated as org.apache.tuscany.sdo.model.DataObject.class
-    initializeType(modelsTypeType, ModelsType.class, "ModelsType", false);
-    property = getLocalProperty(modelsTypeType, 0);
-    initializeProperty(property, getSequence(), "any", null, 0, -1, ModelsType.class, false, false, false);
-
-    initializeType(propertyType, Property.class, "Property", false);
-    property = getLocalProperty(propertyType, 0);
-    initializeProperty(property, this.getString(), "aliasName", null, 0, -1, Property.class, false, false, false);
-
-    property = getLocalProperty(propertyType, 1);
-    initializeProperty(property, getSequence(), "any", null, 0, -1, Property.class, false, false, false);
-
-    property = getLocalProperty(propertyType, 2);
-    initializeProperty(property, this.getString(), "name", null, 0, 1, Property.class, false, true, false);
-
-    property = getLocalProperty(propertyType, 3);
-    initializeProperty(property, this.getBoolean(), "many", null, 0, 1, Property.class, false, true, false);
-
-    property = getLocalProperty(propertyType, 4);
-    initializeProperty(property, this.getBoolean(), "containment", null, 0, 1, Property.class, false, true, false);
-
-    property = getLocalProperty(propertyType, 5);
-    initializeProperty(property, this.getString(), "default", null, 0, 1, Property.class, false, true, false);
-
-    property = getLocalProperty(propertyType, 6);
-    initializeProperty(property, this.getBoolean(), "readOnly", null, 0, 1, Property.class, false, true, false);
-
-    property = getLocalProperty(propertyType, 7);
-    initializeProperty(property, this.getType(), "type", null, 0, 1, Property.class, false, true, false, false , null);
-    setInstanceProperty (property, "commonj.sdo/xml", "propertyType", "sdo:Type");
-
-    property = getLocalProperty(propertyType, 8);
-    initializeProperty(property, this.getProperty(), "opposite", null, 0, 1, Property.class, false, true, false, false , null);
-    setInstanceProperty (property, "commonj.sdo/xml", "propertyType", "sdo:Property");
-
-    property = getLocalProperty(propertyType, 9);
-    initializeProperty(property, this.getBoolean(), "nullable", null, 0, 1, Property.class, false, true, false);
-
-    property = getLocalProperty(propertyType, 10);
-    initializeProperty(property, getSequence(), "anyAttribute", null, 0, -1, Property.class, false, false, false);
-
-    initializeType(textTypeType, TextType.class, "TextType", true);
-    property = getLocalProperty(textTypeType, 0);
-    initializeProperty(property, this.getString(), "text", null, 0, -1, TextType.class, false, false, false);
-
-    initializeType(typeType, Type.class, "Type", false);
-    property = getLocalProperty(typeType, 0);
-    initializeProperty(property, this.getType(), "baseType", null, 0, -1, Type.class, false, false, false, false , null);
-    setInstanceProperty (property, "commonj.sdo/xml", "propertyType", "sdo:Type");
-
-    property = getLocalProperty(typeType, 1);
-    initializeProperty(property, this.getProperty(), "property", null, 0, -1, Type.class, false, false, false, true , null);
-
-    property = getLocalProperty(typeType, 2);
-    initializeProperty(property, this.getString(), "aliasName", null, 0, -1, Type.class, false, false, false);
-
-    property = getLocalProperty(typeType, 3);
-    initializeProperty(property, getSequence(), "any", null, 0, -1, Type.class, false, false, false);
-
-    property = getLocalProperty(typeType, 4);
-    initializeProperty(property, this.getString(), "name", null, 0, 1, Type.class, false, true, false);
-    setInstanceProperty (property, "commonj.sdo/xml", "dataType", "sdo:String");
-
-    property = getLocalProperty(typeType, 5);
-    initializeProperty(property, this.getURI(), "uri", null, 0, 1, Type.class, false, true, false);
-
-    property = getLocalProperty(typeType, 6);
-    initializeProperty(property, this.getBoolean(), "dataType", null, 0, 1, Type.class, false, true, false);
-
-    property = getLocalProperty(typeType, 7);
-    initializeProperty(property, this.getBoolean(), "open", null, 0, 1, Type.class, false, true, false);
-
-    property = getLocalProperty(typeType, 8);
-    initializeProperty(property, this.getBoolean(), "sequenced", null, 0, 1, Type.class, false, true, false);
-
-    property = getLocalProperty(typeType, 9);
-    initializeProperty(property, this.getBoolean(), "abstract", null, 0, 1, Type.class, false, true, false);
-
-    property = getLocalProperty(typeType, 10);
-    initializeProperty(property, getSequence(), "anyAttribute", null, 0, -1, Type.class, false, false, false);
-
-    initializeType(typesType, Types.class, "Types", false);
-    property = getLocalProperty(typesType, 0);
-    initializeProperty(property, this.getType(), "type", null, 0, -1, Types.class, false, false, false, true , null);
-
-    initializeType(xsdTypeType, XSDType.class, "XSDType", false);
-    property = getLocalProperty(xsdTypeType, 0);
-    initializeProperty(property, getSequence(), "any", null, 0, -1, XSDType.class, false, false, false);
-
-    // Initialize data types
-    initializeType(boolean_Type, boolean.class, "Boolean", true, false);
-    setInstanceProperty (boolean_Type, "commonj.sdo/java", "instanceClass", "boolean");
-
-    initializeType(booleanObjectType, Boolean.class, "BooleanObject", true, false);
-
-    initializeType(byte_Type, byte.class, "Byte", true, false);
-    setInstanceProperty (byte_Type, "commonj.sdo/java", "instanceClass", "byte");
-
-    initializeType(byteObjectType, Byte.class, "ByteObject", true, false);
-
-    initializeType(bytesType, byte[].class, "Bytes", true, false);
-    setInstanceProperty (bytesType, "commonj.sdo/java", "instanceClass", "byte[]");
-
-    initializeType(changeSummaryTypeType, ChangeSummary.class, "ChangeSummaryType", true, false);
-    setInstanceProperty (changeSummaryTypeType, "commonj.sdo/java", "instanceClass", "commonj.sdo.ChangeSummary");
-
-    initializeType(characterType, char.class, "Character", true, false);
-    setInstanceProperty (characterType, "commonj.sdo/java", "instanceClass", "char");
-
-    initializeType(characterObjectType, Character.class, "CharacterObject", true, false);
-
-    initializeType(dateType, Date.class, "Date", true, false);
-    setInstanceProperty (dateType, "commonj.sdo/java", "instanceClass", "java.util.Date");
-
-    initializeType(dateTimeType, String.class, "DateTime", true, false);
-    setInstanceProperty (dateTimeType, "commonj.sdo/java", "instanceClass", "java.lang.String");
-
-    initializeType(dayType, String.class, "Day", true, false);
-    setInstanceProperty (dayType, "commonj.sdo/java", "instanceClass", "java.lang.String");
-
-    initializeType(decimalType, BigDecimal.class, "Decimal", true, false);
-    setInstanceProperty (decimalType, "commonj.sdo/java", "instanceClass", "java.math.BigDecimal");
-
-    initializeType(double_Type, double.class, "Double", true, false);
-    setInstanceProperty (double_Type, "commonj.sdo/java", "instanceClass", "double");
-
-    initializeType(doubleObjectType, Double.class, "DoubleObject", true, false);
-
-    initializeType(durationType, String.class, "Duration", true, false);
-    setInstanceProperty (durationType, "commonj.sdo/java", "instanceClass", "java.lang.String");
-
-    initializeType(float_Type, float.class, "Float", true, false);
-    setInstanceProperty (float_Type, "commonj.sdo/java", "instanceClass", "float");
-
-    initializeType(floatObjectType, Float.class, "FloatObject", true, false);
-
-    initializeType(int_Type, int.class, "Int", true, false);
-    setInstanceProperty (int_Type, "commonj.sdo/java", "instanceClass", "int");
-
-    initializeType(integerType, BigInteger.class, "Integer", true, false);
-    setInstanceProperty (integerType, "commonj.sdo/java", "instanceClass", "java.math.BigInteger");
-
-    initializeType(intObjectType, Integer.class, "IntObject", true, false);
-
-    initializeType(long_Type, long.class, "Long", true, false);
-    setInstanceProperty (long_Type, "commonj.sdo/java", "instanceClass", "long");
-
-    initializeType(longObjectType, Long.class, "LongObject", true, false);
-
-    initializeType(monthType, String.class, "Month", true, false);
-    setInstanceProperty (monthType, "commonj.sdo/java", "instanceClass", "java.lang.String");
-
-    initializeType(monthDayType, String.class, "MonthDay", true, false);
-    setInstanceProperty (monthDayType, "commonj.sdo/java", "instanceClass", "java.lang.String");
-
-    initializeType(objectType, Object.class, "Object", true, false);
-    setInstanceProperty (objectType, "commonj.sdo/java", "instanceClass", "java.lang.Object");
-
-    initializeType(short_Type, short.class, "Short", true, false);
-    setInstanceProperty (short_Type, "commonj.sdo/java", "instanceClass", "short");
-
-    initializeType(shortObjectType, Short.class, "ShortObject", true, false);
-
-    initializeType(stringType, String.class, "String", true, false);
-    setInstanceProperty (stringType, "commonj.sdo/java", "instanceClass", "java.lang.String");
-
-    initializeType(stringsType, List.class, "Strings", true, false);
-    setInstanceProperty (stringsType, "commonj.sdo/java", "instanceClass", "java.util.List");
-
-    initializeType(timeType, String.class, "Time", true, false);
-    setInstanceProperty (timeType, "commonj.sdo/java", "instanceClass", "java.lang.String");
-
-    initializeType(uriType, String.class, "URI", true, false);
-    setInstanceProperty (uriType, "commonj.sdo/java", "instanceClass", "java.lang.String");
-
-    initializeType(yearType, String.class, "Year", true, false);
-    setInstanceProperty (yearType, "commonj.sdo/java", "instanceClass", "java.lang.String");
-
-    initializeType(yearMonthType, String.class, "YearMonth", true, false);
-    setInstanceProperty (yearMonthType, "commonj.sdo/java", "instanceClass", "java.lang.String");
-
-    initializeType(yearMonthDayType, String.class, "YearMonthDay", true, false);
-    setInstanceProperty (yearMonthDayType, "commonj.sdo/java", "instanceClass", "java.lang.String");
-
-    createXSDMetaData();
-  }
-    
-  protected void createXSDMetaData()
-  {
-    super.initXSD();
-    
-    commonj.sdo.Property property = null;
-    
-
-    addXSDMapping
-      (baseDataGraphTypeType,
-       new String[] 
-       {
-       "name", "BaseDataGraphType",
-       "kind", "elementOnly"
-       });
-
-    addXSDMapping
-      (getProperty(baseDataGraphTypeType, BaseDataGraphTypeImpl.INTERNAL_MODELS),
-       new String[]
-       {
-       "kind", "element",
-       "name", "models"
-       });
-
-    addXSDMapping
-      (getProperty(baseDataGraphTypeType, BaseDataGraphTypeImpl.INTERNAL_XSD),
-       new String[]
-       {
-       "kind", "element",
-       "name", "xsd"
-       });
-
-    addXSDMapping
-      (getProperty(baseDataGraphTypeType, BaseDataGraphTypeImpl.INTERNAL_CHANGE_SUMMARY),
-       new String[]
-       {
-       "kind", "element",
-       "name", "changeSummary"
-       });
-
-    addXSDMapping
-      (getProperty(baseDataGraphTypeType, BaseDataGraphTypeImpl.INTERNAL_ANY_ATTRIBUTE),
-       new String[]
-       {
-       "kind", "attributeWildcard",
-       "wildcards", "##other",
-       "name", ":3",
-       "processing", "lax"
-       });
-
-    addXSDMapping
-      (dataGraphTypeType,
-       new String[] 
-       {
-       "name", "DataGraphType",
-       "kind", "elementOnly"
-       });
-
-    addXSDMapping
-      (getProperty(dataGraphTypeType, DataGraphTypeImpl.INTERNAL_ANY),
-       new String[]
-       {
-       "kind", "elementWildcard",
-       "wildcards", "##other",
-       "name", ":4",
-       "processing", "lax"
-       });
-
-    addXSDMapping
-      (dataObjectType,
-       new String[] 
-       {
-       "name", "DataObject",
-       "kind", "empty"
-       });
-
-    property = createGlobalProperty
-      ("datagraph",
-      this.getDataGraphType(),
-       new String[]
-       {
-       "kind", "element",
-       "name", "datagraph",
-       "namespace", "##targetNamespace"
-       });
-                    
-    property = createGlobalProperty
-      ("dataObject",
-      this.getDataObject(),
-       new String[]
-       {
-       "kind", "element",
-       "name", "dataObject",
-       "namespace", "##targetNamespace"
-       });
-                    
-    property = createGlobalProperty
-      ("type",
-      this.getType(),
-       new String[]
-       {
-       "kind", "element",
-       "name", "type",
-       "namespace", "##targetNamespace"
-       });
-                    
-    property = createGlobalProperty
-      ("types",
-      this.getTypes(),
-       new String[]
-       {
-       "kind", "element",
-       "name", "types",
-       "namespace", "##targetNamespace"
-       });
-                    
-    property = createGlobalProperty
-      ("ref",
-      this.getString(),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "ref",
-       "namespace", "##targetNamespace"
-       },
-       IS_ATTRIBUTE);
-                    
-    property = createGlobalProperty
-      ("unset",
-      this.getString(),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "unset",
-       "namespace", "##targetNamespace"
-       },
-       IS_ATTRIBUTE);
-                    
-    addXSDMapping
-      (modelsTypeType,
-       new String[] 
-       {
-       "name", "ModelsType",
-       "kind", "elementOnly"
-       });
-
-    addXSDMapping
-      (getProperty(modelsTypeType, ModelsTypeImpl.INTERNAL_ANY),
-       new String[]
-       {
-       "kind", "elementWildcard",
-       "wildcards", "##other",
-       "name", ":0",
-       "processing", "lax"
-       });
-
-    addXSDMapping
-      (propertyType,
-       new String[] 
-       {
-       "name", "Property",
-       "kind", "elementOnly"
-       });
-
-    addXSDMapping
-      (getProperty(propertyType, PropertyImpl.INTERNAL_ALIAS_NAME),
-       new String[]
-       {
-       "kind", "element",
-       "name", "aliasName",
-       "namespace", "##targetNamespace"
-       });
-
-    addXSDMapping
-      (getProperty(propertyType, PropertyImpl.INTERNAL_ANY),
-       new String[]
-       {
-       "kind", "elementWildcard",
-       "wildcards", "##other",
-       "name", ":1",
-       "processing", "lax"
-       });
-
-    addXSDMapping
-      (getProperty(propertyType, PropertyImpl.INTERNAL_NAME),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "name"
-       });
-
-    addXSDMapping
-      (getProperty(propertyType, PropertyImpl.INTERNAL_MANY),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "many"
-       });
-
-    addXSDMapping
-      (getProperty(propertyType, PropertyImpl.INTERNAL_CONTAINMENT),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "containment"
-       });
-
-    addXSDMapping
-      (getProperty(propertyType, PropertyImpl.INTERNAL_DEFAULT),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "default"
-       });
-
-    addXSDMapping
-      (getProperty(propertyType, PropertyImpl.INTERNAL_READ_ONLY),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "readOnly"
-       });
-
-    addXSDMapping
-      (getProperty(propertyType, PropertyImpl.INTERNAL_TYPE),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "type"
-       });
-
-    addXSDMapping
-      (getProperty(propertyType, PropertyImpl.INTERNAL_OPPOSITE),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "opposite"
-       });
-
-    addXSDMapping
-      (getProperty(propertyType, PropertyImpl.INTERNAL_NULLABLE),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "nullable"
-       });
-
-    addXSDMapping
-      (getProperty(propertyType, PropertyImpl.INTERNAL_ANY_ATTRIBUTE),
-       new String[]
-       {
-       "kind", "attributeWildcard",
-       "wildcards", "##any",
-       "name", ":10",
-       "processing", "lax"
-       });
-
-    addXSDMapping
-      (textTypeType,
-       new String[] 
-       {
-       "name", "TextType",
-       "kind", "elementOnly"
-       });
-
-    addXSDMapping
-      (getProperty(textTypeType, TextTypeImpl.INTERNAL_TEXT),
-       new String[]
-       {
-       "kind", "element",
-       "name", "text",
-       "namespace", "##targetNamespace"
-       });
-
-    addXSDMapping
-      (typeType,
-       new String[] 
-       {
-       "name", "Type",
-       "kind", "elementOnly"
-       });
-
-    addXSDMapping
-      (getProperty(typeType, TypeImpl.INTERNAL_BASE_TYPE),
-       new String[]
-       {
-       "kind", "element",
-       "name", "baseType",
-       "namespace", "##targetNamespace"
-       });
-
-    addXSDMapping
-      (getProperty(typeType, TypeImpl.INTERNAL_PROPERTY),
-       new String[]
-       {
-       "kind", "element",
-       "name", "property",
-       "namespace", "##targetNamespace"
-       });
-
-    addXSDMapping
-      (getProperty(typeType, TypeImpl.INTERNAL_ALIAS_NAME),
-       new String[]
-       {
-       "kind", "element",
-       "name", "aliasName",
-       "namespace", "##targetNamespace"
-       });
-
-    addXSDMapping
-      (getProperty(typeType, TypeImpl.INTERNAL_ANY),
-       new String[]
-       {
-       "kind", "elementWildcard",
-       "wildcards", "##other",
-       "name", ":3",
-       "processing", "lax"
-       });
-
-    addXSDMapping
-      (getProperty(typeType, TypeImpl.INTERNAL_NAME),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "name"
-       });
-
-    addXSDMapping
-      (getProperty(typeType, TypeImpl.INTERNAL_URI),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "uri"
-       });
-
-    addXSDMapping
-      (getProperty(typeType, TypeImpl.INTERNAL_DATA_TYPE),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "dataType"
-       });
-
-    addXSDMapping
-      (getProperty(typeType, TypeImpl.INTERNAL_OPEN),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "open"
-       });
-
-    addXSDMapping
-      (getProperty(typeType, TypeImpl.INTERNAL_SEQUENCED),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "sequenced"
-       });
-
-    addXSDMapping
-      (getProperty(typeType, TypeImpl.INTERNAL_ABSTRACT),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "abstract"
-       });
-
-    addXSDMapping
-      (getProperty(typeType, TypeImpl.INTERNAL_ANY_ATTRIBUTE),
-       new String[]
-       {
-       "kind", "attributeWildcard",
-       "wildcards", "##any",
-       "name", ":10",
-       "processing", "lax"
-       });
-
-    addXSDMapping
-      (typesType,
-       new String[] 
-       {
-       "name", "Types",
-       "kind", "elementOnly"
-       });
-
-    addXSDMapping
-      (getProperty(typesType, TypesImpl.INTERNAL_TYPE),
-       new String[]
-       {
-       "kind", "element",
-       "name", "type",
-       "namespace", "##targetNamespace"
-       });
-
-    addXSDMapping
-      (xsdTypeType,
-       new String[] 
-       {
-       "name", "XSDType",
-       "kind", "elementOnly"
-       });
-
-    addXSDMapping
-      (getProperty(xsdTypeType, XSDTypeImpl.INTERNAL_ANY),
-       new String[]
-       {
-       "kind", "elementWildcard",
-       "wildcards", "http://www.w3.org/2001/XMLSchema",
-       "name", ":0",
-       "processing", "lax"
-       });
-
-    addXSDMapping
-      (boolean_Type,
-       new String[] 
-       {
-       "name", "Boolean"
-       });
-
-    addXSDMapping
-      (booleanObjectType,
-       new String[] 
-       {
-       "name", "Boolean:Object",
-       "baseType", "Boolean"
-       });
-
-    addXSDMapping
-      (byte_Type,
-       new String[] 
-       {
-       "name", "Byte"
-       });
-
-    addXSDMapping
-      (byteObjectType,
-       new String[] 
-       {
-       "name", "Byte:Object",
-       "baseType", "Byte"
-       });
-
-    addXSDMapping
-      (bytesType,
-       new String[] 
-       {
-       "name", "Bytes"
-       });
-
-    addXSDMapping
-      (changeSummaryTypeType,
-       new String[] 
-       {
-       "name", "ChangeSummaryType"
-       });
-
-    addXSDMapping
-      (characterType,
-       new String[] 
-       {
-       "name", "Character"
-       });
-
-    addXSDMapping
-      (characterObjectType,
-       new String[] 
-       {
-       "name", "Character:Object",
-       "baseType", "Character"
-       });
-
-    addXSDMapping
-      (dateType,
-       new String[] 
-       {
-       "name", "Date"
-       });
-
-    addXSDMapping
-      (dateTimeType,
-       new String[] 
-       {
-       "name", "DateTime"
-       });
-
-    addXSDMapping
-      (dayType,
-       new String[] 
-       {
-       "name", "Day"
-       });
-
-    addXSDMapping
-      (decimalType,
-       new String[] 
-       {
-       "name", "Decimal"
-       });
-
-    addXSDMapping
-      (double_Type,
-       new String[] 
-       {
-       "name", "Double"
-       });
-
-    addXSDMapping
-      (doubleObjectType,
-       new String[] 
-       {
-       "name", "Double:Object",
-       "baseType", "Double"
-       });
-
-    addXSDMapping
-      (durationType,
-       new String[] 
-       {
-       "name", "Duration"
-       });
-
-    addXSDMapping
-      (float_Type,
-       new String[] 
-       {
-       "name", "Float"
-       });
-
-    addXSDMapping
-      (floatObjectType,
-       new String[] 
-       {
-       "name", "Float:Object",
-       "baseType", "Float"
-       });
-
-    addXSDMapping
-      (int_Type,
-       new String[] 
-       {
-       "name", "Int"
-       });
-
-    addXSDMapping
-      (integerType,
-       new String[] 
-       {
-       "name", "Integer"
-       });
-
-    addXSDMapping
-      (intObjectType,
-       new String[] 
-       {
-       "name", "Int:Object",
-       "baseType", "Int"
-       });
-
-    addXSDMapping
-      (long_Type,
-       new String[] 
-       {
-       "name", "Long"
-       });
-
-    addXSDMapping
-      (longObjectType,
-       new String[] 
-       {
-       "name", "Long:Object",
-       "baseType", "Long"
-       });
-
-    addXSDMapping
-      (monthType,
-       new String[] 
-       {
-       "name", "Month"
-       });
-
-    addXSDMapping
-      (monthDayType,
-       new String[] 
-       {
-       "name", "MonthDay"
-       });
-
-    addXSDMapping
-      (objectType,
-       new String[] 
-       {
-       "name", "Object"
-       });
-
-    addXSDMapping
-      (short_Type,
-       new String[] 
-       {
-       "name", "Short"
-       });
-
-    addXSDMapping
-      (shortObjectType,
-       new String[] 
-       {
-       "name", "Short:Object",
-       "baseType", "Short"
-       });
-
-    addXSDMapping
-      (stringType,
-       new String[] 
-       {
-       "name", "String"
-       });
-
-    addXSDMapping
-      (stringsType,
-       new String[] 
-       {
-       "name", "Strings"
-       });
-
-    addXSDMapping
-      (timeType,
-       new String[] 
-       {
-       "name", "Time"
-       });
-
-    addXSDMapping
-      (uriType,
-       new String[] 
-       {
-       "name", "URI"
-       });
-
-    addXSDMapping
-      (yearType,
-       new String[] 
-       {
-       "name", "Year"
-       });
-
-    addXSDMapping
-      (yearMonthType,
-       new String[] 
-       {
-       "name", "YearMonth"
-       });
-
-    addXSDMapping
-      (yearMonthDayType,
-       new String[] 
-       {
-       "name", "YearMonthDay"
-       });
-
-  }
-    
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Boolean createBooleanFromString(String initialValue)
-  {
-    return XMLTypeFactory.eINSTANCE.createBooleanObject(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertBooleanToString(Object instanceValue)
-  {
-    return XMLTypeFactory.eINSTANCE.convertBooleanObject((Boolean)instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Boolean createBooleanObjectFromString(String initialValue)
-  {
-    return (Boolean)createBooleanFromString(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertBooleanObjectToString(Object instanceValue)
-  {
-    return convertBooleanToString(instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Byte createByteFromString(String initialValue)
-  {
-    return XMLTypeFactory.eINSTANCE.createByteObject(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertByteToString(Object instanceValue)
-  {
-    return XMLTypeFactory.eINSTANCE.convertByteObject((Byte)instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Byte createByteObjectFromString(String initialValue)
-  {
-    return (Byte)createByteFromString(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertByteObjectToString(Object instanceValue)
-  {
-    return convertByteToString(instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public byte[] createBytesFromString(String initialValue)
-  {
-    return XMLTypeFactory.eINSTANCE.createHexBinary(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertBytesToString(Object instanceValue)
-  {
-    if (instanceValue instanceof byte[]) {
-      return XMLTypeFactory.eINSTANCE.convertHexBinary((byte[])instanceValue);
-    } else {
-      return XMLTypeFactory.eINSTANCE.convertHexBinary(instanceValue.toString().getBytes());
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public ChangeSummary createChangeSummaryTypeFromString(String initialValue)
-  {
-    return null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertChangeSummaryTypeToString(Object instanceValue)
-  {
-    return "change summary serialization goes here ...";
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Character createCharacterFromString(String initialValue)
-  {
-    return (initialValue == null && initialValue.length() > 0) 
-    ? null : (new Character(XMLTypeUtil.normalize(initialValue, true).charAt(0)));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertCharacterToString(Object instanceValue)
-  {
-    return String.valueOf(((Character)instanceValue).charValue());
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Character createCharacterObjectFromString(String initialValue)
-  {
-    return (Character)createCharacterFromString(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertCharacterObjectToString(Object instanceValue)
-  {
-    return convertCharacterToString(instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Date createDateFromString(String initialValue)
-  {
-    // XMLCalendar cal = (XMLCalendar) XMLTypeFactory.eINSTANCE.createDate(initialValue);
-    // return (cal != null) ? cal.getDate() : null;
-    return DataHelper.INSTANCE.toDate(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertDateToString(Object instanceValue)
-  {
-    if (instanceValue == null)
-    {
-      return null;
-    }
-    
-    SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'.'SSS'Z'");
-    f.setTimeZone(TimeZone.getTimeZone("GMT"));
-    
-    return f.format((Date)instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String createDateTimeFromString(String initialValue)
-  {
-      return initialValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertDateTimeToString(Object instanceValue)
-  {
-      return (String)instanceValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String createDayFromString(String initialValue)
-  {
-      return initialValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertDayToString(Object instanceValue)
-  {
-      return (String)instanceValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public BigDecimal createDecimalFromString(String initialValue)
-  {
-    return XMLTypeFactory.eINSTANCE.createDecimal(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertDecimalToString(Object instanceValue)
-  {
-    return XMLTypeFactory.eINSTANCE.convertDecimal((BigDecimal)instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Double createDoubleFromString(String initialValue)
-  {
-    return XMLTypeFactory.eINSTANCE.createDoubleObject(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertDoubleToString(Object instanceValue)
-  {
-    return XMLTypeFactory.eINSTANCE.convertDoubleObject((Double)instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Double createDoubleObjectFromString(String initialValue)
-  {
-    return (Double)createDoubleFromString(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertDoubleObjectToString(Object instanceValue)
-  {
-    return convertDoubleToString(instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String createDurationFromString(String initialValue)
-  {
-      return initialValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertDurationToString(Object instanceValue)
-  {
-      return (String)instanceValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Float createFloatFromString(String initialValue)
-  {
-    return XMLTypeFactory.eINSTANCE.createFloatObject(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertFloatToString(Object instanceValue)
-  {
-    return XMLTypeFactory.eINSTANCE.convertFloatObject((Float)instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Float createFloatObjectFromString(String initialValue)
-  {
-    return (Float)createFloatFromString(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertFloatObjectToString(Object instanceValue)
-  {
-    return convertFloatToString(instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Integer createIntFromString(String initialValue)
-  {
-    return XMLTypeFactory.eINSTANCE.createIntObject(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertIntToString(Object instanceValue)
-  {
-    return XMLTypeFactory.eINSTANCE.convertIntObject((Integer)instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public BigInteger createIntegerFromString(String initialValue)
-  {
-    return XMLTypeFactory.eINSTANCE.createInteger(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertIntegerToString(Object instanceValue)
-  {
-    return XMLTypeFactory.eINSTANCE.convertInteger((BigInteger)instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Integer createIntObjectFromString(String initialValue)
-  {
-    return (Integer)createIntFromString(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertIntObjectToString(Object instanceValue)
-  {
-    return convertIntToString(instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Long createLongFromString(String initialValue)
-  {
-    return XMLTypeFactory.eINSTANCE.createLongObject(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertLongToString(Object instanceValue)
-  {
-    return XMLTypeFactory.eINSTANCE.convertLongObject((Long)instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Long createLongObjectFromString(String initialValue)
-  {
-    return (Long)createLongFromString(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertLongObjectToString(Object instanceValue)
-  {
-    return convertLongToString(instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String createMonthFromString(String initialValue)
-  {
-      return initialValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertMonthToString(Object instanceValue)
-  {
-      return (String)instanceValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String createMonthDayFromString(String initialValue)
-  {
-      return initialValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertMonthDayToString(Object instanceValue)
-  {
-      return (String)instanceValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Object createObjectFromString(String initialValue)
-  {
-    return initialValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertObjectToString(Object instanceValue)
-  {
-    return (instanceValue != null) ? instanceValue.toString() : null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Short createShortFromString(String initialValue)
-  {
-    return XMLTypeFactory.eINSTANCE.createShortObject(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertShortToString(Object instanceValue)
-  {
-    return XMLTypeFactory.eINSTANCE.convertShortObject((Short)instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Short createShortObjectFromString(String initialValue)
-  {
-    return (Short)createShortFromString(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertShortObjectToString(Object instanceValue)
-  {
-    return convertShortToString(instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String createStringFromString(String initialValue)
-  {
-    return initialValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertStringToString(Object instanceValue)
-  {
-    return (instanceValue != null) ? instanceValue.toString() : null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List createStringsFromString(String initialValue)
-  {
-    return XMLTypeFactory.eINSTANCE.createENTITIES(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertStringsToString(Object instanceValue)
-  {
-    return XMLTypeFactory.eINSTANCE.convertENTITIES((List)instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String createTimeFromString(String initialValue)
-  {
-      return initialValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertTimeToString(Object instanceValue)
-  {
-      return (String)instanceValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String createURIFromString(String initialValue)
-  {
-    return initialValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertURIToString(Object instanceValue)
-  {
-    return (instanceValue != null) ? instanceValue.toString() : null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String createYearFromString(String initialValue)
-  {
-      return initialValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertYearToString(Object instanceValue)
-  {
-      return (String)instanceValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String createYearMonthFromString(String initialValue)
-  {
-      return initialValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertYearMonthToString(Object instanceValue)
-  {
-      return (String)instanceValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String createYearMonthDayFromString(String initialValue)
-  {
-      return initialValue;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertYearMonthDayToString(Object instanceValue)
-  {
-      return (String)instanceValue;
-  }
-
-
-
-} //ModelFactoryImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java
deleted file mode 100644
index df043a0d10..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/ModelsTypeImpl.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model.impl;
-
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-import org.apache.tuscany.sdo.model.ModelFactory;
-import org.apache.tuscany.sdo.model.ModelsType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Models Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.ModelsTypeImpl#getAny <em>Any</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ModelsTypeImpl extends DataObjectBase implements ModelsType
-{
-
-  public final static int ANY = -1;
-
-  public final static int SDO_PROPERTY_COUNT = 0;
-
-  public final static int EXTENDED_PROPERTY_COUNT = -1;
-
-
-  /**
-   * The internal feature id for the '<em><b>Any</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_ANY = 0;
-
-  /**
-   * The number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public final static int INTERNAL_PROPERTY_COUNT = 1;
-
-  protected int internalConvertIndex(int internalIndex)
-  {
-    switch (internalIndex)
-    {
-      case INTERNAL_ANY: return ANY;
-    }
-    return super.internalConvertIndex(internalIndex);
-  }
-
-
-  /**
-   * The cached value of the '{@link #getAny() <em>Any</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAny()
-   * @generated
-   * @ordered
-   */
-  
-  protected Sequence any = null;
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ModelsTypeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type getStaticType()
-  {
-    return ((ModelFactoryImpl)ModelFactory.INSTANCE).getModelsType();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Sequence getAny()
-  {
-    if (any == null)
-    {
-      any = createSequence(INTERNAL_ANY);
-    }
-    return any;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeContext inverseRemove(Object otherEnd, int propertyIndex, ChangeContext changeContext)
-  {
-    switch (propertyIndex)
-    {
-      case ANY:
-        return removeFromSequence(getAny(), otherEnd, changeContext);
-    }
-    return super.inverseRemove(otherEnd, propertyIndex, changeContext);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object get(int propertyIndex, boolean resolve)
-  {
-    switch (propertyIndex)
-    {
-      case ANY:
-        // XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view
-        //if (coreType) 
-        return getAny();
-    }
-    return super.get(propertyIndex, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void set(int propertyIndex, Object newValue)
-  {
-    switch (propertyIndex)
-    {
-      case ANY:
-      	setSequence(getAny(), newValue);
-        return;
-    }
-    super.set(propertyIndex, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unset(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case ANY:
-        unsetSequence(getAny());
-        return;
-    }
-    super.unset(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case ANY:
-        return any != null && !isSequenceEmpty(getAny());
-    }
-    return super.isSet(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (isProxy(this)) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (any: ");
-    result.append(any);
-    result.append(')');
-    return result.toString();
-  }
-
-} //ModelsTypeImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java
deleted file mode 100644
index c8348ded2d..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/PropertyImpl.java
+++ /dev/null
@@ -1,1170 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model.impl;
-
-import commonj.sdo.Sequence;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-import org.apache.tuscany.sdo.model.ModelFactory;
-import org.apache.tuscany.sdo.model.Property;
-import org.apache.tuscany.sdo.model.Type;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Property</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.PropertyImpl#getAliasName <em>Alias Name</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.PropertyImpl#getAny <em>Any</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.PropertyImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.PropertyImpl#isMany <em>Many</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.PropertyImpl#isContainment <em>Containment</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.PropertyImpl#getDefault <em>Default</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.PropertyImpl#isReadOnly <em>Read Only</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.PropertyImpl#getType_ <em>Type</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.PropertyImpl#getOpposite <em>Opposite</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.PropertyImpl#isNullable <em>Nullable</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.PropertyImpl#getAnyAttribute <em>Any Attribute</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PropertyImpl extends DataObjectBase implements Property
-{
-
-  public final static int ALIAS_NAME = 0;
-
-  public final static int ANY = -1;
-
-  public final static int NAME = 1;
-
-  public final static int MANY = 2;
-
-  public final static int CONTAINMENT = 3;
-
-  public final static int DEFAULT = 4;
-
-  public final static int READ_ONLY = 5;
-
-  public final static int TYPE = 6;
-
-  public final static int OPPOSITE = 7;
-
-  public final static int NULLABLE = 8;
-
-  public final static int ANY_ATTRIBUTE = -2;
-
-  public final static int SDO_PROPERTY_COUNT = 9;
-
-  public final static int EXTENDED_PROPERTY_COUNT = -2;
-
-
-  /**
-   * The internal feature id for the '<em><b>Alias Name</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_ALIAS_NAME = 0;
-
-  /**
-   * The internal feature id for the '<em><b>Any</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_ANY = 1;
-
-  /**
-   * The internal feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_NAME = 2;
-
-  /**
-   * The internal feature id for the '<em><b>Many</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_MANY = 3;
-
-  /**
-   * The internal feature id for the '<em><b>Containment</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_CONTAINMENT = 4;
-
-  /**
-   * The internal feature id for the '<em><b>Default</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_DEFAULT = 5;
-
-  /**
-   * The internal feature id for the '<em><b>Read Only</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_READ_ONLY = 6;
-
-  /**
-   * The internal feature id for the '<em><b>Type</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_TYPE = 7;
-
-  /**
-   * The internal feature id for the '<em><b>Opposite</b></em>' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_OPPOSITE = 8;
-
-  /**
-   * The internal feature id for the '<em><b>Nullable</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_NULLABLE = 9;
-
-  /**
-   * The internal feature id for the '<em><b>Any Attribute</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_ANY_ATTRIBUTE = 10;
-
-  /**
-   * The number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public final static int INTERNAL_PROPERTY_COUNT = 11;
-
-  protected int internalConvertIndex(int internalIndex)
-  {
-    switch (internalIndex)
-    {
-      case INTERNAL_ALIAS_NAME: return ALIAS_NAME;
-      case INTERNAL_ANY: return ANY;
-      case INTERNAL_NAME: return NAME;
-      case INTERNAL_MANY: return MANY;
-      case INTERNAL_CONTAINMENT: return CONTAINMENT;
-      case INTERNAL_DEFAULT: return DEFAULT;
-      case INTERNAL_READ_ONLY: return READ_ONLY;
-      case INTERNAL_TYPE: return TYPE;
-      case INTERNAL_OPPOSITE: return OPPOSITE;
-      case INTERNAL_NULLABLE: return NULLABLE;
-      case INTERNAL_ANY_ATTRIBUTE: return ANY_ATTRIBUTE;
-    }
-    return super.internalConvertIndex(internalIndex);
-  }
-
-
-  /**
-   * The cached value of the '{@link #getAliasName() <em>Alias Name</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAliasName()
-   * @generated
-   * @ordered
-   */
-  
-  protected List aliasName = null;
-  
-  /**
-   * The cached value of the '{@link #getAny() <em>Any</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAny()
-   * @generated
-   * @ordered
-   */
-  
-  protected Sequence any = null;
-  
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_DEFAULT_;
-
-  /**
-   * This is true if the Name attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean name_set_ = false;
-
-  /**
-   * The default value of the '{@link #isMany() <em>Many</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isMany()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean MANY_DEFAULT_ = false;
-
-  /**
-   * The cached value of the '{@link #isMany() <em>Many</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isMany()
-   * @generated
-   * @ordered
-   */
-  protected boolean many = MANY_DEFAULT_;
-
-  /**
-   * This is true if the Many attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean many_set_ = false;
-
-  /**
-   * The default value of the '{@link #isContainment() <em>Containment</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isContainment()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean CONTAINMENT_DEFAULT_ = false;
-
-  /**
-   * The cached value of the '{@link #isContainment() <em>Containment</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isContainment()
-   * @generated
-   * @ordered
-   */
-  protected boolean containment = CONTAINMENT_DEFAULT_;
-
-  /**
-   * This is true if the Containment attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean containment_set_ = false;
-
-  /**
-   * The default value of the '{@link #getDefault_() <em>Default</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getDefault_()
-   * @generated
-   * @ordered
-   */
-  protected static final String DEFAULT_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getDefault_() <em>Default</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getDefault_()
-   * @generated
-   * @ordered
-   */
-  protected String default_ = DEFAULT_DEFAULT_;
-
-  /**
-   * This is true if the Default attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean default_set_ = false;
-
-  /**
-   * The default value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isReadOnly()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean READ_ONLY_DEFAULT_ = false;
-
-  /**
-   * The cached value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isReadOnly()
-   * @generated
-   * @ordered
-   */
-  protected boolean readOnly = READ_ONLY_DEFAULT_;
-
-  /**
-   * This is true if the Read Only attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean readOnly_set_ = false;
-
-  /**
-   * The cached value of the '{@link #getType_() <em>Type</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getType_()
-   * @generated
-   * @ordered
-   */
-  
-  protected Type type = null;
-  
-  /**
-   * This is true if the Type reference has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean type_set_ = false;
-
-  /**
-   * The cached value of the '{@link #getOpposite_() <em>Opposite</em>}' reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getOpposite_()
-   * @generated
-   * @ordered
-   */
-  
-  protected Property opposite = null;
-  
-  /**
-   * This is true if the Opposite reference has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean opposite_set_ = false;
-
-  /**
-   * The default value of the '{@link #isNullable() <em>Nullable</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isNullable()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean NULLABLE_DEFAULT_ = false;
-
-  /**
-   * The cached value of the '{@link #isNullable() <em>Nullable</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isNullable()
-   * @generated
-   * @ordered
-   */
-  protected boolean nullable = NULLABLE_DEFAULT_;
-
-  /**
-   * This is true if the Nullable attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean nullable_set_ = false;
-
-  /**
-   * The cached value of the '{@link #getAnyAttribute() <em>Any Attribute</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAnyAttribute()
-   * @generated
-   * @ordered
-   */
-  
-  protected Sequence anyAttribute = null;
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public PropertyImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public commonj.sdo.Type getStaticType()
-  {
-    return ((ModelFactoryImpl)ModelFactory.INSTANCE).getProperty();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getAliasName()
-  {
-    if (aliasName == null)
-    {
-      aliasName = createPropertyList(ListKind.DATATYPE, String.class, ALIAS_NAME, 0);
-    }
-    return aliasName;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Sequence getAny()
-  {
-    if (any == null)
-    {
-      any = createSequence(INTERNAL_ANY);
-    }
-    return any;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    boolean oldName_set_ = name_set_;
-    name_set_ = true;
-    if (isNotifying())
-      notify(ChangeKind.SET, INTERNAL_NAME, oldName, name, !oldName_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetName()
-  {
-    String oldName = name;
-    boolean oldName_set_ = name_set_;
-    name = NAME_DEFAULT_;
-    name_set_ = false;
-    if (isNotifying())
-      notify(ChangeKind.UNSET, INTERNAL_NAME, oldName, NAME_DEFAULT_, oldName_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetName()
-  {
-    return name_set_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isMany()
-  {
-    return many;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setMany(boolean newMany)
-  {
-    boolean oldMany = many;
-    many = newMany;
-    boolean oldMany_set_ = many_set_;
-    many_set_ = true;
-    if (isNotifying())
-      notify(ChangeKind.SET, INTERNAL_MANY, oldMany, many, !oldMany_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetMany()
-  {
-    boolean oldMany = many;
-    boolean oldMany_set_ = many_set_;
-    many = MANY_DEFAULT_;
-    many_set_ = false;
-    if (isNotifying())
-      notify(ChangeKind.UNSET, INTERNAL_MANY, oldMany, MANY_DEFAULT_, oldMany_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetMany()
-  {
-    return many_set_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isContainment()
-  {
-    return containment;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setContainment(boolean newContainment)
-  {
-    boolean oldContainment = containment;
-    containment = newContainment;
-    boolean oldContainment_set_ = containment_set_;
-    containment_set_ = true;
-    if (isNotifying())
-      notify(ChangeKind.SET, INTERNAL_CONTAINMENT, oldContainment, containment, !oldContainment_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetContainment()
-  {
-    boolean oldContainment = containment;
-    boolean oldContainment_set_ = containment_set_;
-    containment = CONTAINMENT_DEFAULT_;
-    containment_set_ = false;
-    if (isNotifying())
-      notify(ChangeKind.UNSET, INTERNAL_CONTAINMENT, oldContainment, CONTAINMENT_DEFAULT_, oldContainment_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetContainment()
-  {
-    return containment_set_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getDefault_()
-  {
-    return default_;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setDefault_(String newDefault)
-  {
-    String oldDefault = default_;
-    default_ = newDefault;
-    boolean oldDefault_set_ = default_set_;
-    default_set_ = true;
-    if (isNotifying())
-      notify(ChangeKind.SET, INTERNAL_DEFAULT, oldDefault, default_, !oldDefault_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetDefault()
-  {
-    String oldDefault = default_;
-    boolean oldDefault_set_ = default_set_;
-    default_ = DEFAULT_DEFAULT_;
-    default_set_ = false;
-    if (isNotifying())
-      notify(ChangeKind.UNSET, INTERNAL_DEFAULT, oldDefault, DEFAULT_DEFAULT_, oldDefault_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetDefault()
-  {
-    return default_set_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isReadOnly()
-  {
-    return readOnly;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setReadOnly(boolean newReadOnly)
-  {
-    boolean oldReadOnly = readOnly;
-    readOnly = newReadOnly;
-    boolean oldReadOnly_set_ = readOnly_set_;
-    readOnly_set_ = true;
-    if (isNotifying())
-      notify(ChangeKind.SET, INTERNAL_READ_ONLY, oldReadOnly, readOnly, !oldReadOnly_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetReadOnly()
-  {
-    boolean oldReadOnly = readOnly;
-    boolean oldReadOnly_set_ = readOnly_set_;
-    readOnly = READ_ONLY_DEFAULT_;
-    readOnly_set_ = false;
-    if (isNotifying())
-      notify(ChangeKind.UNSET, INTERNAL_READ_ONLY, oldReadOnly, READ_ONLY_DEFAULT_, oldReadOnly_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetReadOnly()
-  {
-    return readOnly_set_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type getType_()
-  {
-    if (type != null && isProxy(type))
-    {
-      Object oldType = type;
-      type = (Type)resolveProxy(oldType);
-      if (type != oldType)
-      {
-        if (isNotifying())
-          notify(ChangeKind.RESOLVE, INTERNAL_TYPE, oldType, type);
-      }
-    }
-    return type;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type basicGetType()
-  {
-    return type;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setType(Type newType)
-  {
-    Type oldType = type;
-    type = newType;
-    boolean oldType_set_ = type_set_;
-    type_set_ = true;
-    if (isNotifying())
-      notify(ChangeKind.SET, INTERNAL_TYPE, oldType, type, !oldType_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetType()
-  {
-    Type oldType = type;
-    boolean oldType_set_ = type_set_;
-    type = null;
-    type_set_ = false;
-    if (isNotifying())
-      notify(ChangeKind.UNSET, INTERNAL_TYPE, oldType, null, oldType_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetType()
-  {
-    return type_set_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Property getOpposite_()
-  {
-    if (opposite != null && isProxy(opposite))
-    {
-      Object oldOpposite = opposite;
-      opposite = (Property)resolveProxy(oldOpposite);
-      if (opposite != oldOpposite)
-      {
-        if (isNotifying())
-          notify(ChangeKind.RESOLVE, INTERNAL_OPPOSITE, oldOpposite, opposite);
-      }
-    }
-    return opposite;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Property basicGetOpposite()
-  {
-    return opposite;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setOpposite_(Property newOpposite)
-  {
-    Property oldOpposite = opposite;
-    opposite = newOpposite;
-    boolean oldOpposite_set_ = opposite_set_;
-    opposite_set_ = true;
-    if (isNotifying())
-      notify(ChangeKind.SET, INTERNAL_OPPOSITE, oldOpposite, opposite, !oldOpposite_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetOpposite()
-  {
-    Property oldOpposite = opposite;
-    boolean oldOpposite_set_ = opposite_set_;
-    opposite = null;
-    opposite_set_ = false;
-    if (isNotifying())
-      notify(ChangeKind.UNSET, INTERNAL_OPPOSITE, oldOpposite, null, oldOpposite_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetOpposite()
-  {
-    return opposite_set_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isNullable()
-  {
-    return nullable;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setNullable(boolean newNullable)
-  {
-    boolean oldNullable = nullable;
-    nullable = newNullable;
-    boolean oldNullable_set_ = nullable_set_;
-    nullable_set_ = true;
-    if (isNotifying())
-      notify(ChangeKind.SET, INTERNAL_NULLABLE, oldNullable, nullable, !oldNullable_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetNullable()
-  {
-    boolean oldNullable = nullable;
-    boolean oldNullable_set_ = nullable_set_;
-    nullable = NULLABLE_DEFAULT_;
-    nullable_set_ = false;
-    if (isNotifying())
-      notify(ChangeKind.UNSET, INTERNAL_NULLABLE, oldNullable, NULLABLE_DEFAULT_, oldNullable_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetNullable()
-  {
-    return nullable_set_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Sequence getAnyAttribute()
-  {
-    if (anyAttribute == null)
-    {
-      anyAttribute = createSequence(INTERNAL_ANY_ATTRIBUTE);
-    }
-    return anyAttribute;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeContext inverseRemove(Object otherEnd, int propertyIndex, ChangeContext changeContext)
-  {
-    switch (propertyIndex)
-    {
-      case ANY:
-        return removeFromSequence(getAny(), otherEnd, changeContext);
-      case ANY_ATTRIBUTE:
-        return removeFromSequence(getAnyAttribute(), otherEnd, changeContext);
-    }
-    return super.inverseRemove(otherEnd, propertyIndex, changeContext);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object get(int propertyIndex, boolean resolve)
-  {
-    switch (propertyIndex)
-    {
-      case ALIAS_NAME:
-        return getAliasName();
-      case ANY:
-        // XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view
-        //if (coreType) 
-        return getAny();
-      case NAME:
-        return getName();
-      case MANY:
-        return isMany() ? Boolean.TRUE : Boolean.FALSE;
-      case CONTAINMENT:
-        return isContainment() ? Boolean.TRUE : Boolean.FALSE;
-      case DEFAULT:
-        return getDefault_();
-      case READ_ONLY:
-        return isReadOnly() ? Boolean.TRUE : Boolean.FALSE;
-      case TYPE:
-        if (resolve) return getType_();
-        return basicGetType();
-      case OPPOSITE:
-        if (resolve) return getOpposite_();
-        return basicGetOpposite();
-      case NULLABLE:
-        return isNullable() ? Boolean.TRUE : Boolean.FALSE;
-      case ANY_ATTRIBUTE:
-        // XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view
-        //if (coreType) 
-        return getAnyAttribute();
-    }
-    return super.get(propertyIndex, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void set(int propertyIndex, Object newValue)
-  {
-    switch (propertyIndex)
-    {
-      case ALIAS_NAME:
-        getAliasName().clear();
-        getAliasName().addAll((Collection)newValue);
-        return;
-      case ANY:
-      	setSequence(getAny(), newValue);
-        return;
-      case NAME:
-        setName((String)newValue);
-        return;
-      case MANY:
-        setMany(((Boolean)newValue).booleanValue());
-        return;
-      case CONTAINMENT:
-        setContainment(((Boolean)newValue).booleanValue());
-        return;
-      case DEFAULT:
-        setDefault_((String)newValue);
-        return;
-      case READ_ONLY:
-        setReadOnly(((Boolean)newValue).booleanValue());
-        return;
-      case TYPE:
-        setType((Type)newValue);
-        return;
-      case OPPOSITE:
-        setOpposite_((Property)newValue);
-        return;
-      case NULLABLE:
-        setNullable(((Boolean)newValue).booleanValue());
-        return;
-      case ANY_ATTRIBUTE:
-      	setSequence(getAnyAttribute(), newValue);
-        return;
-    }
-    super.set(propertyIndex, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unset(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case ALIAS_NAME:
-        getAliasName().clear();
-        return;
-      case ANY:
-        unsetSequence(getAny());
-        return;
-      case NAME:
-        unsetName();
-        return;
-      case MANY:
-        unsetMany();
-        return;
-      case CONTAINMENT:
-        unsetContainment();
-        return;
-      case DEFAULT:
-        unsetDefault();
-        return;
-      case READ_ONLY:
-        unsetReadOnly();
-        return;
-      case TYPE:
-        unsetType();
-        return;
-      case OPPOSITE:
-        unsetOpposite();
-        return;
-      case NULLABLE:
-        unsetNullable();
-        return;
-      case ANY_ATTRIBUTE:
-        unsetSequence(getAnyAttribute());
-        return;
-    }
-    super.unset(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case ALIAS_NAME:
-        return aliasName != null && !aliasName.isEmpty();
-      case ANY:
-        return any != null && !isSequenceEmpty(getAny());
-      case NAME:
-        return isSetName();
-      case MANY:
-        return isSetMany();
-      case CONTAINMENT:
-        return isSetContainment();
-      case DEFAULT:
-        return isSetDefault();
-      case READ_ONLY:
-        return isSetReadOnly();
-      case TYPE:
-        return isSetType();
-      case OPPOSITE:
-        return isSetOpposite();
-      case NULLABLE:
-        return isSetNullable();
-      case ANY_ATTRIBUTE:
-        return anyAttribute != null && !isSequenceEmpty(getAnyAttribute());
-    }
-    return super.isSet(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (isProxy(this)) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (aliasName: ");
-    result.append(aliasName);
-    result.append(", any: ");
-    result.append(any);
-    result.append(", name: ");
-    if (name_set_) result.append(name); else result.append("<unset>");
-    result.append(", many: ");
-    if (many_set_) result.append(many); else result.append("<unset>");
-    result.append(", containment: ");
-    if (containment_set_) result.append(containment); else result.append("<unset>");
-    result.append(", default: ");
-    if (default_set_) result.append(default_); else result.append("<unset>");
-    result.append(", readOnly: ");
-    if (readOnly_set_) result.append(readOnly); else result.append("<unset>");
-    result.append(", nullable: ");
-    if (nullable_set_) result.append(nullable); else result.append("<unset>");
-    result.append(", anyAttribute: ");
-    result.append(anyAttribute);
-    result.append(')');
-    return result.toString();
-  }
-
-} //PropertyImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java
deleted file mode 100644
index 48a310b142..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TextTypeImpl.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model.impl;
-
-import commonj.sdo.Type;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-import org.apache.tuscany.sdo.model.ModelFactory;
-import org.apache.tuscany.sdo.model.TextType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Text Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.TextTypeImpl#getText <em>Text</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class TextTypeImpl extends DataObjectBase implements TextType
-{
-
-  public final static int TEXT = 0;
-
-  public final static int SDO_PROPERTY_COUNT = 1;
-
-  public final static int EXTENDED_PROPERTY_COUNT = 0;
-
-
-  /**
-   * The internal feature id for the '<em><b>Text</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_TEXT = 0;
-
-  /**
-   * The number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public final static int INTERNAL_PROPERTY_COUNT = 1;
-
-  protected int internalConvertIndex(int internalIndex)
-  {
-    switch (internalIndex)
-    {
-      case INTERNAL_TEXT: return TEXT;
-    }
-    return super.internalConvertIndex(internalIndex);
-  }
-
-
-  /**
-   * The cached value of the '{@link #getText() <em>Text</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getText()
-   * @generated
-   * @ordered
-   */
-  
-  protected List text = null;
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public TextTypeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type getStaticType()
-  {
-    return ((ModelFactoryImpl)ModelFactory.INSTANCE).getTextType();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getText()
-  {
-    if (text == null)
-    {
-      text = createPropertyList(ListKind.DATATYPE, String.class, TEXT, 0);
-    }
-    return text;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object get(int propertyIndex, boolean resolve)
-  {
-    switch (propertyIndex)
-    {
-      case TEXT:
-        return getText();
-    }
-    return super.get(propertyIndex, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void set(int propertyIndex, Object newValue)
-  {
-    switch (propertyIndex)
-    {
-      case TEXT:
-        getText().clear();
-        getText().addAll((Collection)newValue);
-        return;
-    }
-    super.set(propertyIndex, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unset(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case TEXT:
-        getText().clear();
-        return;
-    }
-    super.unset(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case TEXT:
-        return text != null && !text.isEmpty();
-    }
-    return super.isSet(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (isProxy(this)) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (text: ");
-    result.append(text);
-    result.append(')');
-    return result.toString();
-  }
-
-} //TextTypeImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java
deleted file mode 100644
index aee2ecaaab..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypeImpl.java
+++ /dev/null
@@ -1,1068 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model.impl;
-
-import commonj.sdo.Sequence;
-import commonj.sdo.helper.TypeHelper;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-import org.apache.tuscany.sdo.model.ModelFactory;
-import org.apache.tuscany.sdo.model.Property;
-import org.apache.tuscany.sdo.model.Type;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.BasicExtendedMetaData;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.TypeImpl#getBaseType <em>Base Type</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.TypeImpl#getProperty <em>Property</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.TypeImpl#getAliasName <em>Alias Name</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.TypeImpl#getAny <em>Any</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.TypeImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.TypeImpl#getUri <em>Uri</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.TypeImpl#isDataType <em>Data Type</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.TypeImpl#isOpen <em>Open</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.TypeImpl#isSequenced <em>Sequenced</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.TypeImpl#isAbstract <em>Abstract</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.TypeImpl#getAnyAttribute <em>Any Attribute</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TypeImpl extends DataObjectBase implements Type
-{
-
-  public final static int BASE_TYPE = 0;
-
-  public final static int PROPERTY = 1;
-
-  public final static int ALIAS_NAME = 2;
-
-  public final static int ANY = -1;
-
-  public final static int NAME = 3;
-
-  public final static int URI = 4;
-
-  public final static int DATA_TYPE = 5;
-
-  public final static int OPEN = 6;
-
-  public final static int SEQUENCED = 7;
-
-  public final static int ABSTRACT = 8;
-
-  public final static int ANY_ATTRIBUTE = -2;
-
-  public final static int SDO_PROPERTY_COUNT = 9;
-
-  public final static int EXTENDED_PROPERTY_COUNT = -2;
-
-
-  /**
-   * The internal feature id for the '<em><b>Base Type</b></em>' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_BASE_TYPE = 0;
-
-  /**
-   * The internal feature id for the '<em><b>Property</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_PROPERTY = 1;
-
-  /**
-   * The internal feature id for the '<em><b>Alias Name</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_ALIAS_NAME = 2;
-
-  /**
-   * The internal feature id for the '<em><b>Any</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_ANY = 3;
-
-  /**
-   * The internal feature id for the '<em><b>Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_NAME = 4;
-
-  /**
-   * The internal feature id for the '<em><b>Uri</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_URI = 5;
-
-  /**
-   * The internal feature id for the '<em><b>Data Type</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_DATA_TYPE = 6;
-
-  /**
-   * The internal feature id for the '<em><b>Open</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_OPEN = 7;
-
-  /**
-   * The internal feature id for the '<em><b>Sequenced</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_SEQUENCED = 8;
-
-  /**
-   * The internal feature id for the '<em><b>Abstract</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_ABSTRACT = 9;
-
-  /**
-   * The internal feature id for the '<em><b>Any Attribute</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_ANY_ATTRIBUTE = 10;
-
-  /**
-   * The number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public final static int INTERNAL_PROPERTY_COUNT = 11;
-
-  protected int internalConvertIndex(int internalIndex)
-  {
-    switch (internalIndex)
-    {
-      case INTERNAL_BASE_TYPE: return BASE_TYPE;
-      case INTERNAL_PROPERTY: return PROPERTY;
-      case INTERNAL_ALIAS_NAME: return ALIAS_NAME;
-      case INTERNAL_ANY: return ANY;
-      case INTERNAL_NAME: return NAME;
-      case INTERNAL_URI: return URI;
-      case INTERNAL_DATA_TYPE: return DATA_TYPE;
-      case INTERNAL_OPEN: return OPEN;
-      case INTERNAL_SEQUENCED: return SEQUENCED;
-      case INTERNAL_ABSTRACT: return ABSTRACT;
-      case INTERNAL_ANY_ATTRIBUTE: return ANY_ATTRIBUTE;
-    }
-    return super.internalConvertIndex(internalIndex);
-  }
-
-
-  /**
-   * The cached value of the '{@link #getBaseType() <em>Base Type</em>}' reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getBaseType()
-   * @generated
-   * @ordered
-   */
-  
-  protected List baseType = null;
-  
-  /**
-   * The cached value of the '{@link #getProperty() <em>Property</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getProperty()
-   * @generated
-   * @ordered
-   */
-  
-  protected List property = null;
-  
-  /**
-   * The cached value of the '{@link #getAliasName() <em>Alias Name</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAliasName()
-   * @generated
-   * @ordered
-   */
-  
-  protected List aliasName = null;
-  
-  /**
-   * The cached value of the '{@link #getAny() <em>Any</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAny()
-   * @generated
-   * @ordered
-   */
-  
-  protected Sequence any = null;
-  
-  /**
-   * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected static final String NAME_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getName()
-   * @generated
-   * @ordered
-   */
-  protected String name = NAME_DEFAULT_;
-
-  /**
-   * This is true if the Name attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean name_set_ = false;
-
-  /**
-   * The default value of the '{@link #getUri() <em>Uri</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getUri()
-   * @generated
-   * @ordered
-   */
-  protected static final String URI_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getUri() <em>Uri</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getUri()
-   * @generated
-   * @ordered
-   */
-  protected String uri = URI_DEFAULT_;
-
-  /**
-   * This is true if the Uri attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean uri_set_ = false;
-
-  /**
-   * The default value of the '{@link #isDataType() <em>Data Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isDataType()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean DATA_TYPE_DEFAULT_ = false;
-
-  /**
-   * The cached value of the '{@link #isDataType() <em>Data Type</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isDataType()
-   * @generated
-   * @ordered
-   */
-  protected boolean dataType = DATA_TYPE_DEFAULT_;
-
-  /**
-   * This is true if the Data Type attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean dataType_set_ = false;
-
-  /**
-   * The default value of the '{@link #isOpen() <em>Open</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isOpen()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean OPEN_DEFAULT_ = false;
-
-  /**
-   * The cached value of the '{@link #isOpen() <em>Open</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isOpen()
-   * @generated
-   * @ordered
-   */
-  protected boolean open = OPEN_DEFAULT_;
-
-  /**
-   * This is true if the Open attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean open_set_ = false;
-
-  /**
-   * The default value of the '{@link #isSequenced() <em>Sequenced</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSequenced()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean SEQUENCED_DEFAULT_ = false;
-
-  /**
-   * The cached value of the '{@link #isSequenced() <em>Sequenced</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSequenced()
-   * @generated
-   * @ordered
-   */
-  protected boolean sequenced = SEQUENCED_DEFAULT_;
-
-  /**
-   * This is true if the Sequenced attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean sequenced_set_ = false;
-
-  /**
-   * The default value of the '{@link #isAbstract() <em>Abstract</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isAbstract()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean ABSTRACT_DEFAULT_ = false;
-
-  /**
-   * The cached value of the '{@link #isAbstract() <em>Abstract</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isAbstract()
-   * @generated
-   * @ordered
-   */
-  protected boolean abstract_ = ABSTRACT_DEFAULT_;
-
-  /**
-   * This is true if the Abstract attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean abstract_set_ = false;
-
-  /**
-   * The cached value of the '{@link #getAnyAttribute() <em>Any Attribute</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAnyAttribute()
-   * @generated
-   * @ordered
-   */
-  
-  protected Sequence anyAttribute = null;
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public TypeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public commonj.sdo.Type getStaticType()
-  {
-    return ((ModelFactoryImpl)ModelFactory.INSTANCE).getType();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getBaseType()
-  {
-    if (baseType == null)
-    {
-      baseType = createPropertyList(ListKind.NONCONTAINMENT_RESOLVING, Type.class, BASE_TYPE, 0);
-    }
-    return baseType;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getProperty()
-  {
-    if (property == null)
-    {
-      property = createPropertyList(ListKind.CONTAINMENT, Property.class, PROPERTY, 0);
-    }
-    return property;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getAliasName()
-  {
-    if (aliasName == null)
-    {
-      aliasName = createPropertyList(ListKind.DATATYPE, String.class, ALIAS_NAME, 0);
-    }
-    return aliasName;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Sequence getAny()
-  {
-    if (any == null)
-    {
-      any = createSequence(INTERNAL_ANY);
-    }
-    return any;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getName()
-  {
-    return name;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setName(String newName)
-  {
-    String oldName = name;
-    name = newName;
-    boolean oldName_set_ = name_set_;
-    name_set_ = true;
-    if (isNotifying())
-      notify(ChangeKind.SET, INTERNAL_NAME, oldName, name, !oldName_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetName()
-  {
-    String oldName = name;
-    boolean oldName_set_ = name_set_;
-    name = NAME_DEFAULT_;
-    name_set_ = false;
-    if (isNotifying())
-      notify(ChangeKind.UNSET, INTERNAL_NAME, oldName, NAME_DEFAULT_, oldName_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetName()
-  {
-    return name_set_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getUri()
-  {
-    return uri;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setUri(String newUri)
-  {
-    String oldUri = uri;
-    uri = newUri;
-    boolean oldUri_set_ = uri_set_;
-    uri_set_ = true;
-    if (isNotifying())
-      notify(ChangeKind.SET, INTERNAL_URI, oldUri, uri, !oldUri_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetUri()
-  {
-    String oldUri = uri;
-    boolean oldUri_set_ = uri_set_;
-    uri = URI_DEFAULT_;
-    uri_set_ = false;
-    if (isNotifying())
-      notify(ChangeKind.UNSET, INTERNAL_URI, oldUri, URI_DEFAULT_, oldUri_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetUri()
-  {
-    return uri_set_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isDataType()
-  {
-    return dataType;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setDataType(boolean newDataType)
-  {
-    boolean oldDataType = dataType;
-    dataType = newDataType;
-    boolean oldDataType_set_ = dataType_set_;
-    dataType_set_ = true;
-    if (isNotifying())
-      notify(ChangeKind.SET, INTERNAL_DATA_TYPE, oldDataType, dataType, !oldDataType_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetDataType()
-  {
-    boolean oldDataType = dataType;
-    boolean oldDataType_set_ = dataType_set_;
-    dataType = DATA_TYPE_DEFAULT_;
-    dataType_set_ = false;
-    if (isNotifying())
-      notify(ChangeKind.UNSET, INTERNAL_DATA_TYPE, oldDataType, DATA_TYPE_DEFAULT_, oldDataType_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetDataType()
-  {
-    return dataType_set_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isOpen()
-  {
-    return open;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setOpen(boolean newOpen)
-  {
-    boolean oldOpen = open;
-    open = newOpen;
-    boolean oldOpen_set_ = open_set_;
-    open_set_ = true;
-    if (isNotifying())
-      notify(ChangeKind.SET, INTERNAL_OPEN, oldOpen, open, !oldOpen_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetOpen()
-  {
-    boolean oldOpen = open;
-    boolean oldOpen_set_ = open_set_;
-    open = OPEN_DEFAULT_;
-    open_set_ = false;
-    if (isNotifying())
-      notify(ChangeKind.UNSET, INTERNAL_OPEN, oldOpen, OPEN_DEFAULT_, oldOpen_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetOpen()
-  {
-    return open_set_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSequenced()
-  {
-    return sequenced;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setSequenced(boolean newSequenced)
-  {
-    boolean oldSequenced = sequenced;
-    sequenced = newSequenced;
-    boolean oldSequenced_set_ = sequenced_set_;
-    sequenced_set_ = true;
-    if (isNotifying())
-      notify(ChangeKind.SET, INTERNAL_SEQUENCED, oldSequenced, sequenced, !oldSequenced_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetSequenced()
-  {
-    boolean oldSequenced = sequenced;
-    boolean oldSequenced_set_ = sequenced_set_;
-    sequenced = SEQUENCED_DEFAULT_;
-    sequenced_set_ = false;
-    if (isNotifying())
-      notify(ChangeKind.UNSET, INTERNAL_SEQUENCED, oldSequenced, SEQUENCED_DEFAULT_, oldSequenced_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetSequenced()
-  {
-    return sequenced_set_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isAbstract()
-  {
-    return abstract_;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setAbstract(boolean newAbstract)
-  {
-    boolean oldAbstract = abstract_;
-    abstract_ = newAbstract;
-    boolean oldAbstract_set_ = abstract_set_;
-    abstract_set_ = true;
-    if (isNotifying())
-      notify(ChangeKind.SET, INTERNAL_ABSTRACT, oldAbstract, abstract_, !oldAbstract_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetAbstract()
-  {
-    boolean oldAbstract = abstract_;
-    boolean oldAbstract_set_ = abstract_set_;
-    abstract_ = ABSTRACT_DEFAULT_;
-    abstract_set_ = false;
-    if (isNotifying())
-      notify(ChangeKind.UNSET, INTERNAL_ABSTRACT, oldAbstract, ABSTRACT_DEFAULT_, oldAbstract_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetAbstract()
-  {
-    return abstract_set_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Sequence getAnyAttribute()
-  {
-    if (anyAttribute == null)
-    {
-      anyAttribute = createSequence(INTERNAL_ANY_ATTRIBUTE);
-    }
-    return anyAttribute;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeContext inverseRemove(Object otherEnd, int propertyIndex, ChangeContext changeContext)
-  {
-    switch (propertyIndex)
-    {
-      case PROPERTY:
-        return removeFromList(getProperty(), otherEnd, changeContext);
-      case ANY:
-        return removeFromSequence(getAny(), otherEnd, changeContext);
-      case ANY_ATTRIBUTE:
-        return removeFromSequence(getAnyAttribute(), otherEnd, changeContext);
-    }
-    return super.inverseRemove(otherEnd, propertyIndex, changeContext);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object get(int propertyIndex, boolean resolve)
-  {
-    switch (propertyIndex)
-    {
-      case BASE_TYPE:
-        return getBaseType();
-      case PROPERTY:
-        return getProperty();
-      case ALIAS_NAME:
-        return getAliasName();
-      case ANY:
-        // XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view
-        //if (coreType) 
-        return getAny();
-      case NAME:
-        return getName();
-      case URI:
-        return getUri();
-      case DATA_TYPE:
-        return isDataType() ? Boolean.TRUE : Boolean.FALSE;
-      case OPEN:
-        return isOpen() ? Boolean.TRUE : Boolean.FALSE;
-      case SEQUENCED:
-        return isSequenced() ? Boolean.TRUE : Boolean.FALSE;
-      case ABSTRACT:
-        return isAbstract() ? Boolean.TRUE : Boolean.FALSE;
-      case ANY_ATTRIBUTE:
-        // XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view
-        //if (coreType) 
-        return getAnyAttribute();
-    }
-    return super.get(propertyIndex, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void set(int propertyIndex, Object newValue)
-  {
-    switch (propertyIndex)
-    {
-      case BASE_TYPE:
-        getBaseType().clear();
-        getBaseType().addAll((Collection)newValue);
-        return;
-      case PROPERTY:
-        getProperty().clear();
-        getProperty().addAll((Collection)newValue);
-        return;
-      case ALIAS_NAME:
-        getAliasName().clear();
-        getAliasName().addAll((Collection)newValue);
-        return;
-      case ANY:
-      	setSequence(getAny(), newValue);
-        return;
-      case NAME:
-        setName((String)newValue);
-        return;
-      case URI:
-        setUri((String)newValue);
-        return;
-      case DATA_TYPE:
-        setDataType(((Boolean)newValue).booleanValue());
-        return;
-      case OPEN:
-        setOpen(((Boolean)newValue).booleanValue());
-        return;
-      case SEQUENCED:
-        setSequenced(((Boolean)newValue).booleanValue());
-        return;
-      case ABSTRACT:
-        setAbstract(((Boolean)newValue).booleanValue());
-        return;
-      case ANY_ATTRIBUTE:
-      	setSequence(getAnyAttribute(), newValue);
-        return;
-    }
-    super.set(propertyIndex, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unset(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case BASE_TYPE:
-        getBaseType().clear();
-        return;
-      case PROPERTY:
-        getProperty().clear();
-        return;
-      case ALIAS_NAME:
-        getAliasName().clear();
-        return;
-      case ANY:
-        unsetSequence(getAny());
-        return;
-      case NAME:
-        unsetName();
-        return;
-      case URI:
-        unsetUri();
-        return;
-      case DATA_TYPE:
-        unsetDataType();
-        return;
-      case OPEN:
-        unsetOpen();
-        return;
-      case SEQUENCED:
-        unsetSequenced();
-        return;
-      case ABSTRACT:
-        unsetAbstract();
-        return;
-      case ANY_ATTRIBUTE:
-        unsetSequence(getAnyAttribute());
-        return;
-    }
-    super.unset(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case BASE_TYPE:
-        return baseType != null && !baseType.isEmpty();
-      case PROPERTY:
-        return property != null && !property.isEmpty();
-      case ALIAS_NAME:
-        return aliasName != null && !aliasName.isEmpty();
-      case ANY:
-        return any != null && !isSequenceEmpty(getAny());
-      case NAME:
-        return isSetName();
-      case URI:
-        return isSetUri();
-      case DATA_TYPE:
-        return isSetDataType();
-      case OPEN:
-        return isSetOpen();
-      case SEQUENCED:
-        return isSetSequenced();
-      case ABSTRACT:
-        return isSetAbstract();
-      case ANY_ATTRIBUTE:
-        return anyAttribute != null && !isSequenceEmpty(getAnyAttribute());
-    }
-    return super.isSet(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (isProxy(this)) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (aliasName: ");
-    result.append(aliasName);
-    result.append(", any: ");
-    result.append(any);
-    result.append(", name: ");
-    if (name_set_) result.append(name); else result.append("<unset>");
-    result.append(", uri: ");
-    if (uri_set_) result.append(uri); else result.append("<unset>");
-    result.append(", dataType: ");
-    if (dataType_set_) result.append(dataType); else result.append("<unset>");
-    result.append(", open: ");
-    if (open_set_) result.append(open); else result.append("<unset>");
-    result.append(", sequenced: ");
-    if (sequenced_set_) result.append(sequenced); else result.append("<unset>");
-    result.append(", abstract: ");
-    if (abstract_set_) result.append(abstract_); else result.append("<unset>");
-    result.append(", anyAttribute: ");
-    result.append(anyAttribute);
-    result.append(')');
-    return result.toString();
-  }
-
-EStructuralFeature javaClassFeature = null;
-
-public String getInstanceClassName()
-  {
-    if (javaClassFeature == null)
-    {
-      //FB TODO figure out what helper to use
-      javaClassFeature = (EStructuralFeature)TypeHelper.INSTANCE.getOpenContentProperty("commonj.sdo/java", "javaClass");
-    }
-
-    Sequence anyAttribute = getAnyAttribute();
-    int count = anyAttribute.size();
-    for (int i = 0; i < count; i++)
-    {
-      EStructuralFeature eFeature = (EStructuralFeature)anyAttribute.getProperty(i);
-      if (eFeature == javaClassFeature)
-      {
-        return (String)anyAttribute.getValue(i);
-      }
-    }
-    return null; 
-  }
-  
-} //TypeImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java
deleted file mode 100644
index 80945b289a..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/TypesImpl.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model.impl;
-
-import commonj.sdo.Type;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-import org.apache.tuscany.sdo.model.ModelFactory;
-import org.apache.tuscany.sdo.model.Types;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Types</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.TypesImpl#getType_ <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TypesImpl extends DataObjectBase implements Types
-{
-
-  public final static int TYPE = 0;
-
-  public final static int SDO_PROPERTY_COUNT = 1;
-
-  public final static int EXTENDED_PROPERTY_COUNT = 0;
-
-
-  /**
-   * The internal feature id for the '<em><b>Type</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_TYPE = 0;
-
-  /**
-   * The number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public final static int INTERNAL_PROPERTY_COUNT = 1;
-
-  protected int internalConvertIndex(int internalIndex)
-  {
-    switch (internalIndex)
-    {
-      case INTERNAL_TYPE: return TYPE;
-    }
-    return super.internalConvertIndex(internalIndex);
-  }
-
-
-  /**
-   * The cached value of the '{@link #getType_() <em>Type</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getType_()
-   * @generated
-   * @ordered
-   */
-  
-  protected List type = null;
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public TypesImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type getStaticType()
-  {
-    return ((ModelFactoryImpl)ModelFactory.INSTANCE).getTypes();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getType_()
-  {
-    if (type == null)
-    {
-      type = createPropertyList(ListKind.CONTAINMENT, org.apache.tuscany.sdo.model.Type.class, TYPE, 0);
-    }
-    return type;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeContext inverseRemove(Object otherEnd, int propertyIndex, ChangeContext changeContext)
-  {
-    switch (propertyIndex)
-    {
-      case TYPE:
-        return removeFromList(getType_(), otherEnd, changeContext);
-    }
-    return super.inverseRemove(otherEnd, propertyIndex, changeContext);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object get(int propertyIndex, boolean resolve)
-  {
-    switch (propertyIndex)
-    {
-      case TYPE:
-        return getType_();
-    }
-    return super.get(propertyIndex, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void set(int propertyIndex, Object newValue)
-  {
-    switch (propertyIndex)
-    {
-      case TYPE:
-        getType_().clear();
-        getType_().addAll((Collection)newValue);
-        return;
-    }
-    super.set(propertyIndex, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unset(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case TYPE:
-        getType_().clear();
-        return;
-    }
-    super.unset(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case TYPE:
-        return type != null && !type.isEmpty();
-    }
-    return super.isSet(propertyIndex);
-  }
-  
-  public List getTypeList()
-  {
-    return getType_();
-  }
-
-} //TypesImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java
deleted file mode 100644
index 5d0777dd1c..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/impl/XSDTypeImpl.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model.impl;
-
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-import org.apache.tuscany.sdo.model.ModelFactory;
-import org.apache.tuscany.sdo.model.XSDType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>XSD Type</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.impl.XSDTypeImpl#getAny <em>Any</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class XSDTypeImpl extends DataObjectBase implements XSDType
-{
-
-  public final static int ANY = -1;
-
-  public final static int SDO_PROPERTY_COUNT = 0;
-
-  public final static int EXTENDED_PROPERTY_COUNT = -1;
-
-
-  /**
-   * The internal feature id for the '<em><b>Any</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_ANY = 0;
-
-  /**
-   * The number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public final static int INTERNAL_PROPERTY_COUNT = 1;
-
-  protected int internalConvertIndex(int internalIndex)
-  {
-    switch (internalIndex)
-    {
-      case INTERNAL_ANY: return ANY;
-    }
-    return super.internalConvertIndex(internalIndex);
-  }
-
-
-  /**
-   * The cached value of the '{@link #getAny() <em>Any</em>}' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getAny()
-   * @generated
-   * @ordered
-   */
-  
-  protected Sequence any = null;
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XSDTypeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type getStaticType()
-  {
-    return ((ModelFactoryImpl)ModelFactory.INSTANCE).getXSDType();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Sequence getAny()
-  {
-    if (any == null)
-    {
-      any = createSequence(INTERNAL_ANY);
-    }
-    return any;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeContext inverseRemove(Object otherEnd, int propertyIndex, ChangeContext changeContext)
-  {
-    switch (propertyIndex)
-    {
-      case ANY:
-        return removeFromSequence(getAny(), otherEnd, changeContext);
-    }
-    return super.inverseRemove(otherEnd, propertyIndex, changeContext);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object get(int propertyIndex, boolean resolve)
-  {
-    switch (propertyIndex)
-    {
-      case ANY:
-        // XXX query introduce coreType as an argument? -- semantic = if true -- coreType - return the core EMF object if value is a non-EMF wrapper/view
-        //if (coreType) 
-        return getAny();
-    }
-    return super.get(propertyIndex, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void set(int propertyIndex, Object newValue)
-  {
-    switch (propertyIndex)
-    {
-      case ANY:
-      	setSequence(getAny(), newValue);
-        return;
-    }
-    super.set(propertyIndex, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unset(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case ANY:
-        unsetSequence(getAny());
-        return;
-    }
-    super.unset(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case ANY:
-        return any != null && !isSequenceEmpty(getAny());
-    }
-    return super.isSet(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (isProxy(this)) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (any: ");
-    result.append(any);
-    result.append(')');
-    return result.toString();
-  }
-
-} //XSDTypeImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/internal/InternalFactory.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/internal/InternalFactory.java
deleted file mode 100644
index 061d082b1d..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/internal/InternalFactory.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model.internal;
-
-import commonj.sdo.helper.HelperContext;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @generated
- */
-public interface InternalFactory
-{
-
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  InternalFactory INSTANCE = org.apache.tuscany.sdo.model.internal.impl.InternalFactoryImpl.init();
-
-  /**
-   * Registers the types supported by this Factory within the supplied scope.argument
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param scope an instance of HelperContext used to manage the scoping of types.
-   * @generated
-   */
-  public void register(HelperContext scope);
-   
-} //InternalFactory
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/internal/impl/InternalFactoryImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/internal/impl/InternalFactoryImpl.java
deleted file mode 100644
index 06d002ea74..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/internal/impl/InternalFactoryImpl.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model.internal.impl;
-
-import commonj.sdo.helper.HelperContext;
-import org.apache.tuscany.sdo.helper.TypeHelperImpl;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-
-import org.apache.tuscany.sdo.impl.FactoryBase;
-
-import org.apache.tuscany.sdo.model.internal.*;
-import org.eclipse.emf.ecore.xml.type.XMLTypeFactory;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the commonj.sdo.internal model factory.
- * This model is generated from sdoInternal.xsd, in the tuscany-sdo-impl project.
- * Until the SDO code generator supports regen/merge, follow the following steps to regenerate this model:
- *   1. Regenerate the model into a temporary directory:
- *         XSD2JavaGenerator -generateBuiltIn http://www.apache.org/tuscany/commonj.sdo.internal -targetDirectory <temp-dir> -javaPackage org.apache.tuscany.sdo.model.internal <tuscany-sdo-impl-dir>/src/main/resources/xml/sdoInternal.xsd
- *   2. Delete all the createXXXFromString() and convertXXXToString() methods in the newly generated InternalFactoryImpl and
- *      replace them with the ones from this file (resolve any missing imports).
- *   3. Comment out all simple depedencies (SDOUtil.registerStaticTypes calls) in the init() method.
- *   4. Make sure the top of each generated file contains the ASF License.      
- *   5. Move this JavaDoc comment into the newly generated ModelFactoryImpl class.
- * <!-- end-user-doc -->
- * @generated
- */
-public class InternalFactoryImpl extends FactoryBase implements InternalFactory
-{
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String NAMESPACE_URI = "http://www.apache.org/tuscany/commonj.sdo.internal";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String NAMESPACE_PREFIX = "internal";
-
-  /**
-   * The version of the generator pattern used to generate this class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String PATTERN_VERSION = "1.2";
-  
-  public static final int BASE64_BYTES = 1;	
-  public static final int QNAME = 2;
-  
-  /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public InternalFactoryImpl()
-  {
-    super(NAMESPACE_URI, NAMESPACE_PREFIX, "org.apache.tuscany.sdo.model.internal");
-  }
-
-  /**
-   * Registers the Factory instance so that it is available within the supplied scope.
-   * @argument scope a HelperContext instance that will make the types supported by this Factory available.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void register(HelperContext scope) 
-  {
-    if(scope == null) {
-      throw new IllegalArgumentException("Scope can not be null");
-    }
-    
-    //Register dependent packages with provided scope
-    
-    // Initialize this package   
-    TypeHelperImpl th = (TypeHelperImpl)scope.getTypeHelper();
-    th.getExtendedMetaData().putPackage(NAMESPACE_URI, this);
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public DataObject create(int typeNumber)
-  {
-    switch (typeNumber)
-    {
-      default:
-        return super.create(typeNumber);
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object createFromString(int typeNumber, String initialValue)
-  {
-    switch (typeNumber)
-    {
-      case BASE64_BYTES:
-        return createBase64BytesFromString(initialValue);
-      case QNAME:
-        return createQNameFromString(initialValue);
-      default:
-        throw new IllegalArgumentException("The type number '" + typeNumber + "' is not a valid datatype");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertToString(int typeNumber, Object instanceValue)
-  {
-    switch (typeNumber)
-    {
-      case BASE64_BYTES:
-        return convertBase64BytesToString(instanceValue);
-      case QNAME:
-        return convertQNameToString(instanceValue);
-      default:
-        throw new IllegalArgumentException("The type number '" + typeNumber + "' is not a valid datatype");
-    }
-  }
-  
-  // Following creates and initializes SDO metadata for the supported types.		
-  protected Type base64BytesType = null;
-
-  public Type getBase64Bytes()
-  {
-    return base64BytesType;
-  }
-    
-  protected Type qNameType = null;
-
-  public Type getQName()
-  {
-    return qNameType;
-  }
-  
-
-  private static InternalFactoryImpl instance = null; 
-  public static InternalFactoryImpl init()
-  {
-    if (instance != null ) return instance;
-    instance = new InternalFactoryImpl();
-
-    // Initialize dependent packages
-    
-    // Create package meta-data objects
-    instance.createMetaData();
-
-    // Initialize created meta-data
-    instance.initializeMetaData();
-    
-    // Mark meta-data to indicate it can't be changed
-    //theInternalFactoryImpl.freeze(); //FB do we need to freeze / should we freeze ????
-
-    return instance;
-  }
-  
-  private boolean isCreated = false;
-
-  public void createMetaData()
-  {
-    if (isCreated) return;
-    isCreated = true;
-
-    // Create data types
-    base64BytesType = createType(true, BASE64_BYTES );
-    qNameType = createType(true, QNAME );
-  }
-  
-  private boolean isInitialized = false;
-
-  public void initializeMetaData()
-  {
-    if (isInitialized) return;
-    isInitialized = true;
-    Property property = null;
-
-    // Add supertypes to types
-
-    // Initialize types and properties
-    // Initialize data types
-    initializeType(base64BytesType, byte[].class, "Base64Bytes", true, false);
-    setInstanceProperty (base64BytesType, "commonj.sdo/java", "instanceClass", "byte[]");
-
-    initializeType(qNameType, String.class, "QName", true, false);
-    setInstanceProperty (qNameType, "commonj.sdo/java", "instanceClass", "java.lang.String");
-
-    createXSDMetaData();
-  }
-    
-  protected void createXSDMetaData()
-  {
-    super.initXSD();
-    
-    Property property = null;
-    
-
-    addXSDMapping
-      (base64BytesType,
-       new String[] 
-       {
-       "name", "Base64Bytes"
-       });
-
-    addXSDMapping
-      (qNameType,
-       new String[] 
-       {
-       "name", "QName"
-       });
-
-  }
-    
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public byte[] createBase64BytesFromString(String initialValue)
-  {
-      return XMLTypeFactory.eINSTANCE.createBase64Binary(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertBase64BytesToString(Object instanceValue)
-  {
-      if (instanceValue instanceof byte[]) {
-          return XMLTypeFactory.eINSTANCE.convertBase64Binary((byte[])instanceValue);
-        } else {
-          return XMLTypeFactory.eINSTANCE.convertBase64Binary(instanceValue.toString().getBytes());
-      }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String createQNameFromString(String initialValue)
-  {
-    return (String)super.createFromString(QNAME, initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertQNameToString(Object instanceValue)
-  {
-    return super.convertToString(QNAME, instanceValue);
-  }
-
-} //InternalFactoryImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java
deleted file mode 100644
index 50be023db5..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model.java;
-
-import commonj.sdo.helper.HelperContext;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @generated
- */
-public interface JavaFactory
-{
-
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  JavaFactory INSTANCE = org.apache.tuscany.sdo.model.java.impl.JavaFactoryImpl.init();
-
-  /**
-   * Returns a new object of class '<em>Info</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Info</em>'.
-   * @generated
-   */
-  JavaInfo createJavaInfo();
-
-  /**
-   * Registers the types supported by this Factory within the supplied scope.argument
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param scope an instance of HelperContext used to manage the scoping of types.
-   * @generated
-   */
-  public void register(HelperContext scope);
-   
-} //JavaFactory
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java
deleted file mode 100644
index b5eabb0f4a..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/JavaInfo.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model.java;
-
-import java.io.Serializable;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Info</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.java.JavaInfo#getJavaClass <em>Java Class</em>}</li>
- * </ul>
- * </p>
- *
- * @extends Serializable
- * @generated
- */
-public interface JavaInfo extends Serializable
-{
-  /**
-   * Returns the value of the '<em><b>Java Class</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Java Class</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Java Class</em>' attribute.
-   * @see #isSetJavaClass()
-   * @see #unsetJavaClass()
-   * @see #setJavaClass(String)
-   * @generated
-   */
-  String getJavaClass();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.java.JavaInfo#getJavaClass <em>Java Class</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Java Class</em>' attribute.
-   * @see #isSetJavaClass()
-   * @see #unsetJavaClass()
-   * @see #getJavaClass()
-   * @generated
-   */
-  void setJavaClass(String value);
-
-  /**
-   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.java.JavaInfo#getJavaClass <em>Java Class</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetJavaClass()
-   * @see #getJavaClass()
-   * @see #setJavaClass(String)
-   * @generated
-   */
-  void unsetJavaClass();
-
-  /**
-   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.java.JavaInfo#getJavaClass <em>Java Class</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Java Class</em>' attribute is set.
-   * @see #unsetJavaClass()
-   * @see #getJavaClass()
-   * @see #setJavaClass(String)
-   * @generated
-   */
-  boolean isSetJavaClass();
-
-} // JavaInfo
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java
deleted file mode 100644
index 515311f7ff..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaFactoryImpl.java
+++ /dev/null
@@ -1,659 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model.java.impl;
-
-import commonj.sdo.helper.HelperContext;
-import org.apache.tuscany.sdo.helper.TypeHelperImpl;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-
-import org.apache.tuscany.sdo.impl.FactoryBase;
-
-import org.apache.tuscany.sdo.model.ModelFactory;
-
-import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
-
-import org.apache.tuscany.sdo.model.java.*;
-import org.eclipse.emf.ecore.xml.type.XMLTypeFactory;
-import org.eclipse.emf.ecore.xml.type.util.XMLTypeUtil;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the commonj.sdo/java model factory.
- * This model is generated from sdoJava.xsd, in the sdo-api project.
- * Until the SDO code generator supports name conflicts and regen/merge, follow the following steps to regenerate this model:
- *   1. Regenerate the model into a temporary directory:
- *         XSD2JavaGenerator -generateBuiltIn commonj.sdo/java -targetDirectory <temp-dir> -javaPackage org.apache.tuscany.sdo.model.java <sdo-api-dir>/src/main/resources/xml/sdoJava.xsd
- *   2. Delete all the createXXXFromString() and convertXXXToString() methods in the newly generated JavaFactoryImpl and
- *      replace them with the ones from this file.
- *   3. Make sure the top of each generated file contains the ASF License.      
- *   4. Move this JavaDoc comment into the newly generated JavaFactoryImpl class.
- * <!-- end-user-doc -->
- * @generated
- */
-
-public class JavaFactoryImpl extends FactoryBase implements JavaFactory
-{
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String NAMESPACE_URI = "commonj.sdo/java";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String NAMESPACE_PREFIX = "sdoJava";
-
-  /**
-   * The version of the generator pattern used to generate this class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String PATTERN_VERSION = "1.2";
-  
-  public static final int JAVA_INFO = 1;	
-  public static final int BOOLEAN_OBJECT = 2;	
-  public static final int BYTE_OBJECT = 3;	
-  public static final int CHARACTER_OBJECT = 4;	
-  public static final int DOUBLE_OBJECT = 5;	
-  public static final int FLOAT_OBJECT = 6;	
-  public static final int INT_OBJECT = 7;	
-  public static final int LONG_OBJECT = 8;	
-  public static final int SHORT_OBJECT = 9;
-  
-  /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public JavaFactoryImpl()
-  {
-    super(NAMESPACE_URI, NAMESPACE_PREFIX, "org.apache.tuscany.sdo.model.java");
-  }
-
-  /**
-   * Registers the Factory instance so that it is available within the supplied scope.
-   * @argument scope a HelperContext instance that will make the types supported by this Factory available.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void register(HelperContext scope) 
-  {
-    if(scope == null) {
-      throw new IllegalArgumentException("Scope can not be null");
-    }
-    
-    //Register dependent packages with provided scope
-    ModelFactory.INSTANCE.register(scope);
-    
-    // Initialize this package   
-    TypeHelperImpl th = (TypeHelperImpl)scope.getTypeHelper();
-    th.getExtendedMetaData().putPackage(NAMESPACE_URI, this);
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public DataObject create(int typeNumber)
-  {
-    switch (typeNumber)
-    {
-      case JAVA_INFO: return (DataObject)createJavaInfo();
-      default:
-        return super.create(typeNumber);
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object createFromString(int typeNumber, String initialValue)
-  {
-    switch (typeNumber)
-    {
-      case BOOLEAN_OBJECT:
-        return createBooleanObjectFromString(initialValue);
-      case BYTE_OBJECT:
-        return createByteObjectFromString(initialValue);
-      case CHARACTER_OBJECT:
-        return createCharacterObjectFromString(initialValue);
-      case DOUBLE_OBJECT:
-        return createDoubleObjectFromString(initialValue);
-      case FLOAT_OBJECT:
-        return createFloatObjectFromString(initialValue);
-      case INT_OBJECT:
-        return createIntObjectFromString(initialValue);
-      case LONG_OBJECT:
-        return createLongObjectFromString(initialValue);
-      case SHORT_OBJECT:
-        return createShortObjectFromString(initialValue);
-      default:
-        throw new IllegalArgumentException("The type number '" + typeNumber + "' is not a valid datatype");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String convertToString(int typeNumber, Object instanceValue)
-  {
-    switch (typeNumber)
-    {
-      case BOOLEAN_OBJECT:
-        return convertBooleanObjectToString(instanceValue);
-      case BYTE_OBJECT:
-        return convertByteObjectToString(instanceValue);
-      case CHARACTER_OBJECT:
-        return convertCharacterObjectToString(instanceValue);
-      case DOUBLE_OBJECT:
-        return convertDoubleObjectToString(instanceValue);
-      case FLOAT_OBJECT:
-        return convertFloatObjectToString(instanceValue);
-      case INT_OBJECT:
-        return convertIntObjectToString(instanceValue);
-      case LONG_OBJECT:
-        return convertLongObjectToString(instanceValue);
-      case SHORT_OBJECT:
-        return convertShortObjectToString(instanceValue);
-      default:
-        throw new IllegalArgumentException("The type number '" + typeNumber + "' is not a valid datatype");
-    }
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public JavaInfo createJavaInfo()
-  {
-    JavaInfoImpl javaInfo = new JavaInfoImpl();
-    return javaInfo;
-  }
-  
-  // Following creates and initializes SDO metadata for the supported types.			
-  protected Type javaInfoType = null;
-
-  public Type getJavaInfo()
-  {
-    return javaInfoType;
-  }
-    
-  protected Type booleanObjectType = null;
-
-  public Type getBooleanObject()
-  {
-    return booleanObjectType;
-  }
-    
-  protected Type byteObjectType = null;
-
-  public Type getByteObject()
-  {
-    return byteObjectType;
-  }
-    
-  protected Type characterObjectType = null;
-
-  public Type getCharacterObject()
-  {
-    return characterObjectType;
-  }
-    
-  protected Type doubleObjectType = null;
-
-  public Type getDoubleObject()
-  {
-    return doubleObjectType;
-  }
-    
-  protected Type floatObjectType = null;
-
-  public Type getFloatObject()
-  {
-    return floatObjectType;
-  }
-    
-  protected Type intObjectType = null;
-
-  public Type getIntObject()
-  {
-    return intObjectType;
-  }
-    
-  protected Type longObjectType = null;
-
-  public Type getLongObject()
-  {
-    return longObjectType;
-  }
-    
-  protected Type shortObjectType = null;
-
-  public Type getShortObject()
-  {
-    return shortObjectType;
-  }
-  
-
-  private static JavaFactoryImpl instance = null; 
-  public static JavaFactoryImpl init()
-  {
-    if (instance != null ) return instance;
-    instance = new JavaFactoryImpl();
-
-    // Initialize dependent packages
-    ModelFactory ModelFactoryInstance = ModelFactory.INSTANCE;
-    
-    // Create package meta-data objects
-    instance.createMetaData();
-
-    // Initialize created meta-data
-    instance.initializeMetaData();
-    
-    // Mark meta-data to indicate it can't be changed
-    //theJavaFactoryImpl.freeze(); //FB do we need to freeze / should we freeze ????
-
-    return instance;
-  }
-  
-  private boolean isCreated = false;
-
-  public void createMetaData()
-  {
-    if (isCreated) return;
-    isCreated = true;	
-
-    // Create types and their properties
-    javaInfoType = createType(false, JAVA_INFO);
-    createProperty(true, javaInfoType,JavaInfoImpl.INTERNAL_JAVA_CLASS); 
-
-    // Create data types
-    booleanObjectType = createType(true, BOOLEAN_OBJECT );
-    byteObjectType = createType(true, BYTE_OBJECT );
-    characterObjectType = createType(true, CHARACTER_OBJECT );
-    doubleObjectType = createType(true, DOUBLE_OBJECT );
-    floatObjectType = createType(true, FLOAT_OBJECT );
-    intObjectType = createType(true, INT_OBJECT );
-    longObjectType = createType(true, LONG_OBJECT );
-    shortObjectType = createType(true, SHORT_OBJECT );
-  }
-  
-  private boolean isInitialized = false;
-
-  public void initializeMetaData()
-  {
-    if (isInitialized) return;
-    isInitialized = true;
-
-    // Obtain other dependent packages
-    ModelFactoryImpl theModelPackageImpl = (ModelFactoryImpl)ModelFactory.INSTANCE;
-    Property property = null;
-
-    // Add supertypes to types
-
-    // Initialize types and properties
-    initializeType(javaInfoType, JavaInfo.class, "JavaInfo", false);
-    property = getLocalProperty(javaInfoType, 0);
-    initializeProperty(property, theModelPackageImpl.getString(), "javaClass", null, 0, 1, JavaInfo.class, false, true, false);
-
-    // Initialize data types
-    initializeType(booleanObjectType, Boolean.class, "BooleanObject", true, false);
-    setInstanceProperty (booleanObjectType, "commonj.sdo/java", "instanceClass", "java.lang.Boolean");
-
-    initializeType(byteObjectType, Byte.class, "ByteObject", true, false);
-    setInstanceProperty (byteObjectType, "commonj.sdo/java", "instanceClass", "java.lang.Byte");
-
-    initializeType(characterObjectType, Character.class, "CharacterObject", true, false);
-    setInstanceProperty (characterObjectType, "commonj.sdo/java", "instanceClass", "java.lang.Character");
-
-    initializeType(doubleObjectType, Double.class, "DoubleObject", true, false);
-    setInstanceProperty (doubleObjectType, "commonj.sdo/java", "instanceClass", "java.lang.Double");
-
-    initializeType(floatObjectType, Float.class, "FloatObject", true, false);
-    setInstanceProperty (floatObjectType, "commonj.sdo/java", "instanceClass", "java.lang.Float");
-
-    initializeType(intObjectType, Integer.class, "IntObject", true, false);
-    setInstanceProperty (intObjectType, "commonj.sdo/java", "instanceClass", "java.lang.Integer");
-
-    initializeType(longObjectType, Long.class, "LongObject", true, false);
-    setInstanceProperty (longObjectType, "commonj.sdo/java", "instanceClass", "java.lang.Long");
-
-    initializeType(shortObjectType, Short.class, "ShortObject", true, false);
-    setInstanceProperty (shortObjectType, "commonj.sdo/java", "instanceClass", "java.lang.Short");
-
-    createXSDMetaData(theModelPackageImpl);
-  }
-    
-  protected void createXSDMetaData(ModelFactoryImpl theModelPackageImpl)
-  {
-    super.initXSD();
-    
-    Property property = null;
-    
-
-    property = createGlobalProperty
-      ("extendedInstanceClass",
-      theModelPackageImpl.getString(),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "extendedInstanceClass",
-       "namespace", "##targetNamespace"
-       },
-       IS_ATTRIBUTE);
-                  
-    property = createGlobalProperty
-      ("instanceClass",
-      theModelPackageImpl.getString(),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "instanceClass",
-       "namespace", "##targetNamespace"
-       },
-       IS_ATTRIBUTE);
-                  
-    property = createGlobalProperty
-      ("javaClass",
-      theModelPackageImpl.getString(),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "javaClass",
-       "namespace", "##targetNamespace"
-       },
-       IS_ATTRIBUTE);
-                  
-    property = createGlobalProperty
-      ("nestedInterfaces",
-      theModelPackageImpl.getBoolean(),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "nestedInterfaces",
-       "namespace", "##targetNamespace"
-       },
-       IS_ATTRIBUTE);
-                  
-    property = createGlobalProperty
-      ("package",
-      theModelPackageImpl.getString(),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "package",
-       "namespace", "##targetNamespace"
-       },
-       IS_ATTRIBUTE);
-                  
-    addXSDMapping
-      (javaInfoType,
-       new String[] 
-       {
-       "name", "JavaInfo",
-       "kind", "empty"
-       });
-
-    addXSDMapping
-      (getProperty(javaInfoType, JavaInfoImpl.INTERNAL_JAVA_CLASS),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "javaClass"
-       });
-
-    addXSDMapping
-      (booleanObjectType,
-       new String[] 
-       {
-       "name", "BooleanObject"
-       });
-
-    addXSDMapping
-      (byteObjectType,
-       new String[] 
-       {
-       "name", "ByteObject"
-       });
-
-    addXSDMapping
-      (characterObjectType,
-       new String[] 
-       {
-       "name", "CharacterObject"
-       });
-
-    addXSDMapping
-      (doubleObjectType,
-       new String[] 
-       {
-       "name", "DoubleObject"
-       });
-
-    addXSDMapping
-      (floatObjectType,
-       new String[] 
-       {
-       "name", "FloatObject"
-       });
-
-    addXSDMapping
-      (intObjectType,
-       new String[] 
-       {
-       "name", "IntObject"
-       });
-
-    addXSDMapping
-      (longObjectType,
-       new String[] 
-       {
-       "name", "LongObject"
-       });
-
-    addXSDMapping
-      (shortObjectType,
-       new String[] 
-       {
-       "name", "ShortObject"
-       });
-
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Boolean createBooleanObjectFromString(String initialValue)
-  {
-    return XMLTypeFactory.eINSTANCE.createBooleanObject(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertBooleanObjectToString(Object instanceValue)
-  {
-    return XMLTypeFactory.eINSTANCE.convertBooleanObject((Boolean)instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Byte createByteObjectFromString(String initialValue)
-  {
-    return XMLTypeFactory.eINSTANCE.createByteObject(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertByteObjectToString(Object instanceValue)
-  {
-    return XMLTypeFactory.eINSTANCE.convertByteObject((Byte)instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Character createCharacterObjectFromString(String initialValue)
-  {
-    return (initialValue == null && initialValue.length() > 0) 
-      ? null : (new Character(XMLTypeUtil.normalize(initialValue, true).charAt(0)));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertCharacterObjectToString(Object instanceValue)
-  {
-    return instanceValue == null ? null : instanceValue.toString();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Double createDoubleObjectFromString(String initialValue)
-  {
-    return XMLTypeFactory.eINSTANCE.createDoubleObject(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertDoubleObjectToString(Object instanceValue)
-  {
-    return XMLTypeFactory.eINSTANCE.convertDoubleObject((Double)instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Float createFloatObjectFromString(String initialValue)
-  {
-    return XMLTypeFactory.eINSTANCE.createFloatObject(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertFloatObjectToString(Object instanceValue)
-  {
-    return XMLTypeFactory.eINSTANCE.convertFloatObject((Float)instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Integer createIntObjectFromString(String initialValue)
-  {
-    return XMLTypeFactory.eINSTANCE.createIntObject(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertIntObjectToString(Object instanceValue)
-  {
-    return XMLTypeFactory.eINSTANCE.convertIntObject((Integer)instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Long createLongObjectFromString(String initialValue)
-  {
-    return XMLTypeFactory.eINSTANCE.createLongObject(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertLongObjectToString(Object instanceValue)
-  {
-    return XMLTypeFactory.eINSTANCE.convertLongObject((Long)instanceValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Short createShortObjectFromString(String initialValue)
-  {
-    return XMLTypeFactory.eINSTANCE.createShortObject(initialValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String convertShortObjectToString(Object instanceValue)
-  {
-    return XMLTypeFactory.eINSTANCE.convertShortObject((Short)instanceValue);
-  }
-
-} //JavaFactoryImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java
deleted file mode 100644
index de25db5d1e..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/java/impl/JavaInfoImpl.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model.java.impl;
-
-import commonj.sdo.Type;
-
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-import org.apache.tuscany.sdo.model.java.JavaFactory;
-import org.apache.tuscany.sdo.model.java.JavaInfo;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Info</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.java.impl.JavaInfoImpl#getJavaClass <em>Java Class</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JavaInfoImpl extends DataObjectBase implements JavaInfo
-{
-
-  public final static int JAVA_CLASS = 0;
-
-  public final static int SDO_PROPERTY_COUNT = 1;
-
-  public final static int EXTENDED_PROPERTY_COUNT = 0;
-
-
-  /**
-   * The internal feature id for the '<em><b>Java Class</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_JAVA_CLASS = 0;
-
-  /**
-   * The number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public final static int INTERNAL_PROPERTY_COUNT = 1;
-
-  protected int internalConvertIndex(int internalIndex)
-  {
-    switch (internalIndex)
-    {
-      case INTERNAL_JAVA_CLASS: return JAVA_CLASS;
-    }
-    return super.internalConvertIndex(internalIndex);
-  }
-
-
-  /**
-   * The default value of the '{@link #getJavaClass() <em>Java Class</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getJavaClass()
-   * @generated
-   * @ordered
-   */
-  protected static final String JAVA_CLASS_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getJavaClass() <em>Java Class</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getJavaClass()
-   * @generated
-   * @ordered
-   */
-  protected String javaClass = JAVA_CLASS_DEFAULT_;
-
-  /**
-   * This is true if the Java Class attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean javaClass_set_ = false;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public JavaInfoImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type getStaticType()
-  {
-    return ((JavaFactoryImpl)JavaFactory.INSTANCE).getJavaInfo();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getJavaClass()
-  {
-    return javaClass;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setJavaClass(String newJavaClass)
-  {
-    String oldJavaClass = javaClass;
-    javaClass = newJavaClass;
-    boolean oldJavaClass_set_ = javaClass_set_;
-    javaClass_set_ = true;
-    if (isNotifying())
-      notify(ChangeKind.SET, INTERNAL_JAVA_CLASS, oldJavaClass, javaClass, !oldJavaClass_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetJavaClass()
-  {
-    String oldJavaClass = javaClass;
-    boolean oldJavaClass_set_ = javaClass_set_;
-    javaClass = JAVA_CLASS_DEFAULT_;
-    javaClass_set_ = false;
-    if (isNotifying())
-      notify(ChangeKind.UNSET, INTERNAL_JAVA_CLASS, oldJavaClass, JAVA_CLASS_DEFAULT_, oldJavaClass_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetJavaClass()
-  {
-    return javaClass_set_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object get(int propertyIndex, boolean resolve)
-  {
-    switch (propertyIndex)
-    {
-      case JAVA_CLASS:
-        return getJavaClass();
-    }
-    return super.get(propertyIndex, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void set(int propertyIndex, Object newValue)
-  {
-    switch (propertyIndex)
-    {
-      case JAVA_CLASS:
-        setJavaClass((String)newValue);
-        return;
-    }
-    super.set(propertyIndex, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unset(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case JAVA_CLASS:
-        unsetJavaClass();
-        return;
-    }
-    super.unset(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case JAVA_CLASS:
-        return isSetJavaClass();
-    }
-    return super.isSet(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (isProxy(this)) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (javaClass: ");
-    if (javaClass_set_) result.append(javaClass); else result.append("<unset>");
-    result.append(')');
-    return result.toString();
-  }
-
-} //JavaInfoImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/XMLFactory.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/XMLFactory.java
deleted file mode 100644
index 39119a1c77..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/XMLFactory.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model.xml;
-
-import commonj.sdo.helper.HelperContext;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @generated
- */
-public interface XMLFactory
-{
-
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  XMLFactory INSTANCE = org.apache.tuscany.sdo.model.xml.impl.XMLFactoryImpl.init();
-
-  /**
-   * Returns a new object of class '<em>Info</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Info</em>'.
-   * @generated
-   */
-  XMLInfo createXMLInfo();
-
-  /**
-   * Registers the types supported by this Factory within the supplied scope.argument
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param scope an instance of HelperContext used to manage the scoping of types.
-   * @generated
-   */
-  public void register(HelperContext scope);
-   
-} //XMLFactory
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/XMLInfo.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/XMLInfo.java
deleted file mode 100644
index 6f438bc3e2..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/XMLInfo.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model.xml;
-
-import java.io.Serializable;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Info</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.xml.XMLInfo#isXmlElement <em>Xml Element</em>}</li>
- * </ul>
- * </p>
- *
- * @extends Serializable
- * @generated
- */
-public interface XMLInfo extends Serializable
-{
-  /**
-   * Returns the value of the '<em><b>Xml Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Xml Element</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Xml Element</em>' attribute.
-   * @see #isSetXmlElement()
-   * @see #unsetXmlElement()
-   * @see #setXmlElement(boolean)
-   * @generated
-   */
-  boolean isXmlElement();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.model.xml.XMLInfo#isXmlElement <em>Xml Element</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Xml Element</em>' attribute.
-   * @see #isSetXmlElement()
-   * @see #unsetXmlElement()
-   * @see #isXmlElement()
-   * @generated
-   */
-  void setXmlElement(boolean value);
-
-  /**
-   * Unsets the value of the '{@link org.apache.tuscany.sdo.model.xml.XMLInfo#isXmlElement <em>Xml Element</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetXmlElement()
-   * @see #isXmlElement()
-   * @see #setXmlElement(boolean)
-   * @generated
-   */
-  void unsetXmlElement();
-
-  /**
-   * Returns whether the value of the '{@link org.apache.tuscany.sdo.model.xml.XMLInfo#isXmlElement <em>Xml Element</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Xml Element</em>' attribute is set.
-   * @see #unsetXmlElement()
-   * @see #isXmlElement()
-   * @see #setXmlElement(boolean)
-   * @generated
-   */
-  boolean isSetXmlElement();
-
-} // XMLInfo
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLFactoryImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLFactoryImpl.java
deleted file mode 100644
index f07d8b7f3c..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLFactoryImpl.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model.xml.impl;
-
-import commonj.sdo.helper.HelperContext;
-import org.apache.tuscany.sdo.helper.TypeHelperImpl;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-
-import org.apache.tuscany.sdo.impl.FactoryBase;
-
-import org.apache.tuscany.sdo.model.ModelFactory;
-
-import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
-
-import org.apache.tuscany.sdo.model.internal.InternalFactory;
-
-import org.apache.tuscany.sdo.model.internal.impl.InternalFactoryImpl;
-
-import org.apache.tuscany.sdo.model.xml.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the commonj.sdo/xml model factory.
- * This model is generated from sdoXML.xsd, in the sdo-api project.
- * Until the SDO code generator supports name conflicts and regen/merge, follow the following steps to regenerate this model:
- *   1. Regenerate the model into a temporary directory:
- *         XSD2JavaGenerator -generateBuiltIn commonj.sdo/xml -prefix XML -targetDirectory <temp-dir> -javaPackage org.apache.tuscany.sdo.model.xml <sdo-api-dir>/src/main/resources/xml/sdoXML.xsd
- *   2. Make sure the top of each generated file contains the ASF License.      
- *   3. Move this JavaDoc comment into the newly generated XMLFactoryImpl class.
- * <!-- end-user-doc -->
- * @generated
- */
-public class XMLFactoryImpl extends FactoryBase implements XMLFactory
-{
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String NAMESPACE_URI = "commonj.sdo/xml";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String NAMESPACE_PREFIX = "sdoXML";
-
-  /**
-   * The version of the generator pattern used to generate this class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String PATTERN_VERSION = "1.2";
-  
-  public static final int XML_INFO = 1;
-  
-  /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XMLFactoryImpl()
-  {
-    super(NAMESPACE_URI, NAMESPACE_PREFIX, "org.apache.tuscany.sdo.model.xml");
-  }
-
-  /**
-   * Registers the Factory instance so that it is available within the supplied scope.
-   * @argument scope a HelperContext instance that will make the types supported by this Factory available.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void register(HelperContext scope) 
-  {
-    if(scope == null) {
-      throw new IllegalArgumentException("Scope can not be null");
-    }
-    
-    //Register dependent packages with provided scope
-    ModelFactory.INSTANCE.register(scope);
-    InternalFactory.INSTANCE.register(scope);
-    
-    // Initialize this package   
-    TypeHelperImpl th = (TypeHelperImpl)scope.getTypeHelper();
-    th.getExtendedMetaData().putPackage(NAMESPACE_URI, this);
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public DataObject create(int typeNumber)
-  {
-    switch (typeNumber)
-    {
-      case XML_INFO: return (DataObject)createXMLInfo();
-      default:
-        return super.create(typeNumber);
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XMLInfo createXMLInfo()
-  {
-    XMLInfoImpl xmlInfo = new XMLInfoImpl();
-    return xmlInfo;
-  }
-  
-  // Following creates and initializes SDO metadata for the supported types.			
-  protected Type xmlInfoType = null;
-
-  public Type getXMLInfo()
-  {
-    return xmlInfoType;
-  }
-  
-
-  private static XMLFactoryImpl instance = null; 
-  public static XMLFactoryImpl init()
-  {
-    if (instance != null ) return instance;
-    instance = new XMLFactoryImpl();
-
-    // Initialize dependent packages
-    ModelFactory ModelFactoryInstance = ModelFactory.INSTANCE;
-    InternalFactory InternalFactoryInstance = InternalFactory.INSTANCE;
-    
-    // Create package meta-data objects
-    instance.createMetaData();
-
-    // Initialize created meta-data
-    instance.initializeMetaData();
-    
-    // Mark meta-data to indicate it can't be changed
-    //theXMLFactoryImpl.freeze(); //FB do we need to freeze / should we freeze ????
-
-    return instance;
-  }
-  
-  private boolean isCreated = false;
-
-  public void createMetaData()
-  {
-    if (isCreated) return;
-    isCreated = true;	
-
-    // Create types and their properties
-    xmlInfoType = createType(false, XML_INFO);
-    createProperty(true, xmlInfoType,XMLInfoImpl.INTERNAL_XML_ELEMENT); 
-  }
-  
-  private boolean isInitialized = false;
-
-  public void initializeMetaData()
-  {
-    if (isInitialized) return;
-    isInitialized = true;
-
-    // Obtain other dependent packages
-    ModelFactoryImpl theModelPackageImpl = (ModelFactoryImpl)ModelFactory.INSTANCE;
-    InternalFactoryImpl theInternalPackageImpl = (InternalFactoryImpl)InternalFactory.INSTANCE;
-    Property property = null;
-
-    // Add supertypes to types
-
-    // Initialize types and properties
-    initializeType(xmlInfoType, XMLInfo.class, "XMLInfo", false);
-    property = getLocalProperty(xmlInfoType, 0);
-    initializeProperty(property, theModelPackageImpl.getBoolean(), "xmlElement", null, 0, 1, XMLInfo.class, false, true, false);
-
-    createXSDMetaData(theModelPackageImpl, theInternalPackageImpl);
-  }
-    
-  protected void createXSDMetaData(ModelFactoryImpl theModelPackageImpl, InternalFactoryImpl theInternalPackageImpl)
-  {
-    super.initXSD();
-    
-    Property property = null;
-    
-
-    property = createGlobalProperty
-      ("aliasName",
-      theModelPackageImpl.getString(),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "aliasName",
-       "namespace", "##targetNamespace"
-       },
-       IS_ATTRIBUTE);
-                
-    property = createGlobalProperty
-      ("dataType",
-      theInternalPackageImpl.getQName(),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "dataType",
-       "namespace", "##targetNamespace"
-       },
-       IS_ATTRIBUTE);
-                
-    property = createGlobalProperty
-      ("many",
-      theModelPackageImpl.getBoolean(),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "many",
-       "namespace", "##targetNamespace"
-       },
-       IS_ATTRIBUTE);
-                
-    property = createGlobalProperty
-      ("name",
-      theModelPackageImpl.getString(),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "name",
-       "namespace", "##targetNamespace"
-       },
-       IS_ATTRIBUTE);
-                
-    property = createGlobalProperty
-      ("oppositeProperty",
-      theModelPackageImpl.getString(),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "oppositeProperty",
-       "namespace", "##targetNamespace"
-       },
-       IS_ATTRIBUTE);
-                
-    property = createGlobalProperty
-      ("propertyType",
-      theInternalPackageImpl.getQName(),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "propertyType",
-       "namespace", "##targetNamespace"
-       },
-       IS_ATTRIBUTE);
-                
-    property = createGlobalProperty
-      ("readOnly",
-      theModelPackageImpl.getBoolean(),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "readOnly",
-       "namespace", "##targetNamespace"
-       },
-       IS_ATTRIBUTE);
-                
-    property = createGlobalProperty
-      ("sequence",
-      theModelPackageImpl.getBoolean(),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "sequence",
-       "namespace", "##targetNamespace"
-       },
-       IS_ATTRIBUTE);
-                
-    property = createGlobalProperty
-      ("string",
-      theModelPackageImpl.getBoolean(),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "string",
-       "namespace", "##targetNamespace"
-       },
-       IS_ATTRIBUTE);
-                
-    property = createGlobalProperty
-      ("xmlElement",
-      theModelPackageImpl.getBoolean(),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "xmlElement",
-       "namespace", "##targetNamespace"
-       },
-       IS_ATTRIBUTE);
-                
-    addXSDMapping
-      (xmlInfoType,
-       new String[] 
-       {
-       "name", "XMLInfo",
-       "kind", "empty"
-       });
-
-    addXSDMapping
-      (getProperty(xmlInfoType, XMLInfoImpl.INTERNAL_XML_ELEMENT),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "xmlElement"
-       });
-
-  }
-    
-} //XMLFactoryImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLInfoImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLInfoImpl.java
deleted file mode 100644
index 83d8a6725a..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/model/xml/impl/XMLInfoImpl.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.model.xml.impl;
-
-import commonj.sdo.Type;
-
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-import org.apache.tuscany.sdo.model.xml.XMLFactory;
-import org.apache.tuscany.sdo.model.xml.XMLInfo;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Info</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.model.xml.impl.XMLInfoImpl#isXmlElement <em>Xml Element</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class XMLInfoImpl extends DataObjectBase implements XMLInfo
-{
-
-  public final static int XML_ELEMENT = 0;
-
-  public final static int SDO_PROPERTY_COUNT = 1;
-
-  public final static int EXTENDED_PROPERTY_COUNT = 0;
-
-
-  /**
-   * The internal feature id for the '<em><b>Xml Element</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */ 
-  public final static int INTERNAL_XML_ELEMENT = 0;
-
-  /**
-   * The number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public final static int INTERNAL_PROPERTY_COUNT = 1;
-
-  protected int internalConvertIndex(int internalIndex)
-  {
-    switch (internalIndex)
-    {
-      case INTERNAL_XML_ELEMENT: return XML_ELEMENT;
-    }
-    return super.internalConvertIndex(internalIndex);
-  }
-
-
-  /**
-   * The default value of the '{@link #isXmlElement() <em>Xml Element</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isXmlElement()
-   * @generated
-   * @ordered
-   */
-  protected static final boolean XML_ELEMENT_DEFAULT_ = false;
-
-  /**
-   * The cached value of the '{@link #isXmlElement() <em>Xml Element</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isXmlElement()
-   * @generated
-   * @ordered
-   */
-  protected boolean xmlElement = XML_ELEMENT_DEFAULT_;
-
-  /**
-   * This is true if the Xml Element attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean xmlElement_set_ = false;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XMLInfoImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type getStaticType()
-  {
-    return ((XMLFactoryImpl)XMLFactory.INSTANCE).getXMLInfo();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isXmlElement()
-  {
-    return xmlElement;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setXmlElement(boolean newXmlElement)
-  {
-    boolean oldXmlElement = xmlElement;
-    xmlElement = newXmlElement;
-    boolean oldXmlElement_set_ = xmlElement_set_;
-    xmlElement_set_ = true;
-    if (isNotifying())
-      notify(ChangeKind.SET, INTERNAL_XML_ELEMENT, oldXmlElement, xmlElement, !oldXmlElement_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetXmlElement()
-  {
-    boolean oldXmlElement = xmlElement;
-    boolean oldXmlElement_set_ = xmlElement_set_;
-    xmlElement = XML_ELEMENT_DEFAULT_;
-    xmlElement_set_ = false;
-    if (isNotifying())
-      notify(ChangeKind.UNSET, INTERNAL_XML_ELEMENT, oldXmlElement, XML_ELEMENT_DEFAULT_, oldXmlElement_set_);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetXmlElement()
-  {
-    return xmlElement_set_;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object get(int propertyIndex, boolean resolve)
-  {
-    switch (propertyIndex)
-    {
-      case XML_ELEMENT:
-        return isXmlElement() ? Boolean.TRUE : Boolean.FALSE;
-    }
-    return super.get(propertyIndex, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void set(int propertyIndex, Object newValue)
-  {
-    switch (propertyIndex)
-    {
-      case XML_ELEMENT:
-        setXmlElement(((Boolean)newValue).booleanValue());
-        return;
-    }
-    super.set(propertyIndex, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unset(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case XML_ELEMENT:
-        unsetXmlElement();
-        return;
-    }
-    super.unset(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case XML_ELEMENT:
-        return isSetXmlElement();
-    }
-    return super.isSet(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (isProxy(this)) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (xmlElement: ");
-    if (xmlElement_set_) result.append(xmlElement); else result.append("<unset>");
-    result.append(')');
-    return result.toString();
-  }
-
-} //XMLInfoImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/osgi/SdoBundleActivator.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/osgi/SdoBundleActivator.java
deleted file mode 100644
index ef65fc2367..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/osgi/SdoBundleActivator.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.osgi;
-
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-import commonj.sdo.impl.HelperProvider;
-
-public class SdoBundleActivator implements BundleActivator {
-
-
-	public void start(BundleContext bundleContext) throws Exception {
-
-		HelperProvider.setDefaultInstance(this.getClass().getClassLoader());
-
-	}
-
-	public void stop(BundleContext bundleContext) throws Exception {
-
-	}
-
-
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java
deleted file mode 100644
index e25d30e61c..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-
-/**
- *  SDO Sequance implementation which delegates to a feature map.
- */
-public class BasicSequence implements Sequence, FeatureMap.Internal.Wrapper
-{
-  protected FeatureMap.Internal featureMap;
-
-  public BasicSequence(FeatureMap.Internal featureMap)
-  {
-    this.featureMap = featureMap;
-    featureMap.setWrapper(this);
-  }
-
-  public FeatureMap featureMap()
-  {
-    return featureMap;
-  }
-
-  public int size()
-  {
-    return featureMap.size();
-  }
-
-  public Property getProperty(int index)
-  {
-    EStructuralFeature feature = featureMap.getEStructuralFeature(index);
-    return getFeatureProperty(feature);
-  }
-  
-  public static Property getFeatureProperty(EStructuralFeature feature)
-  {
-    boolean isText = 
-      feature == XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__TEXT ||
-      feature == XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__CDATA ||    
-      feature == XMLTypePackage.Literals.XML_TYPE_DOCUMENT_ROOT__COMMENT;
-    return isText ? null : (Property)feature;
-  }
-  
-  public Object getValue(int index)
-  {
-    return featureMap.getValue(index);
-  }
-  
-  public Object setValue(int index, Object value)
-  {
-    return featureMap.setValue(index, value);
-  }
-
-  /*
-  protected EStructuralFeature getEStructuralFeature(String propertyName)
-  {
-    return featureMap.getEObject().eClass().getEStructuralFeature(propertyName);
-  }
-  */
-
-  protected EStructuralFeature getEStructuralFeature(String propertyName, Object value)
-  {
-    EStructuralFeature result = featureMap.getEObject().eClass().getEStructuralFeature(propertyName);
-    if (result == null)
-    {
-      Type type = (Type)featureMap.getEObject().eClass();
-      if (type.isOpen())
-      {
-        result = (EStructuralFeature)DataObjectUtil.demandOpenProperty(type, propertyName, value, true);
-      }
-    }
-    return result;
-  }
-
-  protected EStructuralFeature getEStructuralFeature(int propertyIndex)
-  {
-    return (EStructuralFeature)DataObjectUtil.getProperty((DataObject)featureMap.getEObject(), propertyIndex);
-  }
-
-  public boolean add(String propertyName, Object value)
-  {
-    return featureMap.add(getEStructuralFeature(propertyName, value), value);
-  }
-
-  public boolean add(int propertyIndex, Object value)
-  {
-    return featureMap.add(getEStructuralFeature(propertyIndex), value);
-  }
-
-  public boolean add(Property property, Object value)
-  {
-    return featureMap.add((EStructuralFeature)property, value);
-  }
-
-  public void add(int index, String propertyName, Object value)
-  {
-    featureMap.add(index, getEStructuralFeature(propertyName, value), value);
-  }
-
-  public void add(int index, int propertyIndex, Object value)
-  {
-    featureMap.add(index, getEStructuralFeature(propertyIndex), value);
-  }
-
-  public void add(int index, Property property, Object value)
-  {
-    featureMap.add(index, (EStructuralFeature)property, value);
-  }
-
-  /**
-   * @deprecated
-   */
-  public void add(String text)
-  {
-    FeatureMapUtil.addText(featureMap, text);
-  }
-
-  /**
-   * @deprecated
-   */
-  public void add(int index, String text)
-  {
-    FeatureMapUtil.addText(featureMap, index, text);
-  }
- 
-  public void addText(String text)
-  {
-    FeatureMapUtil.addText(featureMap, text);
-  }
-
-  public void addText(int index, String text)
-  {
-    FeatureMapUtil.addText(featureMap, index, text);
-  }
- 
-  public void remove(int index)
-  {
-    featureMap.remove(index);
-  }
-
-  public void move(int toIndex, int fromIndex)
-  {
-    featureMap.move(toIndex, fromIndex);
-  }
-
-  public String toString()
-  {
-    return featureMap.toString();
-  }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
deleted file mode 100644
index 17a4ec709c..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
+++ /dev/null
@@ -1,711 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sdo.SDOFactory;
-import org.apache.tuscany.sdo.SDOPackage;
-import org.apache.tuscany.sdo.helper.TypeHelperImpl;
-import org.apache.tuscany.sdo.impl.ChangeSummaryImpl;
-import org.apache.tuscany.sdo.impl.DataGraphImpl;
-import org.apache.tuscany.sdo.impl.DynamicDataObjectImpl;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.xmi.EcoreBuilder;
-import org.eclipse.emf.ecore.xmi.NameInfo;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLLoad;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.XMLSave;
-import org.eclipse.emf.ecore.xmi.impl.SAXXMLHandler;
-import org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMLLoadImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMLSaveImpl;
-import org.eclipse.emf.ecore.xmi.util.DefaultEcoreBuilder;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.xml.sax.InputSource;
-import org.xml.sax.helpers.DefaultHandler;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.helper.TypeHelper;
-
-
-public class DataGraphResourceFactoryImpl extends ResourceFactoryImpl
-{
-  /**
-   * Constructor for DataGraphResourceFactoryImpl.
-   */
-  public DataGraphResourceFactoryImpl()
-  {
-    super();
-  }
-  
-  public Resource createResource(URI uri)
-  {
-    XMLResourceImpl result = new DataGraphResourceImpl(uri);
-
-    ExtendedMetaData extendedMetaData = ((TypeHelperImpl)TypeHelper.INSTANCE).getExtendedMetaData();
-    DataObjectUtil.configureXMLResource(result, extendedMetaData);
-    
-    result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-    result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_DEPRECATED_METHODS, Boolean.TRUE);
-    //result.setEncoding("UTF-8");
-    //result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
-    //result.getDefaultSaveOptions().put(XMLResource.OPTION_LINE_WIDTH, new Integer(80));
-
-    return result;
-  }
-
-  public static class DataGraphResourceImpl extends XMLResourceImpl
-  {
-    public DataGraphResourceImpl(URI uri)
-    {
-      super(uri);
-    }
-    
-    public static class HelperImpl extends XMLHelperImpl
-    {
-      protected DataGraphImpl eDataGraph;
-
-      protected List resources;
-      protected List uris;
-      
-      public HelperImpl(XMLResource xmlResource)
-      {
-        super(xmlResource);
-      }
-      
-      public void setResource(XMLResource resource)
-      {
-        super.setResource(resource);
-        if (!resource.getContents().isEmpty())
-        {
-          eDataGraph = (DataGraphImpl)resource.getContents().get(0);
-
-          resources = new ArrayList();
-          uris = new ArrayList();
-
-          resources.add(eDataGraph.getRootResource());
-          uris.add("#" + resource.getURIFragment(eDataGraph) + "/@eRootObject");
-
-          if (eDataGraph.getEChangeSummary() != null)
-          {
-            // Ensure that resource exists.
-            //
-            resources.add(((EObject)eDataGraph.getChangeSummary()).eResource());
-            uris.add("#" + resource.getURIFragment(eDataGraph) + "/@eChangeSummary");
-          }
-
-          if (eDataGraph.eResource() != null && eDataGraph.eResource().getResourceSet() != null)
-          {
-            int count = 0;
-            for (Iterator i = eDataGraph.eResource().getResourceSet().getResources().iterator(); i.hasNext();)
-            {
-              Resource ePackageResource = (Resource)i.next();
-              List resourceContents = ePackageResource.getContents();
-              if (resourceContents.size() == 1 && resourceContents.get(0) instanceof EPackage)
-              {
-                resources.add(ePackageResource);
-                uris.add("#" + resource.getURIFragment(eDataGraph) + "/@models." + count++);
-              }
-            }
-          }
-        }
-      }
-
-      public String getID(EObject eObject)
-      {
-        return super.getID(eObject);
-      }
-
-      public String getIDREF(EObject eObject)
-      {
-        String fragment = super.getIDREF(eObject);
-        if (fragment.startsWith("/"))
-        {
-          int index = resources.indexOf(eObject.eResource());
-          if (index != -1)
-          {
-            fragment = ((String)uris.get(index)).substring(1) + fragment.substring(1);
-          }
-        }
-        return fragment;
-      }
-
-      public String getHREF(EObject eObject)
-      {
-        return super.getHREF(eObject);
-      }
-
-      protected URI getHREF(Resource otherResource, EObject obj)
-      {
-        int index = resources.indexOf(otherResource);
-        if (index == -1)
-        {
-          return super.getHREF(otherResource, obj);
-        }
-        else
-        {
-          return createHREF((String)uris.get(index), otherResource.getURIFragment(obj));
-        }
-      }
-
-      protected URI createHREF(String baseURI, String fragment)
-      {
-        if (fragment.startsWith("/"))
-        {
-          return URI.createURI(baseURI + fragment.substring(1));
-        }
-        else
-        {
-          return URI.createURI("#" + fragment);
-        }
-      }
-      
-      public void populateNameInfo(NameInfo nameInfo, EClass c)
-      {
-        if (c == SDOPackage.eINSTANCE.getDataGraph())
-        {
-          if (extendedMetaData != null)
-          {
-            extendedMetaData.demandPackage("commonj.sdo").setNsPrefix("sdo");
-          }
-          nameInfo.setQualifiedName(getQName("commonj.sdo", "datagraph"));
-          nameInfo.setNamespaceURI("commonj.sdo");
-          nameInfo.setLocalPart("datagraph");
-        }
-        else if (c == SDOPackage.eINSTANCE.getChangeSummary())
-        {
-          if (extendedMetaData != null)
-          {
-            extendedMetaData.demandPackage("commonj.sdo").setNsPrefix("sdo");
-          }
-          nameInfo.setQualifiedName("changeSummary");
-          nameInfo.setNamespaceURI(null);
-          nameInfo.setLocalPart("changeSummary");
-        }
-        else
-        {
-          super.populateNameInfo(nameInfo, c);
-        }
-      }
-
-      public String getQName(EClass c)
-      {
-        if (c == SDOPackage.eINSTANCE.getDataGraph())
-        {
-          if (extendedMetaData != null)
-          {
-            extendedMetaData.demandPackage("commonj.sdo").setNsPrefix("sdo");
-          }
-          return getQName("commonj.sdo", "datagraph");
-        }
-        else if (c == SDOPackage.eINSTANCE.getChangeSummary())
-        {
-          if (extendedMetaData != null)
-          {
-            extendedMetaData.demandPackage("commonj.sdo").setNsPrefix("sdo");
-          }
-          return getQName((String)null, "changeSummary");
-        }
-        else
-        {
-          return super.getQName(c);
-        }
-      }
-    }
-
-    protected XMLHelper createXMLHelper()
-    {
-      return new HelperImpl(this);
-    }
-
-    protected EObject getEObjectByID(String id)
-    {
-      List contents = getContents();
-      if (contents.size() >= 1)
-      {
-        Object rootObject = contents.get(0);
-        if (rootObject instanceof DataGraphImpl)
-        {
-          DataGraphImpl eDataGraph = (DataGraphImpl)rootObject;
-          EObject result = eDataGraph.getRootResource().getEObject(id);
-          if (result != null)
-          {
-            return result;
-          }
-          else
-          {
-            ChangeSummary eChangeSummary = eDataGraph.getEChangeSummary();
-            if (eChangeSummary != null)
-            {
-              result = ((EObject)eDataGraph.getChangeSummary()).eResource().getEObject(id);
-              if (result != null)
-              {
-                return result;
-              }
-            }
-          }
-        }
-      }
-      return super.getEObjectByID(id);
-    }
-
-    public static class SaveImpl extends XMLSaveImpl
-    {
-      protected DataGraphImpl eDataGraph;
-
-      public SaveImpl(XMLHelper xmlHelper)
-      {
-        super(xmlHelper);
-      }
-
-      public void traverse(List contents)
-      {
-        if (contents.size() >= 1 && contents.get(0) instanceof DataGraphImpl)
-        {
-          eDataGraph = (DataGraphImpl)contents.get(0);
-                   
-          Object datagraphMark = null;
-          if (!toDOM)
-          {
-            if (declareXML)
-            {
-              doc.add("<?xml version=\"" + xmlVersion + "\" encoding=\"" + encoding + "\"?>");
-              doc.addLine();
-            }
-            String elementName = helper.getQName(eDataGraph.eClass());
-            doc.startElement(elementName);
-            datagraphMark = doc.mark();
-          }
-          else
-          {
-            helper.populateNameInfo(nameInfo, eDataGraph.eClass());
-            currentNode = document.createElementNS(nameInfo.getNamespaceURI(), nameInfo.getQualifiedName());
-            document.appendChild(currentNode);
-            // not calling handler since there is no corresponding EObject
-          }
-
-          if (eDataGraph.eResource() != null && eDataGraph.eResource().getResourceSet() != null)
-          {
-            List ePackages = new ArrayList();
-            for (Iterator i = eDataGraph.eResource().getResourceSet().getResources().iterator(); i.hasNext();)
-            {
-              List resourceContents = ((Resource)i.next()).getContents();
-              if (resourceContents.size() == 1 && resourceContents.get(0) instanceof EPackage)
-              {
-                ePackages.add(resourceContents.get(0));
-              }
-            }
-            if (!ePackages.isEmpty())
-            {
-              if (!toDOM)
-              {
-                doc.startElement("models");
-                doc.addAttribute("xmlns", "");
-              }
-              else
-              {
-                currentNode = currentNode.appendChild(document.createElementNS(null, "models"));
-                ((Element)currentNode).setAttributeNS(ExtendedMetaData.XMLNS_URI, ExtendedMetaData.XMLNS_PREFIX, "");
-                //  not calling handler since there is no corresponding EObject
-              }
-              for (Iterator i = ePackages.iterator(); i.hasNext();)
-              {
-                writeTopObject((EPackage)i.next());
-              }
-              if (!toDOM)
-              {
-                doc.endElement();
-              }
-              else
-              {
-                currentNode = currentNode.getParentNode();
-              }
-            }
-          }
-
-          // use namespace declarations defined in the document (if any)
-          EObject eRootObject = eDataGraph.getERootObject();
-          EReference xmlnsPrefixMapFeature = extendedMetaData.getXMLNSPrefixMapFeature(eRootObject.eClass());
-          if (xmlnsPrefixMapFeature != null)
-          {
-            EMap xmlnsPrefixMap = (EMap)eRootObject.eGet(xmlnsPrefixMapFeature);
-            helper.setPrefixToNamespaceMap(xmlnsPrefixMap);
-          }
-          ChangeSummary changeSummary = eDataGraph.getEChangeSummary();
-
-          if (changeSummary != null)
-          {
-            helper.setMustHavePrefix(true);
-            if (changeSummary.isLogging())
-            {
-              ((ChangeSummaryImpl)changeSummary).summarize();
-              writeTopObject((EObject)changeSummary);
-            }
-            else
-            {
-              writeTopObject((EObject)changeSummary);
-            }
-            helper.setMustHavePrefix(false);
-          }
-
-          if (eRootObject != null && writeTopObject(eRootObject) == null && !toDOM)
-          {
-            doc.addLine();
-            doc.setMixed(false);
-          }
-          if (!toDOM)
-          {
-            doc.endElement();
-            // reset to add namespace declarations
-            //
-            doc.resetToMark(datagraphMark);
-          }
-          else
-          {
-            currentNode = document.getFirstChild();
-          }
-          addNamespaceDeclarations();
-        }
-        else
-        {
-          super.traverse(contents);
-        }
-      }
-
-      protected void writeTopAttributes(EObject top)
-      {
-        if (top == eDataGraph.getEChangeSummary())
-        {
-          if (!toDOM)
-          {
-            doc.addAttribute("xmlns", "");
-            doc.addAttribute("logging", String.valueOf(eDataGraph.getEChangeSummary().isLogging()));
-          }
-          else
-          {
-            ((Element)currentNode).setAttributeNS(ExtendedMetaData.XMLNS_URI, ExtendedMetaData.XMLNS_PREFIX, "");
-            ((Element)currentNode).setAttributeNS("", "logging", String.valueOf(eDataGraph.getEChangeSummary().isLogging()));
-          }
-        }
-      }
-
-      protected EObject getSchemaLocationRoot(EObject eObject)
-      {
-        return eDataGraph.getERootObject();
-      }
-    }
-
-    protected XMLSave createXMLSave()
-    {
-      return new SaveImpl(createXMLHelper());
-    }
-
-    public static class LoadImpl extends XMLLoadImpl
-    {
-      protected boolean resumeLogging = false;
-      
-      public void load(XMLResource resource, InputSource inputSource, Map options) throws IOException
-      {
-        super.load(resource, inputSource, options);
-        if (resumeLogging) ((ChangeSummaryImpl)((DataGraphImpl)resource.getContents().get(0)).getChangeSummary()).resumeLogging();
-      }
-
-      public void load(XMLResource resource, InputStream inputStream, Map options) throws IOException
-      {
-        super.load(resource, inputStream, options);
-        if (resumeLogging) ((ChangeSummaryImpl)((DataGraphImpl)resource.getContents().get(0)).getChangeSummary()).resumeLogging();
-      }
-
-      public void load(XMLResource resource, Node node, Map options) throws IOException
-      {
-        super.load(resource, node, options);
-        if (resumeLogging) ((ChangeSummaryImpl)((DataGraphImpl)resource.getContents().get(0)).getChangeSummary()).resumeLogging();
-      }
-
-      public LoadImpl(XMLHelper xmlHelper)
-      {
-        super(xmlHelper);
-      }
-
-      protected DefaultHandler makeDefaultHandler()
-      {
-        return new SAXXMLHandler(resource, helper, options)
-          {
-            protected DataGraphImpl eDataGraph;
-
-            protected boolean isInModels;
-
-            protected List ePackages = new ArrayList();
-
-            protected EObject createDocumentRoot(String prefix, String uri, String name, EFactory eFactory, boolean top)
-            {
-              return null;
-            }
-
-            protected void setAttribValue(EObject object, String name, String value)
-            {
-              if ("logging".equals(name) && object instanceof ChangeSummaryImpl)
-              {
-                resumeLogging = Boolean.valueOf(value).booleanValue();
-              }
-              else
-              {
-                super.setAttribValue(object, name, value);
-              }
-            }
-            
-            protected EMap recordNamespacesSchemaLocations(EObject root)
-            {
-              EObject dgroot = eDataGraph.getERootObject();
-              if (dgroot == null)
-              {
-                return null;
-              }
-              EMap prefixToNamespaceMap = super.recordNamespacesSchemaLocations(dgroot);
-              if (prefixToNamespaceMap != null)
-              {
-                for (Iterator i = prefixToNamespaceMap.iterator(); i.hasNext();)
-                {
-                  Map.Entry entry = (Map.Entry)i.next();
-                  String prefix = (String)entry.getKey();
-                  String namespace = (String)entry.getValue();
-                  if (namespace.equals("commonj.sdo"))
-                  {
-                    prefixToNamespaceMap.removeKey(prefix);
-                    break;
-                  }
-                }
-              }
-              return prefixToNamespaceMap;
-            }
-
-            protected void handleFeature(String prefix, String name)
-            {
-              if (isInModels && objects.size() == 2)
-              {
-                EObject modelObject = createObjectByType(prefix, name, false);
-                processObject(modelObject);
-                ePackages.add(modelObject);
-              }
-              else if (objects.size() == 1)
-              {
-                eDataGraph = (DataGraphImpl)objects.peek();
-                eDataGraph.getResourceSet();
-                if ("".equals(prefix) && "changeSummary".equals(name))
-                {
-                  ChangeSummary eChangeSummary = (ChangeSummary)createObjectFromFactory(SDOFactory.eINSTANCE, "ChangeSummary");
-                  eDataGraph.setEChangeSummary(eChangeSummary);
-                  processObject((EObject)eChangeSummary);
-                }
-                else if ("".equals(prefix) && "models".equals(name))
-                {
-                  isInModels = true;
-                  types.push(OBJECT_TYPE);
-                  objects.push(eDataGraph);
-                  mixedTargets.push(null);
-                }
-                else if (eDataGraph.getERootObject() == null)
-                {
-                  if (useNewMethods)
-                  {
-                    handleSchemaLocation();
-                  }
-                  processSchemaLocations(prefix, name);
-                  if (processAnyXML)
-                  {
-                    // Ensure that anything can be handled, even if it's not recognized.
-                    //
-                    String namespaceURI = helper.getURI(prefix);
-                    if (extendedMetaData.getPackage(namespaceURI) == null)
-                    {
-                      EStructuralFeature rootFeature = extendedMetaData.demandFeature(namespaceURI, name, true);
-                      rootFeature.getEContainingClass().getEPackage().setEFactoryInstance(new DynamicDataObjectImpl.FactoryImpl());
-                    }
-                  }
-
-                  //FB TEMPORARY allow loading proper serialization (global element instead of type name)
-                  //FB Proper fix is to reimplement DataGraph as proper DataObject, and remove this entire class
-                  EStructuralFeature rootFeature = extendedMetaData.getElement(helper.getURI(prefix), name);
-                  if (rootFeature != null) name = rootFeature.getEType().getName();
-                  
-                  EObject rootObject = createObjectByType(prefix, name, false);
-                  
-                  eDataGraph.setERootObject(rootObject);
-                  processObject(rootObject);
-                  if (rootObject != null
-                    && rootObject.eClass() == ExtendedMetaData.INSTANCE.getDocumentRoot(rootObject.eClass().getEPackage()))
-                  {
-                    super.handleFeature(prefix, name);
-
-                    // Remove the document root from the stack.
-                    //
-                    Object mixedTarget = mixedTargets.pop();
-                    Object object = objects.pop();
-                    mixedTargets.pop();
-                    objects.pop();
-                    mixedTargets.push(mixedTarget);
-                    objects.push(object);
-                  }
-                }
-              }
-              else
-              {
-                super.handleFeature(prefix, name);
-              }
-            }
-
-            public void endElement(String uri, String localName, String name)
-            {
-              if (isInModels && objects.size() == 2)
-              {
-                if (!ePackages.isEmpty())
-                {
-                  for (Iterator i = ePackages.iterator(); i.hasNext();)
-                  {
-                    EPackage ePackage = (EPackage)i.next();
-                    ePackage.setEFactoryInstance(new DynamicDataObjectImpl.FactoryImpl());
-                    Resource resource = resourceSet.createResource(URI.createURI("*.ecore"));
-                    resource.getContents().add(ePackage);
-                    if (ePackage.getNsURI() != null)
-                    {
-                      resource.setURI(URI.createURI(ePackage.getNsURI()));
-                    }
-
-                    if (extendedMetaData != null)
-                    {
-                      extendedMetaData.putPackage(extendedMetaData.getNamespace(ePackage), ePackage);
-                    }
-                    else
-                    {
-                      packageRegistry.put(ePackage.getNsURI(), ePackage);
-                    }
-                  }
-                  handleForwardReferences();
-                }
-                isInModels = false;
-              }
-              // TODO The following 3 lines of code are a temporary work-around for JIRA issue TUSCANY-1862. 
-              // These lines of code should be removed when TUSCANY-1862 is resolved.
-              if ("".equals(uri) && "objectsToAttach".equals(name) && text != null && text.length() == 0)
-              {
-                text = null;
-              }              
-              super.endElement(uri, localName, name);
-            }
-
-            protected EPackage getPackageForURI(String uriString)
-            {
-              if ("commonj.sdo".equals(uriString))
-              {
-                return SDOPackage.eINSTANCE;
-              }
-              else
-              {
-                return super.getPackageForURI(uriString);
-              }
-            }
-
-            protected EObject createObjectFromFactory(EFactory factory, String typeName)
-            {
-              if (factory == SDOFactory.eINSTANCE)
-              {
-                if ("datagraph".equals(typeName))
-                {
-                  return super.createObjectFromFactory(factory, "DataGraph");
-                }
-              }
-              return super.createObjectFromFactory(factory, typeName);
-            }
-
-            protected EcoreBuilder createEcoreBuilder(Map options, ExtendedMetaData extendedMetaData)
-            {
-              return new DefaultEcoreBuilder(extendedMetaData)
-                {
-                  public Collection generate(Map urisToLocations) throws Exception
-                  {
-                    Collection result = super.generate(urisToLocations);
-                    return updateDynamicFactory(result);
-                  }
-
-                  public Collection generate(Collection urisToLocations) throws Exception
-                  {
-                    Collection result = super.generate(urisToLocations);
-                    return updateDynamicFactory(result);
-                  }
-
-                  protected Collection updateDynamicFactory(Collection result)
-                  {
-                    for (Iterator i = result.iterator(); i.hasNext();)
-                    {
-                      Resource resource = (Resource)i.next();
-                      for (Iterator j = EcoreUtil.getObjectsByType(resource.getContents(), EcorePackage.eINSTANCE.getEPackage()).iterator(); j.hasNext();)
-                      {
-                        EPackage ePackage = (EPackage)j.next();
-                        ePackage.setEFactoryInstance(new DynamicDataObjectImpl.FactoryImpl());
-                      }
-                    }
-                    return result;
-                  }
-
-                };
-            }
-
-            protected EPackage handleMissingPackage(String uriString)
-            {
-              EPackage result = super.handleMissingPackage(uriString);
-              if (processAnyXML && objects.size() == 1)
-              {
-                result = extendedMetaData.demandPackage(uriString);
-              }
-              return result;
-            }
-          };
-      }
-    }
-
-    protected XMLLoad createXMLLoad()
-    {
-      return new LoadImpl(createXMLHelper());
-    }
-  }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
deleted file mode 100644
index 8481fdfd06..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
+++ /dev/null
@@ -1,3035 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util;
-
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.security.AccessController;
-import java.security.PrivilegedExceptionAction;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TimeZone;
-
-import org.apache.tuscany.sdo.SDOExtendedMetaData;
-import org.apache.tuscany.sdo.SDOFactory;
-import org.apache.tuscany.sdo.SDOPackage;
-import org.apache.tuscany.sdo.api.SDOUtil;
-import org.apache.tuscany.sdo.helper.HelperContextImpl;
-import org.apache.tuscany.sdo.impl.ClassImpl;
-import org.apache.tuscany.sdo.impl.DataGraphImpl;
-import org.apache.tuscany.sdo.model.ModelFactory;
-import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
-import org.apache.tuscany.sdo.util.resource.SDOURIConverterImpl;
-import org.apache.tuscany.sdo.util.resource.SDOXMLResourceFactoryImpl;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.UniqueEList;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EDataTypeImpl;
-import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
-import org.eclipse.emf.ecore.impl.EStringToStringMapEntryImpl;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-import org.eclipse.emf.ecore.xmi.XMLOptions;
-import org.eclipse.emf.ecore.xmi.XMLParserPool;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.EMOFResourceFactoryImpl;
-import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMLOptionsImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMLParserPoolImpl;
-import org.eclipse.emf.ecore.xml.type.XMLTypeFactory;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.DataGraph;
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-import commonj.sdo.helper.DataHelper;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.impl.HelperProvider;
-
-
-public final class DataObjectUtil
-{
-  public static void setString(DataObject dataObject, Property property, String value) {
-    dataObject.set(property, getSetValue(property, value));
-  }
-  
-  public static void setShort(DataObject dataObject, Property property, short value) {
-    dataObject.set(property, getSetValue(property, value));
-  }
-  
-  public static void setLong(DataObject dataObject, Property property, long value) {
-    dataObject.set(property, getSetValue(property, value));
-  }
-  
-  public static void setList(DataObject dataObject, Property property, List value) {
-    dataObject.set(property, value);
-  }
-  
-  public static void setInt(DataObject dataObject, Property property, int value) {
-    dataObject.set(property, getSetValue(property, value));
-  }
-  
-  public static void setFloat(DataObject dataObject, Property property, float value) {
-    dataObject.set(property, getSetValue(property, value));
-  }
- 
-  public static void setDouble(DataObject dataObject, Property property, double value) {
-    dataObject.set(property, getSetValue(property, value));
-  }
-  
-  public static void setDate(DataObject dataObject, Property property, Date value) {
-    dataObject.set(property, getSetValue(property, value));
-  }
-  
-  public static void setDataObject(DataObject dataObject, Property property, DataObject value) {
-    dataObject.set(property, value);
-  }
-  
-  public static void setChar(DataObject dataObject, Property property, char value) {
-    dataObject.set(property, getSetValue(property, value));
-  }
-  
-  public static void setBytes(DataObject dataObject, Property property, byte[] value) {
-    dataObject.set(property, getSetValue(property, value));
-  }
-  
-  public static void setByte(DataObject dataObject, Property property, byte value) {
-    dataObject.set(property, getSetValue(property, value));
-  }
-  
-  public static void setBoolean(DataObject dataObject, Property property, boolean value) {
-    dataObject.set(property, getSetValue(property, value));
-  }
-  
-  public static void setBigInteger(DataObject dataObject, Property property, BigInteger value)
-  {
-    dataObject.set(property, getSetValue(property, value));
-  }
-  
-  public static void setBigDecimal(DataObject dataObject, Property property, BigDecimal value)
-  {
-    dataObject.set(property, getSetValue(property, value));
-  }
-   
-  public static String getString(DataObject dataObject, Property property)
-  {
-    return getString(dataObject.get(property));
-  }
-  
-  public static short getShort(DataObject dataObject, Property property)
-  {
-    return getShort(dataObject.get(property));
-  }
-  
-  public static Sequence getSequence(DataObject dataObject, Property property)
-  {
-    return (Sequence)dataObject.get(property);
-  }
-  
-  public static long getLong(DataObject dataObject, Property property)
-  {
-    return getLong(dataObject.get(property));
-  }
-  
-  public static List getList(DataObject dataObject, Property property)
-  {
-    return (List)dataObject.get(property);
-  }
-  
-  public static int getInt(DataObject dataObject, Property property)
-  {
-    return getInt(dataObject.get(property));
-  }
-  
-  public static float getFloat(DataObject dataObject, Property property)
-  {
-    return getFloat(dataObject.get(property));
-  }
-  
-  public static double getDouble(DataObject dataObject, Property property)
-  {
-    return getDouble(dataObject.get(property));
-  }
-  
-  public static Date getDate(DataObject dataObject, Property property)
-  {
-    return getDate(dataObject.get(property));
-  }
-  
-  public static DataObject getDataObject(DataObject dataObject, Property property)
-  {
-    return (DataObject)dataObject.get(property);
-  }
-  
-  public static char getChar(DataObject dataObject, Property property)
-  {
-    return getChar(dataObject.get(property));
-  }
-  
-  public static byte[] getBytes(DataObject dataObject, Property property)
-  {
-    return getBytes(dataObject.get(property));
-  }
-  
-  public static byte getByte(DataObject dataObject, Property property)
-  {
-    return getByte(dataObject.get(property));
-  }
-  
-  public static boolean getBoolean(DataObject dataObject, Property property)
-  {
-    return getBoolean(dataObject.get(property));
-  }
-  
-  public static BigInteger getBigInteger(DataObject dataObject, Property property)
-  {
-    return getBigInteger(dataObject.get(property));
-  }
-  
-  public static BigDecimal getBigDecimal(DataObject dataObject, Property property)
-  {
-    return getBigDecimal(dataObject.get(property));
-  }
-  
-
-  public static void setString(DataObject dataObject, int propertyIndex, String value) {
-      setString(dataObject,getProperty(dataObject, propertyIndex), value);
-  }
-  
-  public static void setShort(DataObject dataObject, int propertyIndex, short value) {
-      setShort(dataObject,getProperty(dataObject, propertyIndex), value);
-  }
-  
-  public static void setLong(DataObject dataObject, int propertyIndex, long value) {
-      setLong(dataObject,getProperty(dataObject, propertyIndex), value);
-  }
-  
-  public static void setList(DataObject dataObject, int propertyIndex, List value) {
-      setList(dataObject,getProperty(dataObject, propertyIndex), value);
-  }
-  
-  public static void setInt(DataObject dataObject, int propertyIndex, int value) {
-      setInt(dataObject,getProperty(dataObject, propertyIndex), value);
-  }
-  
-  public static void setFloat(DataObject dataObject, int propertyIndex, float value) {
-      setFloat(dataObject,getProperty(dataObject, propertyIndex), value);
-  }
- 
-  public static void setDouble(DataObject dataObject, int propertyIndex, double value) {
-      setDouble(dataObject,getProperty(dataObject, propertyIndex), value);
-  }
-  
-  public static void setDate(DataObject dataObject, int propertyIndex, Date value) {
-      setDate(dataObject,getProperty(dataObject, propertyIndex), value);
-  }
-  
-  public static void setDataObject(DataObject dataObject, int propertyIndex, DataObject value) {
-    dataObject.set(getProperty(dataObject, propertyIndex), value);
-  }
-  
-  public static void setChar(DataObject dataObject, int propertyIndex, char value) {
-      setChar(dataObject,getProperty(dataObject, propertyIndex), value);
-  }
-  
-  public static void setBytes(DataObject dataObject, int propertyIndex, byte[] value) {
-      setBytes(dataObject,getProperty(dataObject, propertyIndex), value);
-  }
-  
-  public static void setByte(DataObject dataObject, int propertyIndex, byte value) {
-      setByte(dataObject,getProperty(dataObject, propertyIndex), value);
-  }
-  
-  public static void setBoolean(DataObject dataObject, int propertyIndex, boolean value) {
-      setBoolean(dataObject,getProperty(dataObject, propertyIndex), value);
-  }
-  
-  public static void setBigInteger(DataObject dataObject, int propertyIndex, BigInteger value)
-  {
-      setBigInteger(dataObject,getProperty(dataObject, propertyIndex), value);
-  }
-  
-  public static void setBigDecimal(DataObject dataObject, int propertyIndex, BigDecimal value)
-  {
-    setBigDecimal(dataObject,getProperty(dataObject, propertyIndex), value);
-  }
-  
-  public static String getString(DataObject dataObject, int propertyIndex)
-  {
-    return getString(dataObject.get(getProperty(dataObject, propertyIndex)));
-  }
-  
-  public static short getShort(DataObject dataObject, int propertyIndex)
-  {
-    return getShort(dataObject.get(getProperty(dataObject, propertyIndex)));
-  }
-  
-
-  public static Sequence getSequence(DataObject dataObject, int propertyIndex)
-  {
-    return (Sequence)dataObject.get(propertyIndex);
-  }
-  
-  public static long getLong(DataObject dataObject, int propertyIndex)
-  {
-    return getLong(dataObject.get(getProperty(dataObject, propertyIndex)));
-  }
-  
-  public static List getList(DataObject dataObject, int propertyIndex)
-  {
-    return (List)dataObject.get(getProperty(dataObject, propertyIndex));
-  }
-  
-  public static int getInt(DataObject dataObject, int propertyIndex)
-  {
-    return getInt(dataObject.get(getProperty(dataObject, propertyIndex)));
-  }
-  
-  public static float getFloat(DataObject dataObject, int propertyIndex)
-  {
-    return getFloat(dataObject.get(getProperty(dataObject, propertyIndex)));
-  }
-  
-  public static double getDouble(DataObject dataObject, int propertyIndex)
-  {
-    return getDouble(dataObject.get(getProperty(dataObject, propertyIndex)));
-  }
-  
-  public static Date getDate(DataObject dataObject, int propertyIndex)
-  {
-    return getDate(dataObject.get(getProperty(dataObject, propertyIndex)));
-  }
-  
-  public static DataObject getDataObject(DataObject dataObject, int propertyIndex)
-  {
-    return (DataObject)dataObject.get(getProperty(dataObject, propertyIndex));
-  }
-  
-  public static char getChar(DataObject dataObject, int propertyIndex)
-  {
-    return getChar(dataObject.get(getProperty(dataObject, propertyIndex)));
-  }
-  
-  public static byte[] getBytes(DataObject dataObject, int propertyIndex)
-  {
-    return getBytes(dataObject.get(getProperty(dataObject, propertyIndex)));
-  }
-  
-  public static byte getByte(DataObject dataObject, int propertyIndex)
-  {
-    return getByte(dataObject.get(getProperty(dataObject, propertyIndex)));
-  }
-  
-  public static boolean getBoolean(DataObject dataObject, int propertyIndex)
-  {
-    return getBoolean(dataObject.get(getProperty(dataObject, propertyIndex)));
-  }
-  
-  public static BigInteger getBigInteger(DataObject dataObject, int propertyIndex)
-  {
-    return getBigInteger(dataObject.get(getProperty(dataObject, propertyIndex)));
-  }
-  
-  public static BigDecimal getBigDecimal(DataObject dataObject, int propertyIndex)
-  {
-    return getBigDecimal(dataObject.get(getProperty(dataObject, propertyIndex)));
-  }
-  
-  public static void detach(DataObject dataObject) {
-    EcoreUtil.remove((EObject)dataObject);
-  }
-  
-  public static DataObject getRootObject(DataObject dataObject)
-  {
-    return (DataObject)EcoreUtil.getRootContainer((EObject)dataObject);
-  }
-  
-  public static boolean isInternalProperty(EStructuralFeature eStructuralFeature)
-  {
-    //return FeatureMapUtil.isFeatureMap(eStructuralFeature);
-    EClassifier eClassifier = eStructuralFeature.getEType();
-    return !(eClassifier instanceof Type || eClassifier == XMLTypePackage.Literals.BASE64_BINARY);
-  }
-
-  public static List getInstanceProperties(DataObject dataObject)
-  {
-    Type type = dataObject.getType();
-    List result = new UniqueEList(type.getProperties());
-    ((ClassImpl)type).addOpenProperties((EObject)dataObject, result);
-    return result;
-  }
-  
-  public static void delete(DataObject dataObject)
-  {
-    EObject eDataObject = (EObject)dataObject;
-    EcoreUtil.remove(eDataObject);
-    List contents = new ArrayList((eDataObject).eContents());
-    for (int i = 0, size = contents.size(); i < size; ++i)
-    {
-      ((DataObject)contents.get(i)).delete();
-    }
-    EClass eClass = eDataObject.eClass();
-    for (int i = 0, size = eClass.getFeatureCount(); i < size; ++i)
-    {
-      EStructuralFeature eStructuralFeature = eClass.getEStructuralFeature(i);
-      if (eStructuralFeature.isChangeable() && !eStructuralFeature.isDerived() && !((Property)eStructuralFeature).isReadOnly())
-      {
-        eDataObject.eUnset(eStructuralFeature);
-      }
-    }
-  }
-  
-  public static DataObject createDataObject(DataObject dataObject, Property property, Type type)
-  {
-    if (!property.isContainment())
-    {
-      throw new IllegalArgumentException("The property '" + property.getName() + "' of '" + property.getContainingType().getName()
-        + "' isn't a containment");
-    }
-    DataObject result = DataObjectUtil.create(type);
-    if (FeatureMapUtil.isMany((EObject)dataObject, (EStructuralFeature)property))
-    {
-      ((List)dataObject.get(property)).add(result);
-    }
-    else
-    {
-      dataObject.set(property, result);
-    }
-    return result;
-  }
-  
-  public static DataObject createDataObject(DataObject dataObject, int propertyIndex, String namespaceURI, String typeName)
-  {
-    Property property = DataObjectUtil.getProperty(dataObject, propertyIndex);
-    Type type = DataObjectUtil.getType(dataObject, namespaceURI, typeName);
-    return createDataObject(dataObject, property, type);
-  }
-  
-  public static DataObject createDataObject(DataObject dataObject, String propertyName, String namespaceURI, String typeName)
-  {
-    Property property = getInstanceProperty(dataObject, propertyName);
-    if (property != null) {
-      Type type = DataObjectUtil.getType(dataObject, namespaceURI, typeName);
-      return createDataObject(dataObject, property, type);
-    }
-    else {
-      if (dataObject.getType().isOpen()) {
-        HelperContext ctx = HelperProvider.getDefaultContext();
-        Type propertyType = ctx.getTypeHelper().getType( namespaceURI, typeName );
-        if (propertyType == null) {
-          throw new IllegalStateException( "type does not exist: uri=" + namespaceURI + ", name=" + typeName );
-        }
-        DataObject value = ctx.getDataFactory().create( propertyType );
-        List list = new ArrayList(1);
-        list.add(value);
-        dataObject.setList( propertyName, list );
-        return value;
-      }
-      else {
-        throw new IllegalArgumentException( "property '" + propertyName + "' does not exist" );
-      }
-    }
-  }
-  
-  public static DataObject createDataObject(DataObject dataObject, Property property)
-  {
-    Type type = property.getType();
-    return createDataObject(dataObject, property, type);
-  }
-  
-  public static DataObject createDataObject(DataObject dataObject, int propertyIndex)
-  {
-    Property property = getProperty(dataObject, propertyIndex);
-    Type type = property.getType();
-    return createDataObject(dataObject,property, type);
-  }
-
-  public static DataObject createDataObject(DataObject dataObject, String propertyName)
-  {
-    Property property = (Property)getInstanceProperty(dataObject, propertyName);
-    if (property != null) {
-      Type type = property.getType();
-      return createDataObject(dataObject,property, type);
-    }
-    else {
-      return createDataObject(dataObject, propertyName, "http://www.apache.org/tuscany/2005/SDO", "AnyTypeDataObject" );
-    }
-  }
-  
-  public static void setString(DataObject dataObject, String path, String value)
-  {
-    Property property = dataObject.getType().getProperty(path);
-    if (property != null)
-    {
-      dataObject.set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create((EObject)dataObject, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-
-  
-  public static void setShort(DataObject dataObject, String path, short value)
-  {
-    Property property = dataObject.getType().getProperty(path);
-    if (property != null)
-    {
-      dataObject.set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create((EObject)dataObject, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-  
-  public static void setLong(DataObject dataObject, String path, long value)
-  {
-    Property property = dataObject.getType().getProperty(path);
-    if (property != null)
-    {
-      dataObject.set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create((EObject)dataObject, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-  
-  public static void setList(DataObject dataObject, String path, List value)
-  {
-    dataObject.set(path, value);
-  }
-  
-  public static void setInt(DataObject dataObject, String path, int value)
-  {
-    Property property = dataObject.getType().getProperty(path);
-    if (property != null)
-    {
-      dataObject.set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create((EObject)dataObject, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-  
-  public static void setFloat(DataObject dataObject, String path, float value)
-  {
-    Property property = dataObject.getType().getProperty(path);
-    if (property != null)
-    {
-      dataObject.set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create((EObject)dataObject, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-  
-  public static void setDouble(DataObject dataObject, String path, double value)
-  {
-    Property property = dataObject.getType().getProperty(path);
-    if (property != null)
-    {
-      dataObject.set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create((EObject)dataObject, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }  
-  
-  public static void setDate(DataObject dataObject, String path, Date value)
-  {
-    Property property = dataObject.getType().getProperty(path);
-    if (property != null)
-    {
-      dataObject.set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create((EObject)dataObject, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-  
-  public static void setDataObject(DataObject dataObject, String path, DataObject value)
-  {
-    dataObject.set(path, value);
-  }
-  
-  public static void setChar(DataObject dataObject, String path, char value)
-  {
-    Property property = dataObject.getType().getProperty(path);
-    if (property != null)
-    {
-      dataObject.set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create((EObject)dataObject, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-  
-  public static void setBytes(DataObject dataObject, String path, byte[] value)
-  {
-    Property property = dataObject.getType().getProperty(path);
-    if (property != null)
-    {
-      dataObject.set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create((EObject)dataObject, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-  
-  public static void setByte(DataObject dataObject, String path, byte value)
-  {
-    Property property = dataObject.getType().getProperty(path);
-    if (property != null)
-    {
-      dataObject.set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create((EObject)dataObject, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-  
-  public static void setBoolean(DataObject dataObject, String path, boolean value)
-  {
-    Property property = dataObject.getType().getProperty(path);
-    if (property != null)
-    {
-      dataObject.set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create((EObject)dataObject, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-  
-  public static void setBigInteger(DataObject dataObject, String path, BigInteger value)
-  {
-    Property property = dataObject.getType().getProperty(path);
-    if (property != null)
-    {
-      dataObject.set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create((EObject)dataObject, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-  
-  public static void setBigDecimal(DataObject dataObject, String path, BigDecimal value)
-  {
-    Property property = dataObject.getType().getProperty(path);
-    if (property != null)
-    {
-      dataObject.set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create((EObject)dataObject, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-  
-  public static DataGraph getDataGraph(DataObject dataObject)
-  {
-    Resource resource = ((EObject)dataObject).eResource();
-    if (resource != null)
-    {
-      ResourceSet resourceSet = resource.getResourceSet();
-      if (resourceSet != null)
-      {
-        return (DataGraphImpl)EcoreUtil.getAdapter(resourceSet.eAdapters(), DataGraph.class);
-      }
-    }
-    return null;
-  }
-  
-  public static ChangeSummary getChangeSummary(DataObject dataObject)
-  {
-    DataGraph dataGraph = getDataGraph(dataObject);
-    if (dataGraph != null)
-    {
-      return dataGraph.getChangeSummary();
-    }
-    else
-    {
-      for (DataObject csDataObject = dataObject; csDataObject != null; csDataObject = csDataObject.getContainer())
-      {
-        Property csp = ((ClassImpl)csDataObject.getType()).getChangeSummaryProperty();
-        if (csp != null) return (ChangeSummary)csDataObject.get(csp);
-      }
-    }
-    return null;
-  }
-
-  public static void unset(DataObject dataObject, String path)
-  {
-    Property property = dataObject.getType().getProperty(path);
-    if (property != null)
-    {
-      dataObject.unset(property);
-    }
-    else
-    {
-      DataObjectUtil.Accessor.create((EObject)dataObject, path).unsetAndRecyle();
-    }
-  }
-  
-  public static boolean isSet(DataObject dataObject, String path)
-  {
-    Property property = dataObject.getType().getProperty(path);
-    if (property != null)
-    {
-      return dataObject.isSet(property);
-    }
-    else
-    {
-      return DataObjectUtil.Accessor.create(
-        (EObject)dataObject, path).isSetAndRecyle();
-    }
-  }  
-  
-  public static void set(DataObject dataObject, String path, Object value) 
-  {
-    Property property = dataObject.getType().getProperty(path);
-    if (property != null)
-    {
-      dataObject.set(property, value);
-    } 
-    else 
-    {
-      DataObjectUtil.Accessor.create(
-        (EObject)dataObject, path, value).setAndRecyle(value);
-    }
-  }
-  
-  public static Object get(DataObject dataObject, String path) 
-  {
-    Property property = dataObject.getType().getProperty(path);
-    if (property != null) {
-      return dataObject.get(property);
-    } else {
-      return Accessor.create((EObject)dataObject, path).getAndRecyle();
-    }
-  }
-  
-  public static BigDecimal getBigDecimal(Object value)
-  {
-    if (value instanceof BigDecimal)
-    {
-      return (BigDecimal)value;
-    }
-
-    if (value instanceof BigInteger)
-    {
-      return new BigDecimal((BigInteger)value);
-    }
-    
-    if (value instanceof Long)
-    {
-      return new BigDecimal(((Long)value).longValue());
-    } 
-
-    if (value instanceof Number)
-    {
-      return new BigDecimal(((Number)value).doubleValue());
-    }
-
-    if (value instanceof String)
-    {
-      return new BigDecimal((String)value);
-    }
-
-    if (value == null)
-    {
-      return null;
-    }
-
-    throw new ClassCastException("The value of type '" + value.getClass().getName() + "' cannot be converted to BigDecimal");
-  }
-
-  public static Object getSetValue(Property property, BigDecimal value)
-  {
-    EStructuralFeature eStructuralFeature = (EStructuralFeature)property;
-    EClassifier eType = eStructuralFeature.getEType();
-    if (value == null)
-    {
-      return eType.getDefaultValue();
-    }
-
-    String name = eType.getInstanceClassName();
-    if (name == "java.math.BigDecimal")
-    {
-      return value;
-    }
-
-    if (name == "java.math.BigInteger")
-    {
-      return value.toBigInteger();
-    }
-
-    if (name == "java.lang.Byte" || name == "byte")
-    {
-      return new Byte(value.byteValue());
-    }
-
-    if (name == "java.lang.Double" || name == "double")
-    {
-      return new Double(value.doubleValue());
-    }
-
-    if (name == "java.lang.Float" || name == "float")
-    {
-      return new Float(value.floatValue());
-    }
-
-    if (name == "java.lang.Integer" || name == "int")
-    {
-      return new Integer(value.intValue());
-    }
-
-    if (name == "java.lang.Long" || name == "long")
-    {
-      return new Long(value.longValue());
-    }
-
-    if (name == "java.lang.Short" || name == "short")
-    {
-      return new Short(value.shortValue());
-    }
-
-    if (name == "java.lang.String")
-    {
-      return String.valueOf(value);
-    }
-
-    //Instead of throwing an ClassCastException we will pass the value to the property
-    return value;
-  }
-
-  public static BigInteger getBigInteger(Object value)
-  {
-    if (value instanceof BigInteger)
-    {
-      return (BigInteger)value;
-    }
-
-    if (value instanceof BigDecimal)
-    {
-      return ((BigDecimal)value).toBigInteger();
-    }
-
-    if (value instanceof Number)
-    {
-      return BigInteger.valueOf(((Number)value).longValue());
-    }
-
-    if (value instanceof String)
-    {
-      return new BigInteger((String)value);
-    }
-
-    if (value instanceof byte[])
-    {
-      return new BigInteger((byte[])value);
-    }
-
-    if (value == null)
-    {
-      return null;
-    }
-
-    throw new ClassCastException("The value of type '" + value.getClass().getName() + "' cannot be converted to BigInteger");
-  }
-
-  public static Object getSetValue(Property property, BigInteger value)
-  {
-    EStructuralFeature eStructuralFeature = (EStructuralFeature)property;
-    EClassifier eType = eStructuralFeature.getEType();
-    if (value == null)
-    {
-      return eType.getDefaultValue();
-    }
-
-    String name = eType.getInstanceClassName();
-    if (name == "java.math.BigInteger")
-    {
-      return value;
-    }
-
-    if (name == "java.math.BigDecimal")
-    {
-      return new BigDecimal(value);
-    }
-
-    if (name == "java.lang.Byte" || name == "byte")
-    {
-      return new Byte(value.byteValue());
-    }
-
-    if (name == "java.lang.Double" || name == "double")
-    {
-      return new Double(value.doubleValue());
-    }
-
-    if (name == "java.lang.Float" || name == "float")
-    {
-      return new Float(value.floatValue());
-    }
-
-    if (name == "java.lang.Integer" || name == "int")
-    {
-      return new Integer(value.intValue());
-    }
-
-    if (name == "java.lang.Long" || name == "long")
-    {
-      return new Long(value.longValue());
-    }
-
-    if (name == "java.lang.Short" || name == "short")
-    {
-      return new Short(value.shortValue());
-    }
-
-    if (name == "java.lang.String")
-    {
-      return String.valueOf(value);
-    }
-
-    if (name == "byte[]")
-    {
-      return value.toByteArray();
-    }
-
-    //Instead of throwing an ClassCastException we will pass the value to the property
-    return value;
-  }
-
-  public static boolean getBoolean(Object value)
-  {
-    if (value instanceof Boolean)
-    {
-      return ((Boolean)value).booleanValue();
-    }
-
-    if (value instanceof String)
-    {
-      return Boolean.valueOf((String)value).booleanValue();
-    }
-
-    if (value == null)
-    {
-      return false;
-    }
-
-    throw new ClassCastException("The value of type '" + value.getClass().getName() + "' cannot be converted to boolean");
-  }
-
-  public static Object getSetValue(Property property, boolean value)
-  {
-    EStructuralFeature eStructuralFeature = (EStructuralFeature)property;
-    String name = eStructuralFeature.getEType().getInstanceClassName();
-    if (name == "java.lang.Boolean" || name == "boolean")
-    {
-      return value ? Boolean.TRUE : Boolean.FALSE;
-    }
-
-    if (name == "java.lang.String")
-    {
-      return String.valueOf(value);
-    }
-
-    //Instead of throwing an ClassCastException we will pass the value to the property
-    return value ? Boolean.TRUE : Boolean.FALSE;
-  }
-
-  public static byte getByte(Object value)
-  {
-    if (value instanceof Number)
-    {
-      return ((Number)value).byteValue();
-    }
-
-    if (value instanceof String)
-    {
-      return Byte.parseByte((String)value);
-    }
-
-    if (value == null)
-    {
-      return 0;
-    }
-
-    throw new ClassCastException("The value of type '" + value.getClass().getName() + "' cannot be converted to byte");
-  }
-
-  public static Object getSetValue(Property property, byte value)
-  {
-    EStructuralFeature eStructuralFeature = (EStructuralFeature)property;
-    String name = eStructuralFeature.getEType().getInstanceClassName();
-    if (name == "java.lang.Byte" || name == "byte")
-    {
-      return new Byte(value);
-    }
-
-    if (name == "java.lang.Double" || name == "double")
-    {
-      return new Double(value);
-    }
-
-    if (name == "java.lang.Float" || name == "float")
-    {
-      return new Float(value);
-    }
-
-    if (name == "java.lang.Integer" || name == "int")
-    {
-      return new Integer(value);
-    }
-
-    if (name == "java.lang.Long" || name == "long")
-    {
-      return new Long(value);
-    }
-
-    if (name == "java.lang.Short" || name == "short")
-    {
-      return new Short(value);
-    }
-
-    if (name == "java.math.BigDecimal")
-    {
-      return getBigDecimal(new Byte(value));
-    }
-
-    if (name == "java.math.BigInteger")
-    {
-      return getBigInteger(new Byte(value));
-    }
-
-    if (name == "java.lang.String")
-    {
-      return String.valueOf(value);
-    }
-
-    //Instead of throwing an ClassCastException we will pass the value to the property
-    return new Byte(value);
-  }
-
-  public static byte[] getBytes(Object value)
-  {
-    if (value instanceof byte[])
-    {
-      return (byte[])value;
-    }
-
-    if (value instanceof BigInteger)
-    {
-      return ((BigInteger)value).toByteArray();
-    }
-
-    if (value instanceof String)
-    {
-        return (XMLTypeFactory.eINSTANCE.createHexBinary((String)value));
-    }
-    
-    if (value == null)
-    {
-      return null;
-    }
-
-    throw new ClassCastException("The value of type '" + value.getClass().getName() + "' cannot be converted to byte array");
-  }
-
-  public static Object getSetValue(Property property, byte[] value)
-  {
-    EStructuralFeature eStructuralFeature = (EStructuralFeature)property;
-    EClassifier eType = eStructuralFeature.getEType();
-    if (value == null)
-    {
-      return eType.getDefaultValue();
-    }
-
-    String name = eType.getInstanceClassName();
-    if (name == "byte[]")
-    {
-      return value;
-    }
-
-    if (name == "java.math.BigInteger")
-    {
-      return new BigInteger(value);
-    }
-    
-    if (name == "java.lang.String" )
-    {
-      return XMLTypeFactory.eINSTANCE.convertHexBinary((byte[])value);
-    }
-    
-    //Instead of throwing an ClassCastException we will pass the value to the property
-    return value;
-  }
-
-  public static char getChar(Object value)
-  {
-    if (value instanceof Character)
-    {
-      return ((Character)value).charValue();
-    }
-
-    if (value instanceof String)
-    {
-      return ((String)value).charAt(0);
-    }
-
-    if (value == null)
-    {
-      return 0;
-    }
-
-    throw new ClassCastException("The value of type '" + value.getClass().getName() + "' cannot be converted to char");
-  }
-
-  public static Object getSetValue(Property property, char value)
-  {
-    EStructuralFeature eStructuralFeature = (EStructuralFeature)property;
-    String name = eStructuralFeature.getEType().getInstanceClassName();
-    if (name == "java.lang.Character" || name == "char")
-    {
-      return new Character(value);
-    }
-
-    if (name == "java.lang.String")
-    {
-      return String.valueOf(value);
-    }
-
-    //Instead of throwing an ClassCastException we will pass the value to the property
-    return new Character(value);
-  }
-
-  public static Date getDate(Object value)
-  {
-    if (value instanceof String) {
-      return DataHelper.INSTANCE.toDate((String)value);
-    }
-
-    //if (value instanceof XMLCalendar)
-    //{
-      //return ((XMLCalendar)value).getDate();
-    //}
-
-    if (value instanceof Date)
-    {
-      return (Date)value;
-    }
-
-    if (value instanceof Long)
-    {
-      return new Date(((Long)value).longValue());
-    }
-
-    if (value == null)
-    {
-      return null;
-    }
-
-    throw new ClassCastException("The value of type '" + value.getClass().getName() + "' cannot be converted to Date");
-  }
-
-  public static Object getSetValue(Property property, Date value)
-  {
-    EStructuralFeature eStructuralFeature = (EStructuralFeature)property;
-    EClassifier eType = eStructuralFeature.getEType();
-    if (value == null)
-    {
-      return eType.getDefaultValue();
-    }
-
-    String name = eType.getInstanceClassName();
-        
-    if (name == "java.lang.String")
-    {
-      String typeName = getDateTypeName((EDataType)eType);
-      if ("DateTime".equals(typeName)) {
-          return DataHelper.INSTANCE.toDateTime(value);
-      }
-      else if ("Day".equals(typeName)) {
-          return DataHelper.INSTANCE.toDay(value);
-      }
-      else if ("Duration".equals(typeName)) {
-          return DataHelper.INSTANCE.toDuration(value);
-      }
-      else if ("Month".equals(typeName)) {
-          return DataHelper.INSTANCE.toMonth(value);
-      }
-      else if ("MonthDay".equals(typeName)) {
-          return DataHelper.INSTANCE.toMonthDay(value);
-      }
-      else if ("Time".equals(typeName)) {
-          return DataHelper.INSTANCE.toTime(value);
-      }
-      else if ("Year".equals(typeName)) {
-          return DataHelper.INSTANCE.toYear(value);
-      }
-      else if ("YearMonth".equals(typeName)) {
-          return DataHelper.INSTANCE.toYearMonth(value);
-      }
-      else if ("YearMonthDay".equals(typeName)) {
-          return DataHelper.INSTANCE.toYearMonthDay(value);
-      }
-      else if ("String".equals(typeName))
-      {
-        return DataHelper.INSTANCE.toDateTime(value);
-      }
-      
-      // Instead of throwing an ClassCastException we will pass the value to the property
-      return value;
-    }
-
-    //if (name == "java.util.Date")
-    //{
-      //return new XMLCalendar(value, XMLCalendar.DATE);
-    //}
-    
-    if (name == "java.lang.Long" || name == "long")
-    {
-      return new Long(value.getTime());
-    }
-
-    // Instead of throwing an ClassCastException we will pass the value to the property
-    return value;
-  }
-
-  protected static String getDateTypeName(EDataType eDataType)
-  {
-    String name = eDataType.getName();
-    if (("DateTime".equals(name)) ||
-            ("Day".equals(name)) ||
-            ("Duration".equals(name)) ||
-            ("Month".equals(name)) ||
-            ("MonthDay".equals(name)) ||
-            ("Time".equals(name)) ||
-            ("Year".equals(name)) ||
-            ("YearMonth".equals(name)) ||
-            ("YearMonthDay".equals(name)) ||
-            ("String".equals(name)))
-    {
-      return name;
-    }
-
-    EDataType baseType = ExtendedMetaData.INSTANCE.getBaseType(eDataType);
-    if (baseType != null)
-    {
-      return getDateTypeName(baseType);
-    }
-
-    List memberTypes = ExtendedMetaData.INSTANCE.getMemberTypes(eDataType);
-    if (!memberTypes.isEmpty())
-    {
-      for (int i = 0, size = memberTypes.size(); i < size; ++i)
-      {
-        EDataType memberType = (EDataType)memberTypes.get(i);
-        String memberTypeName = getDateTypeName(memberType);
-        if (("DateTime".equals(memberTypeName)) ||
-                ("Day".equals(memberTypeName)) ||
-                ("Duration".equals(memberTypeName)) ||
-                ("Month".equals(memberTypeName)) ||
-                ("MonthDay".equals(memberTypeName)) ||
-                ("Time".equals(memberTypeName)) ||
-                ("Year".equals(memberTypeName)) ||
-                ("YearMonth".equals(memberTypeName)) ||
-                ("YearMonthDay".equals(memberTypeName)) ||
-                ("String".equals(memberTypeName)))
-        {
-          return memberTypeName;
-        }
-      }
-    }
-
-    return "";
-  }
-
-  public static double getDouble(Object value)
-  {
-    if (value instanceof Number)
-    {
-      return ((Number)value).doubleValue();
-    }
-
-    if (value instanceof String)
-    {
-      return Double.parseDouble((String)value);
-    }
-
-    if (value == null)
-    {
-      return 0;
-    }
-
-    throw new ClassCastException("The value of type '" + value.getClass().getName() + "' cannot be converted to double");
-  }
-
-  public static Object getSetValue(Property property, double value)
-  {
-    EStructuralFeature eStructuralFeature = (EStructuralFeature)property;
-    String name = eStructuralFeature.getEType().getInstanceClassName();
-    if (name == "java.lang.Byte" || name == "byte")
-    {
-      return new Byte((byte)value);
-    }
-
-    if (name == "java.lang.Double" || name == "double")
-    {
-      return new Double(value);
-    }
-
-    if (name == "java.lang.Float" || name == "float")
-    {
-      return new Float(value);
-    }
-
-    if (name == "java.lang.Integer" || name == "int")
-    {
-      return new Integer((int)value);
-    }
-
-    if (name == "java.lang.Long" || name == "long")
-    {
-      return new Long((long)value);
-    }
-
-    if (name == "java.lang.Short" || name == "short")
-    {
-      return new Short((short)value);
-    }
-
-    if (name == "java.math.BigDecimal")
-    {
-      return getBigDecimal(new Double(value));
-    }
-
-    if (name == "java.math.BigInteger")
-    {
-      return getBigInteger(new Double(value));
-    }
-
-    if (name == "java.lang.String")
-    {
-      return String.valueOf(value);
-    }
-
-    //Instead of throwing an ClassCastException we will pass the value to the property
-    return new Double(value);
-  }
-
-  public static float getFloat(Object value)
-  {
-    if (value instanceof Number)
-    {
-      return ((Number)value).floatValue();
-    }
-
-    if (value instanceof String)
-    {
-      return Float.parseFloat((String)value);
-    }
-
-    if (value == null)
-    {
-      return 0;
-    }
-
-    throw new ClassCastException("The value of type '" + value.getClass().getName() + "' cannot be converted to float");
-  }
-
-  public static Object getSetValue(Property property, float value)
-  {
-    EStructuralFeature eStructuralFeature = (EStructuralFeature)property;
-    String name = eStructuralFeature.getEType().getInstanceClassName();
-    if (name == "java.lang.Byte" || name == "byte")
-    {
-      return new Byte((byte)value);
-    }
-
-    if (name == "java.lang.Double" || name == "double")
-    {
-      return new Double(value);
-    }
-
-    if (name == "java.lang.Float" || name == "float")
-    {
-      return new Float(value);
-    }
-
-    if (name == "java.lang.Integer" || name == "int")
-    {
-      return new Integer((int)value);
-    }
-
-    if (name == "java.lang.Long" || name == "long")
-    {
-      return new Long((long)value);
-    }
-
-    if (name == "java.lang.Short" || name == "short")
-    {
-      return new Short((short)value);
-    }
-
-    if (name == "java.math.BigDecimal")
-    {
-      return getBigDecimal(new Float(value));
-    }
-
-    if (name == "java.math.BigInteger")
-    {
-      return getBigInteger(new Float(value));
-    }
-
-    if (name == "java.lang.String")
-    {
-      return String.valueOf(value);
-    }
-
-    // Instead of throwing an ClassCastException we will pass the value to the property
-    return new Float(value);
-  }
-
-  public static int getInt(Object value)
-  {
-    if (value instanceof Number)
-    {
-      return ((Number)value).intValue();
-    }
-
-    if (value instanceof String)
-    {
-      return Integer.parseInt((String)value);
-    }
-
-    if (value == null)
-    {
-      return 0;
-    }
-
-    throw new ClassCastException("The value of type '" + value.getClass().getName() + "' cannot be converted to int");
-  }
-
-  public static Object getSetValue(Property property, int value)
-  {
-    EStructuralFeature eStructuralFeature = (EStructuralFeature)property;
-    String name = eStructuralFeature.getEType().getInstanceClassName();
-    if (name == "java.lang.Byte" || name == "byte")
-    {
-      return new Byte((byte)value);
-    }
-
-    if (name == "java.lang.Double" || name == "double")
-    {
-      return new Double(value);
-    }
-
-    if (name == "java.lang.Float" || name == "float")
-    {
-      return new Float(value);
-    }
-
-    if (name == "java.lang.Integer" || name == "int")
-    {
-      return new Integer(value);
-    }
-
-    if (name == "java.lang.Long" || name == "long")
-    {
-      return new Long(value);
-    }
-
-    if (name == "java.lang.Short" || name == "short")
-    {
-      return new Short((short)value);
-    }
-
-    if (name == "java.math.BigDecimal")
-    {
-      return getBigDecimal(new Integer(value));
-    }
-
-    if (name == "java.math.BigInteger")
-    {
-      return getBigInteger(new Integer(value));
-    }
-
-    if (name == "java.lang.String")
-    {
-      return String.valueOf(value);
-    }
-
-    // Instead of throwing an ClassCastException we will pass the value to the property
-    return new Integer(value);
-  }
-
-  public static long getLong(Object value)
-  {
-    if (value instanceof Number)
-    {
-      return ((Number)value).longValue();
-    }
-
-    if (value instanceof String)
-    {
-      return Long.parseLong((String)value);
-    }
-
-    if (value instanceof Date)
-    {
-      return ((Date)value).getTime();
-    }
-
-    if (value == null)
-    {
-      return 0;
-    }
-
-    throw new ClassCastException("The value of type '" + value.getClass().getName() + "' cannot be converted to long");
-  }
-
-  public static Object getSetValue(Property property, long value)
-  {
-    EStructuralFeature eStructuralFeature = (EStructuralFeature)property;
-    String name = eStructuralFeature.getEType().getInstanceClassName();
-    if (name == "java.lang.Byte" || name == "byte")
-    {
-      return new Byte((byte)value);
-    }
-
-    if (name == "java.lang.Double" || name == "double")
-    {
-      return new Double(value);
-    }
-
-    if (name == "java.lang.Float" || name == "float")
-    {
-      return new Float(value);
-    }
-
-    if (name == "java.lang.Integer" || name == "int")
-    {
-      return new Integer((int)value);
-    }
-
-    if (name == "java.lang.Long" || name == "long")
-    {
-      return new Long(value);
-    }
-
-    if (name == "java.lang.Short" || name == "short")
-    {
-      return new Short((short)value);
-    }
-
-    if (name == "java.math.BigDecimal")
-    {
-      return getBigDecimal(new Long(value));
-    }
-
-    if (name == "java.math.BigInteger")
-    {
-      return getBigInteger(new Long(value));
-    }
-
-    if (name == "java.lang.String")
-    {
-      return String.valueOf(value);
-    }
-
-    if (name == "java.util.Date")
-    {
-      return new Date(value);
-    }
-
-    // Instead of throwing an ClassCastException we will pass the value to the property
-    return new Long(value);
-  }
-
-  public static short getShort(Object value)
-  {
-    if (value instanceof Number)
-    {
-      return ((Number)value).shortValue();
-    }
-
-    if (value instanceof String)
-    {
-      return Short.parseShort((String)value);
-    }
-
-    if (value == null)
-    {
-      return 0;
-    }
-
-    throw new ClassCastException("The value of type '" + value.getClass().getName() + "' cannot be converted to short");
-  }
-
-  public static Object getSetValue(Property property, short value)
-  {
-    EStructuralFeature eStructuralFeature = (EStructuralFeature)property;
-    String name = eStructuralFeature.getEType().getInstanceClassName();
-    if (name == "java.lang.Byte" || name == "byte")
-    {
-      return new Byte((byte)value);
-    }
-
-    if (name == "java.lang.Double" || name == "double")
-    {
-      return new Double(value);
-    }
-
-    if (name == "java.lang.Float" || name == "float")
-    {
-      return new Float(value);
-    }
-
-    if (name == "java.lang.Integer" || name == "int")
-    {
-      return new Integer(value);
-    }
-
-    if (name == "java.lang.Long" || name == "long")
-    {
-      return new Long(value);
-    }
-
-    if (name == "java.lang.Short" || name == "short")
-    {
-      return new Short(value);
-    }
-
-    if (name == "java.math.BigDecimal")
-    {
-      return getBigDecimal(new Short(value));
-    }
-
-    if (name == "java.math.BigInteger")
-    {
-      return getBigInteger(new Short(value));
-    }
-
-    if (name == "java.lang.String")
-    {
-      return String.valueOf(value);
-    }
-
-    // Instead of throwing an ClassCastException we will pass the value to the property
-    return new Short(value);
-  }
-
-  public static String getString(Object value)
-  {
-    if (value instanceof String)
-    {
-      return (String)value;
-    }
-
-    if (value instanceof Number || value instanceof Boolean || value instanceof Character)
-    {
-      return String.valueOf(value);
-    }
-    
-    if (value instanceof Date)
-    {
-      SimpleDateFormat sdf = new SimpleDateFormat("yyyy'-'MM'-'dd'T'H':'mm':'ss.S'Z'");
-      sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
-      return sdf.format((Date) value);
-    }
-
-    if (value instanceof byte[]) {
-      return XMLTypeFactory.eINSTANCE.convertHexBinary((byte[])value);
-    }
-    
-    if (value == null)
-    {
-      return null;
-    }
-
-    throw new ClassCastException("The value of type '" + value.getClass().getName() + "' cannot be converted to String");
-  }
-
-  public static Object getSetValue(Property property, String value)
-  {
-    EStructuralFeature eStructuralFeature = (EStructuralFeature)property;
-    EClassifier eType = eStructuralFeature.getEType();
-    if (value == null)
-    {
-      return eType.getDefaultValue();
-    }
-
-    String name = eType.getInstanceClassName();
-    if (name == "java.lang.String")
-    {
-      return value;
-    }
-
-    if (name == "java.lang.Byte" || name == "byte")
-    {
-      return Byte.valueOf(value);
-    }
-
-    if (name == "java.util.Date")
-    {
-      return DataHelper.INSTANCE.toDate(value);
-    }
-    
-    if (name == "java.lang.Double" || name == "double" || name == "java.lang.Number")
-    {
-      return Double.valueOf(value);
-    }
-
-    if (name == "java.lang.Float" || name == "float")
-    {
-      return new Float(value);
-    }
-
-    if (name == "java.lang.Integer" || name == "int")
-    {
-      return Integer.valueOf(value);
-    }
-
-    if (name == "java.lang.Long" || name == "long")
-    {
-      return Long.valueOf(value);
-    }
-
-    if (name == "java.lang.Short" || name == "short")
-    {
-      return Short.valueOf(value);
-    }
-
-    if (name == "java.lang.Character" || name == "char")
-    {
-      return new Character(value.charAt(0));
-    }
-
-    if (name == "java.math.BigDecimal")
-    {
-      return getBigDecimal(value);
-    }
-
-    if (name == "java.math.BigInteger")
-    {
-      return getBigInteger(value);
-    }
-
-    if (name == "java.lang.Boolean" || name == "boolean")
-    {
-      return Boolean.valueOf(value);
-    }
-    
-    if (name == "byte[]")
-    {
-        return XMLTypeFactory.eINSTANCE.createHexBinary(value);
-    }
-
-    // Instead of throwing an ClassCastException we will pass the value to the property
-    return value;
-  }
-  
-  public static EStructuralFeature getOpenFeature(EObject eObject, int featureID)
-  {
-    EClass eClass = eObject.eClass();
-    int openFeatureCount = featureID - eClass.getFeatureCount();
-    Set openFeatureSet = new HashSet();
-    for (int i = 0, count = eClass.getEAllStructuralFeatures().size(); i < count; ++i)
-    {
-      EStructuralFeature eStructuralFeature = eClass.getEStructuralFeature(i);
-      if (!eStructuralFeature.isDerived() && FeatureMapUtil.isFeatureMap(eStructuralFeature))
-      {
-        List features = (List)eObject.eGet(eStructuralFeature);
-        for (int j = 0, size = features.size(); j < size; ++j)
-        {
-          FeatureMap.Entry entry = (FeatureMap.Entry)features.get(j);
-          EStructuralFeature entryFeature = entry.getEStructuralFeature();
-          if (openFeatureSet.add(entryFeature))
-          {
-            if (--openFeatureCount < 0) return entryFeature;
-          }
-        }
-      }
-    }
-    throw new IndexOutOfBoundsException();
-  }
-  
-  public static List getAliasNames(EStructuralFeature eStructuralFeature)
-  {
-    List list = SDOExtendedMetaData.INSTANCE.getAliasNames(eStructuralFeature);
-    if (list == null) {
-      list = new ArrayList();
-    }
-    return list;
-  }
-
-  public static List getAliasNames(EClassifier eClassifier)
-  {
-    List list = SDOExtendedMetaData.INSTANCE.getAliasNames(eClassifier);
-    if (list == null) {
-      list = new ArrayList();
-    }
-    return list;
-  }
-  
-  protected static Property demandOpenProperty(Type type, String name, Object value, boolean isSequence)
-  {
-    TypeHelper typeHelper = TypeHelper.INSTANCE; //FB TODO: what TypeHelper to use?
-    
-    String uri = type.getURI() + "/" + type.getName(); // unique URI for open content properties on instances of the type
-    Property property = typeHelper.getOpenContentProperty(uri, name);
-    if (property != null)
-      return property;
-
-    boolean isMany = isSequence;
-    boolean isContainment = false;
-    Type propertyType;
-    
-    if (value instanceof DataObject)
-    {
-      DataObject dataObject = (DataObject)value;
-      propertyType = dataObject.getType();
-      isContainment = dataObject.getContainer() == null;
-    }
-    else if (value instanceof List && !((List)value).isEmpty())
-    {
-      Object listValue = ((List)value).get(0); //TODO: get common base class if all values are not the same type?
-      if (listValue instanceof DataObject)
-        propertyType = ((DataObject)listValue).getType();
-      else
-        propertyType = typeHelper.getType(listValue.getClass());
-      isMany = true;
-    }
-    else
-    {
-      propertyType = typeHelper.getType(value.getClass()); 
-    }
-    if (propertyType == null)
-    {
-      propertyType = ((ModelFactoryImpl)ModelFactory.INSTANCE).getObject();
-    }
-    
-    Property newProperty = SDOUtil.createOpenContentProperty(HelperProvider.getDefaultContext(), uri, name, propertyType);
-    if (isMany)
-      SDOUtil.setMany(newProperty, isMany);
-    if (isContainment)
-      SDOUtil.setContainment(newProperty, isContainment);
-
-    return newProperty;
-  }
-
-  /**
-   * Process the default EMF path and minimal XPath syntax.
-   * This design is still under review and construction.
-   *
-   * Syntax:
-   * 
-   *<pre>
-   * path = /? (step '/')* step
-   * step = feature
-   *      | feature '.' index_from_0 
-   *      | feature '[' index_from_1 ']'
-   *      | reference '[' attribute '=' value ']'
-   *      | ..
-   *      | '@' step
-   *</pre>
-   * 
-   * feature = the name of an attribute or reference
-   * attribute = the name of an attribute
-   * reference = the name of a reference
-   * index = positive integer
-   * value = the string value of an attribute
-   * leading / begins at the root
-   * .. is containing object
-   * 
-   * features must be multi-valued to use '.' and '[' operations.
-   * Only the last step may have an attribute as the feature.
-   */
-  public static final class Accessor //TODO rewrite this using SDO APIs
-  {
-    /**
-     * Creates an accessor for the path of the object.
-     */
-    public static Accessor create(EObject eObject, String path)
-    {
-      return create(eObject, path, null);
-    }
-      
-    public static Accessor create(EObject eObject, String path, Object value)
-    {
-      Accessor result = pool.get();
-      result.init(eObject, path, value);
-      return result;
-    }
-
-    /**
-     * Only the get and recycle methods should be call; they are the only synchronized methods.
-     */
-    protected static class Pool extends BasicEList
-    {
-      protected Accessor[] accessors;
-
-      public Pool()
-      {
-        super(10);
-      }
-
-      protected Object[] newData(int capacity)
-      {
-        return accessors = new Accessor [capacity];
-      }
-
-      /**
-       *  Returns a recyled instance or a new instance.
-       */
-      public synchronized Accessor get()
-      {
-        if (size > 0)
-        {
-          return accessors[--size];
-        }
-        else
-        {
-          return new Accessor();
-        }
-      }
-
-      /** Safely gives the accessor back for recycled use.
-       */
-      public synchronized void recycle(Accessor accessor)
-      {
-        int minimumCapacity = size + 1;
-        if (minimumCapacity > data.length)
-        {
-          grow(minimumCapacity);
-        }
-        accessors[size++] = accessor;
-      }
-    }
-
-    /**
-     * A static thread safe pool of Accessors.
-     */
-    static final Pool pool = new Pool();
-
-    protected static final int NO_INDEX = -1;
-
-    protected EObject eObject;
-    protected Object value;
-
-    protected EStructuralFeature feature;
-
-    protected int index;
-    
-    RuntimeException runtimeException;
-
-    protected Accessor()
-    {
-    }
-
-    //protected Accessor(EObject eObject, String path)
-    //{
-    //  init(eObject, path);
-    //}
-
-    protected void init(EObject eObject, String path, Object value)
-    {
-      this.eObject = eObject;
-      this.value = value;
-      runtimeException = null;
-
-      // This should only be called with a path right now.
-      //
-      //feature = getType(eObject).getProperty(path).getEStructuralFeature(); 
-      //if (feature == null)
-      {
-        process(path);
-      }
-      //else
-      {
-        //index = NO_INDEX;
-      }
-    }
-
-    public Object get()
-    {
-      if (feature == null)
-      {
-        return eObject;
-      }
-      else
-      {
-        Object value = eObject.eGet(feature, true);
-        if (index >= 0)
-        {
-          value = ((List)value).get(index);
-          if (value instanceof FeatureMap.Entry)
-          {
-            value = ((FeatureMap.Entry)value).getValue();
-          }
-        }
-        else if (FeatureMapUtil.isFeatureMap(feature))
-        {
-          value = new BasicSequence((FeatureMap.Internal)value);
-        }
-        return value;
-      }
-    }
-
-    public Object getAndRecyle()
-    {
-      Object result = get();
-      pool.recycle(this);
-      return result;
-    }
-    
-    protected final void assertSuccessfulProcess()
-    {
-      if (runtimeException != null)  
-        throw runtimeException;
-    }
-
-    public void set(Object newValue)
-    {
-      assertSuccessfulProcess();
-      if (index >= 0)
-      {
-        List list = (List)eObject.eGet(feature, true);
-        list.set(index, newValue);
-      }
-      else
-      {
-        // EATM newValue = string2Enum(feature, newValue);
-        eObject.eSet(feature, newValue);
-      }
-    }
-
-    public void setAndRecyle(Object newValue)
-    {
-      set(newValue);
-      pool.recycle(this);
-    }
-
-    public boolean isSet()
-    {
-      return feature != null && eObject.eIsSet(feature);
-    }
-
-    public boolean isSetAndRecyle()
-    {
-      boolean result = isSet();
-      pool.recycle(this);
-      return result;
-    }
-
-    public void unset()
-    {
-      assertSuccessfulProcess();
-      eObject.eUnset(feature);
-    }
-
-    public void unsetAndRecyle()
-    {
-      unset();
-      pool.recycle(this);
-    }
-
-    public void recycle()
-    {
-      pool.recycle(this);
-    }
-
-    public EObject getEObject()
-    {
-      return eObject;
-    }
-
-    protected void setEObject(EObject eObject)
-    {
-      this.eObject = eObject;
-      feature = null;
-      index = NO_INDEX;
-    }
-
-    public EStructuralFeature getEStructuralFeature()
-    {
-      return feature;
-    }
-
-    public Property getProperty()
-    {
-      assertSuccessfulProcess();
-      return (Property)feature;
-    }
-
-    protected void setFeatureName(String name)
-    {
-      if (name != null)
-      {
-        feature = (EStructuralFeature)((DataObject)eObject).getInstanceProperty(name);
-        if (feature == null)
-        {
-          int index = name.lastIndexOf('.');
-          if (index == -1)
-          {
-            Type type = (Type)eObject.eClass();
-            if (value != null && type.isOpen())
-            {
-              feature = (EStructuralFeature)demandOpenProperty(type, name, value, false);
-              this.index = NO_INDEX;
-              return;
-            }
-            runtimeException = new IllegalArgumentException("Class '" + eObject.eClass().getName() + "' does not have a feature named '" + name + '\'');
-          }
-          else
-          {
-            int propertyNameEnd = index;
-            try
-            {
-              index = Integer.parseInt(name.substring(++index));
-                //  NumberFormatException may be thrown
-              String propertyName = name.substring(0, propertyNameEnd);
-              feature = (EStructuralFeature)((DataObject)eObject).getInstanceProperty(propertyName);
-              if (feature != null)
-              {
-                setIndex(index);
-                return;
-              }
-              runtimeException = new IllegalArgumentException("Class '" + eObject.eClass().getName() + "' does not have a feature named '" + name + "' or '" + propertyName + '\'');
-            }
-            catch(NumberFormatException eNumberFormat)
-            {
-              runtimeException = eNumberFormat;
-            }
-          }
-          setEObject(null);
-        }
-      }
-      else
-      {
-        feature = null;
-      }
-      index = NO_INDEX;
-    }
-
-    protected int getIndex()
-    {
-      return index;
-    }
-
-    /*
-     * calling constraint, this method is not to be used for semantic of setting index to NO_INDEX
-     */ 
-    protected void setIndex(int index)
-    {
-      if (index < 0) {
-        // The index value should not be less than 0.
-        runtimeException = new IndexOutOfBoundsException("Index value is too low");
-        setEObject(null);
-        return;
-      }
-      if (!FeatureMapUtil.isMany(eObject, feature))
-      {
-        runtimeException = new IndexOutOfBoundsException("Index applies only to multi-valued features");
-        setEObject(null);
-        return;
-      }
-      int size = ((List) eObject.eGet(feature)).size();
-      if (index >= size)
-      {
-        // The index value should be less than size.
-        runtimeException = new IndexOutOfBoundsException("Index value should have been less than " + size);
-        setEObject(null);
-      }
-      this.index = index;
-    }
-
-    protected void process(String pathString)
-    {
-      TokenList tokens = new TokenList(pathString.toCharArray());
-      String token;
-      int size = tokens.size();
-      int x = 0;
-
-      if ("/".equals(tokens.peek(0)))
-      {
-        setEObject(EcoreUtil.getRootContainer(eObject));
-        x++;
-      }
-
-      for (; x < size; x++)
-      {
-        token = tokens.peek(x);
-        char c = token.charAt(0);
-        if ('/' == c)
-        {
-          setEObject((EObject)get());
-          if (eObject == null) break;
-        }
-        else if ("..".equals(token))
-        {
-          setEObject(eObject.eContainer());
-          if (eObject == null) break;
-        }
-        else if ('[' == c)
-        {
-          x++; // skip [
-          token = tokens.peek(x); // name or index
-          char following = tokens.peek(x + 1).charAt(0);
-          if ('=' != following)
-          {
-            try
-            {
-              setIndex(Integer.parseInt(token) - 1);
-                //  runtimeException may be recorded
-            }
-            catch(NumberFormatException eNumberFormat)
-            {
-              runtimeException = eNumberFormat;
-              setEObject(null);
-              break;
-            }
-            if (runtimeException != null)
-              break;
-            x++; // skip ]
-          }
-          else
-          {
-            x++; // done name
-            x++; // skip =
-            String attributeValue = tokens.peek(x); // value
-            if ("\"".equals(attributeValue))
-            {
-              x++; // skip "
-              attributeValue = tokens.peek(++x);
-            }
-            x++; // skip ]
-            int index = matchingIndex((List)get(), token, attributeValue);
-            if (index < 0)
-            {
-              setEObject(null);
-              break;
-            }
-            else
-            {
-              setIndex(index);
-            }
-          }
-        }
-        else if ('@' == c)
-        {
-          // skip @
-        }
-        else
-        {
-          setFeatureName(token);
-          if (eObject == null) break;
-        }
-      }
-    }
-
-    protected static int matchingIndex(List dataObjects, String attributeName, String attributeValue)
-    {
-      for (int i = 0, size = dataObjects.size(); i < size; i++)
-      {
-        DataObject dataObject = (DataObject)dataObjects.get(i);
-        Property property = getInstanceProperty(dataObject, attributeName);
-        if (property != null)
-        {
-          Object test = dataObject.get(property);
-          if (test != null)
-          {
-            String testString = EcoreUtil.convertToString((EDataType)property.getType(), test);
-            if (attributeValue.equals(testString))
-            {
-              return i;
-            }
-          }
-        }
-      }
-      return -1;
-    }
-
-    protected static class TokenList extends BasicEList
-    {
-      public TokenList(char[] path)
-      {
-        super(4);
-
-        int pathLength = path.length;
-        StringBuffer token = new StringBuffer();
-        char cPrev;
-        char c = 0;
-        char cNext;
-        char stringConstant = 0;
-        for (int pos = 0; pos < pathLength; pos++)
-        {
-          cPrev = c;
-          c = path[pos];
-          cNext = pos < pathLength - 1 ? path[pos + 1] : 0;
-
-          if (stringConstant != 0)
-          {
-            if (c == stringConstant)
-            {
-              endToken(token, true);
-              stringConstant = 0;
-            }
-            else
-            {
-              token.append(c);
-            }
-          }
-          else
-          {
-            switch (c)
-            {
-              case ' ':
-              case 0xA:
-              case 0xD:
-              case 0x9:
-                if (cPrev != ' ')
-                {
-                  endToken(token, false);
-                }
-                c = ' ';
-                break;
-
-              case '"':
-              case '\'':
-                endToken(token, false);
-                stringConstant = c;
-                break;
-
-              // double or single tokens
-              case '/':
-              case ':':
-                if (cPrev != c)
-                {
-                  endToken(token, false);
-                }
-                token.append(c);
-                if (cNext != c)
-                {
-                  endToken(token, false);
-                }
-                break;
-
-              // double token (..)
-              case '.':
-                if (cNext == '.')
-                  endToken(token, false);
-                token.append(c);
-                if (cPrev == '.')
-                  endToken(token, false);
-                break;
-
-              // single tokens
-              case '*':
-              case '@':
-              case '[':
-              case ']':
-              case '(':
-              case ')':
-              case '|':
-                endToken(token, false);
-                add(String.valueOf(c));
-                break;
-
-              // TODO: < > <= >= + - !=
-              case '!':
-                endToken(token, false);
-                token.append(c);
-                break;
-
-              case '=':
-                endToken(token, false);
-                add(String.valueOf(c));
-                break;
-
-              default:
-                token.append(c);
-            }
-          }
-        }
-        endToken(token, false);
-      }
-
-      public String peek()
-      {
-        return size > 0 ? (String)data[0] : " ";
-      }
-
-      public String peek(int index)
-      {
-        return index < size ? (String)data[index] : " ";
-      }
-
-      public TokenList pop()
-      {
-        remove(0);
-        return this;
-      }
-
-      public TokenList pop(int count)
-      {
-        while (count-- > 0)
-        {
-          remove(count);
-        }
-        return this;
-      }
-
-      protected void endToken(StringBuffer token, boolean includeEmpty)
-      {
-        if (includeEmpty || token.length() > 0)
-        {
-          add(token.toString());
-        }
-        token.setLength(0);
-      }
-
-      protected boolean canContainNull()
-      {
-        return false;
-      }
-
-      protected Object[] newData(int capacity)
-      {
-        return new String [capacity];
-      }
-    }
-
-    public String toString()
-    {
-      StringBuffer result = new StringBuffer("Accessor (object:");
-      result.append(eObject == null ? "null" : eObject.toString());
-      result.append(", feature:");
-      result.append(feature == null ? "null" : feature.getName());
-      result.append(", index:");
-      result.append(index);
-      result.append(")");
-      return result.toString();
-    }
-  }
-  
-  public static Type getType(DataObject dataObject, String namespaceURI, String typeName)
-  {
-    DataGraph dataGraph = dataObject.getDataGraph();
-    if (dataGraph != null)
-    {
-      return dataGraph.getType(namespaceURI, typeName);
-    }
-    else
-    {
-      //TODO think about where else to find the type
-      return TypeHelper.INSTANCE.getType(namespaceURI, typeName);
-    }
-  }
-
-  public static Property getInstanceProperty(DataObject dataObject, String propertyName)
-  {
-    ClassImpl type = (ClassImpl)dataObject.getType();
-    Property property = type.getProperty(propertyName);
-    if (property == null)
-    {
-      property = type.getOpenProperty((EObject)dataObject, propertyName);
-      //throw new IllegalArgumentException("Type '" + dataObject.getType().getName() + "' does not have a property named '" + propertyName + "'");
-    }
-  
-    return property;
-  }
-
-  public static Property getProperty(DataObject dataObject, int propertyIndex)
-  {
-    List typeProperties = dataObject.getType().getProperties();
-    try {
-      Property property = propertyIndex < typeProperties.size() ?
-          (Property)typeProperties.get(propertyIndex) :
-          (Property)dataObject.getInstanceProperties().get(propertyIndex);
-    
-      return property;
-      } catch (IndexOutOfBoundsException e) {
-        throw new IllegalArgumentException();
-      }
-  }
-
-  public static Property getContainmentProperty(Property property)
-  {
-    if (property.isContainment())
-    {
-      return property;
-    }
-    throw new IllegalArgumentException("The property '" + property.getName() + "' of '" + property.getContainingType().getName()
-      + "' isn't a containment");
-  }
-
-  public static DataObject create(Type type)
-  {
-    //return (DataObject)EcoreUtil.create((EClass)type);
-    if ((type instanceof EClass) && !type.isAbstract()) {
-      EClass eClass = (EClass)type;
-      try {
-          return (DataObject)EcoreUtil.create(eClass);
-      } catch (ClassCastException e) {
-          throw new IllegalArgumentException();
-      }
-    }
-    throw new IllegalArgumentException();
-  }
-  
-  public static ResourceSet createResourceSet()
-  {
-    ResourceSet result = new ResourceSetImpl();
-    configureResourceSet(result);
-    return result;
-  }
-
-  protected static Map registrations;
-
-  protected static Map getRegistrations()
-  {
-    if (registrations == null)
-    {
-      Map result = new HashMap();
-      
-      Resource.Factory factory = Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.datagraph"));
-      result.put("datagraph", factory instanceof DataGraphResourceFactoryImpl ? factory : new DataGraphResourceFactoryImpl());
-
-      factory = Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.ecore"));
-      result.put("ecore", factory instanceof EcoreResourceFactoryImpl ? factory : new EcoreResourceFactoryImpl());
-      
-      factory = Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.emof"));
-      result.put("emof", factory instanceof EMOFResourceFactoryImpl ? factory : new EMOFResourceFactoryImpl());
-
-      factory = Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.xsd"));
-      result.put("xsd", factory instanceof XSDResourceFactoryImpl ? factory : new XSDResourceFactoryImpl());
-
-      factory = Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.wsdl"));
-      result.put("wsdl", factory instanceof XSDResourceFactoryImpl ? factory : new XSDResourceFactoryImpl());
-      
-      factory = Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.*"));
-      result.put("*", factory instanceof SDOXMLResourceFactoryImpl ? factory : new SDOXMLResourceFactoryImpl());
-      
-      registrations = result;
-    }
-
-    return registrations;
-  }
-
-  protected static void configureResourceSet(ResourceSet resourceSet)
-  {
-    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().putAll(getRegistrations());
-    resourceSet.setPackageRegistry(new EPackageRegistryImpl(HelperContextImpl.getBuiltInModelRegistry()));      
-    resourceSet.setURIConverter(new SDOURIConverterImpl());
-  }
-  
-  public static EClass createDocumentRoot()
-  {
-    EClass documentRootEClass = (EClass)SDOFactory.eINSTANCE.createClass();
-    documentRootEClass.setName("DocumentRoot");
-    ExtendedMetaData.INSTANCE.setName(documentRootEClass, "");
-    ExtendedMetaData.INSTANCE.setContentKind(documentRootEClass, ExtendedMetaData.MIXED_CONTENT);
-    
-    EAttribute mixed = (EAttribute)SDOFactory.eINSTANCE.createAttribute();
-    mixed.setName("mixed");
-    mixed.setEType(EcorePackage.eINSTANCE.getEFeatureMapEntry());
-    mixed.setUpperBound(EStructuralFeature.UNBOUNDED_MULTIPLICITY);
-    ExtendedMetaData.INSTANCE.setName(mixed, ":mixed");
-    ExtendedMetaData.INSTANCE.setFeatureKind(mixed, ExtendedMetaData.ELEMENT_WILDCARD_FEATURE);
-    documentRootEClass.getEStructuralFeatures().add(mixed);
-    
-    EReference xmlnsPrefixMap = (EReference)SDOFactory.eINSTANCE.createReference();
-    xmlnsPrefixMap.setName("xMLNSPrefixMap");
-    xmlnsPrefixMap.setEType(EcorePackage.eINSTANCE.getEStringToStringMapEntry());
-    xmlnsPrefixMap.setUpperBound(EStructuralFeature.UNBOUNDED_MULTIPLICITY);
-    xmlnsPrefixMap.setContainment(true);
-    xmlnsPrefixMap.setTransient(true);
-    ExtendedMetaData.INSTANCE.setName(xmlnsPrefixMap, "xmlns:prefix");
-    ExtendedMetaData.INSTANCE.setFeatureKind(xmlnsPrefixMap, ExtendedMetaData.ATTRIBUTE_FEATURE);
-    documentRootEClass.getEStructuralFeatures().add(xmlnsPrefixMap);
-    
-    EReference xsiSchemaLocation = (EReference)SDOFactory.eINSTANCE.createReference();
-    xsiSchemaLocation.setName("xSISchemaLocation");
-    xsiSchemaLocation.setEType(EcorePackage.eINSTANCE.getEStringToStringMapEntry());
-    xsiSchemaLocation.setUpperBound(EStructuralFeature.UNBOUNDED_MULTIPLICITY);
-    xsiSchemaLocation.setContainment(true);
-    xsiSchemaLocation.setTransient(true);
-    ExtendedMetaData.INSTANCE.setName(xsiSchemaLocation, "xsi:schemaLocation");
-    ExtendedMetaData.INSTANCE.setFeatureKind(xsiSchemaLocation, ExtendedMetaData.ATTRIBUTE_FEATURE);
-    documentRootEClass.getEStructuralFeatures().add(xsiSchemaLocation);
-    
-    return documentRootEClass;
-  }
-
-  /**
-   * Configure EMF to support the SDO runtime by registering a specialized Ecore factory, SDOEcoreFactory.
-   *  This static initializion must run before any SDO metadata is created or loaded.
-   *  As long as SDO helper classes (e.g., TypeHelper, XMLHelper, etc.) are accessed though their
-   *  corresponding INSTANCE fields (e.g., TypeHelper.INSTANCE), or using the SDOUtil methods (e.g.,
-   *  SDOUtil.createTypeHelper(), this will always be the case.
-   */
-  /*
-  static
-  {
-    EPackage.Registry.INSTANCE.put(EcorePackage.eNS_URI, new EPackage.Descriptor()
-      {
-        public EPackage getEPackage()
-        {
-          return EcorePackage.eINSTANCE;
-        }
-
-        public EFactory getEFactory()
-        {
-          return new SDOFactoryImpl.SDOEcoreFactory();
-        }
-      });
-  }
-  */
-  
-  /*
-  protected static StringBuffer getXPath(DataObject dataObject, StringBuffer path, DataObject root)
-  {
-    DataObject container = dataObject.getContainer();
-    if (container == null) return path;
-    
-    if (container == root) {
-        throw new IllegalStateException("There is a cycle in the containment hierarchy of " + root);
-    }
-
-    boolean first = path.length() == 0;
-    Property property = dataObject.getContainmentProperty();
-    if (SDOUtil.isMany(property, dataObject))
-    {
-      List list = container.getList(property);
-      int pos = list.indexOf(dataObject);
-      path.insert(0, property.getName() + "." + pos + (first ? "" : "/"));
-    }
-    else
-    {
-      path.insert(0, property.getName() + (first ? "" : "/"));
-    }
-
-    return getXPath(container, path, root);
-  }
-  */
-
-  public static String getXPath(DataObject dataObject)
-  {
-    return SDOUtil.getXPath(dataObject);
-    //StringBuffer path = getXPath(dataObject, new StringBuffer(), dataObject);
-    //return path.toString();
-  }
-  
-  protected static XMLParserPool globalXMLParserPool = new XMLParserPoolImpl();
-  
-  public static void configureXMLResource(XMLResource resource, ExtendedMetaData extendedMetaData)
-  {
-    XMLOptions xmlOptions = new XMLOptionsImpl();
-    xmlOptions.setProcessAnyXML(true);
-    resource.getDefaultLoadOptions().put(XMLResource.OPTION_XML_OPTIONS, xmlOptions);
-
-    resource.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, extendedMetaData);
-    resource.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, extendedMetaData);
-    
-    resource.getDefaultLoadOptions().put(XMLResource.OPTION_USE_PARSER_POOL, globalXMLParserPool);
-    
-    resource.getDefaultLoadOptions().put(XMLResource.OPTION_USE_DEPRECATED_METHODS, Boolean.FALSE);
-    
-    resource.getDefaultSaveOptions().put(XMLResource.OPTION_CONFIGURATION_CACHE, Boolean.TRUE);
-    resource.getDefaultLoadOptions().put(XMLResource.OPTION_CONFIGURATION_CACHE, Boolean.TRUE);
-    
-    resource.getDefaultLoadOptions().put(XMLResource.OPTION_ANY_TYPE, SDOPackage.eINSTANCE.getAnyTypeDataObject());
-    resource.getDefaultSaveOptions().put(XMLResource.OPTION_ANY_TYPE, SDOPackage.eINSTANCE.getAnyTypeDataObject());
-
-    resource.getDefaultLoadOptions().put(XMLResource.OPTION_ANY_SIMPLE_TYPE, SDOPackage.eINSTANCE.getSimpleAnyTypeDataObject());
-    resource.getDefaultSaveOptions().put(XMLResource.OPTION_ANY_SIMPLE_TYPE, SDOPackage.eINSTANCE.getSimpleAnyTypeDataObject());
-
-    //resource.getDefaultLoadOptions().put(XMLResource.OPTION_USE_XML_NAME_TO_FEATURE_MAP, globalHashMap);
-
-    //resource.getDefaultSaveOptions().put(XMLResource.OPTION_FORMATTED, Boolean.FALSE);
-  }
-
-  /**
-   * @deprecated SDO runtime initialization is no longer required
-   */
-  public static void initRuntime()
-  {
-    // NOOP since init is done during static initialization of this class. See above.
-  }
-  
-  /*
-  public static Object get(org.apache.tuscany.sdo.model.Property property, int propertyIndex) {
-    switch(propertyIndex)
-    {
-      case ModelPackageImpl.PROPERTY__ALIAS_NAME:
-        return property.getAliasName();
-      case ModelPackageImpl.PROPERTY__ANY:
-        return property.getAny();
-      case ModelPackageImpl.PROPERTY__ANY_ATTRIBUTE:
-        return property.getAnyAttribute();
-      case ModelPackageImpl.PROPERTY__CONTAINMENT:
-        return Boolean.valueOf(property.isContainment());
-      case ModelPackageImpl.PROPERTY__DEFAULT:
-        return property.getDefault_();
-      case ModelPackageImpl.PROPERTY__MANY:
-        return Boolean.valueOf(property.isMany());
-      case ModelPackageImpl.PROPERTY__NAME:
-        return property.getName();
-      case ModelPackageImpl.PROPERTY__OPPOSITE:
-        return property.getOpposite_();
-      case ModelPackageImpl.PROPERTY__READ_ONLY:
-        return Boolean.valueOf(property.isReadOnly());
-      case ModelPackageImpl.PROPERTY__TYPE:
-        return property.getType_();
-    }
-    return null;
-  }
-  
-  public static boolean isSet(org.apache.tuscany.sdo.model.Property property, int propertyIndex) {
-    switch(propertyIndex)
-    {
-      case ModelPackageImpl.PROPERTY__ALIAS_NAME:
-        return !property.getAliasName().isEmpty();
-      case ModelPackageImpl.PROPERTY__ANY:
-        return false;
-      case ModelPackageImpl.PROPERTY__ANY_ATTRIBUTE:
-        return false;
-      case ModelPackageImpl.PROPERTY__CONTAINMENT:
-        return property.isSetContainment();
-      case ModelPackageImpl.PROPERTY__DEFAULT:
-        return property.getDefault_() != null;
-      case ModelPackageImpl.PROPERTY__MANY:
-        return property.isSetMany();
-      case ModelPackageImpl.PROPERTY__NAME:
-        return property.getName() != null;
-      case ModelPackageImpl.PROPERTY__OPPOSITE:
-        return property.getOpposite_() != null;
-      case ModelPackageImpl.PROPERTY__READ_ONLY:
-        return property.isSetReadOnly();
-      case ModelPackageImpl.PROPERTY__TYPE:
-        return property.getType_() != null;
-    }
-    return false;
-  }
-  
-  public static Object get(org.apache.tuscany.sdo.model.Type type, int propertyIndex) {
-    switch (propertyIndex)
-    {
-      case ModelPackageImpl.TYPE__BASE_TYPE:
-        return type.getBaseType();
-      case ModelPackageImpl.TYPE__PROPERTY:
-        return type.getProperty();
-      case ModelPackageImpl.TYPE__ALIAS_NAME:
-        return type.getAliasName();
-      case ModelPackageImpl.TYPE__ANY:
-        return type.getAny();
-      case ModelPackageImpl.TYPE__ABSTRACT:
-        return Boolean.valueOf(type.isAbstract());
-      case ModelPackageImpl.TYPE__DATA_TYPE:
-        return Boolean.valueOf(type.isDataType());
-      case ModelPackageImpl.TYPE__NAME:
-        return type.getName();
-      case ModelPackageImpl.TYPE__OPEN:
-        return Boolean.valueOf(type.isOpen());
-      case ModelPackageImpl.TYPE__SEQUENCED:
-        return Boolean.valueOf(type.isSequenced());
-      case ModelPackageImpl.TYPE__URI:
-        return type.getUri();
-      case ModelPackageImpl.TYPE__ANY_ATTRIBUTE:
-        return type.getAnyAttribute();
-    }
-    return null;
-  }
-  
-  public static boolean isSet(org.apache.tuscany.sdo.model.Type type, int propertyIndex) {
-    //FB Note that this implementation has the undesirable effect of invoking lazy creation of feature lists
-    switch (propertyIndex)
-    {
-      case ModelPackageImpl.TYPE__BASE_TYPE:
-        return !type.getBaseType().isEmpty();
-      case ModelPackageImpl.TYPE__PROPERTY:
-        return !type.getProperty().isEmpty();
-      case ModelPackageImpl.TYPE__ALIAS_NAME:
-        return !type.getAliasName().isEmpty();
-      case ModelPackageImpl.TYPE__ANY:
-        return false;
-      case ModelPackageImpl.TYPE__ABSTRACT:
-        return type.isSetAbstract();
-      case ModelPackageImpl.TYPE__DATA_TYPE:
-        return type.isSetDataType();
-      case ModelPackageImpl.TYPE__NAME:
-        return type.getName() != null;
-      case ModelPackageImpl.TYPE__OPEN:
-        return type.isSetOpen();
-      case ModelPackageImpl.TYPE__SEQUENCED:
-        return type.isSetSequenced();
-      case ModelPackageImpl.TYPE__URI:
-        return type.getUri() != null;
-      case ModelPackageImpl.TYPE__ANY_ATTRIBUTE:
-        return false;
-    }
-    return false;
-  }
-  */
-
-  /**
-   * Returns a unique list of meta object instance properties (stored in EAnnotations)
-   *  
-   * @param metaObject - A Type or Property instance
-   * @return A list of commonj.sdo.Property instances
-   */
-  public static List getMetaObjectInstanceProperties(EModelElement metaObject) 
-  {
-    // Use the default helper context for now
-	// TypeHelper typeHelper = HelperProvider.getDefaultContext().getTypeHelper();
-      HelperContext hc = HelperProvider.getDefaultContext();
-      
-    List result = new UniqueEList();
-    List annotations = metaObject.getEAnnotations();
-    int size = annotations.size();
-    for (int i=0; i<size; i++) 
-    {
-      EAnnotation annotation = (EAnnotation)annotations.get(i);
-      String propertyURI = annotation.getSource();
-      
-      for (Iterator iter = annotation.getDetails().iterator(); iter.hasNext(); ) 
-      {
-        EStringToStringMapEntryImpl entry = (EStringToStringMapEntryImpl)iter.next();
-        String propertyName = entry.getTypedKey();
-        
-        Property globalProperty = getGlobalProperty(hc, propertyURI, propertyName);
-        if (globalProperty != null)
-        {
-          result.add(globalProperty);
-        }
-      }
-    }
-    return result; 
-  }
-  
-  /**
-   * Return the value of the specified mata object instance property (stored in EAnnotations)
-   * 
-   * @param metaObject - A Type or Property instance
-   * @param property - The instance property to retrieve
-   * @return The value of the instance property
-   */
-  /*public static Object getMetaObjectInstanceProperty(EModelElement metaObject, Property property)
-  {
-    String value = EcoreUtil.getAnnotation(metaObject, property.getContainingType().getURI(), property.getName());
-    //TODO if (property.isMany()) ... // create list of values from from string
-    return SDOUtil.createFromString(property.getType(), value);
-  }*/
-  
-	 public static Object getMetaObjectInstanceProperty(EModelElement metaObject, Property property)
-	 {
-	  if(metaObject instanceof EDataTypeImpl){
-		  if(property.getName().equals("enumeration")) {
-				  List enumVals = ((EDataTypeImpl)metaObject).getExtendedMetaData().getEnumerationFacet();
-				  return enumVals;
-			  }
-	 
-			  if(property.getName().equals("pattern")) {
-			  List patternVals = ((EDataTypeImpl)metaObject).getExtendedMetaData().getPatternFacet();
-			  return patternVals;
-		  }
-	  }
-	  String value = EcoreUtil.getAnnotation(metaObject, property.getContainingType().getURI(), property.getName());
-	  //TODO if (property.isMany()) ... // create list of values from from string
-	  return SDOUtil.createFromString(property.getType(), value);
-	 }
-  
-  
-/*
-  protected static Property getGlobalProperty(TypeHelper typeHelper, String uri, String name)
-  {
-    Property property;
-    if (ExtendedMetaData.ANNOTATION_URI.equals(uri)) {
-      if ("minExclusive".equals(name) ||
-          "minInclusive".equals(name) ||
-          "maxExclusive".equals(name) ||
-          "maxInclusive".equals(name) ||
-          "totalDigits".equals(name) ||
-          "fractionDigits".equals(name) ||
-          "length".equals(name) ||
-          "minLength".equals(name) ||
-          "maxLength".equals(name) ||
-          "enumeration".equals(name) ||
-          "whiteSpace".equals(name) ||
-          "pattern".equals(name))
-      {
-        //TODO Use standard facet properties, once SDO defines them
-        //TODO property = getSDOFacetProperty(name);
-        //TEMP For now just expose a string property for the EMF (ExtendedMetaData) facets
-        property = SDOUtil.createOpenContentProperty(typeHelper, uri, name, ((ModelFactoryImpl)ModelFactory.INSTANCE).getString());
-      }
-      else
-      {
-        //TODO Should we consider exposing more ExtendedMetaData?
-        property = null;
-      }
-    }
-    else
-    {
-      property = typeHelper.getOpenContentProperty(uri, name);
-      if (property == null)
-      {
-        property = SDOUtil.createOpenContentProperty(typeHelper, uri, name, ((ModelFactoryImpl)ModelFactory.INSTANCE).getString());
-      }
-    }
-    return property;
-  }
-*/
-  protected static Property getGlobalProperty(HelperContext hc, String uri, String name)
-  {
-    Property property;
-    if (ExtendedMetaData.ANNOTATION_URI.equals(uri)) {
-      if ("minExclusive".equals(name) ||
-          "minInclusive".equals(name) ||
-          "maxExclusive".equals(name) ||
-          "maxInclusive".equals(name) ||
-          "totalDigits".equals(name) ||
-          "fractionDigits".equals(name) ||
-          "length".equals(name) ||
-          "minLength".equals(name) ||
-          "maxLength".equals(name) ||
-          "enumeration".equals(name) ||
-          "whiteSpace".equals(name) ||
-          "pattern".equals(name))
-      {
-        //TODO Use standard facet properties, once SDO defines them
-        //TODO property = getSDOFacetProperty(name);
-        //TEMP For now just expose a string property for the EMF (ExtendedMetaData) facets
-        property = SDOUtil.createOpenContentProperty(hc, uri, name, ((ModelFactoryImpl)ModelFactory.INSTANCE).getString());
-      }
-      else
-      {
-        //TODO Should we consider exposing more ExtendedMetaData?
-        property = null;
-      }
-    }
-    else
-    {
-      property = hc.getTypeHelper().getOpenContentProperty(uri, name);
-      if (property == null)
-      {
-        property = SDOUtil.createOpenContentProperty(hc, uri, name, ((ModelFactoryImpl)ModelFactory.INSTANCE).getString());
-      }
-    }
-    return property;
-  }
-  
-  protected static Class loadClass(final ClassLoader classLoader, final String className) {
-    Class returnClass = null;
-    try
-    {
-      returnClass = (Class)AccessController.doPrivileged(new PrivilegedExceptionAction()
-        {
-          public Object run() throws Exception
-          {
-            return classLoader.loadClass(className);
-          }
-        });
-    }
-    catch (Exception e)
-    {
-      return null;
-    }
-
-    return returnClass;
-  }
-  
-  public static Class getImplementationClass(Class instanceClass, boolean concrete)
-  {
-    if (instanceClass.isInterface())
-    {
-      String sdoTypeImplClassName = instanceClass.getName();
-      int index = sdoTypeImplClassName.lastIndexOf('.');
-      if (index == -1) {
-        sdoTypeImplClassName = "impl." + sdoTypeImplClassName + "Impl";
-      }
-      else {
-        sdoTypeImplClassName = sdoTypeImplClassName.substring(0, index) + ".impl" + sdoTypeImplClassName.substring(index) + "Impl";
-      }
-      if (concrete) sdoTypeImplClassName += "$ConcreteBase";
-      return loadClass(instanceClass.getClassLoader(), sdoTypeImplClassName);
-    }
-    else
-    {
-      return instanceClass;
-    }
-  }     
-
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
deleted file mode 100644
index 19ac5e8a09..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
+++ /dev/null
@@ -1,593 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Field;
-import java.security.AccessController;
-import java.security.PrivilegedExceptionAction;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sdo.api.SDOHelper.XMLOptions;
-import org.apache.tuscany.sdo.helper.DataFactoryImpl;
-import org.apache.tuscany.sdo.helper.HelperContextImpl;
-import org.apache.tuscany.sdo.helper.SDOExtendedMetaDataImpl;
-import org.apache.tuscany.sdo.helper.TypeHelperImpl;
-import org.apache.tuscany.sdo.helper.XMLHelperImpl;
-import org.apache.tuscany.sdo.helper.XMLStreamHelper;
-import org.apache.tuscany.sdo.helper.XSDHelperImpl;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-
-import commonj.sdo.DataGraph;
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-import commonj.sdo.helper.CopyHelper;
-import commonj.sdo.helper.DataFactory;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XMLHelper;
-import commonj.sdo.helper.XSDHelper;
-
-/**
- * This class provides some useful static utility functions which are not specified in the SDO 
- *  specification itself. Use of the functions in this class is recommended, instead of resorting 
- *  to low-level implementation-specific APIs.
- *  @deprecated
- *  @see {@link org.apache.tuscany.sdo.api.SDOUtil}.
- *  @see {@link org.apache.tuscany.sdo.api.SDOHelper.XMLOptions}.
- */
-public final class SDOUtil
-{
-  /**
-   * Line Break String such as "\n", "\r\n", "\r" and "", absence/null is the default (line.separator System Property)
-   *  @deprecated see {@link org.apache.tuscany.sdo.api.SDOHelper.XMLOptions}.
-   */
-  static public final String XML_SAVE_LineBreak = XMLOptions.XML_SAVE_LINE_BREAK,
-  /**
-   * Indent String such as "\t", "", etc. absence/null is the default ("  ")
-   */
-  XML_SAVE_INDENT = XMLOptions.XML_SAVE_INDENT,
-  /**
-   * Margin String such as " ", "\t\t", etc. Absence/null/"" is the default (no margin)
-   */
-  XML_SAVE_MARGIN = XMLOptions.XML_SAVE_MARGIN,
-  /**
-   * Attribute formatting that exceeds the specified width as Integer will cause a line break so that formatting will continue indented on the next line
-   */
-  XML_SAVE_LineWidth = XMLOptions.XML_SAVE_LINE_WIDTH,
-  /**
-   * Boolean to save a doctype declaration 
-   */
-  XML_SAVE_DocType = XMLOptions.XML_SAVE_DOCTYPE,
-  /**
-   * Boolean to process the schemaLocation/noNamespaceSchemaLocation attributes occurring in the instance document to {@link XSDHelper#define convert XSD(s) to Types} 
-   */
-  XML_LOAD_SCHEMA = XMLOptions.XML_LOAD_SCHEMA,
-  /**
-   * To tolerate malformed elements and attributes (default unless set by System property XML.load.form.lax). 0 not to.  
-   */
-  XML_LOAD_LaxForm = XMLOptions.XML_LOAD_LAX_FORM;
-
-  /**
-   * Create a new TypeHelper instance. The returned type helper will have visibility of types registered
-   *  directly by calling a define method on it or by calling define on an associated XSDHelper. It will
-   *  also have visibility of static types registered by calling SDOUtil.registerStaticTypes in the 
-   *  same classLoader scope.
-   * @return the new TypeHelper.
-   * @deprecated see {@link org.apache.tuscany.sdo.api.SDOUtil#createHelperContext}
-   */
-  public static TypeHelper createTypeHelper()
-  {
-    EPackage.Registry registry = new EPackageRegistryImpl(EPackage.Registry.INSTANCE);
-    ExtendedMetaData extendedMetaData = new SDOExtendedMetaDataImpl(registry); //TODO create subclass that makes demand() methods synchronous
-    //return new TypeHelperImpl(extendedMetaData);
-    return (new HelperContextImpl(extendedMetaData, false)).getTypeHelper();
-  }
-
-  /**
-   * Create a new DataFactory, with visibility to types in the specified TypeHelper scope.
-   * @param scope the TypeHelper to use for locating types.
-   * @return the new DataFactory.
-   * @deprecated see {@link org.apache.tuscany.sdo.api.SDOUtil#createHelperContext}
-   */
-  public static DataFactory createDataFactory(TypeHelper scope)
-  {
-	  return ((TypeHelperImpl)scope).getHelperContext().getDataFactory();
-  }
-
-  /**
-   * Create a new XMLHelper, with visibility to types in the specified TypeHelper scope.
-   * @param scope the TypeHelper to use for locating types.
-   * @return the new XMLHelper.
-   * @deprecated see {@link org.apache.tuscany.sdo.api.SDOUtil#createHelperContext}
-   */
-  public static XMLHelper createXMLHelper(TypeHelper scope)
-  {
-	  return ((TypeHelperImpl)scope).getHelperContext().getXMLHelper();
-  }
-  
-  /**
-   * Create a new XSDHelper, with visibility to types in the specified TypeHelper scope.
-   * @param scope the TypeHelper to use for locating and populating types.
-   * @return the new XSDHelper.
-   * @deprecated see {@link org.apache.tuscany.sdo.api.SDOUtil#createHelperContext}
-   */
-  public static XSDHelper createXSDHelper(TypeHelper scope)
-  {
-	  return ((TypeHelperImpl)scope).getHelperContext().getXSDHelper();
-  }
-  
-  /**
-   * @deprecated see {@link org.apache.tuscany.sdo.api.SDOUtil#addTypeInstanceProperty(Type, Property, Object}
-   */
-  public static void addTypeInstanceProperties(Type definedType, DataObject modeledType)
-  {
-    List instanceProperties = getOpenContentProperties(modeledType);
-    for (Iterator iter = instanceProperties.iterator(); iter.hasNext(); )
-    {
-      Property property = (Property)iter.next();
-      org.apache.tuscany.sdo.api.SDOUtil.addTypeInstanceProperty(definedType, property, modeledType.get(property));
-    }
-  }
-
-  /**
-   * @deprecated see {@link org.apache.tuscany.sdo.api.SDOUtil#addPropertyInstanceProperty(Property, Property, Object}
-   */
-  public static void addPropertyInstanceProperties(Property definedProperty, DataObject modeledProperty)
-  {
-    List instanceProperties = getOpenContentProperties(modeledProperty);
-    for (Iterator iter = instanceProperties.iterator(); iter.hasNext(); )
-    {
-      Property property = (Property)iter.next();
-      org.apache.tuscany.sdo.api.SDOUtil.addPropertyInstanceProperty(definedProperty, property, modeledProperty.get(property));
-    }
-  }
- 
-  /**
-   * Register and initialize the SDO types supported by the specified generated factory class.
-   *  This function must be called before instances of the generated types can be created/used.
-   *  The registered types will be visible in all TypeHelper's created in the same classLoader
-   *  scope as the call to this function.
-   * @param factoryClass the generated factory class.
-   * @deprecated see the register(HelperContext) metods on generated Factory classes
-   */
-  public static void registerStaticTypes(Class factoryClass)
-  {
-    //TODO this implementation is temporary, until the SDO generated factory pattern is decided
-    //TODO might want to clean this implementation in the light of the requirement to regenerate all classes
-    //after noEMF became the default, so we have no compatibility requirements (unless we
-    //cater for the simple hand edit that would make M2 generated classes work) -- as this is
-    //deprecated I'm going to do nothing for now
-    //
-    String temp = factoryClass.getName().replaceFirst("Factory$", "PackageImpl");
-    int lastDot = temp.lastIndexOf('.');
-    String packageName = temp.substring(0, lastDot) + ".impl" + temp.substring(lastDot);
-    
-    try // this case handles the old style EMF pattern
-    {
-      Class javaClass = getPackageClass(factoryClass, packageName);
-      Field field = javaClass.getField("eINSTANCE");
-      EPackageImpl pkg = (EPackageImpl)field.get(null);
-      EPackage.Registry.INSTANCE.put(pkg.getNsURI(), pkg);
-    }
-    catch (Exception e1)
-    {
-      packageName = factoryClass.getName().replaceFirst("Factory$", "Package");
-      try // this case handles the EMF -noInterfaces generator pattern
-      {
-        Class javaClass = getPackageClass(factoryClass, packageName);
-        Field field = javaClass.getField("eINSTANCE");
-        EPackageImpl pkg = (EPackageImpl)field.get(null);
-        EPackage.Registry.INSTANCE.put(pkg.getNsURI(), pkg);
-      }
-      catch (Exception e2)
-      {
-        try // this case handles the default (was -noEMF) generator pattern
-        {
-          Field field = factoryClass.getField("INSTANCE");
-          EPackageImpl pkg = (EPackageImpl)field.get(null);
-          EPackage.Registry.INSTANCE.put(pkg.getNsURI(), pkg);
-          // TODO -- decide if we should block global initialization of Factories with the new register method.
-        }
-        catch (Exception e3)
-        {
-          e3.printStackTrace();
-        }
-      }
-    }
-  }
-
-  /**
-   * @deprecated
-   */
-  private static Class getPackageClass(Class factoryClass, String packageName) throws Exception
-  {
-    final Class factoryClassTemp = factoryClass;
-    final String packageNameTemp = packageName;
-    return (Class)AccessController.doPrivileged(new PrivilegedExceptionAction() {
-        public Object run() throws Exception {
-          return factoryClassTemp.getClassLoader().loadClass(packageNameTemp);
-        }
-      });
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#createDataTypeWrapper(Type, Object)}.
-   * @deprecated
-   */
-  public static DataObject createDataTypeWrapper(Type dataType, Object value)
-  {
-    return org.apache.tuscany.sdo.api.SDOUtil.createDataTypeWrapper(dataType, value);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#createFromString(Type, String)}.
-   * @deprecated
-   */
-  public static Object createFromString(Type dataType, String literal)
-  {
-    return org.apache.tuscany.sdo.api.SDOUtil.createFromString(dataType, literal);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#convertToString(Type, Object)}.
-   * @deprecated
-   */
-  public static String convertToString(Type dataType, Object value)
-  {
-    return org.apache.tuscany.sdo.api.SDOUtil.convertToString(dataType, value);
-  }
-
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#getXSDSDOType(String)}.
-   * @deprecated
-   */
-  public static Type getXSDSDOType(String xsdType)
-  {    
-    return org.apache.tuscany.sdo.api.SDOUtil.getXSDSDOType(xsdType);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#getSubstitutionValues(DataObject, Property)}.
-   * @deprecated
-   */
-  public static Sequence getSubstitutionValues(DataObject dataObject, Property head)
-  {
-    return org.apache.tuscany.sdo.api.SDOUtil.getSubstitutionValues(dataObject, head);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#getJavaSDOType(Class)}.
-   * @deprecated
-   */
-  public static Type getJavaSDOType(Class javaClass)
-  {    
-    return org.apache.tuscany.sdo.api.SDOUtil.getJavaSDOType(javaClass);
-  }
-
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#isRequired(Property)}.
-   * @deprecated
-   */
-  public static boolean isRequired(Property property)
-  {
-    return org.apache.tuscany.sdo.api.SDOUtil.isRequired(property);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#getUpperBound(Property)}.
-   * @deprecated
-   */
-  public static int getUpperBound(Property property)
-  {
-    return org.apache.tuscany.sdo.api.SDOUtil.getUpperBound(property);
-  }
-
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#isMany(Property, DataObject)}.
-   * @deprecated
-   */
-  public static boolean isMany(Property property, DataObject context) 
-  {
-    return org.apache.tuscany.sdo.api.SDOUtil.isMany(property, context);
-  }
-
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#createDataGraph}.
-   * @deprecated
-   */
-  public static DataGraph createDataGraph()
-  {
-    return org.apache.tuscany.sdo.api.SDOUtil.createDataGraph();
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#setRootObject(DataGraph, DataObject)}.
-   * @deprecated
-   */
-  public static void setRootObject(DataGraph dataGraph, DataObject rootObject)
-  {
-    org.apache.tuscany.sdo.api.SDOUtil.setRootObject(dataGraph, rootObject);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#loadDataGraph(InputStream, Map, TypeHelper)}.
-   * @deprecated
-   */
-  public static DataGraph loadDataGraph(InputStream inputStream, Map options) throws IOException
-  {
-    return org.apache.tuscany.sdo.api.SDOUtil.loadDataGraph(inputStream, options, (HelperContext)null);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#loadDataGraph(InputStream, Map, TypeHelper)}.
-   * @deprecated
-   */
-  public static DataGraph loadDataGraph(InputStream inputStream, Map options, TypeHelper scope) throws IOException
-  {
-    return org.apache.tuscany.sdo.api.SDOUtil.loadDataGraph(inputStream, options, ((TypeHelperImpl)scope).getHelperContext());
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#saveDataGraph(DataGraph, OutputStream, Map)}.
-   * @deprecated
-   */
-  public static void saveDataGraph(DataGraph dataGraph, OutputStream outputStream, Map options) throws IOException
-  {
-    org.apache.tuscany.sdo.api.SDOUtil.saveDataGraph(dataGraph, outputStream, options);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#registerDataGraphTypes(DataGraph, List)}.
-   * @deprecated
-   */
-  public static void registerDataGraphTypes(DataGraph dataGraph, List/*Type*/ types)
-  {
-    org.apache.tuscany.sdo.api.SDOUtil.registerDataGraphTypes(dataGraph, types);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#createHelperContext(boolean)}.
-   * @deprecated
-   */
-  public static HelperContext createHelperContext(boolean extensibleNamespaces)
-  {
-    return org.apache.tuscany.sdo.api.SDOUtil.createHelperContext(extensibleNamespaces);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#createHelperContext}.
-   * @deprecated
-   */
-  public static HelperContext createHelperContext()
-  {
-    return org.apache.tuscany.sdo.api.SDOUtil.createHelperContext();
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#createCrossScopeCopyHelper(TypeHelper)}.
-   * @deprecated
-   */
-  public static CopyHelper createCrossScopeCopyHelper(TypeHelper targetScope) 
-  {
-    return org.apache.tuscany.sdo.api.SDOUtil.createCrossScopeCopyHelper(((TypeHelperImpl)targetScope).getHelperContext()); 
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#createXMLStreamHelper(TypeHelper)}.
-   * @deprecated
-   */
-  public static XMLStreamHelper createXMLStreamHelper(TypeHelper scope)
-  {
-    return (XMLStreamHelper)org.apache.tuscany.sdo.api.SDOUtil.createXMLStreamHelper(((TypeHelperImpl)scope).getHelperContext());
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#createObjectInputStream(InputStream, HelperContext)}.
-   * @deprecated
-   */
-  public static ObjectInputStream createObjectInputStream(InputStream inputStream, HelperContext helperContext) throws IOException
-  {
-    return org.apache.tuscany.sdo.api.SDOUtil.createObjectInputStream(inputStream, helperContext);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#createObjectOutputStream(OutputStream, HelperContext)}.
-   * @deprecated
-   */
-  public static ObjectOutputStream createObjectOutputStream(OutputStream outputStream, HelperContext helperContext) throws IOException
-  {
-    return org.apache.tuscany.sdo.api.SDOUtil.createObjectOutputStream(outputStream, helperContext);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#getTypes(TypeHelper, String)}.
-   * @deprecated
-   */
-  public static List getTypes(TypeHelper scope, String uri) {
-
-    return org.apache.tuscany.sdo.api.SDOUtil.getTypes(((TypeHelperImpl)scope).getHelperContext(), uri);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#getOpenContentProperties(DataObject)}.
-   * @deprecated
-   */
-  public static List getOpenContentProperties(DataObject dataObject)
-  {
-    return org.apache.tuscany.sdo.api.SDOUtil.getOpenContentProperties(dataObject);
-  }
-
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper#isDocumentRoot(Type)}.
-   * @deprecated
-   */
-  public static boolean isDocumentRoot(Type type)
-  {
-    return org.apache.tuscany.sdo.api.SDOUtil.isDocumentRoot(type);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#createType(TypeHelper, String, String, boolean)}.
-   * @deprecated
-   */
-  public static Type createType(TypeHelper scope, String uri, String name, boolean isDataType)
-  {
-    return org.apache.tuscany.sdo.api.SDOUtil.createType(((TypeHelperImpl)scope).getHelperContext(), uri, name, isDataType);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#addBaseType(Type, Type)}.
-   * @deprecated
-   */
-  public static void addBaseType(Type type, Type baseType)
-  {
-    org.apache.tuscany.sdo.api.SDOUtil.addBaseType(type, baseType);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#addAliasName(Type, String)}.
-   * @deprecated
-   */
-  public static void addAliasName(Type type, String aliasName)
-  {
-    org.apache.tuscany.sdo.api.SDOUtil.addAliasName(type, aliasName);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#setOpen(Type, boolean)}.
-   * @deprecated
-   */
-  public static void setOpen(Type type, boolean isOpen)
-  {
-    org.apache.tuscany.sdo.api.SDOUtil.setOpen(type, isOpen);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#setSequenced(Type, boolean)}.
-   * @deprecated
-   */
-  public static void setSequenced(Type type, boolean isSequenced)
-  {
-    org.apache.tuscany.sdo.api.SDOUtil.setSequenced(type, isSequenced);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#setAbstract(Type, boolean)}.
-   * @deprecated
-   */
-  public static void setAbstract(Type type, boolean isAbstract)
-  {
-    org.apache.tuscany.sdo.api.SDOUtil.setAbstract(type, isAbstract);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#setJavaClassName(Type, String)}.
-   * @deprecated
-   */
-  public static void setJavaClassName(Type type, String javaClassName)
-  {
-    org.apache.tuscany.sdo.api.SDOUtil.setJavaClassName(type, javaClassName);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#createProperty(Type, String, Type)}.
-    * @deprecated
-  */
-  public static Property createProperty(Type containingType, String name, Type propertyType)
-  {
-    return org.apache.tuscany.sdo.api.SDOUtil.createProperty(containingType, name, propertyType);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#createGlobalProperty(TypeHelper, String, String, Type)}.
-   * @deprecated
-   */
-  public static Property createGlobalProperty(TypeHelper scope, String uri, String name, Type type)
-  {
-    return org.apache.tuscany.sdo.api.SDOUtil.createOpenContentProperty(((TypeHelperImpl)scope).getHelperContext(), uri, name, type);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#addAliasName(Property, String)}.
-   * @deprecated
-   */
-  public static void addAliasName(Property property, String aliasName)
-  {
-    org.apache.tuscany.sdo.api.SDOUtil.addAliasName(property, aliasName);
-  }
- 
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#setMany(Property, boolean)}.
-   * @deprecated
-   */
-  public static void setMany(Property property, boolean isMany)
-  {
-    org.apache.tuscany.sdo.api.SDOUtil.setMany(property, isMany);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#setContainment(Property, boolean)}.
-   * @deprecated
-   */
-  public static void setContainment(Property property, boolean isContainment)
-  {
-    org.apache.tuscany.sdo.api.SDOUtil.setContainment(property, isContainment);
-  }
-
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#setDefault(Property, String)}.
-   * @deprecated
-   */
-  public static void setDefault(Property property, String defaultValue)
-  {
-    org.apache.tuscany.sdo.api.SDOUtil.setDefault(property, defaultValue);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#setReadOnly(Property, boolean)}.
-   * @deprecated
-   */
-  public static void setReadOnly(Property property, boolean isReadOnly)
-  {
-    org.apache.tuscany.sdo.api.SDOUtil.setReadOnly(property, isReadOnly);
-  }
-  
-  /**
-   * @see {@link org.apache.tuscany.sdo.api.SDOHelper.MetaDataBuilder#setOpposite(Property, Property)}.
-   * @deprecated
-   */
-  public static void setOpposite(Property property, Property opposite)
-  {
-    org.apache.tuscany.sdo.api.SDOUtil.setOpposite(property, opposite);
-  }
-    
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java
deleted file mode 100644
index de91421140..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/StAX2SAXAdapter.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.Location;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.Locator;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-/**
- * Adapter that converts from StAX to SAX event streams. Currently the following SAX events are not generated:
- * <ul>
- * <li>ignorableWhitespace</li>
- * <li>skippedEntity</li>
- * <ul>
- * Also the following StAX events are not mapped:
- * <ul>
- * <li>CDATA</li>
- * <li>COMMENT</li>
- * <li>DTD</li>
- * <li>ENTITY_DECLARATION</li>
- * <li>ENTITY_REFERENCE</li>
- * <li>NOTATION_DECLARATION</li>
- * <li>SPACE</li>
- * </ul>
- * StAX ATTRIBUTE events are ignored but the equivalent attributes (derived from the START_ELEMENT event) are supplied in the SAX startElement event's
- * Attributes parameter. If the adaptor is configured to pass namespace prefixes then namespace information will also be included in the Attributes;
- * StAX NAMESPACE events are ignored.
- * <p/>
- * Another issue is namespace processing. If the reader is positioned at a sub-node, we cannot capture all the in-scope namespace bindings. Therefore
- * we cannot re-create a proper SAX event stream from a StAX parser.
- * <p/>
- * For example
- * <p/>
- * &lt;a:root xmlns:a="foo" xmlns:b="bar"&gt;&lt;b:sub&gt;a:foo&lt;/b:sub&gt;&lt;/a:root&gt;
- * <p/>
- * And if you are handed a parser at &lt;b:sub&gt;, then your SAX events should look like:
- * <p/>
- * &lt;b:sub xmlns:a="foo" xmlns:b="bar"&gt;a:foo&lt;/b:sub&gt;
- * <p/>
- * not:
- * <p/>
- * &lt;b:sub&gt;a:foo&lt;/b:sub&gt;
- * <p/>
- * <p/>
- * Proposal: we change the receiver of SAX events (SDOXMLResourceImpl) so that it uses NamespaceContext to resolve prefix (as opposed to record
- * start/endPrefixMappings and use it for resolution.)
- *
- * @version $Rev$ $Date$
- */
-public class StAX2SAXAdapter {
-    private final boolean namespacePrefixes;
-
-    /**
-     * Construct a new StAX to SAX adapter that will convert a StAX event stream into a SAX event stream.
-     *
-     * @param namespacePrefixes whether xmlns attributes should be included in startElement events;
-     */
-    public StAX2SAXAdapter(boolean namespacePrefixes) {
-        this.namespacePrefixes = namespacePrefixes;
-    }
-
-    /**
-     * Pull events from the StAX stream and dispatch to the SAX ContentHandler. The StAX stream would typically be located on a START_DOCUMENT or
-     * START_ELEMENT event and when this method returns it will be located on the associated END_DOCUMENT or END_ELEMENT event. Behaviour with other
-     * start events is undefined.
-     *
-     * @param reader  StAX event source to read
-     * @param handler SAX ContentHandler for processing events
-     * @throws XMLStreamException if there was a problem reading the stream
-     * @throws SAXException       passed through from the ContentHandler
-     */
-    public void parse(XMLStreamReader reader, ContentHandler handler) throws XMLStreamException, SAXException {
-        handler.setDocumentLocator(new LocatorAdaptor(reader.getLocation()));
-
-        // remembers the nest level of elements to know when we are done
-        int level = 0;
-        int event = reader.getEventType();
-        while (true) {
-            switch (event) {
-            case XMLStreamConstants.START_DOCUMENT:
-                level++;
-                handler.startDocument();
-                break;
-            case XMLStreamConstants.START_ELEMENT:
-                level++;
-                handleStartElement(reader, handler);
-                break;
-            case XMLStreamConstants.PROCESSING_INSTRUCTION:
-                handler.processingInstruction(reader.getPITarget(), reader.getPIData());
-                break;
-            case XMLStreamConstants.CHARACTERS:
-                handler.characters(reader.getTextCharacters(), reader.getTextStart(), reader.getTextLength());
-                break;
-            case XMLStreamConstants.END_ELEMENT:
-                handleEndElement(reader, handler);
-                level--;
-                if (level == 1) {
-                    return;
-                }
-                break;
-            case XMLStreamConstants.END_DOCUMENT:
-                handler.endDocument();
-                return;
-                /*
-                * uncomment to handle all events rather than just mapped ones // StAX events that are not mapped to SAX case XMLStreamConstants.COMMENT:
-                * case XMLStreamConstants.SPACE: case XMLStreamConstants.ENTITY_REFERENCE: case XMLStreamConstants.DTD: case XMLStreamConstants.CDATA:
-                * case XMLStreamConstants.NOTATION_DECLARATION: case XMLStreamConstants.ENTITY_DECLARATION: break; // StAX events handled in
-                * START_ELEMENT case XMLStreamConstants.ATTRIBUTE: case XMLStreamConstants.NAMESPACE: break; default: throw new AssertionError("Unknown
-                * StAX event: " + event);
-                */
-            }
-            event = reader.next();
-        }
-    }
-
-    private void handleStartElement(XMLStreamReader reader, ContentHandler handler) throws SAXException {
-        // send startPrefixMapping events immediately before startElement event
-        int nsCount = reader.getNamespaceCount();
-        for (int i = 0; i < nsCount; i++) {
-            String prefix = reader.getNamespacePrefix(i);
-            if (prefix == null) { // true for default namespace
-                prefix = "";
-            }
-            handler.startPrefixMapping(prefix, reader.getNamespaceURI(i));
-        }
-
-        // fire startElement
-        QName qname = reader.getName();
-        String prefix = qname.getPrefix();
-        String rawname;
-        if (prefix == null || prefix.length() == 0) {
-            rawname = qname.getLocalPart();
-        } else {
-            rawname = prefix + ':' + qname.getLocalPart();
-        }
-        Attributes attrs = getAttributes(reader);
-        handler.startElement(qname.getNamespaceURI(), qname.getLocalPart(), rawname, attrs);
-    }
-
-    private static void handleEndElement(XMLStreamReader reader, ContentHandler handler) throws SAXException {
-        // fire endElement
-        QName qname = reader.getName();
-        handler.endElement(qname.getNamespaceURI(), qname.getLocalPart(), qname.toString());
-
-        // send endPrefixMapping events immediately after endElement event
-        // we send them in the opposite order to that returned but this is not actually required by SAX
-        int nsCount = reader.getNamespaceCount();
-        for (int i = nsCount - 1; i >= 0; i--) {
-            String prefix = reader.getNamespacePrefix(i);
-            if (prefix == null) { // true for default namespace
-                prefix = "";
-            }
-            handler.endPrefixMapping(prefix);
-        }
-    }
-
-    /**
-     * Get the attributes associated with the current START_ELEMENT event.
-     *
-     * @return the StAX attributes converted to org.xml.sax.Attributes
-     */
-    private Attributes getAttributes(XMLStreamReader reader) {
-        // assert reader.getEventType() == XMLStreamConstants.START_ELEMENT;
-
-        AttributesImpl attrs = new AttributesImpl();
-
-        // add namespace declarations if required
-        if (namespacePrefixes) {
-            for (int i = 0; i < reader.getNamespaceCount(); i++) {
-                String prefix = reader.getNamespacePrefix(i);
-                String uri = reader.getNamespaceURI(i);
-                attrs.addAttribute(null, prefix, "xmlns:" + prefix, "CDATA", uri);
-            }
-        }
-
-        // Regular attributes
-        for (int i = 0; i < reader.getAttributeCount(); i++) {
-            String uri = reader.getAttributeNamespace(i);
-            if (uri == null) {
-                uri = "";
-            }
-            String localName = reader.getAttributeLocalName(i);
-            String prefix = reader.getAttributePrefix(i);
-            String qname;
-            if (prefix == null || prefix.length() == 0) {
-                qname = localName;
-            } else {
-                qname = prefix + ':' + localName;
-            }
-            String type = reader.getAttributeType(i);
-            String value = reader.getAttributeValue(i);
-
-            attrs.addAttribute(uri, localName, qname, type, value);
-        }
-
-        return attrs;
-    }
-
-    /**
-     * Adaptor for mapping Locator information.
-     */
-    private static class LocatorAdaptor implements Locator {
-        private final Location location;
-
-        private LocatorAdaptor(Location location) {
-            this.location = location;
-        }
-
-        public int getColumnNumber() {
-            return location == null ? 0 : location.getColumnNumber();
-        }
-
-        public int getLineNumber() {
-            return location == null ? 0 : location.getLineNumber();
-        }
-
-        public String getPublicId() {
-            return location == null ? "" : location.getPublicId();
-        }
-
-        public String getSystemId() {
-            return location == null ? "" : location.getSystemId();
-        }
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/StreamDeserializer.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/StreamDeserializer.java
deleted file mode 100644
index 9e1492c9fd..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/StreamDeserializer.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util;
-
-import java.util.Comparator;
-
-import javax.xml.XMLConstants;
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sdo.util.resource.RecordedEventXMLStreamReader;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xml.type.internal.QName;
-
-/**
- * StAX Deserializer. The instance isn't thread-safe, however it's safe to use the instance any times on the same thread.
- */
-public class StreamDeserializer implements XMLStreamConstants {
-    protected XMLStreamReader reader;
-
-    protected final XMLStreamReader play(RecordedEventXMLStreamReader.Tag tag) {
-        return tag.play(reader);
-    }
-
-    protected String nameSpace, name;
-
-    protected final boolean typedXSI() {
-        name = reader.getAttributeValue(ExtendedMetaData.XSI_URI, XMLResource.TYPE);
-        if (name == null)
-            return false;
-        int index = name.indexOf(':');
-        if (index == -1)
-            nameSpace = reader.getNamespaceURI(XMLConstants.DEFAULT_NS_PREFIX); // may be XMLConstants.NULL_NS_URI
-        else {
-            nameSpace = reader.getNamespaceURI(name.substring(0, index));
-            name = name.substring(++index);
-        }
-        return true;
-    }
-
-    static protected Object value(Object type, String literal, NamespaceContext nameSpaces) {
-        Object value = EcoreUtil.createFromString((EDataType) type, literal);
-        if (!(value instanceof QName))
-            return value;
-        QName qName = (QName) value;
-        qName.setNamespaceURI(nameSpaces.getNamespaceURI(qName.getPrefix()));
-        return value;
-    }
-
-    static public class Attribute {
-        public String name, value;
-    }
-
-    static public final class QualifiedAttribute extends Attribute {
-        public String nameSpace;
-    }
-
-    static protected final Comparator EQUAL_NULL = new Comparator() {
-        public int compare(Object v, Object NULL) {
-            return v == null || v.equals(null) ? 0 : 1;
-        }
-    }, EQUAL = new Comparator() {
-        public int compare(Object v, Object value) {
-            return value.equals(v) ? 0 : -1;
-        }
-    }, SAME = new Comparator() {
-        public int compare(Object v, Object value) {
-            return value == v ? 0 : -1;
-        }
-    };
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/VirtualSequence.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/VirtualSequence.java
deleted file mode 100644
index a5982ceb35..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/VirtualSequence.java
+++ /dev/null
@@ -1,780 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.tuscany.sdo.impl.ClassImpl;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Sequence;
-
-/**
- *  SDO Sequance implementation which delegates to a Collection of DataObject properties.
- */
-public class VirtualSequence implements Sequence
-{
-  private final DataObject dataObject;
-  protected final List delegateProperties; // size > 1
-
-  public VirtualSequence(DataObject object)
-  {
-    dataObject = object;
-    delegateProperties = ((ClassImpl)dataObject.getType()).getVirtualSequenceProperties();
-  }
-  
-  static protected boolean isSequenceProperty(Object property)
-  {
-    return FeatureMapUtil.isFeatureMap((EStructuralFeature)property);
-  }
-  
-  public int size()
-  {
-    int size = 0;
-    for (Iterator iterator = delegateProperties.iterator() ; iterator.hasNext() ;)
-    {
-      Property property = (Property)iterator.next();
-      if (dataObject.isSet(property))
-        if (isSequenceProperty(property))
-          size += ((Sequence)dataObject.get(property)).size();
-        else if (property.isMany())
-          size += dataObject.getList(property).size();
-        else
-          ++size;
-    }
-    return size;
-  }
-
-  public Property getProperty(int index)
-  {
-    for (Iterator iterator = delegateProperties.iterator() ; iterator.hasNext() ;)
-    {
-      Property property = (Property)iterator.next();
-      if (dataObject.isSet(property))
-        if (isSequenceProperty(property))
-        {
-          Sequence sequence = (Sequence)dataObject.get(property);
-          int size = sequence.size();
-          if (index < size)
-            return sequence.getProperty(index);
-          index -= size;
-        }
-        else if (property.isMany())
-        {
-          int size = dataObject.getList(property).size();
-          if (index < size)
-            return property;
-          index -= size;
-        }
-        else if (index == 0)
-          return property;
-        else
-          --index;
-    }
-    throw new IndexOutOfBoundsException();
-  }
-
-  public Object getValue(int index)
-  {
-    for (Iterator iterator = delegateProperties.iterator() ; iterator.hasNext() ;)
-    {
-      Property property = (Property)iterator.next();
-      if (dataObject.isSet(property))
-        if (isSequenceProperty(property))
-        {
-          Sequence sequence = (Sequence)dataObject.get(property);
-          int size = sequence.size();
-          if (index < size)
-            return sequence.getValue(index);
-          index -= size;
-        }
-        else if (property.isMany())
-        {
-          List values = dataObject.getList(property);
-          int size = values.size();
-          if (index < size)
-            return values.get(index);
-          index -= size;
-        }
-        else if (index == 0)
-          return dataObject.get(property);
-        else
-          --index;
-    }
-    throw new IndexOutOfBoundsException();
-  }
-
-  public Object setValue(int index, Object value)
-  {
-    for (Iterator iterator = delegateProperties.iterator() ; iterator.hasNext() ;)
-    {
-      Property property = (Property)iterator.next();
-      if (dataObject.isSet(property))
-        if (isSequenceProperty(property))
-        {
-          Sequence sequence = (Sequence)dataObject.get(property);
-          int size = sequence.size();
-          if (index < size)
-            return sequence.setValue(index, value);
-          index -= size;
-        }
-        else if (property.isMany())
-        {
-          List values = dataObject.getList(property);
-          int size = values.size();
-          if (index < size)
-            return values.set(index, value);
-          index -= size;
-        }
-        else if (index == 0)
-        {
-          Object old = dataObject.get(property);  
-          dataObject.set(property, value);
-          return old;
-        }
-        else
-          --index;
-    }
-    throw new IndexOutOfBoundsException();
-  }
-  
-  boolean validate(EStructuralFeature feature, Object property)
-  {
-    return FeatureMapUtil.getValidator((EClass)dataObject.getType(), feature).isValid((EStructuralFeature)property);
-  }
-
-  boolean append(Property delegateProperty, Property property, Object value)
-  {
-    return ((Sequence)dataObject.get(delegateProperty)).add(property, value);
-  }
-  
-  boolean append(Property property, Object value)
-  {
-    return dataObject.getList(property).add(value);
-  }
-  
-  boolean set(Property property, Object value)
-  {
-    if (property.isMany())
-      return append(property, value);
-    dataObject.set(property, value);
-    return true;
-  }
-  
-  public final boolean add(Property p, Object value)
-  {
-    Property property;
-    int size = delegateProperties.size(), index = size;
-    do
-    {
-      property = (Property)delegateProperties.get(--index);
-      if (!dataObject.isSet(property))
-        continue;
-      EStructuralFeature feature = (EStructuralFeature)property;
-      if (FeatureMapUtil.isFeatureMap(feature))
-      {
-        if (validate(feature, p))
-          return append(property, p, value);
-      }
-      else if (property == p && property.isMany())
-        return append(property, value);
-      if (size == ++index)
-        return false;
-      property = (Property)delegateProperties.get(index);
-      break;
-    }
-    while (index != 0);
-    for (;;)
-    {
-      EStructuralFeature feature = (EStructuralFeature)property;
-      if (FeatureMapUtil.isFeatureMap(feature))
-      {
-        if (validate(feature, p))
-          return append(property, p, value);
-      }
-      else if (property == p)
-        return set(p, value);
-      if (size == ++index)
-        return false;
-      property = (Property)delegateProperties.get(index);
-    }
-  }
-
-  protected final Property property(String name)
-  {
-    return dataObject.getType().getProperty(name);
-  }
-
-  public boolean add(String propertyName, Object value)
-  {
-    return add(property(propertyName), value);
-  }
-
-  protected final Property property(int index)
-  {
-    return (Property)dataObject.getType().getProperties().get(index);
-  }
-
-  public boolean add(int propertyIndex, Object value)
-  {
-    return add(property(propertyIndex), value);
-  }
-  
-  void insert(Property property, Property p, Object value)
-  {
-    ((Sequence)dataObject.get(property)).add(0, p, value);
-  }
-  
-  void insert(Property property, Object value)
-  {
-    dataObject.getList(property).add(0, value);
-  }
-  
-  protected final int insert(Iterator iterator, Property p, Object value)
-  {
-    while (iterator.hasNext())
-    {
-      Property property = (Property)iterator.next();
-      EStructuralFeature feature = (EStructuralFeature)property;
-      if (dataObject.isSet(property))
-      {
-        if (FeatureMapUtil.isFeatureMap(feature))
-        {
-          if (!validate(feature, p))
-            return 2;
-          insert(property, p, value);
-          return 0;
-        }
-        if (property != p || !property.isMany())
-          return 2;
-        insert(property, value);
-        return 0;
-      }
-      if (FeatureMapUtil.isFeatureMap(feature))
-      {
-        if (validate(feature, p))
-        {
-          append(property, p, value);
-          return 0;
-        }
-      }
-      else if (property == p)
-      {
-        set(property, value);
-        return 0;
-      }
-    } // iterator.hasNext()
-    return 1;
-  }
-  
-  public final void add(int index, Property p, Object value)
-  {
-    Iterator iterator = delegateProperties.iterator();
-    if (index == 0)
-      switch (insert(iterator, p, value))
-      {
-        case 0:
-          return;
-        case 1:  
-          throw new IndexOutOfBoundsException();
-        default: // 2  
-          throw new IllegalArgumentException();
-      }
-    while (iterator.hasNext())
-    {
-      Property property = (Property)iterator.next();
-      if (dataObject.isSet(property))
-        if (isSequenceProperty(property))
-        {
-          Sequence sequence = (Sequence)dataObject.get(property);
-          int size = sequence.size();
-          if (index < size)
-          {
-            sequence.add(index, p, value);
-            return;
-          }
-          index -= size;
-          if (index != 0)
-            continue;
-          if (insert(iterator, p, value) != 0)
-            /*assert */sequence.add(p, value);
-          return;
-        } // sequence(property)
-        else if (property.isMany())
-        {
-          List values = dataObject.getList(property);
-          int size = values.size();
-          if (index < size)
-          {
-            values.add(index, value);
-            return;
-          }
-          index -= size;
-          if (index == 0 && property == p)
-          {
-            values.add(value);
-            return;
-          }
-        }
-        else if (index == 0)
-          throw new IllegalArgumentException();
-        else
-          --index;
-    }
-    throw new IndexOutOfBoundsException();
-  }
-
-  public void add(int index, String propertyName, Object value)
-  {
-    add(index, property(propertyName), value);
-  }
-
-  public void add(int index, int propertyIndex, Object value)
-  {
-    add(index, property(propertyIndex), value);
-  }
-
-  public final void addText(String text)
-  {
-    throw new IllegalArgumentException();
-  }
-
-  /**
-   * @deprecated
-   */
-  public void add(String text)
-  {
-    addText(text);
-  }
-
-  public final void addText(int index, String text)
-  {
-    throw new IllegalArgumentException();
-  }
-
-  /**
-   * @deprecated
-   */
-  public void add(int index, String text)
-  {
-    addText(index, text);
-  }
-
-  public void remove(int index)
-  {
-    for (Iterator iterator = delegateProperties.iterator() ; iterator.hasNext() ;)
-    {
-      Property property = (Property)iterator.next();
-      if (dataObject.isSet(property))
-        if (isSequenceProperty(property))
-        {
-          Sequence sequence = (Sequence)dataObject.get(property);
-          int size = sequence.size();
-          if (index < size)
-          {
-            sequence.remove(index);
-            return;
-          }
-          index -= size;
-        }
-        else if (property.isMany())
-        {
-          List values = dataObject.getList(property);
-          int size = values.size();
-          if (index < size)
-          {
-            values.remove(index);
-            return;
-          }
-          index -= size;
-        }
-        else if (index == 0)
-        {
-          dataObject.unset(property);
-          return;
-        }
-        else
-          --index;
-    }
-    throw new IndexOutOfBoundsException();
-  }
-
-  static private Object remove(Sequence sequence, int index)
-  {
-    Object value = sequence.getValue(index);
-    sequence.remove(index);
-    return value;
-  }
-  
-  static void move(Sequence fromSequence, int fromIndex, Sequence toSequence, int toIndex, Property property)
-  {
-    toSequence.add(toIndex, property, remove(fromSequence, fromIndex)); // removes containment
-  }
-  
-  static protected void move(Sequence fromSequence, int fromIndex, Sequence toSequence, int toIndex)
-  {
-    move(fromSequence, fromIndex, toSequence, toIndex, fromSequence.getProperty(fromIndex));
-  }
-  
-  static protected void add(Object value,List list,int index, int size)
-  {
-    if (++index == size)
-      /*assert */list.add(value);
-    else
-      list.add(index, value); // removes containment
-  }
-  
-  static protected void add(Property property, Object value, Sequence toSequence, int toIndex, int size)
-  {
-    if (++toIndex == size)
-      toSequence.add(property, value); // removes containment
-    else
-      toSequence.add(toIndex, property, value); // removes containment
-  }
-  
-  public void move(int toIndex, int fromIndex)
-  {
-    for (Iterator iterator = delegateProperties.iterator(); iterator.hasNext() ;)
-    {
-      Property property = (Property)iterator.next();
-      if (dataObject.isSet(property))
-        if (isSequenceProperty(property))
-        {
-          Sequence sequence = (Sequence)dataObject.get(property);
-          int size = sequence.size();
-          if (toIndex < size)
-          {
-            if (fromIndex < size)
-            {
-              sequence.move(toIndex, fromIndex);
-              return;
-            }
-            while (iterator.hasNext())
-            {
-              property = (Property)iterator.next();
-              if (!dataObject.isSet(property))
-                continue;
-              fromIndex -= size;
-              if (isSequenceProperty(property))
-              {
-                Sequence fromSequence = (Sequence)dataObject.get(property);
-                size = fromSequence.size();
-                if (fromIndex >= size)
-                  continue;
-                move(fromSequence, fromIndex, sequence, toIndex);
-                return;
-              }
-              if (property.isMany())
-              {
-                List list = dataObject.getList(property);
-                size = list.size();
-                if (fromIndex >= size)
-                  continue;
-                sequence.add(toIndex, property, list.remove(fromIndex)); // removes containment
-                return;
-              }
-              if (fromIndex == 0)
-              {
-                sequence.add(toIndex, property, dataObject.get(property)); // removes containment
-                dataObject.unset(property);
-                return;
-              }
-              size = 1;
-            } // iterator.hasNext()
-            break;
-          } // toIndex < size
-          if (fromIndex < size)
-          {
-            while (iterator.hasNext())
-            {
-              property = (Property)iterator.next();
-              if (!dataObject.isSet(property))
-                continue;
-              toIndex -= size;
-              if (isSequenceProperty(property))
-              {
-                Sequence toSequence = (Sequence)dataObject.get(property);
-                size = toSequence.size();
-                if (toIndex >= size)
-                  continue;
-                if (++toIndex == size)
-                  toSequence.add(sequence.getProperty(fromIndex), remove(sequence, fromIndex)); // Java pushes stack from left to right
-                    // removes containment
-                else
-                  move(sequence, fromIndex, toSequence, toIndex);
-                return;
-              }
-              if (property.isMany())
-              {
-                List list = dataObject.getList(property);
-                size = list.size();
-                if (toIndex >= size)
-                  continue;
-                if (sequence.getProperty(fromIndex) != property)
-                  throw new IllegalArgumentException();
-                add(remove(sequence, fromIndex), list, toIndex, size);
-                return;
-              }
-              if (toIndex == 0)
-              {
-                while (iterator.hasNext())
-                {
-                  Property p = sequence.getProperty(fromIndex);
-                  property = (Property)iterator.next();
-                  EStructuralFeature feature = (EStructuralFeature)property;
-                  if (dataObject.isSet(property))
-                  {
-                    if (FeatureMapUtil.isFeatureMap(feature))
-                    {
-                      /*if (!validate(feature, p))
-                        throw new IllegalArgumentException(); */
-                      move(sequence, fromIndex, (Sequence)dataObject.get(property), 0, p);
-                      return;
-                    }
-                    if (property != p || !property.isMany())
-                      throw new IllegalArgumentException();
-                    insert(property, remove(sequence, fromIndex)); // removes containment
-                    return;
-                  }
-                  if (FeatureMapUtil.isFeatureMap(feature))
-                  {
-                    if (validate(feature, p))
-                    {
-                      append(property, p, remove(sequence, fromIndex)); // removes containment
-                      return;
-                    }
-                  }
-                  else if (property == p)
-                  {
-                    set(property, remove(sequence, fromIndex));
-                    return;
-                  }
-                } // iterator.hasNext()
-                break;
-              }
-              size = 1;
-            } // iterator.hasNext()
-            break;
-          } // fromIndex < size
-          toIndex -= size;
-          fromIndex -= size;
-        } // sequence(property)
-        else if (property.isMany())
-        {
-          List list = dataObject.getList(property);
-          int size = list.size();
-          if (toIndex < size)
-          {
-            if (fromIndex < size)
-            {
-              ((EList)list).move(toIndex, fromIndex);
-              return;
-            }
-            while (iterator.hasNext())
-            {
-              Property p = (Property)iterator.next();
-              if (!dataObject.isSet(p))
-                continue;
-              fromIndex -= size;
-              if (isSequenceProperty(p))
-              {
-                Sequence fromSequence = (Sequence)dataObject.get(p);
-                size = fromSequence.size();
-                if (fromIndex >= size)
-                  continue;
-                if (fromSequence.getProperty(fromIndex) != property)
-                  throw new IllegalArgumentException();
-                list.add(toIndex, remove(fromSequence, fromIndex)); // removes containment
-                return;
-              }
-              if (p.isMany())
-              {
-                List l = dataObject.getList(p);
-                size = l.size();
-                if (fromIndex >= size)
-                  continue;
-                /*if (p != property)
-                  throw new IllegalArgumentException(); */
-                list.add(toIndex, l.remove(fromIndex)); // removes containment
-                return;
-              }
-              if (fromIndex == 0)
-              {
-                /*if (p != property)
-                throw new IllegalArgumentException(); */
-                list.add(toIndex, dataObject.get(p)); // removes containment
-                dataObject.unset(p);
-                return;
-              }
-              size = 1;
-            } // iterator.hasNext()
-            break;
-          } // toIndex < size
-          if (fromIndex < size)
-          {
-            while (iterator.hasNext())
-            {
-              Property p = (Property)iterator.next();
-              if (!dataObject.isSet(p))
-                continue;
-              toIndex -= size;
-              if (isSequenceProperty(p))
-              {
-                Sequence toSequence = (Sequence)dataObject.get(p);
-                size = toSequence.size();
-                if (toIndex >= size)
-                  continue;
-                add(property, list.remove(fromIndex), toSequence, toIndex, size);
-                return;
-              }
-              if (p.isMany())
-              {
-                List l = dataObject.getList(p);
-                size = l.size();
-                if (toIndex >= size)
-                  continue;
-                /*if (property != p)
-                  throw new IllegalArgumentException(); */
-                add(list.remove(fromIndex), l, toIndex, size);
-                return;
-              }
-              if (toIndex == 0)
-              {
-                while (iterator.hasNext())
-                {
-                  p = (Property)iterator.next();
-                  EStructuralFeature feature = (EStructuralFeature)p;
-                  if (dataObject.isSet(p))
-                  {
-                    if (FeatureMapUtil.isFeatureMap(feature))
-                    {
-                      /*if (!validate(feature, property))
-                        throw new IllegalArgumentException(); */
-                      insert(p, property, list.remove(fromIndex));
-                      return;
-                    }
-                    if (/*p != property || */!p.isMany())
-                      throw new IllegalArgumentException();
-                    insert(p, list.remove(fromIndex)); // removes containment
-                    return;
-                  }
-                  if (FeatureMapUtil.isFeatureMap(feature))
-                  {
-                    if (!validate(feature, property))
-                      continue;
-                    append(p, property, list.remove(fromIndex)); // removes containment
-                    return;
-                  }
-                  else if (p == property)
-                  {
-                    set(p, list.remove(fromIndex));
-                    return;
-                  }
-                } // iterator.hasNext()
-                break;
-              } // toIndex == 0
-              size = 1;
-            } // iterator.hasNext()
-            break;
-          } // fromIndex < size
-          toIndex -= size;
-          fromIndex -= size;
-        } // property.isMany()
-        else if (toIndex == 0)
-          throw new IllegalArgumentException();
-        else if (fromIndex == 0)
-        {
-          for (int size = 1; iterator.hasNext() ;)
-          {
-            Property p = (Property)iterator.next();
-            if (!dataObject.isSet(p))
-              continue;
-            toIndex -= size;
-            if (isSequenceProperty(p))
-            {
-              Sequence toSequence = (Sequence)dataObject.get(p);
-              size = toSequence.size();
-              if (toIndex >= size)
-                continue;
-              add(property, dataObject.get(property), toSequence, toIndex, size);
-              dataObject.unset(property);
-              return;
-            }
-            if (p.isMany())
-            {
-              List l = dataObject.getList(p);
-              size = l.size();
-              if (toIndex >= size)
-                continue;
-              /*if (property != p)
-                throw new IllegalArgumentException(); */
-              add(dataObject.get(property), l, toIndex, size);
-              dataObject.unset(property);
-              return;
-            }
-            if (toIndex == 0)
-            {
-              while (iterator.hasNext())
-              {
-                p = (Property)iterator.next();
-                EStructuralFeature feature = (EStructuralFeature)p;
-                if (dataObject.isSet(p))
-                  if (FeatureMapUtil.isFeatureMap(feature))
-                    /*if (!validate(feature, property))
-                      throw new IllegalArgumentException(); */
-                    insert(p, property, dataObject.get(property));
-                  else if (/*p == property && */p.isMany())
-                    insert(p, dataObject.get(property)); // removes containment
-                  else
-                    throw new IllegalArgumentException();
-                else if (FeatureMapUtil.isFeatureMap(feature))
-                {
-                  if (!validate(feature, property))
-                    continue;
-                  append(p, property, dataObject.get(property)); // removes containment
-                }
-                else if (p == property)
-                  set(p, dataObject.get(property));
-                else
-                  continue;
-                dataObject.unset(property);
-                return;
-              } // iterator.hasNext()
-              break;
-            } // toIndex == 0
-            size = 1;
-          } // iterator.hasNext()
-          break;
-        } // fromIndex == 0
-        else
-        {
-          --toIndex;
-          --fromIndex;
-        }
-    }
-    throw new IndexOutOfBoundsException();
-  }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java
deleted file mode 100644
index f24b166f77..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/JavaMetaData.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util.metadata;
-
-import java.io.Serializable;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Java Meta Data</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.util.metadata.JavaMetaData#getFactoryInterface <em>Factory Interface</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.util.metadata.JavaMetaData#getTypeInterface <em>Type Interface</em>}</li>
- * </ul>
- * </p>
- *
- * @extends Serializable
- * @generated
- */
-public interface JavaMetaData extends Serializable
-{
-  /**
-   * Returns the value of the '<em><b>Factory Interface</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Factory Interface</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Factory Interface</em>' attribute.
-   * @see #setFactoryInterface(String)
-   * @generated
-   */
-  String getFactoryInterface();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.util.metadata.JavaMetaData#getFactoryInterface <em>Factory Interface</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Factory Interface</em>' attribute.
-   * @see #getFactoryInterface()
-   * @generated
-   */
-  void setFactoryInterface(String value);
-
-  /**
-   * Returns the value of the '<em><b>Type Interface</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Type Interface</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Type Interface</em>' attribute.
-   * @see #setTypeInterface(String)
-   * @generated
-   */
-  String getTypeInterface();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.util.metadata.JavaMetaData#getTypeInterface <em>Type Interface</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Type Interface</em>' attribute.
-   * @see #getTypeInterface()
-   * @generated
-   */
-  void setTypeInterface(String value);
-
-} // JavaMetaData
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java
deleted file mode 100644
index 1f540afa2c..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/MetadataFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util.metadata;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @generated
- */
-public interface MetadataFactory
-{
-
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  MetadataFactory INSTANCE = org.apache.tuscany.sdo.util.metadata.impl.MetadataFactoryImpl.init();
-
-  /**
-   * Returns a new object of class '<em>Java Meta Data</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Java Meta Data</em>'.
-   * @generated
-   */
-  JavaMetaData createJavaMetaData();
-
-  /**
-   * Returns a new object of class '<em>SDO Meta Data Group</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>SDO Meta Data Group</em>'.
-   * @generated
-   */
-  SDOMetaDataGroup createSDOMetaDataGroup();
-
-  /**
-   * Returns a new object of class '<em>Type Meta Data</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Type Meta Data</em>'.
-   * @generated
-   */
-  TypeMetaData createTypeMetaData();
-
-  /**
-   * Returns a new object of class '<em>XSD Meta Data</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>XSD Meta Data</em>'.
-   * @generated
-   */
-  XSDMetaData createXSDMetaData();
-
-} //MetadataFactory
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java
deleted file mode 100644
index 5657f26ca5..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/SDOMetaDataGroup.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util.metadata;
-
-import java.io.Serializable;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>SDO Meta Data Group</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.util.metadata.SDOMetaDataGroup#getJavaMetaData <em>Java Meta Data</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.util.metadata.SDOMetaDataGroup#getXsdMetaData <em>Xsd Meta Data</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.util.metadata.SDOMetaDataGroup#getTypeMetaData <em>Type Meta Data</em>}</li>
- * </ul>
- * </p>
- *
- * @extends Serializable
- * @generated
- */
-public interface SDOMetaDataGroup extends Serializable
-{
-  /**
-   * Returns the value of the '<em><b>Java Meta Data</b></em>' containment reference list.
-   * The list contents are of type {@link org.apache.tuscany.sdo.util.metadata.JavaMetaData}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Java Meta Data</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Java Meta Data</em>' containment reference list.
-   * @generated
-   */
-  List getJavaMetaData();
-
-  /**
-   * Returns the value of the '<em><b>Xsd Meta Data</b></em>' containment reference list.
-   * The list contents are of type {@link org.apache.tuscany.sdo.util.metadata.XSDMetaData}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Xsd Meta Data</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Xsd Meta Data</em>' containment reference list.
-   * @generated
-   */
-  List getXsdMetaData();
-
-  /**
-   * Returns the value of the '<em><b>Type Meta Data</b></em>' containment reference list.
-   * The list contents are of type {@link org.apache.tuscany.sdo.util.metadata.TypeMetaData}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Type Meta Data</em>' containment reference list isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Type Meta Data</em>' containment reference list.
-   * @generated
-   */
-  List getTypeMetaData();
-
-} // SDOMetaDataGroup
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java
deleted file mode 100644
index c3d67a8318..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/TypeMetaData.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util.metadata;
-
-import java.io.Serializable;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Type Meta Data</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.util.metadata.TypeMetaData#getLocation <em>Location</em>}</li>
- * </ul>
- * </p>
- *
- * @extends Serializable
- * @generated
- */
-public interface TypeMetaData extends Serializable
-{
-  /**
-   * Returns the value of the '<em><b>Location</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Location</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Location</em>' attribute.
-   * @see #setLocation(String)
-   * @generated
-   */
-  String getLocation();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.util.metadata.TypeMetaData#getLocation <em>Location</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Location</em>' attribute.
-   * @see #getLocation()
-   * @generated
-   */
-  void setLocation(String value);
-
-} // TypeMetaData
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java
deleted file mode 100644
index 09bffece71..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/XSDMetaData.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-
-package org.apache.tuscany.sdo.util.metadata;
-
-import java.io.Serializable;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>XSD Meta Data</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.util.metadata.XSDMetaData#getLocation <em>Location</em>}</li>
- * </ul>
- * </p>
- *
- * @extends Serializable
- * @generated
- */
-public interface XSDMetaData extends Serializable
-{
-  /**
-   * Returns the value of the '<em><b>Location</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Location</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Location</em>' attribute.
-   * @see #setLocation(String)
-   * @generated
-   */
-  String getLocation();
-
-  /**
-   * Sets the value of the '{@link org.apache.tuscany.sdo.util.metadata.XSDMetaData#getLocation <em>Location</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Location</em>' attribute.
-   * @see #getLocation()
-   * @generated
-   */
-  void setLocation(String value);
-
-} // XSDMetaData
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java
deleted file mode 100644
index 8a6dce6161..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/JavaMetaDataImpl.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util.metadata.impl;
-
-import commonj.sdo.Type;
-
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-import org.apache.tuscany.sdo.util.metadata.JavaMetaData;
-import org.apache.tuscany.sdo.util.metadata.MetadataFactory;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Java Meta Data</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.util.metadata.impl.JavaMetaDataImpl#getFactoryInterface <em>Factory Interface</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.util.metadata.impl.JavaMetaDataImpl#getTypeInterface <em>Type Interface</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class JavaMetaDataImpl extends DataObjectBase implements JavaMetaData
-{
-  /**
-   * The feature id for the '<em><b>Factory Interface</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */	 
-  public final static int FACTORY_INTERFACE = 0;
-
-  /**
-   * The feature id for the '<em><b>Type Interface</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */	 
-  public final static int TYPE_INTERFACE = 1;
-
-  /**
-   * This represents the number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  
-  public final static int SDO_PROPERTY_COUNT = 2;
-
-  /**
-   * The default value of the '{@link #getFactoryInterface() <em>Factory Interface</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFactoryInterface()
-   * @generated
-   * @ordered
-   */
-  protected static final String FACTORY_INTERFACE_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getFactoryInterface() <em>Factory Interface</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getFactoryInterface()
-   * @generated
-   * @ordered
-   */
-  protected String factoryInterface = FACTORY_INTERFACE_DEFAULT_;
-
-  /**
-   * The default value of the '{@link #getTypeInterface() <em>Type Interface</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTypeInterface()
-   * @generated
-   * @ordered
-   */
-  protected static final String TYPE_INTERFACE_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getTypeInterface() <em>Type Interface</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTypeInterface()
-   * @generated
-   * @ordered
-   */
-  protected String typeInterface = TYPE_INTERFACE_DEFAULT_;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected JavaMetaDataImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type getStaticType()
-  {
-    return ((MetadataFactoryImpl)MetadataFactory.INSTANCE).getJavaMetaData();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getFactoryInterface()
-  {
-    return factoryInterface;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setFactoryInterface(String newFactoryInterface)
-  {
-    String oldFactoryInterface = factoryInterface;
-    factoryInterface = newFactoryInterface;
-    if (isNotifying())
-      notify(ChangeKind.SET, FACTORY_INTERFACE, oldFactoryInterface, factoryInterface);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getTypeInterface()
-  {
-    return typeInterface;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setTypeInterface(String newTypeInterface)
-  {
-    String oldTypeInterface = typeInterface;
-    typeInterface = newTypeInterface;
-    if (isNotifying())
-      notify(ChangeKind.SET, TYPE_INTERFACE, oldTypeInterface, typeInterface);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object get(int propertyIndex, boolean resolve)
-  {
-    switch (propertyIndex)
-    {
-      case FACTORY_INTERFACE:
-        return getFactoryInterface();
-      case TYPE_INTERFACE:
-        return getTypeInterface();
-    }
-    return super.get(propertyIndex, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void set(int propertyIndex, Object newValue)
-  {
-    switch (propertyIndex)
-    {
-      case FACTORY_INTERFACE:
-        setFactoryInterface((String)newValue);
-        return;
-      case TYPE_INTERFACE:
-        setTypeInterface((String)newValue);
-        return;
-    }
-    super.set(propertyIndex, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unset(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case FACTORY_INTERFACE:
-        setFactoryInterface(FACTORY_INTERFACE_DEFAULT_);
-        return;
-      case TYPE_INTERFACE:
-        setTypeInterface(TYPE_INTERFACE_DEFAULT_);
-        return;
-    }
-    super.unset(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case FACTORY_INTERFACE:
-        return FACTORY_INTERFACE_DEFAULT_ == null ? factoryInterface != null : !FACTORY_INTERFACE_DEFAULT_.equals(factoryInterface);
-      case TYPE_INTERFACE:
-        return TYPE_INTERFACE_DEFAULT_ == null ? typeInterface != null : !TYPE_INTERFACE_DEFAULT_.equals(typeInterface);
-    }
-    return super.isSet(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (isProxy(this)) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (factoryInterface: ");
-    result.append(factoryInterface);
-    result.append(", typeInterface: ");
-    result.append(typeInterface);
-    result.append(')');
-    return result.toString();
-  }
-
-} //JavaMetaDataImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java
deleted file mode 100644
index a4ea322549..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/MetadataFactoryImpl.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util.metadata.impl;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-
-import org.apache.tuscany.sdo.SDOFactory;
-
-import org.apache.tuscany.sdo.impl.FactoryBase;
-
-import org.apache.tuscany.sdo.model.ModelFactory;
-
-import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
-
-import org.apache.tuscany.sdo.util.SDOUtil;
-
-import org.apache.tuscany.sdo.util.metadata.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class MetadataFactoryImpl extends FactoryBase implements MetadataFactory
-{
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String NAMESPACE_URI = "org.apache.tuscany.sdo/metadata";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String NAMESPACE_PREFIX = "metadata";	
-  public static final int JAVA_META_DATA = 1;	
-  public static final int SDO_META_DATA_GROUP = 2;	
-  public static final int TYPE_META_DATA = 3;	
-  public static final int XSD_META_DATA = 4;
-  
-  /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public MetadataFactoryImpl()
-  {
-    super(NAMESPACE_URI, NAMESPACE_PREFIX);
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public DataObject create(int typeNumber)
-  {
-    switch (typeNumber)
-    {
-      case JAVA_META_DATA: return (DataObject)createJavaMetaData();
-      case SDO_META_DATA_GROUP: return (DataObject)createSDOMetaDataGroup();
-      case TYPE_META_DATA: return (DataObject)createTypeMetaData();
-      case XSD_META_DATA: return (DataObject)createXSDMetaData();
-      default:
-        return super.create(typeNumber);
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public JavaMetaData createJavaMetaData()
-  {
-    JavaMetaDataImpl javaMetaData = new JavaMetaDataImpl();
-    return javaMetaData;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public SDOMetaDataGroup createSDOMetaDataGroup()
-  {
-    SDOMetaDataGroupImpl sdoMetaDataGroup = new SDOMetaDataGroupImpl();
-    return sdoMetaDataGroup;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public TypeMetaData createTypeMetaData()
-  {
-    TypeMetaDataImpl typeMetaData = new TypeMetaDataImpl();
-    return typeMetaData;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public XSDMetaData createXSDMetaData()
-  {
-    XSDMetaDataImpl xsdMetaData = new XSDMetaDataImpl();
-    return xsdMetaData;
-  }
-  
-  // Following creates and initializes SDO metadata for the supported types.			
-  protected Type javaMetaDataType = null;
-
-  public Type getJavaMetaData()
-  {
-    return javaMetaDataType;
-  }
-    
-  protected Type sdoMetaDataGroupType = null;
-
-  public Type getSDOMetaDataGroup()
-  {
-    return sdoMetaDataGroupType;
-  }
-    
-  protected Type typeMetaDataType = null;
-
-  public Type getTypeMetaData()
-  {
-    return typeMetaDataType;
-  }
-    
-  protected Type xsdMetaDataType = null;
-
-  public Type getXSDMetaData()
-  {
-    return xsdMetaDataType;
-  }
-  
-
-  private static boolean isInited = false;
-
-  public static MetadataFactoryImpl init()
-  {
-    if (isInited) return (MetadataFactoryImpl)FactoryBase.getStaticFactory(MetadataFactoryImpl.NAMESPACE_URI);
-    MetadataFactoryImpl theMetadataFactoryImpl = new MetadataFactoryImpl();
-    isInited = true;
-
-    // Initialize simple dependencies
-    SDOUtil.registerStaticTypes(SDOFactory.class);
-    SDOUtil.registerStaticTypes(ModelFactory.class);
-
-    // Create package meta-data objects
-    theMetadataFactoryImpl.createMetaData();
-
-    // Initialize created meta-data
-    theMetadataFactoryImpl.initializeMetaData();
-
-    // Mark meta-data to indicate it can't be changed
-    //theMetadataFactoryImpl.freeze(); //FB do we need to freeze / should we freeze ????
-
-    return theMetadataFactoryImpl;
-  }
-  
-  private boolean isCreated = false;
-
-  public void createMetaData()
-  {
-    if (isCreated) return;
-    isCreated = true;	
-
-
-    javaMetaDataType = createType(false, JAVA_META_DATA);
-    createProperty(true, javaMetaDataType, JavaMetaDataImpl.FACTORY_INTERFACE);
-    createProperty(true, javaMetaDataType, JavaMetaDataImpl.TYPE_INTERFACE);
-
-    sdoMetaDataGroupType = createType(false, SDO_META_DATA_GROUP);
-    createProperty(false, sdoMetaDataGroupType, SDOMetaDataGroupImpl.JAVA_META_DATA);
-    createProperty(false, sdoMetaDataGroupType, SDOMetaDataGroupImpl.XSD_META_DATA);
-    createProperty(false, sdoMetaDataGroupType, SDOMetaDataGroupImpl.TYPE_META_DATA);
-
-    typeMetaDataType = createType(false, TYPE_META_DATA);
-    createProperty(true, typeMetaDataType, TypeMetaDataImpl.LOCATION);
-
-    xsdMetaDataType = createType(false, XSD_META_DATA);
-    createProperty(true, xsdMetaDataType, XSDMetaDataImpl.LOCATION);
-  }
-  
-  private boolean isInitialized = false;
-
-  public void initializeMetaData()
-  {
-    if (isInitialized) return;
-    isInitialized = true;
-
-    // Obtain other dependent packages
-    ModelFactoryImpl theModelPackageImpl = (ModelFactoryImpl)FactoryBase.getStaticFactory(ModelFactoryImpl.NAMESPACE_URI);
-    Property property = null;
-
-    // Add supertypes to classes
-
-    // Initialize classes and features; add operations and parameters
-    initializeType(javaMetaDataType, JavaMetaData.class, "JavaMetaData");
-
-    property = (Property)javaMetaDataType.getProperties().get(JavaMetaDataImpl.FACTORY_INTERFACE);
-    initializeProperty(property, theModelPackageImpl.getString(), "factoryInterface", null, 0, 1, JavaMetaData.class, false, false, false);
-
-    property = (Property)javaMetaDataType.getProperties().get(JavaMetaDataImpl.TYPE_INTERFACE);
-    initializeProperty(property, theModelPackageImpl.getString(), "typeInterface", null, 0, 1, JavaMetaData.class, false, false, false);
-
-    initializeType(sdoMetaDataGroupType, SDOMetaDataGroup.class, "SDOMetaDataGroup");
-
-    property = (Property)sdoMetaDataGroupType.getProperties().get(SDOMetaDataGroupImpl.JAVA_META_DATA);
-    initializeProperty(property, this.getJavaMetaData(), "javaMetaData", null, 0, -1, SDOMetaDataGroup.class, false, false, false, true , null);
-
-    property = (Property)sdoMetaDataGroupType.getProperties().get(SDOMetaDataGroupImpl.XSD_META_DATA);
-    initializeProperty(property, this.getXSDMetaData(), "xsdMetaData", null, 0, -1, SDOMetaDataGroup.class, false, false, false, true , null);
-
-    property = (Property)sdoMetaDataGroupType.getProperties().get(SDOMetaDataGroupImpl.TYPE_META_DATA);
-    initializeProperty(property, this.getTypeMetaData(), "typeMetaData", null, 0, -1, SDOMetaDataGroup.class, false, false, false, true , null);
-
-    initializeType(typeMetaDataType, TypeMetaData.class, "TypeMetaData");
-
-    property = (Property)typeMetaDataType.getProperties().get(TypeMetaDataImpl.LOCATION);
-    initializeProperty(property, theModelPackageImpl.getString(), "location", null, 1, 1, TypeMetaData.class, false, false, false);
-
-    initializeType(xsdMetaDataType, XSDMetaData.class, "XSDMetaData");
-
-    property = (Property)xsdMetaDataType.getProperties().get(XSDMetaDataImpl.LOCATION);
-    initializeProperty(property, theModelPackageImpl.getString(), "location", null, 1, 1, XSDMetaData.class, false, false, false);
-
-    createXSDMetaData(theModelPackageImpl);
-  }
-    
-  protected void createXSDMetaData(ModelFactoryImpl theModelPackageImpl)
-  {
-    super.initXSD();
-    
-    Property property = null;
-    
-    property = createGlobalProperty
-      ("sdoMetaDataGroup",
-      this.getSDOMetaDataGroup(),
-       new String[]
-       {
-       "kind", "element",
-       "name", "sdoMetaDataGroup",
-       "namespace", "##targetNamespace"
-       });
-                
-    addXSDMapping
-      (javaMetaDataType,
-       new String[] 
-       {
-       "name", "JavaMetaData",
-       "kind", "empty"
-       });
-
-    addXSDMapping
-      ((Property)javaMetaDataType.getProperties().get(JavaMetaDataImpl.FACTORY_INTERFACE),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "factoryInterface"
-       });
-
-    addXSDMapping
-      ((Property)javaMetaDataType.getProperties().get(JavaMetaDataImpl.TYPE_INTERFACE),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "typeInterface"
-       });
-
-    addXSDMapping
-      (sdoMetaDataGroupType,
-       new String[] 
-       {
-       "name", "SDOMetaDataGroup",
-       "kind", "elementOnly"
-       });
-
-    addXSDMapping
-      ((Property)sdoMetaDataGroupType.getProperties().get(SDOMetaDataGroupImpl.JAVA_META_DATA),
-       new String[]
-       {
-       "kind", "element",
-       "name", "javaMetaData"
-       });
-
-    addXSDMapping
-      ((Property)sdoMetaDataGroupType.getProperties().get(SDOMetaDataGroupImpl.XSD_META_DATA),
-       new String[]
-       {
-       "kind", "element",
-       "name", "xsdMetaData"
-       });
-
-    addXSDMapping
-      ((Property)sdoMetaDataGroupType.getProperties().get(SDOMetaDataGroupImpl.TYPE_META_DATA),
-       new String[]
-       {
-       "kind", "element",
-       "name", "typeMetaData"
-       });
-
-    addXSDMapping
-      (typeMetaDataType,
-       new String[] 
-       {
-       "name", "TypeMetaData",
-       "kind", "empty"
-       });
-
-    addXSDMapping
-      ((Property)typeMetaDataType.getProperties().get(TypeMetaDataImpl.LOCATION),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "location"
-       });
-
-    addXSDMapping
-      (xsdMetaDataType,
-       new String[] 
-       {
-       "name", "XSDMetaData",
-       "kind", "empty"
-       });
-
-    addXSDMapping
-      ((Property)xsdMetaDataType.getProperties().get(XSDMetaDataImpl.LOCATION),
-       new String[]
-       {
-       "kind", "attribute",
-       "name", "location"
-       });
-
-  }
-  
-} //MetadataFactoryImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java
deleted file mode 100644
index 43746399fc..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/SDOMetaDataGroupImpl.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util.metadata.impl;
-
-import commonj.sdo.Type;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-import org.apache.tuscany.sdo.util.metadata.JavaMetaData;
-import org.apache.tuscany.sdo.util.metadata.MetadataFactory;
-import org.apache.tuscany.sdo.util.metadata.SDOMetaDataGroup;
-import org.apache.tuscany.sdo.util.metadata.TypeMetaData;
-import org.apache.tuscany.sdo.util.metadata.XSDMetaData;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>SDO Meta Data Group</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.util.metadata.impl.SDOMetaDataGroupImpl#getJavaMetaData <em>Java Meta Data</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.util.metadata.impl.SDOMetaDataGroupImpl#getXsdMetaData <em>Xsd Meta Data</em>}</li>
- *   <li>{@link org.apache.tuscany.sdo.util.metadata.impl.SDOMetaDataGroupImpl#getTypeMetaData <em>Type Meta Data</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SDOMetaDataGroupImpl extends DataObjectBase implements SDOMetaDataGroup
-{
-  /**
-   * The feature id for the '<em><b>Java Meta Data</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */	 
-  public final static int JAVA_META_DATA = 0;
-
-  /**
-   * The feature id for the '<em><b>Xsd Meta Data</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */	 
-  public final static int XSD_META_DATA = 1;
-
-  /**
-   * The feature id for the '<em><b>Type Meta Data</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */	 
-  public final static int TYPE_META_DATA = 2;
-
-  /**
-   * This represents the number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  
-  public final static int SDO_PROPERTY_COUNT = 3;
-
-  /**
-   * The cached value of the '{@link #getJavaMetaData() <em>Java Meta Data</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getJavaMetaData()
-   * @generated
-   * @ordered
-   */
-  
-  protected List javaMetaData = null;
-  
-  /**
-   * The cached value of the '{@link #getXsdMetaData() <em>Xsd Meta Data</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getXsdMetaData()
-   * @generated
-   * @ordered
-   */
-  
-  protected List xsdMetaData = null;
-  
-  /**
-   * The cached value of the '{@link #getTypeMetaData() <em>Type Meta Data</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getTypeMetaData()
-   * @generated
-   * @ordered
-   */
-  
-  protected List typeMetaData = null;
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected SDOMetaDataGroupImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type getStaticType()
-  {
-    return ((MetadataFactoryImpl)MetadataFactory.INSTANCE).getSDOMetaDataGroup();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getJavaMetaData()
-  {
-    if (javaMetaData == null)
-    {
-      javaMetaData = createPropertyList(ListKind.CONTAINMENT, JavaMetaData.class, JAVA_META_DATA);
-    }
-    return javaMetaData;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getXsdMetaData()
-  {
-    if (xsdMetaData == null)
-    {
-      xsdMetaData = createPropertyList(ListKind.CONTAINMENT, XSDMetaData.class, XSD_META_DATA);
-    }
-    return xsdMetaData;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getTypeMetaData()
-  {
-    if (typeMetaData == null)
-    {
-      typeMetaData = createPropertyList(ListKind.CONTAINMENT, TypeMetaData.class, TYPE_META_DATA);
-    }
-    return typeMetaData;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public ChangeContext inverseRemove(Object otherEnd, int propertyIndex, ChangeContext changeContext)
-  {
-    switch (propertyIndex)
-    {
-      case JAVA_META_DATA:
-        return removeFromList(getJavaMetaData(), otherEnd, changeContext);
-      case XSD_META_DATA:
-        return removeFromList(getXsdMetaData(), otherEnd, changeContext);
-      case TYPE_META_DATA:
-        return removeFromList(getTypeMetaData(), otherEnd, changeContext);
-    }
-    return super.inverseRemove(otherEnd, propertyIndex, changeContext);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object get(int propertyIndex, boolean resolve)
-  {
-    switch (propertyIndex)
-    {
-      case JAVA_META_DATA:
-        return getJavaMetaData();
-      case XSD_META_DATA:
-        return getXsdMetaData();
-      case TYPE_META_DATA:
-        return getTypeMetaData();
-    }
-    return super.get(propertyIndex, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void set(int propertyIndex, Object newValue)
-  {
-    switch (propertyIndex)
-    {
-      case JAVA_META_DATA:
-        getJavaMetaData().clear();
-        getJavaMetaData().addAll((Collection)newValue);
-        return;
-      case XSD_META_DATA:
-        getXsdMetaData().clear();
-        getXsdMetaData().addAll((Collection)newValue);
-        return;
-      case TYPE_META_DATA:
-        getTypeMetaData().clear();
-        getTypeMetaData().addAll((Collection)newValue);
-        return;
-    }
-    super.set(propertyIndex, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unset(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case JAVA_META_DATA:
-        getJavaMetaData().clear();
-        return;
-      case XSD_META_DATA:
-        getXsdMetaData().clear();
-        return;
-      case TYPE_META_DATA:
-        getTypeMetaData().clear();
-        return;
-    }
-    super.unset(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case JAVA_META_DATA:
-        return javaMetaData != null && !javaMetaData.isEmpty();
-      case XSD_META_DATA:
-        return xsdMetaData != null && !xsdMetaData.isEmpty();
-      case TYPE_META_DATA:
-        return typeMetaData != null && !typeMetaData.isEmpty();
-    }
-    return super.isSet(propertyIndex);
-  }
-
-} //SDOMetaDataGroupImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java
deleted file mode 100644
index 66d7f8625f..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/TypeMetaDataImpl.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util.metadata.impl;
-
-import commonj.sdo.Type;
-
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-import org.apache.tuscany.sdo.util.metadata.MetadataFactory;
-import org.apache.tuscany.sdo.util.metadata.TypeMetaData;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Type Meta Data</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.util.metadata.impl.TypeMetaDataImpl#getLocation <em>Location</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TypeMetaDataImpl extends DataObjectBase implements TypeMetaData
-{
-  /**
-   * The feature id for the '<em><b>Location</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */	 
-  public final static int LOCATION = 0;
-
-  /**
-   * This represents the number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  
-  public final static int SDO_PROPERTY_COUNT = 1;
-
-  /**
-   * The default value of the '{@link #getLocation() <em>Location</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLocation()
-   * @generated
-   * @ordered
-   */
-  protected static final String LOCATION_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getLocation() <em>Location</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLocation()
-   * @generated
-   * @ordered
-   */
-  protected String location = LOCATION_DEFAULT_;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected TypeMetaDataImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type getStaticType()
-  {
-    return ((MetadataFactoryImpl)MetadataFactory.INSTANCE).getTypeMetaData();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getLocation()
-  {
-    return location;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setLocation(String newLocation)
-  {
-    String oldLocation = location;
-    location = newLocation;
-    if (isNotifying())
-      notify(ChangeKind.SET, LOCATION, oldLocation, location);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object get(int propertyIndex, boolean resolve)
-  {
-    switch (propertyIndex)
-    {
-      case LOCATION:
-        return getLocation();
-    }
-    return super.get(propertyIndex, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void set(int propertyIndex, Object newValue)
-  {
-    switch (propertyIndex)
-    {
-      case LOCATION:
-        setLocation((String)newValue);
-        return;
-    }
-    super.set(propertyIndex, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unset(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case LOCATION:
-        setLocation(LOCATION_DEFAULT_);
-        return;
-    }
-    super.unset(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case LOCATION:
-        return LOCATION_DEFAULT_ == null ? location != null : !LOCATION_DEFAULT_.equals(location);
-    }
-    return super.isSet(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (isProxy(this)) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (location: ");
-    result.append(location);
-    result.append(')');
-    return result.toString();
-  }
-
-} //TypeMetaDataImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java
deleted file mode 100644
index 7a04d6b99c..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/metadata/impl/XSDMetaDataImpl.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util.metadata.impl;
-
-import commonj.sdo.Type;
-
-import org.apache.tuscany.sdo.impl.DataObjectBase;
-
-import org.apache.tuscany.sdo.util.metadata.MetadataFactory;
-import org.apache.tuscany.sdo.util.metadata.XSDMetaData;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>XSD Meta Data</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.tuscany.sdo.util.metadata.impl.XSDMetaDataImpl#getLocation <em>Location</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class XSDMetaDataImpl extends DataObjectBase implements XSDMetaData
-{
-  /**
-   * The feature id for the '<em><b>Location</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */	 
-  public final static int LOCATION = 0;
-
-  /**
-   * This represents the number of properties for this type.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  
-  public final static int SDO_PROPERTY_COUNT = 1;
-
-  /**
-   * The default value of the '{@link #getLocation() <em>Location</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLocation()
-   * @generated
-   * @ordered
-   */
-  protected static final String LOCATION_DEFAULT_ = null;
-
-  /**
-   * The cached value of the '{@link #getLocation() <em>Location</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLocation()
-   * @generated
-   * @ordered
-   */
-  protected String location = LOCATION_DEFAULT_;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected XSDMetaDataImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Type getStaticType()
-  {
-    return ((MetadataFactoryImpl)MetadataFactory.INSTANCE).getXSDMetaData();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getLocation()
-  {
-    return location;
-  }
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setLocation(String newLocation)
-  {
-    String oldLocation = location;
-    location = newLocation;
-    if (isNotifying())
-      notify(ChangeKind.SET, LOCATION, oldLocation, location);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object get(int propertyIndex, boolean resolve)
-  {
-    switch (propertyIndex)
-    {
-      case LOCATION:
-        return getLocation();
-    }
-    return super.get(propertyIndex, resolve);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void set(int propertyIndex, Object newValue)
-  {
-    switch (propertyIndex)
-    {
-      case LOCATION:
-        setLocation((String)newValue);
-        return;
-    }
-    super.set(propertyIndex, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unset(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case LOCATION:
-        setLocation(LOCATION_DEFAULT_);
-        return;
-    }
-    super.unset(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    switch (propertyIndex)
-    {
-      case LOCATION:
-        return LOCATION_DEFAULT_ == null ? location != null : !LOCATION_DEFAULT_.equals(location);
-    }
-    return super.isSet(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (isProxy(this)) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (location: ");
-    result.append(location);
-    result.append(')');
-    return result.toString();
-  }
-
-} //XSDMetaDataImpl
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/ChangeSummaryStreamDeserializer.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/ChangeSummaryStreamDeserializer.java
deleted file mode 100644
index 697de1c7ad..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/ChangeSummaryStreamDeserializer.java
+++ /dev/null
@@ -1,663 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util.resource;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sdo.SDOFactory;
-import org.apache.tuscany.sdo.helper.SDOAnnotations;
-import org.apache.tuscany.sdo.impl.ChangeSummaryImpl;
-import org.apache.tuscany.sdo.impl.ClassImpl;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.ETypedElement;
-import org.eclipse.emf.ecore.change.ChangeDescription;
-import org.eclipse.emf.ecore.change.ChangeFactory;
-import org.eclipse.emf.ecore.change.ChangeKind;
-import org.eclipse.emf.ecore.change.FeatureChange;
-import org.eclipse.emf.ecore.change.FeatureMapEntry;
-import org.eclipse.emf.ecore.change.ListChange;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-import commonj.sdo.helper.HelperContext;
-
-/**
- * ChangeSummary StAX Deserializer whose input conforms to the SDO Java/C++/PHP specifications. The instance isn't thread-safe, however it's safe to
- * use the instance any times on the same thread.
- */
-public class ChangeSummaryStreamDeserializer extends SDODeserializer {
-    static final class ForwardReference extends Ref {
-        final String unset;
-
-        ForwardReference(String ref, NamespaceContext nameSpaces, String u) {
-            super(ref, nameSpaces);
-            unset = u;
-        }
-
-        Collection attributes/* = null */, qualifiedAttributes/* = null */, tags/* = null */; // may be null, never empty
-    }
-
-    protected Collection forwardReferences/* = null */;
-
-    static private final class ElementChange extends Ref {
-        private final Object containing, containment;
-        private ElementChange(String ref, NamespaceContext nameSpaces, Object property, Object propertyInSequence) {
-            super(ref, nameSpaces);
-            containing = property;
-            containment = propertyInSequence;
-        }
-    }
-
-    static private class PropertyMapChanges {
-        Map/* Property,List */lists/* = null */;// may be null
-
-        Collection put(Object property) {
-            Collection list = new ArrayList();
-            lists.put(property, list);
-            return list;
-        }
-
-        protected final Collection get(Object property) {
-            Object list = lists.get(property);
-            return list == null ? put(property) : (Collection) list;
-        }
-
-        protected final Collection newList(Object property) {
-            lists = new HashMap();
-            return put(property);
-        }
-    }
-
-    static final class ObjectChanges extends PropertyMapChanges {
-        Collection elementChanges/* = null */,// may be null, never empty
-                featureChanges;
-
-        protected final void newElementChanges() {
-            elementChanges = new ArrayList();
-        }
-    }
-
-    Collection objectChangesCollection/* = null */, objectMapChanges, deletedDataObjects;
-
-    protected final ObjectChanges newObjectChanges(Collection featureChanges) {
-        ObjectChanges objectChanges = new ObjectChanges();
-        objectChanges.featureChanges = featureChanges;
-        if (objectChangesCollection == null)
-            objectChangesCollection = new ArrayList();
-        objectChangesCollection.add(objectChanges);
-        return objectChanges;
-    }
-
-    private ChangeFactory changeFactory;
-
-    private SDOFactory changeSettingFactory;
-
-    private void logPropertyChange(Collection featureChanges, EStructuralFeature feature, Object value, boolean set) {
-        if (changeSettingFactory == null)
-            featureChanges.add(changeFactory.createFeatureChange(feature, value, set));
-        else
-            featureChanges.add(changeSettingFactory.createChangeSummarySetting(feature, value, set));
-    }
-
-    void unsetProperty(Collection featureChanges, String unset, int begin, int index, Type type) {
-        logPropertyChange(featureChanges, (EStructuralFeature) type.getProperty(unset.substring(begin, index)), null, false);
-    }
-
-    static boolean isWhitespace(String unset, int index) {
-        return Character.isWhitespace(unset.charAt(index));
-    }
-
-    protected final Collection unsetProperties(EObject referent, String unset, Type type) {
-        Map.Entry entry = changeFactory.createEObjectToChangesMapEntry(referent);
-        objectMapChanges.add(entry);
-        Collection featureChanges = (Collection) entry.getValue();
-        if (unset == null)
-            return featureChanges;
-        int end = unset.length();
-        if (end != 0)
-            for (int begin = 0, index = 1;/* true */; ++index) {
-                if (index == end) {
-                    unsetProperty(featureChanges, unset, begin, index, type);
-                    break;
-                }
-                if (isWhitespace(unset, index)) {
-                    unsetProperty(featureChanges, unset, begin, index, type);
-                    while (true) {
-                        if (++index != end)
-                            return featureChanges;
-                        if (!isWhitespace(unset, index)) {
-                            begin = index;
-                            break;
-                        }
-                    }
-                }
-            }
-        return featureChanges;
-    }
-
-    private Object value(EStructuralFeature containing, Object containment, Object value) {
-        return FeatureMapUtil.isFeatureMap(containing) ? changeFactory.createFeatureMapEntry((EStructuralFeature) containment, value) : value;
-    }
-
-    private void logPropertyChange(Collection featureChanges, Object containing, Object containment, Object value) {
-        EStructuralFeature feature = (EStructuralFeature) containing;
-        logPropertyChange(featureChanges, feature, value(feature, containment, value), true);
-    }
-
-    private void logPropertyChange(Collection featureChanges, Object property, Object value) {
-        logPropertyChange(featureChanges, property, propertyInSequence, value);
-    }
-
-    void logAttributeChange(Collection featureChanges, Property property, String literal, NamespaceContext nameSpaces) {
-        logPropertyChange(featureChanges, property, value(property.getType(), literal, nameSpaces));
-    }
-
-    protected final void logAttributeChange(Collection featureChanges, String property, Type type, String value, NamespaceContext nameSpaces) {
-        logAttributeChange(featureChanges, getProperty(type, property), value, nameSpaces);
-    }
-
-    protected final void logAttributeChange(Collection featureChanges, String nameSpace, String name, Type type, String value,
-            NamespaceContext nameSpaces) {
-        logAttributeChange(featureChanges, getProperty(type, nameSpace, name, false), value, nameSpaces);
-    }
-
-    protected final String ref() {
-        return reader.getAttributeValue(SDOAnnotations.COMMONJ_SDO_NS, ChangeSummaryStreamSerializer.REF_ATTRIBUTE);
-    }
-
-    ChangeSummaryImpl changeSummary;
-
-    protected Object load(XMLStreamReader reader, Map options) throws XMLStreamException {
-        Object value = super.load(reader, options);
-        deletedDataObjects.add(value);
-        return value;
-    }
-
-    protected final void getChangeSummary(DataObject rootObject) {
-        changeSummary = (ChangeSummaryImpl) rootObject.getChangeSummary(); // DynamicDataObjectImpl(EClass)
-    }
-
-    static protected final class Tag extends RecordedEventXMLStreamReader.Tag {
-        protected String ref;
-
-        protected Object value;
-
-        protected Tag(XMLStreamReader reader) {
-            super(reader);
-        }
-    }
-
-    protected final void addPropertyChange(Collection list, Object value, Object containing) {
-        list.add(value((EStructuralFeature) containing, propertyInSequence, value));
-    }
-
-    protected boolean logging;
-
-    /**
-     * Imports ChangeSummary 2-1. Forward references will be resolved by {@link #end()}.
-     * 
-     * @param reader
-     *            Never null
-     * @throws XMLStreamException
-     */
-    public final void begin(DataObject rootObject, HelperContext scope, XMLStreamReader reader) throws XMLStreamException {
-        /*
-         * 3-1. Instantiate ChangeSummary input: reader (xsi:type), factory, rootObject output: changeSummary, changeDescription
-         */
-        initialize(reader, scope, rootObject);
-        if (typedXSI()) {
-            changeSummary = (ChangeSummaryImpl) scope.getDataFactory().create(nameSpace, name);
-            if (changeSummary == null)
-                getChangeSummary(rootObject);
-            else {
-                Property csp = ((ClassImpl) rootObject.getType()).getChangeSummaryProperty();
-                rootObject.set(csp, changeSummary);
-                changeSummary.setDataObject(rootObject);
-            }
-        } else
-            getChangeSummary(rootObject);
-        ChangeDescription changeDescription = (ChangeDescription) changeSummary;
-
-        /*
-         * 3-2. "logging" attribute input: reader output: logging
-         */
-        logging = Boolean.valueOf(reader.getAttributeValue(null, "logging")).booleanValue();
-
-        /*
-         * 3-3. Modified DataObjects input: changeDescription
-         */
-        if (forwardReferences != null)
-            forwardReferences.clear();
-        if (objectChangesCollection != null)
-            objectChangesCollection.clear();
-        if (START_ELEMENT == reader.nextTag()) {
-            objectMapChanges = changeDescription.getObjectChanges();
-            deletedDataObjects = changeDescription.getObjectsToAttach();
-            Object factory = changeDescription.eClass().getEPackage().getEFactoryInstance();
-            changeFactory = factory instanceof ChangeFactory ? (ChangeFactory) factory : ChangeFactory.eINSTANCE;
-            changeSettingFactory = factory instanceof SDOFactory ? (SDOFactory) factory : null;
-            do {
-                /*
-                 * Modified DataObject
-                 */
-                String ref = ref(), unset = reader.getAttributeValue(SDOAnnotations.COMMONJ_SDO_NS, ChangeSummaryStreamSerializer.UNSET);
-                int attributes = reader.getAttributeCount();
-                NamespaceContext nameSpaces = reader.getNamespaceContext();
-                EObject referent = referent(ref, nameSpaces);
-                if (referent == null) {
-                    /*
-                     * Forward-referenced(unresolved) modified DataObject
-                     */
-                    ForwardReference forwardReference = new ForwardReference(ref, nameSpaces, unset);
-                    if (forwardReferences == null)
-                        forwardReferences = new ArrayList();
-                    forwardReferences.add(forwardReference);
-                    do // what about xmlns="NS1" a1="qName" xmlns="NS2" a2="qName" ?
-                    {
-                        /*
-                         * Record property old value as attribute for end()
-                         */
-                        String nameSpace = reader.getAttributeNamespace(--attributes), name = reader.getAttributeLocalName(attributes), value = reader
-                                .getAttributeValue(attributes);
-                        if (nameSpace == null) {
-                            /*
-                             * Local attribute
-                             */
-                            Attribute attribute = new Attribute();
-                            attribute.name = name;
-                            attribute.value = value;
-                            if (forwardReference.attributes == null)
-                                forwardReference.attributes = new ArrayList();
-                            forwardReference.attributes.add(attribute);
-                        } else if (!SDOAnnotations.COMMONJ_SDO_NS.equals(nameSpace) || !ChangeSummaryStreamSerializer.REF_ATTRIBUTE.equals(name)
-                                && !ChangeSummaryStreamSerializer.UNSET.equals(name)) {
-                            /*
-                             * Qualified(global) attribute
-                             */
-                            QualifiedAttribute attribute = new QualifiedAttribute();
-                            attribute.name = name;
-                            attribute.value = value;
-                            attribute.nameSpace = nameSpace;
-                            if (forwardReference.qualifiedAttributes == null)
-                                forwardReference.qualifiedAttributes = new ArrayList();
-                            forwardReference.qualifiedAttributes.add(attribute);
-                        }
-                    } while (attributes != 0);
-                    while (START_ELEMENT == reader.nextTag()) {
-                        /*
-                         * Record property old value as element for end()
-                         */
-                        Tag tag = new Tag(reader);
-                        if (forwardReference.tags == null)
-                            forwardReference.tags = new ArrayList();
-                        forwardReference.tags.add(tag);
-                        tag.ref = ref();
-                        if (tag.ref != null)
-                            continue;
-                        Type xsi = typeXSI();
-                        if (xsi == null) {
-                            if (tag.nameSpace != null)
-                                tag.value = value(globalElementType(tag.nameSpace, tag.name.getLocalPart())); // TODO substitutionGroup type if null
-                            else if (tag.record(reader))
-                                break;
-                        } else
-                            tag.value = value(xsi);
-                    }
-                } else {
-                    /*
-                     * Resolved(back-referenced) modified DataObject
-                     */
-                    Type type = ((DataObject) referent).getType();
-                    Collection featureChanges = unsetProperties(referent, unset, type);
-                    do // what about xmlns="NS1" a1="qName" xmlns="NS2" a2="qName" ?
-                    {
-                        /*
-                         * Log property old value as attribute
-                         */
-                        String nameSpace = reader.getAttributeNamespace(--attributes), name = reader.getAttributeLocalName(attributes), value = reader
-                                .getAttributeValue(attributes);
-                        if (nameSpace == null)
-                            logAttributeChange(featureChanges, name, type, value, nameSpaces);
-                        else if (!SDOAnnotations.COMMONJ_SDO_NS.equals(nameSpace) || !ChangeSummaryStreamSerializer.REF_ATTRIBUTE.equals(name)
-                                && !ChangeSummaryStreamSerializer.UNSET.equals(name))
-                            logAttributeChange(featureChanges, nameSpace, name, type, value, nameSpaces);
-                    } while (attributes != 0);
-                    if (START_ELEMENT == reader.nextTag()) {
-                        ObjectChanges objectChanges = null;
-                        do {
-                            /*
-                             * Log property old value as element
-                             */
-                            String nameSpace = reader.getNamespaceURI(), name = reader.getLocalName();
-                            Property property = getProperty(nameSpace, name, type);
-                            boolean many = property.isMany();
-                            Object value;
-                            ref = ref();
-                            if (ref == null) {
-                                /*
-                                 * Contained property old value
-                                 */
-                                Type xsi = typeXSI();
-                                if (xsi != null)
-                                    value = value(xsi);
-                                else if (nameSpace == null)
-                                    value = value(reader);
-                                else {
-                                    xsi = globalElementType(nameSpace, name);
-                                    value = value(xsi == null ? propertyInSequence.getType() : xsi);
-                                }
-                            } else {
-                                /*
-                                 * Referenced child DataObject
-                                 */
-                                nameSpaces = reader.getNamespaceContext();
-                                reader.nextTag()/* END_ELEMENT */;
-                                value = referent(ref, nameSpaces);
-                                if (value == null) {
-                                    /*
-                                     * Forward-referenced(unresolved) child DataObject
-                                     */
-                                    if (!many) {
-                                        ElementChange elementChange = new ElementChange(ref, nameSpaces, property, propertyInSequence);
-                                        if (objectChanges == null) {
-                                            objectChanges = newObjectChanges(featureChanges);
-                                            objectChanges.newElementChanges();
-                                        } else if (objectChanges.elementChanges == null)
-                                            objectChanges.newElementChanges();
-                                        objectChanges.elementChanges.add(elementChange);
-                                        continue;
-                                    }
-                                    value = new Ref(ref, nameSpaces);
-                                }
-                            }
-                            if (many) {
-                                Collection list;
-                                if (objectChanges == null) {
-                                    objectChanges = newObjectChanges(featureChanges);
-                                    list = objectChanges.newList(property);
-                                } else if (objectChanges.lists == null)
-                                    list = objectChanges.newList(property);
-                                else
-                                    list = objectChanges.get(property);
-                                addPropertyChange(list, value, property);
-                            } else
-                                logPropertyChange(featureChanges, property, value);
-                        } while (START_ELEMENT == reader.nextTag());
-                    }
-                }
-            } while (START_ELEMENT == reader.nextTag());
-        }
-    }
-
-    static private boolean sequence(Object listChanges) {
-        return FeatureMapUtil.isFeatureMap(((FeatureChange) ((EStructuralFeature.Setting) listChanges).getEObject()).getFeature());
-    }
-
-    private ListChange createListChange(ChangeKind changeKind, int index, Collection listChanges) {
-        ListChange listChange = changeFactory.createListChange();
-        listChange.setKind(changeKind);
-        listChange.setIndex(index);
-        listChanges.add(listChange);
-        return listChange;
-    }
-
-    Collection add(Collection adds, int change, Collection listChanges, Object value) {
-        if (adds == null) {
-            ListChange listChange = createListChange(ChangeKind.ADD_LITERAL, change, listChanges);
-            adds = sequence(listChanges) ? listChange.getFeatureMapEntryValues() : listChange.getValues();
-        }
-        adds.add(value);
-        return adds;
-    }
-
-    private int remove(int change, Collection listChanges, List list, int begin, int end) {
-        ListChange listChange = createListChange(ChangeKind.REMOVE_LITERAL, change, listChanges);
-        if (sequence(listChanges)) {
-            Collection removes = listChange.getFeatureMapEntryValues();
-            do {
-                FeatureMap.Entry fme = (FeatureMap.Entry) list.get(begin);
-                removes.add(changeFactory.createFeatureMapEntry(fme.getEStructuralFeature(), fme.getValue()));
-            } while (++begin != end);
-            return begin;
-        }
-        Collection removes = listChange.getValues();
-        do
-            removes.add(list.get(begin));
-        while (++begin != end);
-        return begin;
-    }
-
-    int remove(int begin, int end, int change, Collection listChanges, List list) {
-        return begin == end ? begin : remove(change, listChanges, list, begin, end);
-    }
-
-    protected final void logManyChanges(PropertyMapChanges propertyMapChanges, EObject referent, Collection featureChanges) {
-        for (Iterator lists = propertyMapChanges.lists.entrySet().iterator(); lists.hasNext();) {
-            /*
-             * Compute ListChanges out of comparision of old and new list
-             */
-            Map.Entry entry = (Map.Entry) lists.next();
-            EStructuralFeature property = (EStructuralFeature) entry.getKey();
-            Iterator values = ((Collection) entry.getValue()).iterator(); // old list
-            Object value = referent.eGet(property);
-            List list = value instanceof FeatureMap.Internal.Wrapper ? ((FeatureMap.Internal.Wrapper) value).featureMap() : (List) value; // new
-            int change = 0;
-            FeatureChange featureChange = changeSettingFactory == null ? changeFactory.createFeatureChange() : (FeatureChange) changeSettingFactory
-                    .createChangeSummarySetting();
-            featureChange.setFeature(property);
-            Collection listChanges = featureChange.getListChanges(), adds = null;
-            featureChanges.add(featureChange);
-            if (property.getEType() instanceof EClass) {
-                /*
-                 * Log child DataObject changes
-                 */
-                int begin = 0, end = list.size();
-                while (values.hasNext()) {
-                    value = values.next();
-                    if (value.getClass() == Ref.class) {
-                        value = referent((Ref) value);
-                        if (value == null)
-                            continue;// report error?
-                    }
-                    // values.remove();
-                    for (int index = begin;/* true */; ++index)
-                        if (index == end) {
-                            adds = add(adds, change, listChanges, value);
-                            break;
-                        } else if (list.get(index) == value) // List#indexOf uses equals
-                        {
-                            begin = remove(begin, index, change, listChanges, list);
-                            ++begin;
-                            adds = null;
-                            break;
-                        }
-                    ++change;
-                }
-                remove(begin, end, change, listChanges, list);
-            } else if (FeatureMapUtil.isFeatureMap(property)) {
-                /*
-                 * Log Sequence changes
-                 */
-                int begin = 0, end = list.size();
-                while (values.hasNext()) {
-                    FeatureMapEntry featureMapEntry = (FeatureMapEntry) values.next();
-                    value = featureMapEntry.getValue();
-                    if (value.getClass() == Ref.class) {
-                        value = referent((Ref) value);
-                        if (value == null)
-                            continue;// report error?
-                    }
-                    // values.remove();
-                    Comparator equality;
-                    ETypedElement feature = featureMapEntry.getFeature();
-                    if (((Type) feature.getEType()).isDataType())
-                        if (value == null)
-                            equality = EQUAL_NULL;
-                        else
-                            equality = EQUAL;
-                    else
-                        equality = SAME;
-                    for (int index = begin;/* true */; ++index)
-                        if (index == end) {
-                            adds = add(adds, change, listChanges, featureMapEntry);
-                            break;
-                        } else {
-                            FeatureMap.Entry fme = (FeatureMap.Entry) list.get(index);
-                            if (feature == fme.getEStructuralFeature() && equality.compare(fme.getValue(), value) == 0) {
-                                begin = remove(begin, index, change, listChanges, list);
-                                ++begin;
-                                adds = null;
-                                break;
-                            }
-                        }
-                    ++change;
-                }
-                remove(begin, end, change, listChanges, list);
-            } else {
-                /*
-                 * Log simple value changes
-                 */
-                while (values.hasNext()) {
-                    value = values.next();
-                    // values.remove();
-                    int index = list.indexOf(value);
-                    switch (index) {
-                    case -1:
-                        adds = add(adds, change, listChanges, value);
-                        break;
-                    default:
-                        remove(change, listChanges, list, 0, index);
-                    case 0:
-                        list = list.subList(++index, list.size());
-                        adds = null;
-                    }
-                    ++change;
-                }
-                remove(0, list.size(), change, listChanges, list);
-            }
-        }
-    }
-
-    protected PropertyMapChanges propertyMapChanges/* = null */;
-
-    /**
-     * Imports ChangeSummary 2-2. Resolves forward references from {@link #begin} and resumes logging if necessary. If it's invoked from
-     * patching/resolving, try to make it last since logging may be turned on.
-     * 
-     * @see #begin
-     */
-    public final ChangeSummary end() throws XMLStreamException {
-        if (forwardReferences != null)
-            for (Iterator iterator = forwardReferences.iterator(); iterator.hasNext();) {
-                /*
-                 * Forward-referenced(unresolved) modified DataObject from begin(...)
-                 */
-                ForwardReference forwardReference = (ForwardReference) iterator.next();
-                EObject referent = referent(forwardReference);
-                if (referent == null)
-                    continue; // report error?
-                // iterator.remove();
-                Type type = ((DataObject) referent).getType();
-                Collection featureChanges = unsetProperties(referent, forwardReference.unset, type);
-                if (forwardReference.attributes != null)
-                    for (Iterator attributes = forwardReference.attributes.iterator(); attributes.hasNext();) {
-                        /*
-                         * Log property old value as local attribute from begin(...)
-                         */
-                        Attribute attribute = (Attribute) attributes.next();
-                        logAttributeChange(featureChanges, attribute.name, type, attribute.value, forwardReference.nameSpaces);
-                    }
-                if (forwardReference.qualifiedAttributes != null)
-                    for (Iterator attributes = forwardReference.qualifiedAttributes.iterator(); attributes.hasNext();) {
-                        /*
-                         * Log property old value as qualified/global attribute from begin(...)
-                         */
-                        QualifiedAttribute attribute = (QualifiedAttribute) attributes.next();
-                        logAttributeChange(featureChanges, attribute.nameSpace, attribute.name, type, attribute.value, forwardReference.nameSpaces);
-                    }
-                if (forwardReference.tags != null) {
-                    if (propertyMapChanges != null)
-                        propertyMapChanges.lists.clear();
-                    for (Iterator tags = forwardReference.tags.iterator(); tags.hasNext();) {
-                        /*
-                         * Log property old value as element from begin(...)
-                         */
-                        Tag tag = (Tag) tags.next();
-                        Property property = getProperty(tag.nameSpace, tag.name.getLocalPart(), type);
-                        if (tag.ref != null)
-                            tag.value = referent(tag.ref, tag.nameSpaceContext);
-                        // if (tag.value == null) report error?
-                        else if (tag.events != null)
-                            tag.value = value(play(tag));
-                        if (property.isMany()) {
-                            Collection list;
-                            if (propertyMapChanges == null) {
-                                propertyMapChanges = new PropertyMapChanges();
-                                list = propertyMapChanges.newList(property);
-                            } else
-                                list = propertyMapChanges.get(property);
-                            addPropertyChange( list, tag.value, property);
-                        } else
-                            logPropertyChange(featureChanges, property, tag.value);
-                    }
-                    if (propertyMapChanges != null)
-                        logManyChanges(propertyMapChanges, referent, featureChanges);
-                }
-            }
-        if (objectChangesCollection != null)
-            for (Iterator iterator = objectChangesCollection.iterator(); iterator.hasNext();) {
-                /*
-                 * Forward-referenced(unresolved) child DataObject from begin(...)
-                 */
-                ObjectChanges objectChanges = (ObjectChanges) iterator.next();
-                if (objectChanges.elementChanges != null)
-                    for (Iterator elementChanges = objectChanges.elementChanges.iterator(); elementChanges.hasNext();) {
-                        ElementChange elementChange = (ElementChange) elementChanges.next();
-                        Object value = referent(elementChange);
-                        if (value == null)
-                            continue; // report error?
-                        // iterator.remove();
-                        logPropertyChange(objectChanges.featureChanges, elementChange.containing, elementChange.containment, value);
-                    }
-                if (objectChanges.lists != null)
-                    logManyChanges(objectChanges, (EObject) ((Map.Entry) ((EStructuralFeature.Setting) objectChanges.featureChanges).getEObject())
-                            .getKey(), objectChanges.featureChanges);
-            }
-        if (logging)
-            changeSummary.resumeLogging();
-        return changeSummary;
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/ChangeSummaryStreamSerializer.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/ChangeSummaryStreamSerializer.java
deleted file mode 100644
index ef5af8ab57..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/ChangeSummaryStreamSerializer.java
+++ /dev/null
@@ -1,690 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util.resource;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sdo.SDOPackage;
-import org.apache.tuscany.sdo.helper.HelperContextImpl;
-import org.apache.tuscany.sdo.helper.SDOAnnotations;
-import org.apache.tuscany.sdo.helper.XSDHelperImpl;
-import org.apache.tuscany.sdo.impl.ChangeSummaryImpl;
-import org.apache.tuscany.sdo.model.ModelFactory;
-import org.apache.tuscany.sdo.model.impl.ModelFactoryImpl;
-import org.apache.tuscany.sdo.util.SDOUtil;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.change.ChangeDescription;
-import org.eclipse.emf.ecore.change.ChangeKind;
-import org.eclipse.emf.ecore.change.FeatureChange;
-import org.eclipse.emf.ecore.change.ListChange;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.helper.XSDHelper;
-
-/**
- * ChangeSummary StAX Serializer whose output conforms to the SDO Java/C++/PHP specifications. The instance isn't thread-safe, however it's safe to
- * use the instance any times on the same thread.
- */
-public class ChangeSummaryStreamSerializer {
-    private XMLStreamWriter writer;
-
-    private String writeNamespace(String prefix, String nameSpace) throws XMLStreamException {
-        writer.writeNamespace(prefix, nameSpace);
-        writer.setPrefix(prefix, nameSpace);
-        return prefix;
-    }
-
-    private int nsPrefixSuffix;
-
-    private String prefix(String nameSpace, String preference) throws XMLStreamException {
-        if (preference != null) {
-            String bound = writer.getNamespaceContext().getNamespaceURI(preference);
-            if (bound == null) {
-                String prefix = writer.getPrefix(nameSpace);
-                return prefix == null ? writeNamespace(preference, nameSpace) : prefix/* or null */;
-            }
-            if (bound.equals(nameSpace))
-                return preference;
-        }
-        Object automaticNsPrefix = writer.getProperty(XMLOutputFactory.IS_REPAIRING_NAMESPACES);
-        if (automaticNsPrefix != null && automaticNsPrefix.getClass() == Boolean.class // faster than instanceof since Boolean is final
-                && ((Boolean) automaticNsPrefix).booleanValue())
-            return null;
-        String prefix = writer.getPrefix(nameSpace);
-        if (prefix != null)
-            return prefix; // or null
-        NamespaceContext nameSpaces = writer.getNamespaceContext();
-        do
-            prefix = "CS" + nsPrefixSuffix++;
-        while (nameSpaces.getNamespaceURI(prefix) != null);
-        return writeNamespace(prefix, nameSpace);
-    }
-
-    void writeGlobalAttribute(String prefix, String nameSpace, String name, String value) throws XMLStreamException {
-        prefix = prefix(nameSpace, prefix);
-        if (prefix == null)
-            writer.writeAttribute(nameSpace, name, value);
-        else
-            writer.writeAttribute(prefix, nameSpace, name, value);
-    }
-    
-    XSDHelper xsdHelper;
-
-    protected final void writeAttribute(Property property, String value) throws XMLStreamException {
-        String name = xsdHelper.getLocalName(property), nameSpace = xsdHelper.getNamespaceURI(property);
-        // TODO "" for no-NameSpace global attribute
-        if (nameSpace == null)
-            writer.writeAttribute(name, value);
-        else
-            writeGlobalAttribute(null, nameSpace, name, value);
-    }
-
-    private String lineBreak, indent, margin;
-
-    private int nest;
-
-    private void breakLine() throws XMLStreamException {
-        writer.writeCharacters(lineBreak);
-
-        if (margin != null)
-            writer.writeCharacters(margin);
-
-        if (indent != null)
-            for (int count = nest; count != 0; --count)
-                writer.writeCharacters(indent);
-    }
-
-    private Map options;
-
-    static private final String STRING_OPTION = "String option";
-
-    void startElement() throws XMLStreamException {
-        if (options == null)
-            return;
-        if (lineBreak == STRING_OPTION)
-            lineBreak = (String) options.get(SDOUtil.XML_SAVE_LineBreak);
-        if (lineBreak == null)
-            return;
-        if (margin == STRING_OPTION)
-            margin = (String) options.get(SDOUtil.XML_SAVE_MARGIN);
-        if (indent == STRING_OPTION)
-            indent = (String) options.get(SDOUtil.XML_SAVE_INDENT);
-        breakLine();
-    }
-
-    void writeStartElement(String prefix, String nameSpace, String name) throws XMLStreamException {
-        startElement();
-        if (nameSpace == null)
-            writer.writeStartElement(name);
-        else {
-            prefix = prefix(nameSpace, prefix);
-            if (prefix == null)
-                writer.writeStartElement(nameSpace, name);
-            else
-                writer.writeStartElement(prefix, name, nameSpace);
-        }
-    }
-
-    void writeStartElement(Property property) throws XMLStreamException {
-        ++nest;
-        writeStartElement(null, xsdHelper.getNamespaceURI(property),// TODO "" for no-NameSpace global element
-                xsdHelper.getLocalName(property));
-    }
-
-    static protected final String CREATE_ATTRIBUTE = "create", DELETE_ATTRIBUTE = "delete", LOGGING_ATTRIBUTE = "logging", REF_ATTRIBUTE = "ref", UNSET = "unset";
-
-    private StringBuffer step(String nameSpace, String name, StringBuffer path) throws XMLStreamException {
-        if (nameSpace != null) {
-            nameSpace = writer.getPrefix(nameSpace);
-            if (nameSpace != null && nameSpace.length() != 0)
-                return path.append(nameSpace).append(':').append(name); // *:name[namespace-uri()='nameSpace']
-        }
-        return path.append(name); 
-    }
-
-    private StringBuffer step(Property containmentProperty, StringBuffer path) throws XMLStreamException {
-        return step(xsdHelper.getNamespaceURI(containmentProperty),// TODO "" for no-NameSpace global element
-                xsdHelper.getLocalName(containmentProperty), path);
-    }
-
-    private StringBuffer step(Property containmentProperty) throws XMLStreamException {
-        return step(containmentProperty, new StringBuffer());
-    }
-
-    private DataObject dataObject;
-
-    private StringBuffer step(Object container) throws XMLStreamException {
-        Property containmentProperty = dataObject.getContainmentProperty();
-        StringBuffer step = step(containmentProperty);
-        if (containmentProperty.isMany() || ((EObject) dataObject).eContainingFeature() != containmentProperty)
-            step.append('[').append(((DataObject) container).getList(containmentProperty).indexOf(dataObject) + 1).append(']');
-        return step;
-    }
-
-    private String pathRootObject;
-    private DataObject rootObject;
-
-    private EObject container(EObject object) {
-        final EObject container = object.eContainer();
-        if (!(container instanceof DataObject))
-            return null;
-        String name = extendedMetaData.getName(container.eClass());
-        return name != null && name.length() == 0 // DocumentRoot
-             ? null : container;
-    }
-
-    private String path() throws XMLStreamException {
-        if (pathRootObject == STRING_OPTION)
-            pathRootObject = options == null ? null : (String) options.get(OPTION_RootObject_PATH);
-        if (pathRootObject != null && dataObject == rootObject)
-            return null;
-        EObject container = container((EObject) dataObject);
-        if (container == null)
-            return null;
-        StringBuffer step = step(container);
-        while (true) {
-            String path = step.toString();
-            dataObject = (DataObject) container;
-            if (pathRootObject != null && container == rootObject)
-                return path;
-            container = container(container);
-            if (container == null)
-                return path;
-            step = step(container).append('/').append(path);
-        }
-    }
-
-    /*
-     * not to support DataGraph 3-1 private org.eclipse.emf.ecore.resource.Resource rootResource;
-     */
-
-    protected String rootElementNS;
-
-    String rootElementName;
-
-    ExtendedMetaData extendedMetaData;
-
-    protected final String rootElementName() {
-        if (rootElementNS != null)
-            return rootElementName;
-        QName rootElement = (QName) options.get(OPTION_ROOT_ELEMENT);
-        if (rootElement != null) {
-            rootElementNS = rootElement.getNamespaceURI();
-            return rootElementName = rootElement.getLocalPart();
-        }
-        EStructuralFeature element = ((EObject) rootObject).eContainingFeature();
-        if (element == null) {
-            rootElementNS = "";
-            return rootElementName = "descendant-or-self::node()";
-        }
-        rootElementNS = extendedMetaData.getNamespace(element);
-        if (rootElementNS == null)
-            rootElementNS = "";
-        return rootElementName = extendedMetaData.getName(element);
-    }
-
-    String ref() throws XMLStreamException {
-        /*
-         * not to support DataGraph 3-2 if (rootResource != null) return rootResource.getURIFragment((EObject) dataObject);
-         */
-        String id = EcoreUtil.getID((EObject) dataObject);
-        if (id != null)
-            return id;
-        id = path();
-        if (pathRootObject == null)
-            return id == null ? "#/" + rootElementName() // descendant-or-self::node()
-            : "#//" + id;
-        return id == null ? pathRootObject/* + "."*/ : pathRootObject + id;
-    }
-
-    void writeRef(String ref) throws XMLStreamException {
-        writer.writeAttribute(SDOAnnotations.COMMONJ_SDO_NS, REF_ATTRIBUTE, ref);
-    }
-
-    void writeRef() throws XMLStreamException {
-        writeRef(ref());
-    }
-
-    void writeEndElement(String lineBreak) throws XMLStreamException {
-        if (lineBreak != null)
-            breakLine();
-        writer.writeEndElement();
-        --nest;
-    }
-
-    private StringBuffer pathDeleted/* = null */;
-
-    private Collection modifiedDataObjects;
-    
-    private int lengthDeleted;
-
-    private String changeSummaryElementNS, changeSummaryElementName;
-
-    private ChangeSummary changeSummary;
-
-    protected boolean skipDeletedModification(DataObject modifiedDataObject) {
-        return changeSummary.isDeleted(modifiedDataObject);
-    }
-
-    String refDeleted() throws XMLStreamException {
-        String id = EcoreUtil.getID((EObject) dataObject);
-        if (id != null)
-            return id;
-        id = path(); // "dataObject" is updated too!!
-        DataObject deletedDataObject = dataObject;
-        
-        /*
-         * construct "#//...changeSummary/"
-         *  output: pathDeleted
-         */
-        if (lengthDeleted == -1) {
-            String path = pathRootObject == null ? "#//" : pathRootObject;
-            if (pathDeleted == null)
-                pathDeleted = new StringBuffer(path);
-            else
-                pathDeleted.replace(0, pathDeleted.length(), path);
-            dataObject = rootObject;
-            path = path();
-            if (path != null)
-                pathDeleted.append(path).append('/');
-            step(changeSummaryElementNS, changeSummaryElementName, pathDeleted).append('/');
-            lengthDeleted = pathDeleted.length();
-        } else
-            pathDeleted.delete(lengthDeleted, pathDeleted.length());
-        
-        dataObject = changeSummary.getOldContainer(deletedDataObject);
-        Property containmentProperty = dataObject.getContainmentProperty();
-        String name = containmentProperty == null ? rootElementName() : xsdHelper.getLocalName(containmentProperty);
-        int index = 1;
-        for (Iterator iterator = modifiedDataObjects.iterator(); iterator.hasNext();) {
-            DataObject modifiedDataObject = (DataObject) iterator.next();
-            if (skipDeletedModification(modifiedDataObject))
-                continue;
-            if (modifiedDataObject == dataObject)
-                break;
-            Property property = modifiedDataObject.getContainmentProperty();
-            if (property == containmentProperty || name.equals(property == null ? rootElementName() : xsdHelper.getLocalName(property)))
-                ++index;
-        }
-        pathDeleted/*.append("*:")*/.append(name).append('[').append(index).append("]/");
-        containmentProperty = changeSummary.getOldContainmentProperty(deletedDataObject);
-        // assert containmentProperty != null;
-        step(containmentProperty, pathDeleted);
-        Object f;
-        if (containmentProperty.isMany()
-                || (f = extendedMetaData.getAffiliation(((EObject) dataObject).eClass(), (EStructuralFeature) containmentProperty)) != null
-                && f != containmentProperty)
-            pathDeleted.append('[').append(
-                    ((List) changeSummary.getOldValue(dataObject, containmentProperty).getValue()).indexOf(deletedDataObject) + 1).append(']');
-        if (id != null)
-            pathDeleted.append('/').append(id);
-        return pathDeleted.toString();
-    }
-
-    static String convertToString(Property property, Object value) {
-        return EcoreUtil.convertToString((EDataType) property.getType(), value);
-    }
-
-    void writeRefDeleted() throws XMLStreamException {
-        writeRef(refDeleted());
-    }
-
-    protected final void writeDeletedObject(Property property) throws XMLStreamException {
-      ++nest;
-      startElement();
-      --nest;
-      DataObject oldDataObject = ((ChangeSummaryImpl)changeSummary).getOldDataObject(dataObject);
-      XMLStreamReader reader = new DataObjectXMLStreamReader(property, oldDataObject, null, xsdHelper);
-      new XMLStreamSerializer().serialize(new XMLDocumentStreamReader(reader), writer);
-    }
-
-    static public final Object ChangeSummary_TYPE = ((ModelFactoryImpl) ModelFactory.INSTANCE).getChangeSummaryType();
-
-    Collection deletedDataObjects;
-
-    protected final void writeElement(Object value, Property property) throws XMLStreamException {
-        if (value == null) {
-            writeStartElement(property);
-            writeGlobalAttribute(ExtendedMetaData.XSI_PREFIX, ExtendedMetaData.XSI_URI, XMLResource.NIL, "true");
-            writeEndElement(null);
-        } else if (value instanceof DataObject) {
-            dataObject = (DataObject) value;
-            if (!changeSummary.isDeleted(dataObject)) {
-                writeStartElement(property);
-                writeRef();
-                writeEndElement(null);
-            } else if (property.isContainment() && deletedDataObjects.contains(dataObject)) {
-                writeDeletedObject(property);
-            } else {
-                writeStartElement(property);
-                writeRefDeleted();
-                writeEndElement(null);
-            }
-        } else {
-            Object type = property.getType();
-            if (type == ChangeSummary_TYPE)
-                return;
-            writeStartElement(property);
-            writer.writeCharacters(EcoreUtil.convertToString((EDataType) type, value));
-            writeEndElement(null);
-        }
-    }
-    
-    protected final void writeElement(Object value) throws XMLStreamException {
-        FeatureMap.Entry entry = (FeatureMap.Entry) value;
-        writeElement(entry.getValue(), (Property)entry.getEStructuralFeature());
-    }
-
-    static protected List optimize(List values, Object featureChange, int size) {
-        int fromIndex = size, toIndex = 0;
-        for (Iterator changes = ((FeatureChange) featureChange).getListChanges().iterator(); changes.hasNext();) {
-            ListChange change = (ListChange) changes.next();
-            Object kind = change.getKind();
-            if (kind == ChangeKind.MOVE_LITERAL)
-                return values;
-            int index = change.getIndex();
-            if (kind == ChangeKind.ADD_LITERAL) {
-                if (index == 0) {
-                    fromIndex = 0;
-                    if (toIndex == 0)
-                        toIndex = 1;
-                } else {
-                    int to = index;
-                    if (--index < fromIndex)
-                        fromIndex = index;
-                    if (++to > toIndex)
-                        toIndex = to;
-                    else if (to < toIndex)
-                        ++toIndex;
-                }
-                ++size;
-            } else {
-                --size;
-                if (index < fromIndex)
-                    fromIndex = index;
-                if (index < toIndex)
-                    --toIndex;
-                else if (index > toIndex && index != size)
-                    toIndex = index;
-            }
-        }
-        return values.subList(fromIndex, toIndex);
-    }
-    
-    static protected final Object CHANGE_SUMMARY = SDOPackage.eINSTANCE.getChangeSummary();
-
-    /**
-     * Root Object path String such as "#", etc. Absent/null is the default (automatic computation)
-     */
-    static public final String OPTION_RootObject_PATH = "RootObject path",
-    /**
-     * Boolean to optimize sequence/list/array. Absent/null/Boolean.FALSE is the default (no optimization)
-     */
-    OPTION_OPTIMIZE_LIST = "optimize sequence/list/array",
-    /**
-     * Element QName if the changeSummary Root Object is a XML root; the NameSpace can be empty, never null; the prefix is ignored.
-     * Absent/null is the default (automatic computation from DocumentRoot if any)
-     */
-    OPTION_ROOT_ELEMENT = "Root Element";
-
-    /**
-     * Exports ChangeSummary
-     * 
-     * @param changeSummary
-     *            Never null
-     * @param changeSummaryElement
-     *            changeSummary element; the NameSpace can be empty if no NameSpace, or null if local element; the prefix can be null(no preference)
-     * @param writer
-     *            Never null
-     * @param options
-     *            {@link SDOUtil#XML_SAVE_LineBreak} (absence/null is the default i.e. no Line Breaking), {@link SDOUtil#XML_SAVE_INDENT} (absence/null is the default i.e. no indentation), {@link SDOUtil#XML_SAVE_MARGIN}, {@link #OPTION_RootObject_PATH}, {@link #OPTION_OPTIMIZE_LIST} and XMLResource.OPTION_EXTENDED_META_DATA; can be null or empty
-     */
-    public final void saveChangeSummary(ChangeSummary changeSummary, QName changeSummaryElement, XMLStreamWriter writer, Map options)
-            throws XMLStreamException {
-        /*
-         * 6-1. Group created, deleted and modified DataObjects
-         *  input: changeSummary output: createdDataObjects, deletedDataObjects & modifiedDataObjects
-         *  implement: careful if compute from changeSummary.getChangedDataObjects() since it also includes children of deleted objects (thank Frank)
-         */
-        if (changeSummary.isLogging())
-            ((ChangeSummaryImpl) changeSummary).summarize();
-        ChangeDescription changeDescription = (ChangeDescription) changeSummary;
-        Iterator createdDataObjects = changeDescription.getObjectsToDetach().iterator();
-        deletedDataObjects = changeDescription.getObjectsToAttach();
-        EMap objectChanges = changeDescription.getObjectChanges();
-        modifiedDataObjects = objectChanges.keySet(); // may contain DO(s) from createdDataObjects and/or deletedDataObjects
-
-        /*
-         * 6-2. Prepare to compute (X)Path
-         *  input: changeSummary
-         *  output: rootResource
-         */
-        /*not to support DataGraph 3-3
-        Object dataGraph = changeSummary.getDataGraph();
-        if (dataGraph == null) {
-            DataObject rootObject = changeSummary.getRootObject();
-            // assert rootObject != null;
-            rootResource = rootObject.getContainer() == null ? ((EObject) rootObject).eResource() // Can be null since this *StAX* writer does NOT
-                    // require rootObject contained by an *EMF* Resource
-                    : null; // eResource() direct content may not necessarily always be the XML document
-        } else
-            // assert dataGraph instanceof DataGraphImpl;
-            rootResource = ((org.apache.tuscany.sdo.impl.DataGraphImpl) dataGraph).getRootResource(); */
-
-        /*
-         * 6-2. Start ChangeSummary element
-         *  input: writer, options, elementCS, changeSummary & changeDescription (6-1)
-         */
-        nsPrefixSuffix = 0;
-        this.writer = writer;
-        this.options = options;
-        lineBreak = "";
-        indent = margin = pathRootObject = STRING_OPTION;
-        nest = 0;
-        changeSummaryElementNS = changeSummaryElement.getNamespaceURI();
-        changeSummaryElementName = changeSummaryElement.getLocalPart();
-        writeStartElement(changeSummaryElement.getPrefix(), changeSummaryElementNS, changeSummaryElementName);
-        lineBreak = STRING_OPTION;
-        rootObject = changeSummary.getRootObject();
-        extendedMetaData = (ExtendedMetaData) options.get(XMLResource.OPTION_EXTENDED_META_DATA);
-        if (extendedMetaData == null)
-        {
-            extendedMetaData = ExtendedMetaData.INSTANCE;
-            xsdHelper = XSDHelper.INSTANCE;
-        }
-        else{
-        	xsdHelper = (new HelperContextImpl(extendedMetaData, false)).getXSDHelper();
-        }
-        Property declaration = changeSummaryElementNS == null
-                             ? rootObject.getType().getProperty(changeSummaryElementName)
-                             : xsdHelper.getGlobalProperty(changeSummaryElementNS, changeSummaryElementName, true);
-        if (declaration != null)
-        {
-            EClassifier type = changeDescription.eClass();
-            if (type != declaration.getType() && type != CHANGE_SUMMARY)
-                writeGlobalAttribute(ExtendedMetaData.XSI_PREFIX, ExtendedMetaData.XSI_URI, XMLResource.TYPE, new StringBuffer(prefix(extendedMetaData.getNamespace(type), null))
-                        .append(':').append(extendedMetaData.getName(type)).toString());
-        }
-        
-        /*
-         * 6-3. "create" attribute
-         *  input: createdDataObjects (6-1), rootResource (6-2), changeSummary & writer
-         */
-        rootElementNS = null;
-        this.changeSummary = changeSummary;
-        if (createdDataObjects.hasNext()) {
-            StringBuffer buffer = new StringBuffer();
-            while (true) {
-                dataObject = (DataObject) createdDataObjects.next();
-                buffer.append(ref());
-                if (!createdDataObjects.hasNext())
-                    break;
-                buffer.append(' ');
-            }
-            writer.writeAttribute(CREATE_ATTRIBUTE, buffer.toString());
-        }
-
-        /*
-         * 6-4. "delete" attribute
-         *  input: deletedDataObjects (6-1), modifiedDataObjects (6-1) & writer
-         */
-        Iterator iterator = deletedDataObjects.iterator();
-        if (iterator.hasNext()) {
-            lengthDeleted = -1;
-            StringBuffer buffer = null;
-            do {
-                dataObject = (DataObject) iterator.next();
-                if (skipDeletedModification(changeSummary.getOldContainer(dataObject)))
-                    continue;
-                if (buffer == null)
-                    buffer = new StringBuffer();
-                else
-                    buffer.append(' ');
-                buffer.append(refDeleted());
-            } while (iterator.hasNext());
-            writer.writeAttribute(DELETE_ATTRIBUTE, buffer.toString());
-        }
-
-        /*
-         * 6-5. "logging" attribute
-         *  input: changeSummary & writer
-         */
-        writer.writeAttribute(LOGGING_ATTRIBUTE, changeSummary.isLogging() ? "true" : "false");
-
-        /*
-         * 6-6. Modified DataObjects
-         *  input: modifiedDataObjects (6-1), rootResource (6-2), changeSummary & writer
-         */
-        iterator = modifiedDataObjects.iterator();
-        if (iterator.hasNext()) {
-            boolean optimizeList;
-            if (options == null)
-                optimizeList = false;
-            else
-            {
-                Object option = options.get(OPTION_OPTIMIZE_LIST);
-                optimizeList = option == null ? false : ((Boolean)option).booleanValue();
-            }
-            prefix(SDOAnnotations.COMMONJ_SDO_NS, SDOPackage.eNS_PREFIX);
-            do {
-                DataObject dataObject = (DataObject) iterator.next();
-                if (skipDeletedModification(dataObject))
-                    continue;
-                Property containmentProperty = dataObject.getContainmentProperty();
-                if (containmentProperty == null) {
-                    ++nest;
-                    startElement();
-                    rootElementName();
-                    writer.writeStartElement(rootElementNS, rootElementName);
-                } else
-                    writeStartElement(containmentProperty);
-                this.dataObject = dataObject;
-                writeRef();
-
-                String lineBreak = null;
-                Collection oldValues = (Collection) objectChanges.get(dataObject); // changeSummary.getOldValues repeats Sequence changes
-                Iterator settings = oldValues.iterator();
-                if (settings.hasNext()) {
-                    do {
-                        ChangeSummary.Setting oldValue = (ChangeSummary.Setting) settings.next();
-                        if (oldValue.isSet())
-                            continue;
-                        StringBuffer unset = step(oldValue.getProperty());
-                        while (settings.hasNext()) {
-                            oldValue = (ChangeSummary.Setting) settings.next();
-                            if (!oldValue.isSet())
-                                step(oldValue.getProperty(), unset.append(' '));
-                        }
-                        writer.writeAttribute(SDOAnnotations.COMMONJ_SDO_NS, UNSET, unset.toString());
-                        break;
-                    } while (settings.hasNext());
-                    for (settings = oldValues.iterator(); settings.hasNext();) {
-                        ChangeSummary.Setting oldValue = (ChangeSummary.Setting) settings.next();
-                        Property property = oldValue.getProperty();
-                        if (oldValue.isSet() && xsdHelper.isAttribute(property))
-                            // assert ! property.isMany();
-                            writeAttribute(property, convertToString(property, oldValue.getValue()));
-                    }
-                    for (settings = oldValues.iterator(); settings.hasNext();) {
-                        ChangeSummary.Setting oldValue = (ChangeSummary.Setting) settings.next();
-                        Property property = oldValue.getProperty();
-                        if (!xsdHelper.isAttribute(property))
-                            if (property.isMany()) {
-                                Object value = oldValue.getValue();
-                                List list = (List) value;
-                                if (FeatureMapUtil.isFeatureMap((EStructuralFeature) property)) {
-                                    if (optimizeList)
-                                        list = optimize(list, oldValue, dataObject.getSequence(property).size());
-                                    Iterator values = list.iterator();
-                                    if (!values.hasNext())
-                                        continue;
-                                    do
-                                        writeElement(values.next());
-                                    while (values.hasNext());
-                                } else {
-                                    if (optimizeList)
-                                        list = optimize(list, oldValue, dataObject.getList(property).size());
-                                    Iterator values = list.iterator();
-                                    if (!values.hasNext())
-                                        continue;
-                                    do
-                                        writeElement(values.next(), property);
-                                    while (values.hasNext());
-                                }
-                                lineBreak = this.lineBreak;
-                            } else if (oldValue.isSet()) {
-                                Object value = oldValue.getValue();
-                                if (value instanceof FeatureMap.Entry)
-                                    writeElement(value);
-                                else
-                                    writeElement(value, property);
-                                lineBreak = this.lineBreak;
-                            }
-                    }
-                }
-                writeEndElement(lineBreak);
-            } while (iterator.hasNext());
-            writeEndElement(lineBreak);
-        } else
-            writeEndElement(null);
-        writer.flush();
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
deleted file mode 100644
index 06099fe6a3..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/DataObjectXMLStreamReader.java
+++ /dev/null
@@ -1,1579 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util.resource;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.namespace.QName;
-import javax.xml.stream.Location;
-import javax.xml.stream.XMLStreamException;
-
-import org.apache.tuscany.sdo.impl.AttributeImpl;
-import org.apache.tuscany.sdo.impl.ReferenceImpl;
-import org.apache.tuscany.sdo.util.SDOUtil;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XSDHelper;
-
-public class DataObjectXMLStreamReader implements XMLFragmentStreamReader {
-    private static final QName XSI_TYPE_QNAME = new QName("http://www.w3.org/2001/XMLSchema-instance", "type", "xsi");
-    private Property rootElement = null;
-    private DataObject dataObject;
-
-    private String rootElementURI;
-
-    private String rootElementName;
-    
-    private DataObject serializeRoot;
-
-    private TypeHelper typeHelper;
-
-    private XSDHelper xsdHelper;
-
-    private Map.Entry[] properties;
-
-    private Map.Entry[] attributes;
-
-    private QName elementQName;
-
-    // we always create a new namespace context
-    private NameSpaceContext namespaceContext;
-
-    private Map declaredNamespaceMap = new HashMap();
-
-    // states for this pullparser - it can only have three states
-    private static final int START_ELEMENT_STATE = 0;
-
-    private static final int END_ELEMENT_STATE = 1;
-
-    private static final int DELEGATED_STATE = 2;
-
-    private static final int TEXT_STATE = 3;
-
-    // integer field that keeps the state of this
-    // parser.
-    private int state = START_ELEMENT_STATE;
-
-    // reference to the child reader
-    private XMLFragmentStreamReader childReader;
-
-    // current property index
-    // initialized at zero
-    private int currentPropertyIndex = 0;
-
-    public DataObjectXMLStreamReader(DataObject dataObject, String rootElmentURI, String rootElementName) {
-        this(dataObject, rootElmentURI, rootElementName, null, null);
-    }
-
-    public DataObjectXMLStreamReader(DataObject dataObject, String rootElmentURI, String rootElementName, TypeHelper typeHelper) {
-        this(dataObject, rootElmentURI, rootElementName, typeHelper, null);
-    }
-
-    public DataObjectXMLStreamReader(DataObject dataObject, String rootElmentURI, String rootElementName, TypeHelper typeHelper, XSDHelper xsdHelper) {
-        this.dataObject = dataObject;
-        this.rootElementURI = rootElmentURI;
-        this.rootElementName = rootElementName;
-        this.serializeRoot = dataObject;
-        this.typeHelper = typeHelper == null ? TypeHelper.INSTANCE : typeHelper;
-        this.xsdHelper = (xsdHelper != null) ? xsdHelper : ((typeHelper == null) ? XSDHelper.INSTANCE : SDOUtil.createXSDHelper(typeHelper));
-        rootElement = this.xsdHelper.getGlobalProperty(rootElmentURI, rootElementName, true);
-        namespaceContext = new NameSpaceContext();
-        populateProperties();
-    }
-
-    protected DataObjectXMLStreamReader(TypeHelper typeHelper, XSDHelper xsdHelper, Property rootElement, DataObject dataObject) {
-        this.typeHelper = typeHelper == null ? TypeHelper.INSTANCE : typeHelper;
-        this.xsdHelper = (xsdHelper != null) ? xsdHelper : ((typeHelper == null) ? XSDHelper.INSTANCE : SDOUtil.createXSDHelper(typeHelper));
-        this.rootElement = rootElement;
-        this.dataObject = dataObject;
-        this.rootElementURI = xsdHelper.getNamespaceURI(rootElement);
-        this.rootElementName = xsdHelper.getLocalName(rootElement);
-    }
-    
-    protected DataObjectXMLStreamReader(TypeHelper typeHelper, XSDHelper xsdHelper, Property rootElement, DataObject dataObject, DataObject serializeRoot) {
-        this.typeHelper = typeHelper == null ? TypeHelper.INSTANCE : typeHelper;
-        this.xsdHelper = (xsdHelper != null) ? xsdHelper : ((typeHelper == null) ? XSDHelper.INSTANCE : SDOUtil.createXSDHelper(typeHelper));
-        this.rootElement = rootElement;
-        this.dataObject = dataObject;
-        this.serializeRoot = serializeRoot;
-        this.rootElementURI = xsdHelper.getNamespaceURI(rootElement);
-        this.rootElementName = xsdHelper.getLocalName(rootElement);
-    }
-    public DataObjectXMLStreamReader(Property rootElement, DataObject dataObject, TypeHelper typeHelper, XSDHelper xsdHelper) {
-        this(typeHelper, xsdHelper, rootElement, dataObject);
-        namespaceContext = new NameSpaceContext();
-        populateProperties();
-    }
-    
-    public DataObjectXMLStreamReader(XMLDocument document, TypeHelper typeHelper) {
-        this.dataObject = document.getRootObject();
-        this.rootElementName = document.getRootElementName();
-        this.rootElementURI = document.getRootElementURI();
-        this.serializeRoot = this.dataObject;
-        this.typeHelper = typeHelper;
-        this.xsdHelper = typeHelper == null ? XSDHelper.INSTANCE : SDOUtil.createXSDHelper(typeHelper);
-        namespaceContext = new NameSpaceContext();
-        populateProperties();
-    }
-
-    /*
-     * we need to pass in a namespace context since when delegated, we've no idea of the current namespace context. So it needs to be passed on here!
-     */
-    protected DataObjectXMLStreamReader(QName elementQName, Map.Entry[] properties, Map.Entry[] attributes) {
-        // validate the lengths, since both the arrays are supposed
-        // to have
-        this.properties = properties;
-        this.elementQName = elementQName;
-        this.attributes = attributes;
-        namespaceContext = new NameSpaceContext();
-    }
-
-    private void addProperty(Property property, Object value, List propertyList) {
-        if (property.isMany() && property.getContainingType().isOpen() && value instanceof Sequence) {
-            addSequenceValue(propertyList, (Sequence) value);
-        } else if (SDOUtil.isMany(property, dataObject) && value instanceof List) {
-            addListValue(propertyList, property, (List) value);
-        } else {
-            // Complex Type
-            addSingleValue(propertyList, property, value);
-        }
-    }
-
-    void addProperty(List propertyList, Property property, Object value, Object type) {
-        if (!isTransient(property, type))
-            addProperty(property, value, propertyList);
-    }
-
-    private void addSequenceValue(List elements, Sequence seq) {
-        if (seq != null && seq.size() > 0) {
-            for (int j = 0; j < seq.size(); j++) {
-                Object o = seq.getValue(j);
-                Property p = seq.getProperty(j);
-                addSingleValue(elements, p, o);
-            }
-        }
-    }
-
-    static private boolean isTransient(Property property, Object type) {
-        // HACK: We need some SDOUtil extension to understand a property is derived
-        EStructuralFeature feature = (EStructuralFeature) property;
-        if (ExtendedMetaData.INSTANCE.getGroup(feature) != null)
-            return false;
-        feature = ExtendedMetaData.INSTANCE.getAffiliation((EClass) type, feature);
-        if (feature != null && feature != property)
-            return false;
-        if (property instanceof ReferenceImpl) {
-            ReferenceImpl r = (ReferenceImpl) property;
-            if (r.isTransient())
-                return true;
-            EReference opposite = r.getEOpposite();
-            if (opposite != null && opposite.isContainment()) {
-                return true;
-            }
-        } else if (property instanceof AttributeImpl) {
-            AttributeImpl a = (AttributeImpl) property;
-            if (a.isTransient())
-                return true;
-            EDataType d = (EDataType) a.getEType();
-            if (!d.isSerializable()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private void addListValue(List propertyList, Property property, List objList) {
-        if (objList != null) {
-            for (int j = 0; j < objList.size(); j++) {
-                Object object = objList.get(j);
-                addSingleValue(propertyList, property, object);
-            }
-        }
-    }
-
-    private void addSingleValue(List propertyList, Property property, Object value) {
-        String uri = xsdHelper.getNamespaceURI(property);
-        String name = xsdHelper.getLocalName(property);
-        QName qname = namespaceContext.createQName(uri, name);
-        Type propertyType = property.getType();
-
-        if (property.getName().equals("value") && uri == null && name.equals(":0")) {
-            // "value" is special property containing the value of simpleContent
-            Map.Entry entry = new NameValuePair(ELEMENT_TEXT, value);
-            propertyList.add(entry);
-        } else
-
-        // FIXME: We need to deal with non-containment properties
-        if (value == null) {
-            // Creating xsi:nil="true" for elements
-            registerNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
-            Map.Entry entry = new NameValuePair(qname, null);
-            propertyList.add(entry);
-        } else if (propertyType.isDataType()) {
-            Map.Entry entry = new NameValuePair(qname, SDOUtil.convertToString(propertyType, value));
-            propertyList.add(entry);
-        } else if (property.isContainment() && value == serializeRoot) {
-            // do not create the childReader because a containmentCycle exists and this is the second
-            // time this DataObject has been encountered
-        } else {
-            DataObjectXMLStreamReader childReader = new DataObjectXMLStreamReader(typeHelper, xsdHelper, property, (DataObject) value, serializeRoot);
-            childReader.namespaceContext = namespaceContext;
-            childReader.populateProperties();
-            childReader.rootElement = property;
-            Map.Entry entry = new NameValuePair(qname, childReader);
-            propertyList.add(entry);
-        }
-    }
-
-    public void populateProperties() {
-        /*declaredNamespaceMap.put("xml", "http://www.w3.org/XML/1998/namespace");
-        declaredNamespaceMap.put("xmlns", "http://www.w3.org/2000/xmlns/");
-        declaredNamespaceMap.put("xsi", "http://www.w3.org/2001/XMLSchema-instance");
-        */
-        
-        if (properties != null)
-            return;
-        if (elementQName == null)
-            elementQName = namespaceContext.createQName(this.rootElementURI, this.rootElementName);
-        else
-            elementQName = namespaceContext.createQName(elementQName.getNamespaceURI(), elementQName.getLocalPart());
-
-        List elementList = new ArrayList();
-        List attributeList = new ArrayList();
-        if (dataObject == null) {
-            return;
-        }
-        Type type = dataObject.getType();
-        
-        // Add xsi:type if rootElement doesn't exist or the type is different
-        if (rootElement == null || (rootElement != null && rootElement.getType() != type)) {
-            // FIXME: XSDHelper.getLocalName() for annoymous type returns null?
-            String typeName = xsdHelper.getLocalName(type);
-            if (typeName != null) {
-                QName realTypeName = namespaceContext.createQName(type.getURI(), typeName);
-                String typeQName = realTypeName.getPrefix() + ":" + realTypeName.getLocalPart();
-                registerNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
-                registerNamespace(realTypeName.getPrefix(), realTypeName.getNamespaceURI());
-                attributeList.add(new NameValuePair(XSI_TYPE_QNAME, typeQName));
-            }
-        }
-        
-        if (type.isSequenced()) {
-            Sequence sequence = dataObject.getSequence();
-            for (int i = 0; i < sequence.size(); i++) {
-                Property property = sequence.getProperty(i);
-                Object value = sequence.getValue(i);
-                if (property == null) {
-                    // property == null for text in mixed content
-                    elementList.add(new NameValuePair(ELEMENT_TEXT, value));
-                } else {
-                    addProperty(property, value, elementList);
-                }
-            }
-            // Attributes are not in the sequence
-            List properties = dataObject.getInstanceProperties();
-            for (Iterator i = properties.iterator(); i.hasNext();) {
-                Property property = (Property) i.next();
-                if (xsdHelper.isAttribute(property)) {
-                    // FIXME: How to handle nilable=true?
-                    if (!dataObject.isSet(property))
-                        continue;
-                    Object value = dataObject.get(property);
-                    addProperty(attributeList, property, value, type);
-                }
-            }
-        } else {
-            List properties = dataObject.getInstanceProperties();
-            for (Iterator i = properties.iterator(); i.hasNext();) {
-                Property property = (Property) i.next();
-                // FIXME: How to handle nilable=true?
-                if (!dataObject.isSet(property))
-                    continue;
-                Object value = dataObject.get(property);
-                if (xsdHelper.isAttribute(property))
-                    addProperty(attributeList, property, value, type);
-                else
-                    addProperty(elementList, property, value, type);
-            }
-        }
-        properties = (Map.Entry[]) elementList.toArray(new Map.Entry[0]);
-        attributes = (Map.Entry[]) attributeList.toArray(new Map.Entry[0]);
-    }
-
-    public DataObject getDataObject() {
-        return dataObject;
-    }
-
-    /**
-     * we need to split out the calling to the populate namespaces seperately since this needs to be done *after* setting the parent namespace
-     * context. We cannot assume it will happen at construction!
-     */
-    public void init() {
-        // here we have an extra issue to attend to. we need to look at the
-        // prefixes and uris (the combination) and populate a hashmap of
-        // namespaces. The hashmap of namespaces will be used to serve the
-        // namespace context
-
-        populateNamespaceContext();
-    }
-
-    /**
-     * 
-     * @param key
-     * @return
-     * @throws IllegalArgumentException
-     */
-    public Object getProperty(String key) throws IllegalArgumentException {
-        if (state == START_ELEMENT_STATE || state == END_ELEMENT_STATE) {
-            return null;
-        } else if (state == TEXT_STATE) {
-            return null;
-        } else if (state == DELEGATED_STATE) {
-            return childReader.getProperty(key);
-        } else {
-            return null;
-        }
-
-    }
-
-    public int next() throws XMLStreamException {
-        return updateStatus();
-    }
-
-    public void require(int i, String string, String string1) throws XMLStreamException {
-        throw new UnsupportedOperationException();
-    }
-
-    /**
-     * todo implement the right contract for this
-     * 
-     * @return
-     * @throws XMLStreamException
-     */
-    public String getElementText() throws XMLStreamException {
-        if (state == DELEGATED_STATE) {
-            return childReader.getElementText();
-        } else {
-            return null;
-        }
-
-    }
-
-    /**
-     * todo implement this
-     * 
-     * @return
-     * @throws XMLStreamException
-     */
-    public int nextTag() throws XMLStreamException {
-        return 0;
-    }
-
-    /**
-     * @return
-     * @throws XMLStreamException
-     */
-    public boolean hasNext() throws XMLStreamException {
-        if (state == DELEGATED_STATE) {
-            if (childReader.isEndOfFragment()) {
-                // the child reader is done. We shouldn't be getting the
-                // hasnext result from the child pullparser then
-                return true;
-            } else {
-                return childReader.hasNext();
-            }
-        } else {
-            return (state == START_ELEMENT_STATE || state == TEXT_STATE);
-
-        }
-    }
-
-    public void close() throws XMLStreamException {
-        // do nothing here - we have no resources to free
-    }
-
-    public String getNamespaceURI(String prefix) {
-        return namespaceContext.getNamespaceURI(prefix);
-    }
-
-    public boolean isStartElement() {
-        if (state == START_ELEMENT_STATE) {
-            return true;
-        } else if (state == END_ELEMENT_STATE) {
-            return false;
-        }
-        return childReader.isStartElement();
-    }
-
-    public boolean isEndElement() {
-        if (state == START_ELEMENT_STATE) {
-            return false;
-        } else if (state == END_ELEMENT_STATE) {
-            return true;
-        }
-        return childReader.isEndElement();
-    }
-
-    public boolean isCharacters() {
-        if (state == START_ELEMENT_STATE || state == END_ELEMENT_STATE) {
-            return false;
-        }
-        return childReader.isCharacters();
-    }
-
-    public boolean isWhiteSpace() {
-        if (state == START_ELEMENT_STATE || state == END_ELEMENT_STATE) {
-            return false;
-        }
-        return childReader.isWhiteSpace();
-    }
-
-    // /////////////////////////////////////////////////////////////////////////
-    // / attribute handling
-    // /////////////////////////////////////////////////////////////////////////
-
-    public String getAttributeValue(String nsUri, String localName) {
-
-        int attribCount = getAttributeCount();
-        String returnValue = null;
-        QName attribQualifiedName;
-        for (int i = 0; i < attribCount; i++) {
-            attribQualifiedName = getAttributeName(i);
-            if (nsUri == null) {
-                if (localName.equals(attribQualifiedName.getLocalPart())) {
-                    returnValue = getAttributeValue(i);
-                    break;
-                }
-            } else {
-                if (localName.equals(attribQualifiedName.getLocalPart()) && nsUri.equals(attribQualifiedName.getNamespaceURI())) {
-                    returnValue = getAttributeValue(i);
-                    break;
-                }
-            }
-
-        }
-
-        return returnValue;
-    }
-
-    public int getAttributeCount() {
-        return (state == DELEGATED_STATE) ? childReader.getAttributeCount()
-                : ((attributes != null) && (state == START_ELEMENT_STATE) ? attributes.length : 0);
-    }
-
-    /**
-     * @param i
-     * @return
-     */
-    public QName getAttributeName(int i) {
-        if (state == DELEGATED_STATE) {
-            return childReader.getAttributeName(i);
-        } else if (state == START_ELEMENT_STATE) {
-            if (attributes == null) {
-                return null;
-            } else {
-                if ((i >= (attributes.length)) || i < 0) { // out of range
-                    return null;
-                } else {
-                    // get the attribute pointer
-                    Object attribPointer = attributes[i].getKey();
-                    // case one - attrib name is null
-                    // this should be the pointer to the OMAttribute then
-                    if (attribPointer instanceof String) {
-                        return new QName((String) attribPointer);
-                    } else if (attribPointer instanceof QName) {
-                        return (QName) attribPointer;
-                    } else {
-                        return null;
-                    }
-                }
-            }
-        } else {
-            throw new IllegalStateException();// as per the api contract
-        }
-
-    }
-
-    public String getAttributeNamespace(int i) {
-        if (state == DELEGATED_STATE) {
-            return childReader.getAttributeNamespace(i);
-        } else if (state == START_ELEMENT_STATE) {
-            QName name = getAttributeName(i);
-            if (name == null) {
-                return null;
-            } else {
-                return name.getNamespaceURI();
-            }
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributeLocalName(int i) {
-        if (state == DELEGATED_STATE) {
-            return childReader.getAttributeLocalName(i);
-        } else if (state == START_ELEMENT_STATE) {
-            QName name = getAttributeName(i);
-            if (name == null) {
-                return null;
-            } else {
-                return name.getLocalPart();
-            }
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributePrefix(int i) {
-        if (state == DELEGATED_STATE) {
-            return childReader.getAttributePrefix(i);
-        } else if (state == START_ELEMENT_STATE) {
-            QName name = getAttributeName(i);
-            if (name == null) {
-                return null;
-            } else {
-                return name.getPrefix();
-            }
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributeType(int i) {
-        return null; // not supported
-    }
-
-    public String getAttributeValue(int i) {
-        if (state == DELEGATED_STATE) {
-            return childReader.getAttributeValue(i);
-        } else if (state == START_ELEMENT_STATE) {
-            if (attributes == null) {
-                return null;
-            } else {
-                if ((i >= (attributes.length)) || i < 0) { // out of range
-                    return null;
-                } else {
-                    // get the attribute pointer
-                    Object attribPointer = attributes[i].getKey();
-                    Object omAttribObj = attributes[i].getValue();
-                    
-                    // Handle xsd:QName/SDO URI type property
-                    // Before save, convert <uri>#<local part> to <prefix>:<local part>
-                    String propertyName = null;
-                    if (attribPointer instanceof String)
-                        propertyName = (String)attribPointer;
-                    else if (attribPointer instanceof QName)
-                        propertyName = ((QName)attribPointer).getLocalPart();
-                    else
-                        return null;
-                    
-                    String attrValue = (String)omAttribObj;
-
-                    Property property = dataObject.getType().getProperty(propertyName);
-                    // property can be null for xsi:type
-                    if (property != null && "URI".equals(property.getType().getName())) {
-                        String namespace = null;
-                        String localPart = attrValue;
-                        
-                        int index = attrValue.indexOf('#');
-                        if (index == -1) {
-                            return localPart;
-                        }
-                        else {
-                            namespace = localPart.substring(0, index);
-                            localPart = localPart.substring(index+1);
-                            
-                            String prefix = namespaceContext.getPrefix(namespace);
-                            if (prefix == null || prefix.length() == 0)
-                                return localPart;
-                            
-                            return prefix + ":" + localPart;
-                        }
-                    }
-                    else {
-                        return attrValue;
-                    }
-                }
-            }
-        } else {
-            throw new IllegalStateException();
-        }
-
-    }
-
-    public boolean isAttributeSpecified(int i) {
-        return false; // not supported
-    }
-
-    // /////////////////////////////////////////////////////////////////////////
-    // //////////// end of attribute handling
-    // /////////////////////////////////////////////////////////////////////////
-
-    // //////////////////////////////////////////////////////////////////////////
-    // //////////// namespace handling
-    // //////////////////////////////////////////////////////////////////////////
-
-    public int getNamespaceCount() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getNamespaceCount();
-        } else {
-            return declaredNamespaceMap.size();
-        }
-    }
-
-    /**
-     * @param i
-     * @return
-     */
-    public String getNamespacePrefix(int i) {
-        if (state == DELEGATED_STATE) {
-            return childReader.getNamespacePrefix(i);
-        } else if (state != TEXT_STATE) {
-            // order the prefixes
-            String[] prefixes = makePrefixArray();
-            if ((i >= prefixes.length) || (i < 0)) {
-                return null;
-            } else {
-                return prefixes[i];
-            }
-
-        } else {
-            throw new IllegalStateException();
-        }
-
-    }
-
-    /**
-     * Get the prefix list from the hastable and take that into an array
-     * 
-     * @return
-     */
-    private String[] makePrefixArray() {
-        String[] prefixes = (String[]) declaredNamespaceMap.keySet().toArray(new String[declaredNamespaceMap.size()]);
-        Arrays.sort(prefixes);
-        return prefixes;
-    }
-
-    public String getNamespaceURI(int i) {
-        if (state == DELEGATED_STATE) {
-            return childReader.getNamespaceURI(i);
-        } else if (state != TEXT_STATE) {
-            String namespacePrefix = getNamespacePrefix(i);
-            return namespacePrefix == null ? null : (String) declaredNamespaceMap.get(namespacePrefix);
-        } else {
-            throw new IllegalStateException();
-        }
-
-    }
-
-    public NamespaceContext getNamespaceContext() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getNamespaceContext();
-        } else {
-            return namespaceContext;
-        }
-
-    }
-
-    // /////////////////////////////////////////////////////////////////////////
-    // /////// end of namespace handling
-    // /////////////////////////////////////////////////////////////////////////
-
-    public int getEventType() {
-        if (state == START_ELEMENT_STATE) {
-            return START_ELEMENT;
-        } else if (state == END_ELEMENT_STATE) {
-            return END_ELEMENT;
-        } else { // this is the delegated state
-            return childReader.getEventType();
-        }
-
-    }
-
-    public String getText() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getText();
-        } else if (state == TEXT_STATE) {
-            return (String) properties[currentPropertyIndex - 1].getValue();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public char[] getTextCharacters() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getTextCharacters();
-        } else if (state == TEXT_STATE) {
-            return getTextData();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    private char[] getTextData() {
-        return properties[currentPropertyIndex - 1].getValue() == null ? new char[0] : ((String) properties[currentPropertyIndex - 1].getValue())
-                .toCharArray();
-    }
-
-    private int copy(int sourceStart, char[] target, int targetStart, int length) {
-        char[] source = getTextData();
-        if (sourceStart > source.length)
-            throw new IndexOutOfBoundsException("source start > source length");
-        int sourceLen = source.length - sourceStart;
-        if (length > sourceLen)
-            length = sourceLen;
-        System.arraycopy(source, sourceStart, target, targetStart, length);
-        return sourceLen;
-    }
-    
-    public int getTextCharacters(int i, char[] chars, int i1, int i2) throws XMLStreamException {
-        if (state == DELEGATED_STATE) {
-            return childReader.getTextCharacters(i, chars, i1, i2);
-        } else if (state == TEXT_STATE) {
-            return copy(i, chars, i1, i2);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public int getTextStart() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getTextStart();
-        } else if (state == TEXT_STATE) {
-            return 0;// assume text always starts at 0
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public int getTextLength() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getTextLength();
-        } else if (state == TEXT_STATE) {
-            return getTextData().length;
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getEncoding() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getEncoding();
-        } else {
-            // we've no idea what the encoding is going to be in this case
-            // perhaps we ought to return some constant here, which the user might
-            // have access to change!
-            return null;
-        }
-    }
-
-    /**
-     * check the validity of this implementation
-     * 
-     * @return
-     */
-    public boolean hasText() {
-        if (state == DELEGATED_STATE) {
-            return childReader.hasText();
-        } else if (state == TEXT_STATE) {
-            return true;
-        } else {
-            return false;
-        }
-
-    }
-
-    /**
-     * @return
-     */
-    public Location getLocation() {
-        // return a default location
-        return new Location() {
-            public int getLineNumber() {
-                return 0;
-            }
-
-            public int getColumnNumber() {
-                return 0;
-            }
-
-            public int getCharacterOffset() {
-                return 0;
-            }
-
-            public String getPublicId() {
-                return null;
-            }
-
-            public String getSystemId() {
-                return null;
-            }
-        };
-    }
-
-    public QName getName() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getName();
-        } else if (state != TEXT_STATE) {
-            return elementQName;
-        } else {
-            throw new IllegalStateException();
-        }
-
-    }
-
-    public String getLocalName() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getLocalName();
-        } else if (state != TEXT_STATE) {
-            return elementQName.getLocalPart();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public boolean hasName() {
-        // since this parser always has a name, the hasname
-        // has to return true if we are still navigating this element
-        // if not we should ask the child reader for it.
-        if (state == DELEGATED_STATE) {
-            return childReader.hasName();
-        } else if (state != TEXT_STATE) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    public String getNamespaceURI() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getNamespaceURI();
-        } else if (state == TEXT_STATE) {
-            return null;
-        } else {
-            return elementQName.getNamespaceURI();
-        }
-    }
-
-    public String getPrefix() {
-        if (state == DELEGATED_STATE) {
-            return childReader.getPrefix();
-        } else if (state == TEXT_STATE) {
-            return null;
-        } else {
-            return elementQName.getPrefix();
-        }
-    }
-
-    public String getVersion() {
-        return null;
-    }
-
-    public boolean isStandalone() {
-        return true;
-    }
-
-    public boolean standaloneSet() {
-        return true;
-    }
-
-    public String getCharacterEncodingScheme() {
-        return null; // todo - should we return something for this ?
-    }
-
-    public String getPITarget() {
-        throw new UnsupportedOperationException("Yet to be implemented !!");
-    }
-
-    public String getPIData() {
-        throw new UnsupportedOperationException("Yet to be implemented !!");
-    }
-
-    // /////////////////////////////////////////////////////////////////////////
-    // / Other utility methods
-    // ////////////////////////////////////////////////////////////////////////
-
-    /**
-     * Populates a namespace context
-     */
-    private void populateNamespaceContext() {
-
-        // first add the current element namespace to the namespace context
-        // declare it if not found
-        registerNamespace(elementQName.getPrefix(), elementQName.getNamespaceURI());
-
-        // traverse through the attributes and populate the namespace context
-        // the attrib list can be of many combinations
-        // the valid combinations are
-        // String - String
-        // QName - QName
-        // null - OMAttribute
-
-        if (attributes != null) {
-            for (int i = 0; i < attributes.length; i++) { // jump in two
-                Object attribName = attributes[i].getKey();
-                if (attribName instanceof String) {
-                    // ignore this case - Nothing to do
-                } else if (attribName instanceof QName) {
-                    QName attribQName = ((QName) attribName);
-                    registerNamespace(attribQName.getPrefix(), attribQName.getNamespaceURI());
-
-                }
-            }
-        }
-
-    }
-
-    /**
-     * @param prefix
-     * @param uri
-     */
-    private void registerNamespace(String prefix, String uri) {
-        if (!uri.equals(namespaceContext.getNamespaceURI(prefix))) {
-            namespaceContext.registerMapping(prefix, uri);
-            declaredNamespaceMap.put(prefix, uri);
-        }
-    }
-
-    /**
-     * By far this should be the most important method in this class this method changes the state of the parser according to the change in the
-     */
-    private int updateStatus() throws XMLStreamException {
-        int returnEvent = -1; // invalid state is the default state
-        switch (state) {
-        case START_ELEMENT_STATE:
-            // current element is start element. We should be looking at the
-            // property list and making a pullparser for the property value
-            if (properties == null || properties.length == 0) {
-                // no properties - move to the end element state straightaway
-                state = END_ELEMENT_STATE;
-                returnEvent = END_ELEMENT;
-            } else {
-                // there are properties. now we should delegate this task to a
-                // child reader depending on the property type
-                returnEvent = processProperties();
-
-            }
-            break;
-        case END_ELEMENT_STATE:
-            // we've reached the end element already. If the user tries to push
-            // further ahead then it is an exception
-            throw new XMLStreamException("Trying to go beyond the end of the pullparser");
-
-        case DELEGATED_STATE:
-            if (childReader.isEndOfFragment()) {
-                // we've reached the end!
-                if (currentPropertyIndex > (properties.length - 1)) {
-                    state = END_ELEMENT_STATE;
-                    returnEvent = END_ELEMENT;
-                } else {
-                    returnEvent = processProperties();
-                }
-            } else {
-                returnEvent = childReader.next();
-            }
-            break;
-
-        case TEXT_STATE:
-            // if there are any more event we should be delegating to
-            // processProperties. if not we just return an end element
-            if (currentPropertyIndex > (properties.length - 1)) {
-                state = END_ELEMENT_STATE;
-                returnEvent = END_ELEMENT;
-            } else {
-                returnEvent = processProperties();
-            }
-            break;
-        }
-        return returnEvent;
-    }
-
-    /**
-     * A convenient method to reuse the properties
-     * 
-     * @return event to be thrown
-     * @throws XMLStreamException
-     */
-    private int processProperties() throws XMLStreamException {
-        // move to the next property depending on the current property
-        // index
-        Object propPointer = properties[currentPropertyIndex].getKey();
-        QName propertyQName = null;
-        boolean textFound = false;
-        if (propPointer == null) {
-            throw new XMLStreamException("property key cannot be null!");
-        } else if (propPointer instanceof String) {
-            // propPointer being a String has a special case
-            // that is it can be a the special constant ELEMENT_TEXT that
-            // says this text event
-            if (ELEMENT_TEXT.equals(propPointer)) {
-                textFound = true;
-            } else {
-                propertyQName = new QName((String) propPointer);
-            }
-        } else if (propPointer instanceof QName) {
-            propertyQName = (QName) propPointer;
-        } else {
-            // oops - we've no idea what kind of key this is
-            throw new XMLStreamException("unidentified property key!!!" + propPointer);
-        }
-
-        // ok! we got the key. Now look at the value
-        Object propertyValue = properties[currentPropertyIndex].getValue();
-        // cater for the special case now
-        if (textFound) {
-            // no delegation here - make the parser null and immediately
-            // return with the event characters
-            childReader = null;
-            state = TEXT_STATE;
-            currentPropertyIndex++;
-            return CHARACTERS;
-        } else if (propertyValue == null || propertyValue instanceof String) {
-            // strings are handled by the NameValuePairStreamReader
-            childReader = new SimpleElementStreamReader(propertyQName, (String) propertyValue, namespaceContext);
-            childReader.init();
-        } else if (propertyValue instanceof DataObjectXMLStreamReader) {
-            // ADBbean has it's own method to get a reader
-            XMLFragmentStreamReader reader = (DataObjectXMLStreamReader) propertyValue;
-            // we know for sure that this is an ADB XMLStreamreader.
-            // However we need to make sure that it is compatible
-            childReader = reader;
-            childReader.init();
-        } else {
-            // all special possiblilities has been tried! Let's treat
-            // the thing as a bean and try generating events from it
-            throw new UnsupportedOperationException("Not supported");
-            // childReader = new WrappingXMLStreamReader(BeanUtil.getPullParser(propertyValue, propertyQName));
-            // we cannot register the namespace context here
-        }
-
-        // set the state here
-        state = DELEGATED_STATE;
-        // we are done with the delegation
-        // increment the property index
-        currentPropertyIndex++;
-        return childReader.getEventType();
-    }
-
-    /**
-     * are we done ?
-     * 
-     * @return
-     */
-    public boolean isEndOfFragment() {
-        return (state == END_ELEMENT_STATE);
-    }
-
-    protected static class NameValuePair implements Map.Entry {
-        private Object key;
-
-        private Object value;
-
-        public NameValuePair(Object key, Object value) {
-            this.key = key;
-            this.value = value;
-        }
-
-        public Object getKey() {
-            return key;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object setValue(Object value) {
-            Object v = this.value;
-            this.value = value;
-            return v;
-        }
-
-    }
-
-    protected static class SimpleElementStreamReader implements XMLFragmentStreamReader {
-
-        private static final int START_ELEMENT_STATE = 0;
-
-        private static final int TEXT_STATE = 1;
-
-        private static final int END_ELEMENT_STATE = 2;
-
-        private static final int START_ELEMENT_STATE_WITH_NULL = 3;
-
-        private static final QName XSI_NIL_QNAME = new QName("http://www.w3.org/2001/XMLSchema-instance", "nil", "xsi");
-
-        private final NameSpaceContext namespaceContext;
-
-        private QName name;
-
-        private String value;
-
-        private int state = START_ELEMENT_STATE;
-
-        public SimpleElementStreamReader(QName name, String value, NameSpaceContext nameSpaces) {
-            this.name = name;
-            this.value = value;
-            if (value == null)
-                state = START_ELEMENT_STATE_WITH_NULL;
-            namespaceContext = nameSpaces;
-        }
-
-        public Object getProperty(String key) throws IllegalArgumentException {
-            return null;
-        }
-
-        public int next() throws XMLStreamException {
-            switch (state) {
-            case START_ELEMENT_STATE:
-                state = TEXT_STATE;
-                return CHARACTERS;
-            case START_ELEMENT_STATE_WITH_NULL:
-                state = END_ELEMENT_STATE;
-                return END_ELEMENT;
-            case END_ELEMENT_STATE:
-                // oops, not supposed to happen!
-                throw new XMLStreamException("end already reached!");
-            case TEXT_STATE:
-                state = END_ELEMENT_STATE;
-                return END_ELEMENT;
-            default:
-                throw new XMLStreamException("unknown event type!");
-            }
-        }
-
-        public void require(int i, String string, String string1) throws XMLStreamException {
-            // not implemented
-        }
-
-        public String getElementText() throws XMLStreamException {
-            if (state == START_ELEMENT) {
-                // move to the end state and return the value
-                state = END_ELEMENT_STATE;
-                return value;
-            } else {
-                throw new XMLStreamException();
-            }
-
-        }
-
-        public int nextTag() throws XMLStreamException {
-            return 0;// todo
-        }
-
-        public boolean hasNext() throws XMLStreamException {
-            return (state != END_ELEMENT_STATE);
-        }
-
-        public void close() throws XMLStreamException {
-            // Do nothing - we've nothing to free here
-        }
-
-        public String getNamespaceURI(String prefix) {
-            return namespaceContext.getNamespaceURI(prefix);
-        }
-
-        public boolean isStartElement() {
-            return (state == START_ELEMENT_STATE || state == START_ELEMENT_STATE_WITH_NULL);
-        }
-
-        public boolean isEndElement() {
-            return (state == END_ELEMENT_STATE);
-        }
-
-        public boolean isCharacters() {
-            return (state == TEXT_STATE);
-        }
-
-        public boolean isWhiteSpace() {
-            return false; // no whitespaces here
-        }
-
-        public boolean isAttributeSpecified(int i) {
-            return false; // no attribs here
-        }
-
-        public NamespaceContext getNamespaceContext() {
-            return this.namespaceContext;
-        }
-
-        public int getEventType() {
-            switch (state) {
-            case START_ELEMENT_STATE:
-            case START_ELEMENT_STATE_WITH_NULL:
-                return START_ELEMENT;
-            case END_ELEMENT_STATE:
-                return END_ELEMENT;
-            case TEXT_STATE:
-                return CHARACTERS;
-            default:
-                throw new UnsupportedOperationException();
-            // we've no idea what this is!!!!!
-            }
-
-        }
-
-        public String getText() {
-            if (state == TEXT_STATE) {
-                return value;
-            } else {
-                throw new IllegalStateException();
-            }
-        }
-
-        public char[] getTextCharacters() {
-            if (state == TEXT_STATE) {
-                return value.toCharArray();
-            } else {
-                throw new IllegalStateException();
-            }
-        }
-
-        public int getTextCharacters(int i, char[] chars, int i1, int i2) throws XMLStreamException {
-            // not implemented
-            throw new UnsupportedOperationException();
-        }
-
-        public int getTextStart() {
-            if (state == TEXT_STATE) {
-                return 0;
-            } else {
-                throw new IllegalStateException();
-            }
-        }
-
-        public int getTextLength() {
-            if (state == TEXT_STATE) {
-                return value.length();
-            } else {
-                throw new IllegalStateException();
-            }
-
-        }
-
-        public String getEncoding() {
-            return "UTF-8";
-        }
-
-        public boolean hasText() {
-            return (state == TEXT_STATE);
-        }
-
-        public Location getLocation() {
-            return new Location() {
-                public int getLineNumber() {
-                    return 0;
-                }
-
-                public int getColumnNumber() {
-                    return 0;
-                }
-
-                public int getCharacterOffset() {
-                    return 0;
-                }
-
-                public String getPublicId() {
-                    return null;
-                }
-
-                public String getSystemId() {
-                    return null;
-                }
-            };
-        }
-
-        public QName getName() {
-            if (state != TEXT_STATE) {
-                return name;
-            } else {
-                return null;
-            }
-        }
-
-        public String getLocalName() {
-            if (state != TEXT_STATE) {
-                return name.getLocalPart();
-            } else {
-                return null;
-            }
-        }
-
-        public boolean hasName() {
-            return (state != TEXT_STATE);
-
-        }
-
-        public String getNamespaceURI() {
-            if (state != TEXT_STATE) {
-                return name.getNamespaceURI();
-            } else {
-                return null;
-            }
-
-        }
-
-        public String getPrefix() {
-            if (state != TEXT_STATE) {
-                return name.getPrefix();
-            } else {
-                return null;
-            }
-        }
-
-        public String getVersion() {
-            return null; // todo 1.0 ?
-        }
-
-        public boolean isStandalone() {
-            return false;
-        }
-
-        public boolean standaloneSet() {
-            return false;
-        }
-
-        public String getCharacterEncodingScheme() {
-            return null;
-        }
-
-        public String getPITarget() {
-            return null;
-        }
-
-        public String getPIData() {
-            return null;
-        }
-
-        public boolean isEndOfFragment() {
-            return (state == END_ELEMENT_STATE);
-        }
-
-        public void init() {
-            // just add the current elements namespace and prefix to the this
-            // elements nscontext
-            registerNamespace(name.getPrefix(), name.getNamespaceURI());
-
-        }
-
-        /**
-         * @param prefix
-         * @param uri
-         */
-        private void registerNamespace(String prefix, String uri) {
-            // todo - need to fix this up to cater for cases where
-            // namespaces are having no prefixes
-            if (!uri.equals(namespaceContext.getNamespaceURI(prefix))) {
-                // this namespace is not there. Need to declare it
-                namespaceContext.registerMapping(prefix, uri);
-            }
-        }
-
-        public int getAttributeCount() {
-            if (state == START_ELEMENT_STATE_WITH_NULL)
-                return 1;
-            if (state == START_ELEMENT_STATE) {
-                return 0;
-            } else {
-                throw new IllegalStateException();
-            }
-
-        }
-
-        public String getAttributeLocalName(int i) {
-            if (state == START_ELEMENT_STATE_WITH_NULL && i == 0)
-                return XSI_NIL_QNAME.getLocalPart();
-            if (state == START_ELEMENT_STATE) {
-                return null;
-            } else {
-                throw new IllegalStateException();
-            }
-        }
-
-        public QName getAttributeName(int i) {
-            if (state == START_ELEMENT_STATE_WITH_NULL && i == 0)
-                return XSI_NIL_QNAME;
-            if (state == START_ELEMENT_STATE) {
-                return null;
-            } else {
-                throw new IllegalStateException();
-            }
-        }
-
-        public String getAttributeNamespace(int i) {
-            if (state == START_ELEMENT_STATE_WITH_NULL && i == 0)
-                return XSI_NIL_QNAME.getNamespaceURI();
-            if (state == START_ELEMENT_STATE) {
-                return null;
-            } else {
-                throw new IllegalStateException();
-            }
-        }
-
-        public String getAttributePrefix(int i) {
-            if (state == START_ELEMENT_STATE_WITH_NULL && i == 0)
-                return XSI_NIL_QNAME.getPrefix();
-            if (state == START_ELEMENT_STATE) {
-                return null;
-            } else {
-                throw new IllegalStateException();
-            }
-        }
-
-        public String getAttributeType(int i) {
-            return null; // not implemented
-        }
-
-        public String getAttributeValue(int i) {
-            if (state == START_ELEMENT_STATE_WITH_NULL && i == 0)
-                return "true";
-            if (state == START_ELEMENT_STATE) {
-                return null;
-            } else {
-                throw new IllegalStateException();
-            }
-        }
-
-        public String getAttributeValue(String string, String string1) {
-            if (state == TEXT_STATE) {
-                // todo something
-                return null;
-            } else {
-                return null;
-            }
-
-        }
-
-        public int getNamespaceCount() {
-            if (state == START_ELEMENT_STATE_WITH_NULL && isXsiNamespacePresent())
-                return 1;
-            else
-                return 0;
-
-        }
-
-        public String getNamespacePrefix(int i) {
-            if (state == START_ELEMENT_STATE_WITH_NULL && isXsiNamespacePresent() && i == 0)
-                return XSI_NIL_QNAME.getPrefix();
-            else
-                return null;
-        }
-
-        public String getNamespaceURI(int i) {
-            if (state == START_ELEMENT_STATE_WITH_NULL && isXsiNamespacePresent() && i == 0)
-                return XSI_NIL_QNAME.getNamespaceURI();
-            else
-                return null;
-        }
-
-        /**
-         * Test whether the xsi namespace is present
-         * 
-         * @return
-         */
-        private boolean isXsiNamespacePresent() {
-            return (namespaceContext.getNamespaceURI(XSI_NIL_QNAME.getPrefix()) != null);
-        }
-
-    }
-
-    protected class NameSpaceContext implements NamespaceContext {
-        private Map prefixToNamespaceMapping = new HashMap();
-
-        public NameSpaceContext() {
-            prefixToNamespaceMapping.put("xml", "http://www.w3.org/XML/1998/namespace");
-            prefixToNamespaceMapping.put("xmlns", "http://www.w3.org/2000/xmlns/");
-            prefixToNamespaceMapping.put("xsi", "http://www.w3.org/2001/XMLSchema-instance");
-        }
-
-        public String getNamespaceURI(String prefix) {
-            if (prefix == null)
-                throw new IllegalArgumentException("Prefix is null");
-
-            String ns = (String) prefixToNamespaceMapping.get(prefix);
-            if (ns != null)
-                return ns;
-            else
-                return null;
-        }
-
-        public String getPrefix(String nsURI) {
-            if (nsURI == null)
-                throw new IllegalArgumentException("Namespace is null");
-            for (Iterator i = prefixToNamespaceMapping.entrySet().iterator(); i.hasNext();) {
-                Map.Entry entry = (Map.Entry) i.next();
-                if (entry.getValue().equals(nsURI)) {
-                    return (String) entry.getKey();
-                }
-            }
-            return null;
-        }
-
-        public Iterator getPrefixes(String nsURI) {
-            List prefixList = new ArrayList();
-            for (Iterator i = prefixToNamespaceMapping.entrySet().iterator(); i.hasNext();) {
-                Map.Entry entry = (Map.Entry) i.next();
-                if (entry.getValue().equals(nsURI)) {
-                    prefixList.add(entry.getKey());
-                }
-            }
-            return prefixList.iterator();
-        }
-
-        public void registerMapping(String prefix, String nsURI) {
-            prefixToNamespaceMapping.put(prefix, nsURI);
-        }
-
-        private int counter = 0;
-
-        public synchronized QName createQName(String nsURI, String name) {
-            String prefix = nsURI != null ? (String) getPrefix(nsURI) : null;
-            if (prefix == null && nsURI != null && !nsURI.equals(""))
-                prefix = "p" + (counter++);
-            if (prefix == null)
-                prefix = "";
-            if (nsURI != null) {
-                prefixToNamespaceMapping.put(prefix, nsURI);
-                declaredNamespaceMap.put(prefix, nsURI);
-            }
-            return new QName(nsURI, name, prefix);
-        }
-
-        public void removeMapping(String prefix) {
-            prefixToNamespaceMapping.remove(prefix);
-        }
-    }
-
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/RecordedEventXMLStreamReader.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/RecordedEventXMLStreamReader.java
deleted file mode 100644
index a0da5d2609..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/RecordedEventXMLStreamReader.java
+++ /dev/null
@@ -1,868 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util.resource;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-
-import javax.xml.XMLConstants;
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.namespace.QName;
-import javax.xml.stream.Location;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.xml.sax.Attributes;
-import org.xml.sax.Locator;
-
-/**
- * This special purpose XMLStreamReader is used to produce a StAX event stream corresponding to a list of events 
- * recorded earlier. The recorded events are generated by the inner class RecordedEventXMLStreamReader.Tag, 
- * which records the events in either of 2 ways:
- * 
- * 1) in conjunction with class SDOXMLLoadImpl, it records events corresponding to the SAX events being
- *    handled by the SDOXMLLoadImpl when loading XML using SDOXMLResourceImpl.
- * 2) when Tag.record() is called (see class ChangeSummaryStreamDeserializer), it walks through and records 
- *    the StAX events produced by another XMLStreamReader.
- * 
- * This class is used by the SDO StAX-based ChangeSummaryType-property loader, class
- * ChangeSummaryStreamDeserializer, which is inoked by and uses (for loading deleted object XML fragments)
- * the SAX-based loader class XMLResourceImpl.
- */
-public abstract class RecordedEventXMLStreamReader implements XMLStreamReader {
-
-    static private class Event {
-        int type;
-
-        public NamespaceContext nameSpaceContext;
-
-        Location location;
-
-        protected final void initialize(XMLStreamReader reader) {
-            nameSpaceContext = reader.getNamespaceContext();
-            location = reader.getLocation();
-        }
-
-        protected final void location(final Locator locator) {
-            location = new Location() {
-                public int getCharacterOffset() {
-                    return -1;
-                }
-
-                public int getColumnNumber() {
-                    return locator.getColumnNumber();
-                }
-
-                public int getLineNumber() {
-                    return locator.getLineNumber();
-                }
-
-                public String getPublicId() {
-                    return locator.getPublicId();
-                }
-
-                public String getSystemId() {
-                    return locator.getSystemId();
-                }
-            };
-        }
-    }
-
-    static class ValueEvent extends Event {
-        final String value;
-
-        protected ValueEvent(String v) {
-            value = v;
-        }
-    }
-
-    static protected class Reference extends ValueEvent {
-        final String target;
-
-        protected Reference(String name, String data) {
-            super(data);
-            target = name;
-        }
-    }
-
-    static protected final class AttributeEvent extends Reference {
-        final QName name;
-
-        final String nameSpace, prefix;
-
-        int attributes;
-
-        final boolean specified;
-
-        protected AttributeEvent(XMLStreamReader reader) {
-            super(reader.getAttributeType(0), reader.getAttributeValue(0));
-            attributes = reader.getAttributeCount();
-            name = reader.getAttributeName(0);
-            nameSpace = reader.getAttributeNamespace(0);
-            prefix = reader.getAttributePrefix(0);
-            specified = reader.isAttributeSpecified(0);
-        }
-    }
-
-    static protected final class NameSpaceEvent extends Reference {
-        int nameSpaces;
-
-        protected NameSpaceEvent(XMLStreamReader reader) {
-            super(reader.getNamespacePrefix(0), reader.getNamespaceURI(0));
-            nameSpaces = reader.getNamespaceCount();
-        }
-    }
-
-    static protected String prefix(String qName, String nameSpace) {
-        int delimiter = qName.indexOf(':');
-        if (delimiter != -1)
-            return qName.substring(0, delimiter);
-        if (nameSpace.length() != 0)
-            return XMLConstants.DEFAULT_NS_PREFIX;
-        // if (nameSpaceContext.getNamespaceURI(XMLConstants.DEFAULT_NS_PREFIX) != null || xsdHelper.getGlobalProperty(null, name, element) == null)
-        return null;
-    }
-
-    static class EndElement extends Event {
-        List nameSpaces/* = null */;
-
-        public final QName name;
-
-        public final String nameSpace;
-
-        final String prefix;
-
-        protected EndElement(XMLStreamReader reader) {
-            name = reader.getName();
-            nameSpace = reader.getNamespaceURI();
-            prefix = reader.getPrefix();
-            int count = reader.getNamespaceCount();
-            if (count == 0)
-                return;
-            nameSpaces = new ArrayList(count);
-            int index = 0;
-            do
-                Tag.bind(reader.getNamespacePrefix(index), reader.getNamespaceURI(index), nameSpaces);
-            while (++index != count);
-        }
-
-        protected EndElement(String uri, String local, String p, Locator locator) {
-            if (p == null) {
-                name = new QName(uri, local, XMLConstants.DEFAULT_NS_PREFIX);
-                nameSpace = null;
-            } else {
-                name = new QName(uri, local, p);
-                nameSpace = uri;
-            }
-            prefix = p;
-            location(locator);
-        }
-    }
-
-    static class NameSpace {
-        final String prefix, uri;
-
-        protected NameSpace(String p, String nameSpace) {
-            prefix = p;
-            uri = nameSpace;
-        }
-    }
-
-    static final class Attribute extends NameSpace {
-        final String type, value;
-
-        final QName qName;
-
-        boolean specified/* = false */;
-
-        protected Attribute(String t, String v, QName name, String prefix, String nameSpace) {
-            super(prefix, nameSpace);
-            type = t;
-            value = v;
-            qName = name;
-        }
-    }
-
-    static final class AttributeList /* implements Attributes */{// TODO exclude XMLConstants.XMLNS_ATTRIBUTE
-        final List attributes;
-
-        protected AttributeList(int size) {
-            attributes = new ArrayList(size);
-        }
-
-        /*
-         * @param uri Never null
-         */
-        public final int getIndex(String uri, String localName) {
-            for (int index = getLength(); index != 0;)
-                if (getLocalName(--index).equals(localName) && uri.equals(getURI(index)))
-                    return index;
-            return -1;
-        }
-
-        public final int getLength() {
-            return attributes.size();
-        }
-
-        protected final Attribute attribute(int index) {
-            return (Attribute) attributes.get(index);
-        }
-
-        public final String getLocalName(int index) {
-            return attribute(index).qName.getLocalPart();
-        }
-
-        public final String getType(int index) {
-            return attribute(index).type;
-        }
-
-        /*public String getType(String uri, String localName) {
-            int index = getIndex(uri, localName);
-            return index == -1 ? null: getType(index);
-         } */
-
-        public final String getURI(int index) {
-            return attribute(index).uri;
-        }
-
-        public final String getValue(int index) {
-            return attribute(index).value;
-        }
-
-        /*
-         * @param uri Never null
-         */
-        public final String getValue(String uri, String localName) {
-            int index = getIndex(uri, localName);
-            return index == -1 ? null : getValue(index);
-        }
-    }
-
-    static protected class StartElement extends EndElement {
-        final AttributeList attributes;
-
-        protected StartElement(XMLStreamReader reader) {
-            super(reader);
-            int count = reader.getAttributeCount();
-            if (count == 0)
-                attributes = null;
-            else {
-                attributes = new AttributeList(count);
-                int index = 0;
-                do {
-                    Attribute attribute = new Attribute(reader.getAttributeType(index), reader.getAttributeValue(index), reader
-                            .getAttributeName(index), reader.getAttributePrefix(index), reader.getAttributeNamespace(index));
-                    attribute.specified = reader.isAttributeSpecified(index);
-                    attributes.attributes.add(attribute);
-                } while (++index != count);
-            }
-        }
-
-        protected StartElement(String nameSpace, String local, String prefix, Attributes attributeArray, Locator locator, List bindings,
-                final NamespaceContext context) {
-            super(nameSpace, local, prefix, locator);
-            nameSpaces = bindings;
-            nameSpaceContext = bindings == null || bindings.isEmpty() ? context : new NamespaceContext() {
-                public String getNamespaceURI(String prefix) {
-                    for (int index = nameSpaces.size(); index != 0;) {
-                        NameSpace binding = (NameSpace) nameSpaces.get(--index);
-                        if (binding.prefix.equals(prefix))
-                            return binding.uri;
-                    }
-                    return context.getNamespaceURI(prefix);
-                }
-
-                public String getPrefix(String namespaceURI) {
-                    for (int index = nameSpaces.size(); index != 0;) {
-                        NameSpace binding = (NameSpace) nameSpaces.get(--index);
-                        if (binding.uri.equals(namespaceURI))
-                            return binding.prefix;
-                    }
-                    return context.getPrefix(namespaceURI);
-                }
-
-                public Iterator getPrefixes(final String namespaceURI) {
-                    final Iterator iterator = context.getPrefixes(namespaceURI);
-                    return new Iterator() {
-                        Iterator bindings = nameSpaces.iterator();
-
-                        NameSpace binding/* = null */;
-
-                        protected final boolean prefix() {
-                            while (bindings.hasNext()) {
-                                binding = (NameSpace) bindings.next();
-                                if (binding.uri.equals(namespaceURI))
-                                    return true;
-                            }
-                            bindings = null;
-                            return false;
-                        }
-
-                        public boolean hasNext() {
-                            return bindings != null && prefix() || iterator.hasNext();
-                        }
-
-                        protected NameSpace nameSpace;
-
-                        public Object next() {
-                            if (bindings == null || binding == null && !prefix())
-                                return iterator.next();
-                            nameSpace = binding;
-                            binding = null;
-                            return nameSpace.prefix;
-                        }
-
-                        public void remove() {
-                            if (bindings == null)
-                                iterator.remove();
-                            else
-                                nameSpaces.remove(nameSpace);
-                        }
-                    };
-                }
-            };
-            int count = attributeArray.getLength();
-            if (count == 0)
-                attributes = null;
-            else {
-                attributes = new AttributeList(count);
-                int index = 0;
-                do {
-                    QName name;
-                    nameSpace = attributeArray.getURI(index);
-                    local = attributeArray.getLocalName(index);
-                    prefix = prefix(attributeArray.getQName(index), nameSpace);
-                    if (prefix == null) {
-                        name = new QName(nameSpace, local, XMLConstants.DEFAULT_NS_PREFIX);
-                        nameSpace = null;
-                    } else
-                        name = new QName(nameSpace, local, prefix);
-                    attributes.attributes.add(new Attribute(attributeArray.getType(index), attributeArray.getValue(index), name, prefix, nameSpace));
-                } while (++index != count);
-            }
-        }
-    }
-
-    static public class Tag extends StartElement {
-        public Tag(XMLStreamReader reader) {
-            super(reader);
-            initialize(reader);
-        }
-
-        public List events/* = null */; // may be empty
-
-        protected final void events() {
-            events = new ArrayList();
-        }
-
-        public Tag(String nameSpace, String local, String prefix, Attributes attributes, Locator locator, NamespaceContext context, List bindings) {
-            super(nameSpace, local, prefix, attributes, locator, bindings, context);
-            events();
-        }
-
-        static public void bind(String prefix, String nameSpace, Collection nameSpaces) {
-            nameSpaces.add(new NameSpace(prefix, nameSpace));
-        }
-
-        protected int nest/* = 0 */;
-
-        public final void start(String nameSpace, String local, String qName, Attributes attributes, Locator locator, List bindings) {
-            Event event;
-            for (int index = events.size();/* true */;) {
-                if (index == 0) {
-                    event = this;
-                    break;
-                }
-                event = (Event) events.get(--index);
-                if (event.type != END_ELEMENT)
-                    break;
-                siblings: for (int nest = 0;/* true */;)
-                    switch (((Event) events.get(--index)).type) {
-                    case START_ELEMENT:
-                        if (nest == 0)
-                            break siblings;
-                        --nest;
-                        break;
-                    case END_ELEMENT:
-                        ++nest;
-                    }
-            }
-            Event start = new StartElement(nameSpace, local, prefix(qName, nameSpace), attributes, locator, bindings, event.nameSpaceContext);
-            start.type = START_ELEMENT;
-            events.add(start);
-            ++nest;
-        }
-
-        protected final void  add (Event event)
-        {
-            int index = events.size();
-            event.nameSpaceContext = index == 0 ? nameSpaceContext : ((Event) events.get(--index)).nameSpaceContext;
-            events.add(event);
-        }
-
-        public final void text(int type, String value, Locator locator) {
-            Event event = new ValueEvent(value);
-            event.type = type;
-            event.location(locator);
-            //int index = events.size();
-            add(event);
-        }
-
-        public final boolean end(String nameSpace, String local, String qName, Locator locator) {
-            Event end = new EndElement(nameSpace, local, prefix(qName, nameSpace), locator);
-            end.type = END_ELEMENT;
-            add(end);
-            if (nest == 0)
-                return true;
-            --nest;
-            return false;
-        }
-
-        public final XMLStreamReader play(final XMLResource resource) {
-            return new RecordedEventXMLStreamReader(this) {
-                public void close() {
-                }
-
-                public String getCharacterEncodingScheme() {
-                    return null; // TODO
-                }
-
-                public String getEncoding() {
-                    return resource.getEncoding();
-                }
-
-                public Object getProperty(String property) {
-                    return null; // TODO javax.xml.stream.notations & javax.xml.stream.entities for DTD
-                }
-
-                public String getVersion() {
-                    return resource.getXMLVersion();
-                }
-
-                public boolean isStandalone() {
-                    return false; // TODO
-                }
-
-                public boolean standaloneSet() {
-                    return false; // TODO
-                }
-            };
-        }
-
-        protected final void add(Event event, int type, XMLStreamReader reader) {
-            event.type = type;
-            event.initialize(reader);
-            events.add(event);
-        }
-
-        public final boolean record(XMLStreamReader reader) throws XMLStreamException {
-            events();
-            for (int nest = 0; reader.hasNext();) {
-                Event event;
-                int type = reader.next();
-                switch (type) {
-                case CHARACTERS:
-                case CDATA:
-                case COMMENT:
-                case SPACE:
-                case DTD:
-                    event = new ValueEvent(reader.getText());
-                    break;
-                case ENTITY_REFERENCE:
-                    event = new Reference(reader.getLocalName(), reader.getText());
-                    break;
-                case PROCESSING_INSTRUCTION:
-                    event = new Reference(reader.getPITarget(), reader.getPIData());
-                    break;
-                case ATTRIBUTE:
-                    event = new AttributeEvent(reader);
-                    break;
-                case NAMESPACE:
-                    event = new NameSpaceEvent(reader);
-                    break;
-                case START_ELEMENT:
-                    ++nest;
-                    event = new StartElement(reader);
-                    break;
-                case END_ELEMENT:
-                    add(new EndElement(reader), type, reader);
-                    if (nest == 0)
-                        return false;
-                    --nest;
-                    continue;
-                case END_DOCUMENT:
-                    return true; // report error?
-                default: // new type
-                    event = new Event();
-                }
-                add(event, type, reader);
-            }
-            return true; // report error?
-        }
-
-        public final XMLStreamReader play(final XMLStreamReader reader) {
-            return new RecordedEventXMLStreamReader(this) {
-                public void close() throws XMLStreamException {
-                    reader.close();
-                }
-
-                public String getCharacterEncodingScheme() {
-                    return reader.getCharacterEncodingScheme();
-                }
-
-                public String getEncoding() {
-                    return reader.getEncoding();
-                }
-
-                public Object getProperty(String property) {
-                    return reader.getProperty(property); // TODO javax.xml.stream.notations & javax.xml.stream.entities for DTD
-                }
-
-                public String getVersion() {
-                    return reader.getVersion();
-                }
-
-                public boolean isStandalone() {
-                    return reader.isStandalone();
-                }
-
-                public boolean standaloneSet() {
-                    return reader.standaloneSet();
-                }
-            };
-        }
-    }
-
-    Event event;
-
-    final List events;
-
-    final int size;
-
-    protected RecordedEventXMLStreamReader(Tag tag) {
-        event = tag;
-        tag.type = START_ELEMENT;
-        events = tag.events;
-        size = events.size();
-    }
-
-    public int getAttributeCount() {
-        switch (getEventType()) {
-        case START_ELEMENT:
-            AttributeList attributes = ((StartElement) event).attributes;
-            return attributes == null ? 0 : attributes.getLength();
-        case ATTRIBUTE:
-            return ((AttributeEvent) event).attributes;
-        }
-        throw new IllegalStateException("Neither START_ELEMENT nor ATTRIBUTE");
-    }
-
-    protected final AttributeList attributes() {
-        if (getEventType() == START_ELEMENT)
-            return ((StartElement) event).attributes;
-        throw new IllegalStateException("Neither START_ELEMENT nor ATTRIBUTE");
-    }
-
-    public String getAttributeLocalName(int index) {
-        return attributes().getLocalName(index);
-    }
-
-    static Attribute attribute(AttributeList attributes, int index) {
-        return (Attribute) attributes.attributes.get(index);
-    }
-
-    public QName getAttributeName(int index) {
-        return getEventType() == ATTRIBUTE ? ((AttributeEvent) event).name : attribute(attributes(), index).qName;
-    }
-
-    public String getAttributeNamespace(int index) {
-        return getEventType() == ATTRIBUTE ? ((AttributeEvent) event).nameSpace : attributes().getURI(index);
-    }
-
-    public String getAttributePrefix(int index) {
-        return getEventType() == ATTRIBUTE ? ((AttributeEvent) event).prefix : attribute(attributes(), index).prefix;
-    }
-
-    public String getAttributeType(int index) {
-        return getEventType() == ATTRIBUTE ? ((Reference) event).target : attributes().getType(index);
-    }
-
-    public String getAttributeValue(int index) {
-        return getEventType() == ATTRIBUTE ? ((ValueEvent) event).value : attributes().getValue(index);
-    }
-
-    public boolean isAttributeSpecified(int index) {
-        if (getEventType() == ATTRIBUTE)
-            return ((AttributeEvent) event).specified;
-        AttributeList attributes = attributes();
-        return attribute(attributes, index).specified;
-    }
-
-    public String getAttributeValue(String nameSpace, String name) {
-        if (getEventType() == ATTRIBUTE) {
-            AttributeEvent attribute = (AttributeEvent) event;
-            return !attribute.name.getLocalPart().equals(name) ? null : nameSpace == null ? (attribute.nameSpace == null ? attribute.value : null)
-                    : nameSpace.equals(attribute.nameSpace) ? attribute.value : null;
-        }
-        AttributeList attributes = attributes();
-        return attributes == null ? null : attributes.getValue(nameSpace == null ? "" : nameSpace, name);
-    }
-
-    protected StringBuffer buffer/* = null */;
-
-    public String getElementText() {
-        if (buffer != null)
-            buffer.delete(0, buffer.length());
-        for (;;)
-            switch (next()) {
-            case END_ELEMENT:
-                return buffer == null ? null : buffer.toString();
-            default:
-                if (buffer == null)
-                    buffer = new StringBuffer();
-                buffer.append(getText());
-            case PROCESSING_INSTRUCTION:
-            case COMMENT:
-            }
-    }
-
-    public final int getEventType() {
-        return event.type;
-    }
-
-    public String getLocalName() {
-        if (getEventType() == ENTITY_REFERENCE)
-            return ((Reference) event).target;
-        if (event instanceof EndElement)
-            return ((EndElement) event).name.getLocalPart();
-        throw new IllegalStateException("Neither START_ELEMENT, END_ELEMENT nor ENTITY_REFERENCE");
-    }
-
-    public final Location getLocation() {
-        return event.location;
-    }
-
-    public QName getName() {
-        if (hasName())
-            return ((EndElement) event).name;
-        throw new IllegalStateException("Neither START_ELEMENT nor END_ELEMENT");
-    }
-
-    public final NamespaceContext getNamespaceContext() {
-        return event.nameSpaceContext;
-    }
-
-    public int getNamespaceCount() {
-        if (getEventType() == NAMESPACE)
-            return ((NameSpaceEvent) event).nameSpaces;
-        if (!(event instanceof EndElement))
-            throw new IllegalStateException("Neither START_ELEMENT, END_ELEMENT nor NAMESPACE");
-        Collection nameSpaces = ((EndElement) event).nameSpaces;
-        return nameSpaces == null ? 0 : nameSpaces.size();
-    }
-
-    protected final NameSpace getNameSpace(int index) {
-        if (event instanceof EndElement)
-            return (NameSpace) ((EndElement) event).nameSpaces.get(index);
-        throw new IllegalStateException("Neither START_ELEMENT, END_ELEMENT nor NAMESPACE");
-    }
-
-    public String getNamespacePrefix(int index) {
-        return getEventType() == NAMESPACE ? ((Reference) event).target : getNameSpace(index).prefix;
-    }
-
-    public final String getNamespaceURI() {
-        switch (getEventType()) {
-        case ATTRIBUTE:
-            return ((AttributeEvent) event).nameSpace;
-        case NAMESPACE:
-            return ((ValueEvent) event).value;
-        }
-        return event instanceof EndElement ? ((EndElement) event).nameSpace : null;
-    }
-
-    public String getNamespaceURI(String prefix) {
-        return getNamespaceContext().getNamespaceURI(prefix);
-    }
-
-    public String getNamespaceURI(int index) {
-        return getEventType() == NAMESPACE ? ((ValueEvent) event).value : getNameSpace(index).uri;
-    }
-
-    public String getPIData() {
-        return getEventType() == PROCESSING_INSTRUCTION ? ((ValueEvent) event).value : null;
-    }
-
-    public String getPITarget() {
-        return getEventType() == PROCESSING_INSTRUCTION ? ((Reference) event).target : null;
-    }
-
-    public String getPrefix() {
-        switch (getEventType()) {
-        case ATTRIBUTE:
-            return ((AttributeEvent) event).prefix;
-        case NAMESPACE:
-            return ((Reference) event).target;
-        }
-        return event instanceof EndElement ? ((EndElement) event).prefix : null;
-    }
-
-    public final String getText() {
-        if (hasText())
-            return ((ValueEvent) event).value;
-        throw new IllegalStateException("Neither CHARACTERS, CDATA, COMMENT, SPACE, ENTITY_REFERENCE nor DTD");
-    }
-
-    public final char[] getTextCharacters() {
-        switch (getEventType()) {
-        case CHARACTERS:
-        case CDATA:
-        case COMMENT:
-        case SPACE:
-            return ((ValueEvent) event).value.toCharArray();
-        }
-        throw new IllegalStateException("Neither CHARACTERS, CDATA, COMMENT nor SPACE");
-    }
-
-    public int getTextCharacters(int sourceStart, char[] target, int targetStart, int length) {
-        char[] source = getTextCharacters();
-        if (sourceStart > source.length)
-            throw new IndexOutOfBoundsException("source start > source length");
-        int sourceLen = source.length - sourceStart;
-        if (length > sourceLen)
-            length = sourceLen;
-        System.arraycopy(source, sourceStart, target, targetStart, length);
-        return sourceLen;
-    }
-
-    public int getTextLength() {
-        return getTextCharacters().length;
-    }
-
-    public int getTextStart() {
-        return 0;
-    }
-
-    public final boolean hasName() {
-        return event instanceof EndElement;
-    }
-
-    protected int next/* = 0 */;
-
-    public final boolean hasNext() {
-        return next != size;
-    }
-
-    public final boolean hasText() {
-        switch (getEventType()) {
-        case CHARACTERS:
-        case CDATA:
-        case COMMENT:
-        case SPACE:
-        case ENTITY_REFERENCE:
-        case DTD:
-            return true;
-        }
-        return false;
-    }
-
-    public boolean isCharacters() {
-        switch (getEventType()) {
-        case CHARACTERS:
-        case CDATA:
-        case SPACE:
-            return true;
-        }
-        return false;
-    }
-
-    public boolean isEndElement() {
-        return getEventType() == END_ELEMENT;
-    }
-
-    public boolean isStartElement() {
-        return getEventType() == START_ELEMENT;
-    }
-
-    protected final boolean areWhiteSpace() {
-        String text = getText();
-        for (int index = text.length(); index != 0;)
-            if (!Character.isWhitespace(text.charAt(--index)))
-                return false;
-        return true;
-    }
-
-    public boolean isWhiteSpace() {
-        switch (getEventType()) {
-        case CHARACTERS:
-        case CDATA:
-            return areWhiteSpace();
-        case SPACE:
-            return true;
-        }
-        return false;
-    }
-
-    public final int next() {
-        if (!hasNext())
-            throw new NoSuchElementException();
-        event = (Event) events.get(next++);
-        return event.type;
-    }
-
-    protected final void throwXMLStreamException(String message) throws XMLStreamException {
-        throw new XMLStreamException(message, getLocation());
-    }
-
-    public int nextTag() throws XMLStreamException {
-        for (;;) {
-            int type = next();
-            switch (type) {
-            case CHARACTERS:
-            case CDATA:
-                if (!areWhiteSpace())
-                    break;
-            case SPACE:
-            case PROCESSING_INSTRUCTION:
-            case COMMENT:
-                continue;
-            case START_ELEMENT:
-            case END_ELEMENT:
-                return type;
-            }
-            throwXMLStreamException("expected start or end tag");
-        }
-    }
-
-    public void require(int type, String nameSpace, String name) throws XMLStreamException {
-        if (getEventType() != type)
-            throwXMLStreamException("type not matched");
-        if (nameSpace != null && !nameSpace.equals(getNamespaceURI()))
-            throwXMLStreamException("Name Space not matched");
-        if (name != null
-                && !(getEventType() == ATTRIBUTE ? name.equals(((AttributeEvent) event).name.getLocalPart()) : event instanceof EndElement
-                        && name.equals(((EndElement) event).name.getLocalPart())))
-            throwXMLStreamException("name not matched");
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDODeserializer.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDODeserializer.java
deleted file mode 100644
index 01c043b074..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDODeserializer.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util.resource;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sdo.helper.HelperContextImpl;
-import org.apache.tuscany.sdo.helper.TypeHelperImpl;
-import org.apache.tuscany.sdo.helper.XMLStreamHelper;
-import org.apache.tuscany.sdo.helper.XMLStreamHelperImpl;
-import org.apache.tuscany.sdo.util.StreamDeserializer;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XSDHelper;
-
-/**
- * SDO StAX Deserializer. The instance isn't thread-safe, however it's safe to use the instance any times on the same thread.
- */
-public class SDODeserializer extends StreamDeserializer {
-	private HelperContext hc;
-    protected final void initialize(XMLStreamReader stream, HelperContext scope, Object rootObject) {
-    	hc = scope;
-        reader = stream;
-        xsdHelper = scope.getXSDHelper();
-        typeHelper = scope.getTypeHelper();
-        extendedMetaData = ((TypeHelperImpl) typeHelper).getExtendedMetaData();
-        deserializer = (XMLStreamHelperImpl)((HelperContextImpl)scope).getXMLStreamHelper();;
-        root = (EObject) rootObject;
-    }
-
-    XSDHelper xsdHelper;
-
-    protected Property propertyInSequence;
-
-    Property getProperty(Object type) {
-        EClass c = (EClass) type;
-        EStructuralFeature containment = (EStructuralFeature) propertyInSequence;
-        Object containing = extendedMetaData.getAffiliation(c, containment);
-        // if (containing == null) report error?
-        if (containment == containing && containment.isDerived()) {
-            containing = extendedMetaData.getMixedFeature(c);
-            if (containing == null) {
-                containing = extendedMetaData.getGroup(containment);
-                if (containing == null)
-                    return propertyInSequence;
-            }
-        }
-        return (Property) containing;
-    }
-
-    protected final Property getProperty(Type type, String nameSpace, String name, boolean element) {
-        for (Iterator iterator = type.getProperties().iterator(); iterator.hasNext();) {
-            propertyInSequence = (Property) iterator.next();
-            if (name.equals(xsdHelper.getLocalName(propertyInSequence))
-                    && nameSpace.equals(xsdHelper.getNamespaceURI(propertyInSequence)))
-                return getProperty(type);
-        }
-        propertyInSequence = xsdHelper.getGlobalProperty(nameSpace, name, element);
-        // if (propertyInSequence == null) report error?
-        return getProperty(type);
-    }
-
-    protected final Property getProperty(Type type, String name) {
-        propertyInSequence = type.getProperty(name);
-        // if (propertyInSequence == null) report error?
-        return getProperty(type);
-    }
-
-    protected final Property getProperty(String nameSpace, String name, Type type) {
-        return null == nameSpace ? getProperty(type, name) : getProperty(type, nameSpace, name, true);
-    }
-
-    XMLStreamHelperImpl deserializer;
-
-    TypeHelper typeHelper;
-
-    protected Object load(XMLStreamReader reader, Map options) throws XMLStreamException {
-        return deserializer.loadObject(reader, options);
-    }
-
-    static Object value(Type type, XMLStreamReader reader) throws XMLStreamException {
-        return value(type, reader.getElementText(), reader.getNamespaceContext());
-    }
-
-    protected final Object value(Type type) throws XMLStreamException {
-        return "true".equals(reader.getAttributeValue(ExtendedMetaData.XSI_URI, XMLResource.NIL)) ? null : type.isDataType() ? value(type, reader)
-                : load(reader, null);
-    }
-
-    Map options/* = null */;
-
-    protected final Object value(XMLStreamReader reader) throws XMLStreamException {
-        Type propertyType = propertyInSequence.getType();
-        if (propertyType.isDataType())
-            return value(propertyType, reader);
-        if (options == null)
-            options = new HashMap();
-        options.put(XMLStreamHelper.OPTION_DEFAULT_ROOT_TYPE, propertyType);
-        return load(reader, options);
-    }
-
-    private boolean match(String name, String space, EStructuralFeature feature) {
-        return name.equals(extendedMetaData.getName(feature)) && space.equals(extendedMetaData.getNamespace(feature));
-    }
-
-    EObject step(String ref, int step, int index, EObject container, String prefix, NamespaceContext nameSpaces) {
-        String name = ref.substring(step, index);
-        Iterator iterator = container.eContents().iterator();
-        if (iterator.hasNext())
-            if (prefix == null)
-                do {
-                    container = (EObject) iterator.next();
-                    // if( container == null )continue;
-                    if (name.equals(extendedMetaData.getName(container.eContainmentFeature())))
-                        return container;
-                } while (iterator.hasNext());
-            else {
-                prefix = nameSpaces.getNamespaceURI(prefix);
-                do {
-                    container = (EObject) iterator.next();
-                    // if( container == null )continue;
-                    if (match(name, prefix, container.eContainmentFeature()))
-                        return container;
-                } while (iterator.hasNext());
-            }
-        return null;
-    }
-
-    EObject root;
-    
-    ExtendedMetaData extendedMetaData;
-
-    protected final EObject referent(String ref, NamespaceContext nameSpaces) {
-        int length = ref.length();
-        switch (length) {
-        case 0:
-            return null;
-        case 1: // #
-            return root;
-        }
-        EObject container;
-        int step;
-        if (ref.charAt(1) == '/') {
-            container = EcoreUtil.getRootContainer(root);
-            if (length == 2)
-                return container;
-            if (ref.charAt(2) == '/') {
-                for (Iterator iterator = container.eContents().iterator();/* true */;) {
-                    if (!iterator.hasNext())
-                        return null;
-                    container = (EObject) iterator.next();
-                    // if( container != null )
-                    break;
-                }
-                /*#// is invalid
-                if (length == 3)
-                    return container; */
-                step = 3;
-            } else
-                step = 2;
-        } else {
-            container = root;
-            step = 1;
-        }
-        String prefix = null;
-        for (int index = step; ++index != length;) {
-            switch (ref.charAt(index)) {
-            case '/':
-                container = step(ref, step, index, container, prefix, nameSpaces);
-                if (container == null)
-                    return null;
-                break;
-            case ':':
-                prefix = ref.substring(step, index);
-                if (++index == length)
-                    return container; // report error?
-                step = index;
-            default:
-                continue;
-            case '[':
-                name = ref.substring(step, index);
-                step = ref.indexOf(']', index + 2);
-                if (step == -1)
-                    return container; // report error?
-                index = Integer.parseInt(ref.substring(++index, step));
-                EStructuralFeature feature;
-                Iterator iterator = container.eContents().iterator();
-                if (prefix == null)
-                    do {
-                        if (!iterator.hasNext())
-                            return null;
-                        EObject content = (EObject) iterator.next();
-                        // if( content == null )continue;
-                        feature = content.eContainmentFeature();
-                    } while (!name.equals(extendedMetaData.getName(feature)));
-                else {
-                    prefix = nameSpaces.getNamespaceURI(prefix);
-                    do {
-                        if (!iterator.hasNext())
-                            return null;
-                        EObject content = (EObject) iterator.next();
-                        // if( content == null )continue;
-                        feature = content.eContainmentFeature();
-                    } while (!match(name, prefix, feature));
-                }
-                Object value = container.eGet(feature);
-                if (value instanceof List) {
-                    List values = (List) value;
-                    if (index > values.size())
-                        return null;
-                    container = (EObject) values.get(--index);
-                } else if (index == 1)
-                    container = (EObject) value;
-                else
-                    return null;
-                index = ref.indexOf('/', ++step);
-                if (index == -1)
-                    return container;
-            }
-            if (++index == length)
-                return container;
-            step = index;
-            prefix = null;
-        }
-        return step(ref, step, length, container, prefix, nameSpaces);
-    }
-
-    static protected class Ref implements EObject // FeatureMapEntry value
-    {
-        protected Ref(String path, NamespaceContext context) {
-            ref = path;
-            nameSpaces = context;
-        }
-
-        final String ref;
-
-        final NamespaceContext nameSpaces;
-
-        public TreeIterator eAllContents() {
-            return null;
-        }
-        public EClass eClass() {
-            return null;
-        }
-        public EObject eContainer() {
-            return null;
-        }
-        public EStructuralFeature eContainingFeature() {
-            return null;
-        }
-        public EReference eContainmentFeature() {
-            return null;
-        }
-        public EList eContents() {
-            return null;
-        }
-        public EList eCrossReferences() {
-            return null;
-        }
-        public Object eGet(EStructuralFeature feature) {
-            return null;
-        }
-        public Object eGet(EStructuralFeature feature, boolean resolve) {
-            return null;
-        }
-        public boolean eIsProxy() {
-            return false;
-        }
-        public boolean eIsSet(EStructuralFeature feature) {
-            return false;
-        }
-        public Resource eResource() {
-            return null;
-        }
-        public void eSet(EStructuralFeature feature, Object newValue) {
-        }
-        public void eUnset(EStructuralFeature feature) {
-        }
-        public EList eAdapters() {
-            return null;
-        }
-        public boolean eDeliver() {
-            return false;
-        }
-        public void eNotify(Notification notification) {
-        }
-        public void eSetDeliver(boolean deliver) {
-        }
-    }
-
-    protected final EObject referent(Ref path) {
-        return referent(path.ref, path.nameSpaces);
-    }
-
-    protected final Type typeXSI() {
-        return typedXSI() ? typeHelper.getType(nameSpace, name) : null;
-    }
-
-    protected final Type globalElementType(String nameSpace, String name) {
-        return xsdHelper.getGlobalProperty(nameSpace, name, true).getType();
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOURIConverterImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOURIConverterImpl.java
deleted file mode 100644
index 6110cd2305..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOURIConverterImpl.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util.resource;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.URIConverterImpl;
-
-public class SDOURIConverterImpl extends URIConverterImpl {
-    /**
-     * Disable going out to the wire.
-     */
-    protected InputStream createURLInputStream(URI uri) throws IOException {
-        String scheme = uri.scheme();
-        if ("http".equals(scheme) || "https".equals(scheme)) {
-            // TUSCANY 2240: We need to compromise if the remote loading is allowed or not
-            String ext = uri.fileExtension();
-            if (!"wsdl".equalsIgnoreCase(ext) && !"xsd".equalsIgnoreCase(ext)) {
-                throw new Resource.IOWrappedException(new RuntimeException("Reading remote URL not supported: " + uri));
-            }
-        }
-        return super.createURLInputStream(uri);
-    }
-
-    /**
-     * Disable going out to the wire.
-     */
-    protected OutputStream createURLOutputStream(URI uri) throws IOException {
-        String scheme = uri.scheme();
-        if ("http".equals(scheme) || "https".equals(scheme)) {
-            // TUSCANY 2240: We need to compromise if the remote loading is allowed or not
-            String ext = uri.fileExtension();
-            if (!"wsdl".equalsIgnoreCase(ext) && !"xsd".equalsIgnoreCase(ext)) {
-                throw new Resource.IOWrappedException(new RuntimeException("Reading remote URL not supported: " + uri));
-            }
-        }
-        return super.createURLOutputStream(uri);
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceFactoryImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceFactoryImpl.java
deleted file mode 100644
index c8189f9766..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceFactoryImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util.resource;
-
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
-
-/**
- * This class creates SDOXMLResourceImpl objects.
- */
-public class SDOXMLResourceFactoryImpl extends ResourceFactoryImpl 
-{
-  /**
-   * Constructor for SDOXMLResourceFactoryImpl.
-   */
-  public SDOXMLResourceFactoryImpl() 
-  {
-    super();
-  }
-
-  /**
-   * Creates an XMLResourceImpl and returns it.
-   */
-  public Resource createResource(URI uri)
-  {
-    return new SDOXMLResourceImpl(uri);
-  }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceImpl.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceImpl.java
deleted file mode 100644
index 172afb73db..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/SDOXMLResourceImpl.java
+++ /dev/null
@@ -1,1009 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util.resource;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Writer;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.xml.XMLConstants;
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sdo.SDOExtendedMetaData;
-import org.apache.tuscany.sdo.helper.HelperContextImpl;
-import org.apache.tuscany.sdo.helper.SDOExtendedMetaDataImpl;
-import org.apache.tuscany.sdo.helper.XMLStreamHelper;
-import org.apache.tuscany.sdo.helper.XSDHelperImpl;
-import org.apache.tuscany.sdo.api.SDOHelper;
-import org.apache.tuscany.sdo.api.SDOUtil;
-import org.apache.tuscany.sdo.util.StAX2SAXAdapter;
-import org.apache.tuscany.sdo.model.internal.InternalFactory;
-import org.apache.tuscany.sdo.model.internal.impl.InternalFactoryImpl;
-import org.eclipse.emf.common.util.EMap;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.xmi.XMIException;
-import org.eclipse.emf.ecore.xmi.XMLHelper;
-import org.eclipse.emf.ecore.xmi.XMLLoad;
-import org.eclipse.emf.ecore.xmi.XMLOptions;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.XMLSave;
-import org.eclipse.emf.ecore.xmi.impl.SAXXMLHandler;
-import org.eclipse.emf.ecore.xmi.impl.XMLHelperImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMLLoadImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMLOptionsImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMLSaveImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMLString;
-import org.eclipse.emf.ecore.xmi.util.DefaultEcoreBuilder;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.XSDHelper;
-
-public class SDOXMLResourceImpl extends XMLResourceImpl {
-    private XMLStreamReader reader;
-
-    /**
-     * [rfeng] Override the XMLHelperImpl to replace the NamespaceSupport so that it's aware of the NamespaceContext from the XMLStreamReader
-     */
-    public static class SDOXMLHelperImpl extends XMLHelperImpl {
-
-        /**
-         * EMF XMLResource (SAX) may be used to load from only a *portion* of a StAX stream
-         * which may reference (global) namespaces bound outside the (local) portion.
-         * This class extends EMF's NamespaceSupport to make {@link #getPrefix} and {@link #getURI}
-         * query these global binding(s) after first checking the local context(s).
-         */
-        private static class StreamNamespaceSupport extends XMLHelperImpl.NamespaceSupport {
-            protected NamespaceContext nameSpaceContext;
-
-            public String getPrefix(String uri) {
-                String prefix = super.getPrefix(uri);
-                if (prefix == null)
-                    try {
-                        prefix = nameSpaceContext.getPrefix(uri);
-                    } catch (Exception e) {
-                        // HACK:
-                        // java.lang.UnsupportedOperationException
-                        // at org.apache.axiom.om.impl.llom.OMStAXWrapper.getNamespaceContext(OMStAXWrapper.java:984)
-                    }
-                return prefix;
-            }
-
-            public String getURI(String prefix) {
-                String uri = super.getURI(prefix);
-                if (uri == null)
-                    try {
-                        uri = nameSpaceContext.getNamespaceURI(prefix);
-                    } catch (Exception e) {
-                        // HACK:
-                        // java.lang.UnsupportedOperationException
-                        // at org.apache.axiom.om.impl.llom.OMStAXWrapper.getNamespaceContext(OMStAXWrapper.java:984)
-                    }
-                return uri;
-            }
-
-            public StreamNamespaceSupport(XMLStreamReader reader) {
-                super();
-                nameSpaceContext = reader.getNamespaceContext();
-            }
-
-        }
-
-        public SDOXMLHelperImpl(XMLResource resource, XMLStreamReader reader) {
-            this(reader);
-            setResource(resource);
-        }
-
-        public SDOXMLHelperImpl(XMLStreamReader reader) {
-            super();
-            if (reader instanceof XMLDocumentStreamReader) // Only use StreamNamespaceSupport when loading from a *portion* of a StAX stream
-                namespaceSupport = new StreamNamespaceSupport(reader);
-        }
-        
-        private class NameSpaceContext implements NamespaceContext { // TODO Helper# pushContext() & popContext
-            public String getNamespaceURI(String prefix) {
-                return SDOXMLHelperImpl.this.getNamespaceURI(prefix);
-            }
-
-            public String getPrefix(String namespaceURI) {
-                return SDOXMLHelperImpl.this.getPrefix(namespaceURI);
-            }
-
-            public Iterator getPrefixes(String namespaceURI) {
-                return ((Collection) urisToPrefixes.get(namespaceURI)).iterator();
-            }
-        }
-
-        NameSpaceContext nameSpaceContext/* = null */;
-
-        protected final NameSpaceContext nameSpaceContext() {
-            if (nameSpaceContext == null)
-                nameSpaceContext = new NameSpaceContext();
-            return nameSpaceContext;
-        }
-        
-        private String xsdQName2SDOURI(String xsdQName) {
-            org.eclipse.emf.ecore.xml.type.internal.QName qname = new org.eclipse.emf.ecore.xml.type.internal.QName(xsdQName);
-            try {
-                updateQNameURI(qname);
-            }
-            catch (IllegalArgumentException e) {
-                return xsdQName;
-            }
-            String uri = qname.getNamespaceURI();
-            if (uri != "")
-              return uri + "#" + qname.getLocalPart();
-            else
-              return qname.getLocalPart();
-        }
-        
-        private String getPrefixFromNamespaceURI(String nsURI) {
-            String nsPrefix = null;
-
-            List prefixes = (List)urisToPrefixes.get(nsURI);
-            if (prefixes != null)
-            {
-              for (Iterator i = prefixes.iterator(); i.hasNext(); )
-              {
-                nsPrefix = (String)i.next();
-                if (nsPrefix.length() >= 0) {
-                    // When the length is 0, it's the default namespace
-                    return nsPrefix;
-                }
-              }
-            }
-            
-            nsPrefix = namespaceSupport.getPrefix(nsURI);
-            if (nsPrefix != null)
-            {
-              return nsPrefix;
-            }
-            
-            // Demand create a new package
-            EPackage ePackage = extendedMetaData.demandPackage(nsURI);
-
-            if (ExtendedMetaData.XSI_URI.equals(nsURI)) {
-                ePackage.setNsPrefix(ExtendedMetaData.XSI_PREFIX);
-            }
-            
-            // getPrefix() will make sure all mapping tables are configured correctly
-            nsPrefix = getPrefix(ePackage, true);
-            
-            return nsPrefix;
-        }
-        
-        private String SDOURI2XsdQName(String sdoURI) {
-            String namespace = null;
-            String localPart = sdoURI;
-            
-            int index = sdoURI.indexOf('#');
-            if (index == -1) {
-                return localPart;
-            }
-            else {
-                namespace = sdoURI.substring(0, index);
-                localPart = sdoURI.substring(index+1);
-                
-                String prefix = getPrefixFromNamespaceURI(namespace);
-
-                if (prefix.length() == 0)
-                    return localPart;
-                
-                return prefix + ":" + localPart;
-            }
-        }
-        
-        protected Object createFromString(EFactory eFactory, EDataType eDataType, String value) {
-            Object obj = super.createFromString(eFactory, eDataType, value);
-            if (eDataType == ((InternalFactoryImpl)InternalFactory.INSTANCE).getQName()) {
-                if (extendedMetaData != null) {
-                    if (obj instanceof List) {
-                        List list = (List)obj;
-                        for (int i=0; i<list.size(); i++) {
-                            String xsdQName = (String)list.get(i);
-                            list.set(i, xsdQName2SDOURI(xsdQName));
-                        }
-                    }
-                    else {
-                        obj = xsdQName2SDOURI((String)obj);
-                    }
-                }
-            }
-            return obj;
-        }
-        
-        public String convertToString(EFactory factory, EDataType eDataType, Object value) {
-            if (eDataType == ((InternalFactoryImpl)InternalFactory.INSTANCE).getQName()) {
-                if (extendedMetaData != null) {
-                    if (value instanceof List) {
-                        List list = (List)value;
-                        for (int i=0; i<list.size(); i++) {
-                            String sdoURI = (String)list.get(i);
-                            list.set(i, SDOURI2XsdQName(sdoURI));
-                        }
-                    }
-                    else {
-                        value = SDOURI2XsdQName((String)value);
-                    }
-                }
-            }
-            
-            return super.convertToString(factory, eDataType, value);
-        }
-    }
-
-    public EObject root;
-
-    /**
-     * An EMF XMLLoad that loads a model from a StAX stream
-     */
-    public class SDOXMLLoadImpl extends XMLLoadImpl {
-        public SDOXMLLoadImpl(XMLHelper helper) {
-            super(helper);
-        }
-
-        final class XmlHandler extends SAXXMLHandler {
-            XmlHandler() {
-                super(resource, SDOXMLLoadImpl.this.helper, options);
-            }
-
-            protected void handleTopLocations(String prefix, String name) {
-                processSchemaLocations(prefix, name);
-                if (!processAnyXML)
-                    return;
-                String nameSpace = helper.getURI(prefix);
-                if (extendedMetaData.getPackage(nameSpace) == null)
-                    if (options.get(XMLStreamHelper.OPTION_DEFAULT_ROOT_TYPE) == null)
-                        extendedMetaData.demandFeature(nameSpace, name, true);
-                    else
-                        extendedMetaData.demandPackage(nameSpace);
-            }
-
-            EClassifier defaultRootType(String prefix, String name, boolean isElement, EObject peekObject, String value) {
-                Object type = options.get(XMLStreamHelper.OPTION_DEFAULT_ROOT_TYPE);
-                if (type != null)
-                    return (EClassifier) type;
-                super.handleUnknownFeature(prefix, name, isElement, peekObject, value);
-                return null;
-            }
-
-            protected void handleUnknownFeature(String prefix, String name, boolean isElement, EObject peekObject, String value) {
-                if (objects.size() == 1) {
-                    EFactory eFactory;
-                    EClassifier type;
-                    String typeQName = getXSIType();
-                    if (typeQName == null) {
-                        type = defaultRootType(prefix, name, isElement, peekObject, value);
-                        if (type == null)
-                            return;
-                        eFactory = type.getEPackage().getEFactoryInstance();
-                    } else {// createObjectFromTypeName
-                        String typeName = null;
-                        String xsiPrefix = XMLConstants.DEFAULT_NS_PREFIX;
-                        int index = typeQName.indexOf(":");
-                        if (index > 0) {
-                            xsiPrefix = typeQName.substring(0, index);
-                            typeName = typeQName.substring(index + 1);
-                        } else
-                            typeName = typeQName;
-                        eFactory = getFactoryForPrefix(xsiPrefix);
-                        if (eFactory != null)
-                            type = helper.getType(eFactory, typeName);
-                        else if (XMLConstants.DEFAULT_NS_PREFIX.equals(xsiPrefix) && helper.getURI(xsiPrefix) == null) {
-                            EPackage ePackage = handleMissingPackage(null);
-                            if (ePackage == null) {
-                                type = defaultRootType(prefix, name, isElement, peekObject, value);
-                                if (type == null)
-                                    return;
-                                eFactory = type.getEPackage().getEFactoryInstance();
-                            } else
-                                type = helper.getType(eFactory = ePackage.getEFactoryInstance(), typeName);
-                        } else {
-                            type = defaultRootType(prefix, name, isElement, peekObject, value);
-                            if (type == null)
-                                return;
-                            eFactory = type.getEPackage().getEFactoryInstance();
-                        }
-                    }
-                    root = helper.createObject(eFactory, type);
-                    if (root != null) {
-                        if (disableNotify)
-                            root.eSetDeliver(false);
-                        handleObjectAttribs(root);
-                        processObject(root);
-                        return;
-                    }
-                }
-                super.handleUnknownFeature(prefix, name, isElement, peekObject, value);
-            }
-
-            protected RecordedEventXMLStreamReader.Tag tag/* =null */;
-
-            protected List nameSpaces/* = null */;
-
-            public void startPrefixMapping(String prefix, String uri) {
-                if (nameSpaces == null)
-                    nameSpaces = new ArrayList();
-                RecordedEventXMLStreamReader.Tag.bind(prefix, uri, nameSpaces);
-                if (tag == null)
-                    super.startPrefixMapping(prefix, uri);
-            }
-
-            public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
-                if (tag != null) {
-                    tag.start(uri, localName, qName, attributes, locator, nameSpaces);
-                    nameSpaces = null;
-                    return;
-                }
-                EObject peekObject = objects.peekEObject();
-                if (peekObject != null) {
-                    String prefix = helper.getPrefix(uri.length() == 0 ? null : uri);
-                    EStructuralFeature feature = getFeature(peekObject, prefix == null ? XMLConstants.DEFAULT_NS_PREFIX : prefix, localName, true);
-                    if (feature != null && feature.getEType() == ChangeSummaryStreamSerializer.ChangeSummary_TYPE) {
-                        tag = new RecordedEventXMLStreamReader.Tag(uri, localName, prefix, attributes, locator, ((SDOXMLHelperImpl) helper).nameSpaceContext(),
-                                nameSpaces);
-                        nameSpaces = null;
-                        return;
-                    }
-                }
-                if (nameSpaces != null)
-                    nameSpaces.clear();
-                super.startElement(uri, localName, qName, attributes);
-            }
-
-            public void characters(char[] ch, int start, int length) {
-                if (tag == null)
-                    super.characters(ch, start, length);
-                else
-                    tag.text(XMLStreamConstants.CHARACTERS, new String(ch, start, length), locator);
-            }
-
-            protected Collection changeSummaryDeserializers/* = null */;
-
-            public void endElement(String uri, String localName, String qName) {
-                if (tag == null)
-                    super.endElement(uri, localName, qName);
-                else if (tag.end(uri, localName, qName, locator)) {
-                    if (changeSummaryDeserializers == null)
-                        changeSummaryDeserializers = new ArrayList();
-                    ChangeSummaryStreamDeserializer changeSummaryDeserializer = new ChangeSummaryStreamDeserializer();
-                    try {
-                        changeSummaryDeserializer.begin(
-                          (DataObject) objects.peekEObject(), 
-                          new HelperContextImpl(extendedMetaData, false), 
-                          tag.play(xmlResource));
-                        changeSummaryDeserializers.add(changeSummaryDeserializer);
-                    } catch (XMLStreamException e) {
-                        xmlResource.getErrors().add(new XMIException(e));
-                    }
-                    tag = null;
-                }
-            }
-
-            public void endDocument() {
-                super.endDocument();
-                if (changeSummaryDeserializers != null)
-                    for (Iterator iterator = changeSummaryDeserializers.iterator(); iterator.hasNext();)
-                        try {
-                            ((ChangeSummaryStreamDeserializer) iterator.next()).end();
-                            // iterator.remove();
-                        } catch (XMLStreamException e) {
-                            xmlResource.getErrors().add(new XMIException(e));
-                        }
-            }
-        }
-
-        protected DefaultHandler makeDefaultHandler() {
-            return new XmlHandler();
-        }
-
-        /**
-         * Start parsing an XMLReader with the default handler.
-         */
-        public void load(XMLResource resource, final XMLStreamReader reader, Map options) throws IOException {
-            this.resource = resource;
-            Map mergedOptions = new HashMap(defaultLoadOptions);
-            if (options != null)
-                mergedOptions.putAll(options);
-
-            this.options = mergedOptions;
-
-            final ContentHandler handler = makeDefaultHandler();
-
-            if (errors != null) {
-                errors.clear();
-            }
-
-            final StAX2SAXAdapter adapter = new StAX2SAXAdapter(true);
-            // Parse the XMLReader and generate SAX events
-            try {
-                AccessController.doPrivileged(new PrivilegedExceptionAction() {
-                    public Object run() throws XMLStreamException, SAXException {
-                        adapter.parse(reader, handler);
-                        return null;
-                    }
-                });
-            } catch (PrivilegedActionException e) {
-                throw new Resource.IOWrappedException(e.getException());
-            }
-
-            helper = null;
-            if (!resource.getErrors().isEmpty()) {
-                Exception error = (Exception) resource.getErrors().get(0);
-                if (error instanceof XMIException) {
-                    XMIException exception = (XMIException) error;
-                    if (exception.getWrappedException() != null) {
-                        throw new Resource.IOWrappedException(exception.getWrappedException());
-                    }
-                }
-                throw new Resource.IOWrappedException(error);
-            }
-        }
-    }
-
-    public SDOXMLResourceImpl(URI uri) {
-        super(uri);
-    }
-
-    protected XMLHelper createXMLHelper() {
-        return new SDOXMLHelperImpl(this, reader);
-    }
-
-    /**
-     * @see org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl#createXMLLoad()
-     */
-    protected XMLLoad createXMLLoad() {
-        return new SDOXMLLoadImpl(createXMLHelper());
-    }
-
-    static protected int loadLaxForm;
-    static {
-        int defaultLaxForm = 0x4242;
-        String property = System.getProperty("XML.load.form.lax");
-        if (property == null)
-            loadLaxForm = defaultLaxForm;
-        else
-            try {
-                loadLaxForm = Integer.decode(property).intValue();
-            } catch (NumberFormatException eNumberFormat) {
-                loadLaxForm = defaultLaxForm;
-            }
-    }
-    
-    public void doLoad(InputSource inputSource, Map options) throws IOException {
-        if (options != null) {
-            /*
-             * Tolerates element/attribute malform unless indicated not to
-             */
-            Object option = options.get(SDOHelper.XMLOptions.XML_LOAD_LAX_FORM);
-            int tolerance = option == null ? loadLaxForm : ((Number) option).intValue();
-            option = options.get(OPTION_EXTENDED_META_DATA);
-            if (tolerance == 0) {
-                if (option instanceof SDOExtendedMetaData)
-                    ((SDOExtendedMetaData) option).setFeatureNamespaceMatchingLax(false);
-            } else if (option instanceof SDOExtendedMetaData){
-                ((SDOExtendedMetaData) option).setFeatureNamespaceMatchingLax(true);
-            }
-            else{
-                options.put(OPTION_EXTENDED_META_DATA, option = new SDOExtendedMetaDataImpl()); // TODO copy (BasicExtendedMetaData)option
-            }
-            /*
-             * Loads schema if necessary
-             */
-            if (Boolean.TRUE.equals(options.get(SDOHelper.XMLOptions.XML_LOAD_SCHEMA))){
-                XMLOptions xmlOptions = (XMLOptions) options.get(OPTION_XML_OPTIONS);
-                if (xmlOptions == null) {
-                    xmlOptions = new XMLOptionsImpl();
-                    options.put(OPTION_XML_OPTIONS, xmlOptions);
-                }
-                xmlOptions.setProcessSchemaLocations(true);
-                if (option == null){
-                    option = getDefaultLoadOptions().get(OPTION_EXTENDED_META_DATA);
-                }
-                ExtendedMetaData extendedMetaData;
-                final XSDHelper xsdHelper;
-                if (option == null) {
-                    extendedMetaData = ExtendedMetaData.INSTANCE;
-                    xsdHelper = XSDHelper.INSTANCE;
-                } else {
-                    extendedMetaData = (ExtendedMetaData) option;
-                    xsdHelper = (new HelperContextImpl(extendedMetaData, false)).getXSDHelper();
-                }
-                xmlOptions.setEcoreBuilder(new DefaultEcoreBuilder(extendedMetaData) {
-                    public Collection generate(Map targetNamespaceToURI) throws IOException {
-                        for (Iterator iterator = targetNamespaceToURI.values().iterator(); iterator.hasNext();) {
-                            String uri = iterator.next().toString();
-                            xsdHelper.define(uri.indexOf(":/") == -1 ? Thread.currentThread().getContextClassLoader().getResourceAsStream(uri)
-                                    : new URL(uri).openStream(), uri);
-                        }
-                        return null; // XMLHandler#processSchemaLocations doesn't take the result
-                    }
-                });
-            }
-            
-            if (Boolean.TRUE.equals(options.get(SDOHelper.XMLOptions.XML_LOAD_UNKNOWN_PROPERTIES))) {
-                options.put(OPTION_RECORD_UNKNOWN_FEATURE , Boolean.TRUE);
-            }
-        }
-        else if (loadLaxForm != 0) {
-            /*
-             * Tolerates element/attribute malform
-             */
-            options = new HashMap();
-            options.put(OPTION_EXTENDED_META_DATA, new SDOExtendedMetaDataImpl());
-        }
-        super.doLoad(inputSource, options);
-        // TODO there is some thinking to be done about the restoration of options
-    }
-
-    /**
-     * Loads the resource from a StAX XMLStreamReader.
-     */
-    public void load(XMLStreamReader reader, Map options) throws IOException {
-        this.reader = reader;
-        SDOXMLLoadImpl xmlLoad = (SDOXMLLoadImpl) createXMLLoad();
-        Map mergedOptions = new HashMap(defaultLoadOptions);
-        if (options != null)
-            mergedOptions.putAll(options);
-        xmlLoad.load(this, reader, mergedOptions);
-    }
-
-    ChangeSummaryStreamSerializer changeSummarySerializer/* = null*/;
-
-    static private final class LocalName extends QName {
-        private LocalName(String name) {
-            super(name);
-        }
-
-        public String getNamespaceURI() {
-            return null;
-        }
-    }
-
-    static final String INDENT = "  ", LINE_SEPARATOR = System.getProperty("line.separator");
-
-    static final class XmlString extends XMLString {
-        XmlString(int lineWidth, String temporaryFileName) {
-            super(lineWidth, temporaryFileName); // setLineWidth & setTemporaryFileName
-        }
-
-        XmlString(int lineWidth, String publicId, String systemId, String temporaryFileName) {
-            super(lineWidth, publicId, systemId, temporaryFileName);
-        }
-
-        void setLineBreak(String lineBreak) {
-            lineSeparator = lineBreak;
-        }
-
-        void margin(String margin) {
-            indents.set(0, margin);
-        }
-
-        String indent = INDENT;
-
-        protected String getElementIndent(int extra) {
-            int nesting = depth + extra - 1;
-            for (int i = indents.size() - 1; i < nesting; ++i) {
-                indents.add(indents.get(i) + indent);
-            }
-            return (String) indents.get(nesting);
-        }
-
-        protected String getAttributeIndent() {
-            return getElementIndent();
-        }
-        
-        public final boolean mixed() {
-            return isMixed;
-        }
-
-        public void reset(String publicId, String systemId, int lineWidth, String temporaryFileName) {
-            super.reset(publicId, systemId, lineWidth, temporaryFileName);
-            setLineBreak(LINE_SEPARATOR);
-            indent = INDENT;
-        }
-    }
-
-    static final char MARK = '\n';
-
-    static final String LINE_BREAK = new String(new char[] { MARK });
-
-    final class SDOXMLSaveImpl extends XMLSaveImpl {
-        SDOXMLSaveImpl(XMLHelper helper) {
-            super(helper);
-        }
-
-        XmlString doc(XMLResource resource, Map options) {
-            if (doc instanceof XmlString)
-                return (XmlString) doc;
-            Object lineWidth = options.get(OPTION_LINE_WIDTH);
-            int width = lineWidth == null ? Integer.MAX_VALUE : ((Number) lineWidth).intValue();
-            XmlString d = resource != null && Boolean.TRUE.equals(options.get(OPTION_SAVE_DOCTYPE)) ? new XmlString(width, resource.getPublicId(),
-                    resource.getSystemId(), doc.getTemporaryFileName()) : new XmlString(width, doc.getTemporaryFileName());
-            doc = d;
-            return d;
-        }
-
-        Map changeSummaryOptions = new HashMap();
-        String indent = INDENT, margin;
-
-        protected void init(XMLResource resource, Map options) {
-            super.init(resource, options);
-            int unformat = 0;
-            String lineBreak = (String) options.get(SDOHelper.XMLOptions.XML_SAVE_LINE_BREAK);
-            if (lineBreak == null)
-                changeSummaryOptions.put(SDOHelper.XMLOptions.XML_SAVE_LINE_BREAK, LINE_BREAK);
-            else if (lineBreak.length() == 0)
-                ++unformat;
-            else {
-                changeSummaryOptions.put(SDOHelper.XMLOptions.XML_SAVE_LINE_BREAK, LINE_BREAK);
-                if (lineBreak.equals(LINE_SEPARATOR))
-                    lineBreak = null;
-            }
-            String indent = (String) options.get(SDOHelper.XMLOptions.XML_SAVE_INDENT);
-            if (indent == null)
-                changeSummaryOptions.put(SDOHelper.XMLOptions.XML_SAVE_INDENT, INDENT);
-            else if (indent.length() == 0)
-                ++unformat;
-            else {
-                changeSummaryOptions.put(SDOHelper.XMLOptions.XML_SAVE_INDENT, this.indent = indent);
-                if (indent.equals(INDENT))
-                    indent = null;
-            }
-            String margin = (String) options.get(SDOHelper.XMLOptions.XML_SAVE_MARGIN);
-            if (margin == null || margin.length() == 0) {
-                if (unformat == 2)
-                    doc.setUnformatted(true);
-                else if (lineBreak != null) {
-                    XmlString d = doc(resource, options);
-                    d.setLineBreak(lineBreak);
-                    if (indent != null)
-                        d.indent = indent;
-                } else if (indent != null)
-                    doc(resource, options).indent = indent;
-                this.margin = this.indent;
-            } else {
-                XmlString d = doc(resource, options);
-                d.margin(margin);
-                if (lineBreak != null)
-                    d.setLineBreak(lineBreak);
-                if (indent != null)
-                    d.indent = indent;
-                this.margin = margin + this.indent;
-                if (!toDOM && declareXML)
-                    d.add(margin);
-            }
-            // changeSummaryOptions.put(ChangeSummaryStreamSerializer.OPTION_RootObject_PATH, "#");
-            // changeSummaryOptions.put(ChangeSummaryStreamSerializer.OPTION_OPTIMIZE_LIST, Boolean.TRUE);
-            changeSummaryOptions.put(OPTION_EXTENDED_META_DATA, extendedMetaData);
-        }
-
-        QName qName(EStructuralFeature f) {
-            if (extendedMetaData == null)
-                return new LocalName(f.getName());
-            String nameSpace = extendedMetaData.getNamespace(f), name = extendedMetaData.getName(f);
-            return nameSpace == null ? new LocalName(name) : new QName(nameSpace, name);
-        }
-
-        XMLStreamWriter xmlStreamWriter/* = null*/;
-
-        void saveChangeSummary(EObject o, EStructuralFeature f, Object changeSummary) {
-            boolean notMixed;
-            if (doc instanceof XmlString)
-                notMixed = !((XmlString) doc).mixed();
-            else if (extendedMetaData == null)
-                notMixed = true;
-            else
-                switch (extendedMetaData.getContentKind(o.eClass())) {
-                case ExtendedMetaData.MIXED_CONTENT:
-                case ExtendedMetaData.SIMPLE_CONTENT:
-                    notMixed = false;
-                    break;
-                default:
-                    notMixed = true;
-                }
-            if (notMixed) {
-                StringBuffer margin = new StringBuffer(this.margin);
-                for (EObject container = o.eContainer(), grandContainer; (grandContainer = container.eContainer()) != null; container = grandContainer)
-                    margin.append(indent);
-                changeSummaryOptions.put(SDOHelper.XMLOptions.XML_SAVE_MARGIN, margin.toString());
-            }
-            try {
-                if (xmlStreamWriter == null) {
-                    xmlStreamWriter = XMLOutputFactory.newInstance().createXMLStreamWriter(new Writer() {
-                        public void close() {
-                        }
-
-                        public void flush() {
-                        }
-
-                        protected final void add(char[] cbuf, int index, int off) {
-                            doc.addText(new String(cbuf, index, off - index));
-                        }
-
-                        public void write(char[] cbuf, int off, int len) {
-                            if (len != 0)
-                                for (;;) {
-                                    while (cbuf[off] == MARK) {
-                                        doc.addLine();
-                                        if (--len == 0)
-                                            return;
-                                        ++off;
-                                    }
-                                    for (int index = off;/* true */;) {
-                                        ++off;
-                                        if (--len == 0)
-                                            add(cbuf, index, off);
-                                        else {
-                                            if (cbuf[off] != MARK)
-                                                continue;
-                                            add(cbuf, index, off);
-                                            doc.addLine();
-                                            if (--len != 0)
-                                                break;
-                                        }
-                                        return;
-                                    }
-                                    ++off;
-                                }
-                        }
-                    });
-                    xmlStreamWriter.setNamespaceContext(((SDOXMLHelperImpl) helper).new NameSpaceContext() {
-                        public String getNamespaceURI(String prefix) {
-                            return declareXSI && ExtendedMetaData.XSI_PREFIX.equals(prefix) ? ExtendedMetaData.XSI_URI : super
-                                    .getNamespaceURI(prefix);
-                        }
-
-                        public String getPrefix(String namespaceURI) {
-                            return declareXSI && ExtendedMetaData.XSI_URI.equals(namespaceURI) ? ExtendedMetaData.XSI_PREFIX : super
-                                    .getPrefix(namespaceURI);
-                        }
-
-                        public Iterator getPrefixes(String namespaceURI) {
-                            final Iterator iterator = super.getPrefixes(namespaceURI);
-                            return ExtendedMetaData.XSI_URI.equals(namespaceURI) ? new Iterator() {
-                                boolean first = true;
-
-                                public boolean hasNext() {
-                                    if (first)
-                                        if (declareXSI) // never from true to false
-                                            return true;
-                                        else
-                                            first = false;
-                                    return iterator.hasNext();
-                                }
-
-                                public Object next() {
-                                    if (first) {
-                                        first = false;
-                                        if (declareXSI)
-                                            return ExtendedMetaData.XSI_PREFIX;
-                                    }
-                                    return iterator.next();
-                                }
-
-                                public void remove() {
-                                    if (first)
-                                        declareXSI = false;
-                                    else
-                                        iterator.remove();
-                                }
-                            } : iterator;
-                        }
-                    });
-                    for (Iterator iterator = helper.getPrefixToNamespaceMap().iterator(); iterator.hasNext();) {
-                        Map.Entry entry = (Map.Entry) iterator.next();
-                        xmlStreamWriter.setPrefix((String) entry.getKey(), (String) entry.getValue());
-                    }
-                    if (declareXSI)
-                        xmlStreamWriter.setPrefix(ExtendedMetaData.XSI_PREFIX, ExtendedMetaData.XSI_URI);
-                    if (changeSummarySerializer == null)
-                        changeSummarySerializer = new ChangeSummaryStreamSerializer();
-                }
-                changeSummarySerializer.saveChangeSummary((ChangeSummary) changeSummary, qName(f), xmlStreamWriter, changeSummaryOptions);
-                if (notMixed)
-                    doc.addLine();
-            } catch (XMLStreamException e) {
-                xmlResource.getErrors().add(new XMIException(e));
-            }
-        }
-
-        protected void saveDataTypeElementSingle(EObject o, EStructuralFeature f) {
-            if (f.getEType() == ChangeSummaryStreamSerializer.ChangeSummary_TYPE)
-                saveChangeSummary(o, f, helper.getValue(o, f));
-            else
-                super.saveDataTypeElementSingle(o, f);
-        }
-        
-        /*
-         * TEMPORARILY COPIED FROM BASE CLASS - DO NOT EDIT - WILL BE REMOVED WHEN WE MOVE TO EMF 2.3
-         */
-        protected boolean saveElementFeatureMap(EObject o, EStructuralFeature f)
-        {
-          List values = (List)helper.getValue(o, f);
-          int size = values.size();
-          for (int i = 0; i < size; i++)
-          {
-            FeatureMap.Entry entry = (FeatureMap.Entry)values.get(i);
-            EStructuralFeature entryFeature = entry.getEStructuralFeature();
-            Object value = entry.getValue();
-            if (entryFeature instanceof EReference)
-            {
-              if (value == null)
-              {
-                saveNil(o, entryFeature);
-              }
-              else 
-              {
-                EReference referenceEntryFeature = (EReference)entryFeature;
-                if (referenceEntryFeature.isContainment())
-                {
-                  saveElement((InternalEObject)value, entryFeature);
-                }
-                else if (referenceEntryFeature.isResolveProxies())
-                {
-                  saveFeatureMapElementReference((EObject)value, referenceEntryFeature);
-                }
-                else
-                {
-                  saveElementIDRef(o, (EObject)value, entryFeature);
-                }
-              }
-            }
-            else
-            {
-              if (entryFeature == XMLTypePackage.eINSTANCE.getXMLTypeDocumentRoot_Text())
-              {
-                String svalue = value.toString();
-                if (escape != null)
-                {
-                  svalue =  escape.convertText(svalue);
-                }        
-                if (!toDOM)
-                {    
-                  doc.addText(svalue);
-                }
-                else
-                {
-                  Node text = document.createTextNode(svalue);
-                  currentNode.appendChild(text);
-                  handler.recordValues(text, o, f, entry);
-                }
-              }
-              else if (entryFeature == XMLTypePackage.eINSTANCE.getXMLTypeDocumentRoot_CDATA())
-              {
-                String stringValue = value.toString();
-                if (escape != null)
-                {
-                  stringValue = escape.convertLines(stringValue);
-                }
-                if (!toDOM)
-                {
-                  doc.addCDATA(stringValue);
-                }
-                else
-                {
-                  Node cdata = document.createCDATASection(stringValue);
-                  currentNode.appendChild(cdata);
-                  handler.recordValues(cdata, o, f, entry);            
-                }
-              }
-              else if (entryFeature == XMLTypePackage.eINSTANCE.getXMLTypeDocumentRoot_Comment())
-              {
-                String stringValue = value.toString();
-                if (escape != null)
-                {
-                  stringValue = escape.convertLines(stringValue);
-                }
-                if (!toDOM)
-                {
-                  doc.addComment(stringValue);
-                }
-                else
-                {
-                  // TODO comments are not sent to recordValues
-                  currentNode.appendChild(document.createComment(stringValue));
-                }
-              }
-              else
-              {
-                saveElement(o, value, entryFeature);
-              }
-            }
-          }
-          return size > 0;
-        }
-
-        protected final void saveElement(EObject o, Object value, EStructuralFeature f)
-        {
-          if (f.getEType() == ChangeSummaryStreamSerializer.ChangeSummary_TYPE)
-          {
-            saveChangeSummary(o, f, value);
-            return;
-          }
-          /* super.saveElement(o, value, f);
-           * TEMPORARILY COPIED FROM BASE CLASS - DO NOT EDIT - WILL BE REMOVED WHEN WE MOVE TO EMF 2.3
-           */
-          if (value == null)
-          {
-            saveNil(o, f);
-          }
-          else
-          {
-            String svalue =  getDatatypeValue(value, f, false);
-            if (!toDOM)
-            {
-              doc.saveDataValueElement(helper.getQName(f), svalue);
-            }
-            else
-            {
-              helper.populateNameInfo(nameInfo, f);
-              Element elem = document.createElementNS(nameInfo.getNamespaceURI(), nameInfo.getQualifiedName());
-              Node text = document.createTextNode(svalue);
-              elem.appendChild(text);
-              currentNode.appendChild(elem);
-              handler.recordValues(elem, o, f, value);
-              handler.recordValues(text, o, f, value);
-            }
-          }
-        }
-    }
-
-    protected XMLSave createXMLSave() {
-        return new SDOXMLSaveImpl(createXMLHelper());
-    }
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLDocumentStreamReader.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLDocumentStreamReader.java
deleted file mode 100644
index 64088a0366..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLDocumentStreamReader.java
+++ /dev/null
@@ -1,438 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util.resource;
-
-import java.util.NoSuchElementException;
-
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.namespace.QName;
-import javax.xml.stream.Location;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-/**
- * This class is derived from Apache Axis2 class <a
- * href="http://svn.apache.org/repos/asf/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/StreamWrapper.java">
- * org.apache.axis2.util.StreamWrapper</a>. It's used wrap a XMLStreamReader to create a XMLStreamReader representing a document and it will produce
- * START_DOCUMENT, END_DOCUMENT events.
- * 
- */
-public class XMLDocumentStreamReader implements XMLStreamReader {
-    private static final int STATE_INIT = 0; // The wrapper will produce START_DOCUMENT
-
-    private static final int STATE_SWITCHED = 1; // The real reader will produce events
-
-    private static final int STATE_COMPLETE_AT_NEXT = 2; // The wrapper will produce END_DOCUMENT
-
-    private static final int STATE_COMPLETED = 3; // Done
-
-    private XMLStreamReader realReader = null;
-
-    private int state = STATE_INIT;
-
-    public XMLDocumentStreamReader(XMLStreamReader realReader) {
-        if (realReader == null) {
-            throw new UnsupportedOperationException("Reader cannot be null");
-        }
-
-        this.realReader = realReader;
-
-        // If the real reader is positioned at START_DOCUMENT, always use the real reader
-        if (realReader.getEventType() == START_DOCUMENT)
-            state = STATE_SWITCHED;
-    }
-
-    public void close() throws XMLStreamException {
-        realReader.close();
-    }
-
-    public int next() throws XMLStreamException {
-        int returnEvent = -1;
-
-        switch (state) {
-        case STATE_SWITCHED:
-            returnEvent = realReader.next();
-            if (returnEvent == END_DOCUMENT) {
-                state = STATE_COMPLETED;
-            } else if (!realReader.hasNext()) {
-                state = STATE_COMPLETE_AT_NEXT;
-            }
-            break;
-        case STATE_INIT:
-            state = STATE_SWITCHED;
-            returnEvent = realReader.getEventType();
-            break;
-        case STATE_COMPLETE_AT_NEXT:
-            state = STATE_COMPLETED;
-            returnEvent = END_DOCUMENT;
-            break;
-        case STATE_COMPLETED:
-            // oops - no way we can go beyond this
-            throw new NoSuchElementException("End of stream has reached.");
-        default:
-            throw new UnsupportedOperationException();
-        }
-
-        return returnEvent;
-    }
-
-    private boolean isDelegating() {
-        return state == STATE_SWITCHED || state == STATE_COMPLETE_AT_NEXT;
-    }
-
-    public int nextTag() throws XMLStreamException {
-        if (isDelegating()) {
-            return realReader.nextTag();
-        } else {
-            throw new XMLStreamException();
-        }
-    }
-
-    public void require(int i, String s, String s1) throws XMLStreamException {
-        if (isDelegating()) {
-            realReader.require(i, s, s1);
-        }
-    }
-
-    public boolean standaloneSet() {
-        if (isDelegating()) {
-            return realReader.standaloneSet();
-        } else {
-            return false;
-        }
-    }
-
-    public int getAttributeCount() {
-        if (isDelegating()) {
-            return realReader.getAttributeCount();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributeLocalName(int i) {
-        if (isDelegating()) {
-            return realReader.getAttributeLocalName(i);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public QName getAttributeName(int i) {
-        if (isDelegating()) {
-            return realReader.getAttributeName(i);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributeNamespace(int i) {
-        if (isDelegating()) {
-            return realReader.getAttributeNamespace(i);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributePrefix(int i) {
-        if (isDelegating()) {
-            return realReader.getAttributePrefix(i);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributeType(int i) {
-        if (isDelegating()) {
-            return realReader.getAttributeType(i);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributeValue(int i) {
-        if (isDelegating()) {
-            return realReader.getAttributeValue(i);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getAttributeValue(String s, String s1) {
-        if (isDelegating()) {
-            return realReader.getAttributeValue(s, s1);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getCharacterEncodingScheme() {
-        return realReader.getCharacterEncodingScheme();
-    }
-
-    public String getElementText() throws XMLStreamException {
-        if (isDelegating()) {
-            return realReader.getElementText();
-        } else {
-            throw new XMLStreamException();
-        }
-    }
-
-    public String getEncoding() {
-        return realReader.getEncoding();
-    }
-
-    public int getEventType() {
-        int event = -1;
-        switch (state) {
-        case STATE_SWITCHED:
-        case STATE_COMPLETE_AT_NEXT:
-            event = realReader.getEventType();
-            break;
-        case STATE_INIT:
-            event = START_DOCUMENT;
-            break;
-        case STATE_COMPLETED:
-            event = END_DOCUMENT;
-            break;
-        }
-        return event;
-    }
-
-    public Location getLocation() {
-        if (isDelegating()) {
-            return realReader.getLocation();
-        } else {
-            return null;
-        }
-    }
-
-    public QName getName() {
-        if (isDelegating()) {
-            return realReader.getName();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getLocalName() {
-        if (isDelegating()) {
-            return realReader.getLocalName();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public NamespaceContext getNamespaceContext() {
-        return realReader.getNamespaceContext();
-    }
-
-    public int getNamespaceCount() {
-        if (isDelegating()) {
-            return realReader.getNamespaceCount();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getNamespacePrefix(int i) {
-        if (isDelegating()) {
-            return realReader.getNamespacePrefix(i);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getNamespaceURI() {
-        if (isDelegating()) {
-            return realReader.getNamespaceURI();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getNamespaceURI(int i) {
-        if (isDelegating()) {
-            return realReader.getNamespaceURI(i);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getNamespaceURI(String s) {
-        if (isDelegating()) {
-            return realReader.getNamespaceURI(s);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getPIData() {
-        if (isDelegating()) {
-            return realReader.getPIData();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getPITarget() {
-        if (isDelegating()) {
-            return realReader.getPITarget();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getPrefix() {
-        if (isDelegating()) {
-            return realReader.getPrefix();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public Object getProperty(String s) throws IllegalArgumentException {
-        return realReader.getProperty(s);
-    }
-
-    public String getText() {
-        if (isDelegating()) {
-            return realReader.getText();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public char[] getTextCharacters() {
-        if (isDelegating()) {
-            return realReader.getTextCharacters();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public int getTextCharacters(int i, char[] chars, int i1, int i2) throws XMLStreamException {
-        if (isDelegating()) {
-            return realReader.getTextCharacters(i, chars, i1, i2);
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public int getTextLength() {
-        if (isDelegating()) {
-            return realReader.getTextLength();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public int getTextStart() {
-        if (isDelegating()) {
-            return realReader.getTextStart();
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    public String getVersion() {
-        if (isDelegating()) {
-            return realReader.getVersion();
-        } else {
-            return null;
-        }
-    }
-
-    public boolean hasName() {
-        if (isDelegating()) {
-            return realReader.hasName();
-        } else {
-            return false;
-        }
-    }
-
-    public boolean hasNext() throws XMLStreamException {
-        if (state == STATE_COMPLETE_AT_NEXT) {
-            return true;
-        } else if (state == STATE_COMPLETED) {
-            return false;
-        } else if (state == STATE_SWITCHED) {
-            return realReader.hasNext();
-        } else {
-            return true;
-        }
-    }
-
-    public boolean hasText() {
-        if (isDelegating()) {
-            return realReader.hasText();
-        } else {
-            return false;
-        }
-    }
-
-    public boolean isAttributeSpecified(int i) {
-        if (isDelegating()) {
-            return realReader.isAttributeSpecified(i);
-        } else {
-            return false;
-        }
-    }
-
-    public boolean isCharacters() {
-        if (isDelegating()) {
-            return realReader.isCharacters();
-        } else {
-            return false;
-        }
-    }
-
-    public boolean isEndElement() {
-        if (isDelegating()) {
-            return realReader.isEndElement();
-        } else {
-            return false;
-        }
-    }
-
-    public boolean isStandalone() {
-        if (isDelegating()) {
-            return realReader.isStandalone();
-        } else {
-            return false;
-        }
-    }
-
-    public boolean isStartElement() {
-        if (isDelegating()) {
-            return realReader.isStartElement();
-        } else {
-            return false;
-        }
-    }
-
-    public boolean isWhiteSpace() {
-        if (isDelegating()) {
-            return realReader.isWhiteSpace();
-        } else {
-            return false;
-        }
-    }
-}
\ No newline at end of file
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLFragmentStreamReader.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLFragmentStreamReader.java
deleted file mode 100644
index 66d8fbdc6a..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLFragmentStreamReader.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- *
- *  Licensed to the Apache Software Foundation (ASF) under one
- *  or more contributor license agreements.  See the NOTICE file
- *  distributed with this work for additional information
- *  regarding copyright ownership.  The ASF licenses this file
- *  to you under the Apache License, Version 2.0 (the
- *  "License"); you may not use this file except in compliance
- *  with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing,
- *  software distributed under the License is distributed on an
- *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *  KIND, either express or implied.  See the License for the
- *  specific language governing permissions and limitations
- *  under the License.
- */
-package org.apache.tuscany.sdo.util.resource;
-
-import javax.xml.stream.XMLStreamReader;
-
-interface XMLFragmentStreamReader extends XMLStreamReader {
-
-    // this will help to handle Text within the current element.
-    // user should pass the element text to the property list as this
-    // ELEMENT_TEXT as the key. This key deliberately has a space in it
-    // so that it is not a valid XML name
-    static final String ELEMENT_TEXT = "Element Text";
-
-    /**
-     * Extra method to query the state of the pullparser
-     * @return
-     */
-     boolean isEndOfFragment();
-
-    /**
-     * Initiate the parser - this will do whatever the needed
-     * tasks to initiate the parser and must be called before
-     * attempting any specific parsing using this parser
-     */
-     void init();
-}
diff --git a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLStreamSerializer.java b/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLStreamSerializer.java
deleted file mode 100644
index 2c2dc87aa4..0000000000
--- a/branches/sdo-1.1.1-incubating/impl/src/main/java/org/apache/tuscany/sdo/util/resource/XMLStreamSerializer.java
+++ /dev/null
@@ -1,414 +0,0 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.tuscany.sdo.util.resource;
-
-import java.util.Map;
-import javax.xml.namespace.NamespaceContext;
-import javax.xml.stream.XMLOutputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sdo.api.SDOHelper;
-import org.apache.tuscany.sdo.api.SDOUtil;
-/**
- * The XMLStreamSerializer pulls events from the XMLStreamReader and dumps into the XMLStreamWriter
- */
-public class XMLStreamSerializer implements XMLStreamConstants {
-
-    private static int namespaceSuffix = 0;
-
-    public static final String NAMESPACE_PREFIX = "ns";
-
-    /*
-     * The behavior of the serializer is such that it returns when it encounters the starting element for the second time. The depth variable tracks
-     * the depth of the serilizer and tells it when to return. Note that it is assumed that this serialization starts on an Element.
-     */
-
-    /**
-     * Field depth
-     */
-    private int depth = 0;
-
-    /**
-     * Method serialize.
-     * 
-     * @param node
-     * @param writer
-     * @throws XMLStreamException
-     */
-    public void serialize(XMLStreamReader node, XMLStreamWriter writer) throws XMLStreamException {
-        serializeNode(node, writer);
-    }
-
-    public void serialize(XMLStreamReader node, XMLStreamWriter writer, Map options) throws XMLStreamException {
-    	this.options = options;
-        serializeNode(node, writer);
-    }
-    /**
-     * Method serializeNode.
-     * 
-     * @param reader
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void serializeNode(XMLStreamReader reader, XMLStreamWriter writer) throws XMLStreamException {
-        // TODO We get the StAXWriter at this point and uses it hereafter assuming that this is the only entry point to this class.
-        // If there can be other classes calling methodes of this we might need to change methode signatures to OMOutputer
-        while (reader.hasNext()) {
-            int event = reader.next();
-            if (event == START_ELEMENT) {
-            	if(options == null){
-            		serializeElement(reader, writer);
-            	}
-            	else{
-            		serializeElementWithOptions(reader, writer);
-            	}
-                depth++;
-            } else if (event == ATTRIBUTE) {
-                serializeAttributes(reader, writer);
-            } else if (event == CHARACTERS) {
-                serializeText(reader, writer);
-            } else if (event == COMMENT) {
-                serializeComment(reader, writer);
-            } else if (event == CDATA) {
-                serializeCData(reader, writer);
-            } else if (event == END_ELEMENT) {
-            	if(options == null){
-            		serializeEndElement(writer);
-            	}else{
-            		serializeEndElementWithOptions(writer);
-            	}
-                depth--;
-            } else if (event == START_DOCUMENT) {
-                depth++; // if a start document is found then increment the depth
-            } else if (event == END_DOCUMENT) {
-                if (depth != 0)
-                    depth--; // for the end document - reduce the depth
-                try {
-                	if(options == null){
-                		serializeEndElement(writer);
-                	}
-                	else{
-                		serializeEndElementWithOptions(writer);	
-                	}                    
-                } catch (Exception e) {
-                    // TODO: log exceptions
-                }
-            }
-            if (depth == 0) {
-                break;
-            }
-        }
-    }
-
-    /**
-     * @param reader
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void serializeElement(XMLStreamReader reader, XMLStreamWriter writer) throws XMLStreamException {
-        String prefix = reader.getPrefix();
-        String nameSpaceName = reader.getNamespaceURI();
-        if (nameSpaceName != null) {
-            String writer_prefix = writer.getPrefix(nameSpaceName);
-            if (writer_prefix != null) {
-                writer.writeStartElement(nameSpaceName, reader.getLocalName());
-            } else {
-                if (prefix != null) {
-                    writer.writeStartElement(prefix, reader.getLocalName(), nameSpaceName);
-                    writer.writeNamespace(prefix, nameSpaceName);
-                    writer.setPrefix(prefix, nameSpaceName);
-                } else {
-                    writer.writeStartElement(nameSpaceName, reader.getLocalName());
-                    writer.writeDefaultNamespace(nameSpaceName);
-                    writer.setDefaultNamespace(nameSpaceName);
-                }
-            }
-        } else {
-            writer.writeStartElement(reader.getLocalName());
-        }
-
-        // add the namespaces
-        int count = reader.getNamespaceCount();
-        String namespacePrefix;
-        for (int i = 0; i < count; i++) {
-            namespacePrefix = reader.getNamespacePrefix(i);
-            if (namespacePrefix != null && namespacePrefix.length() == 0)
-                continue;
-
-            serializeNamespace(namespacePrefix, reader.getNamespaceURI(i), writer);
-        }
-
-        // add attributes
-        serializeAttributes(reader, writer);
-
-    }
-    /**
-     * @param reader
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void serializeElementWithOptions(XMLStreamReader reader, XMLStreamWriter writer) throws XMLStreamException {
-    	++nest;
-    	boolean brk=false;
-    	if(oldNest != nest){
-    		if(oldNest < nest) brk = true;
-    		oldNest = nest;    		
-    	}
-    	startElement(writer);
-        String prefix = reader.getPrefix();
-        String nameSpaceName = reader.getNamespaceURI();
-        if (nameSpaceName != null) {
-            String writer_prefix = writer.getPrefix(nameSpaceName);
-            
-            if (writer_prefix != null) {
-                if(brk && nest != 1){
-                	breakLine(writer, true, true);
-                }
-                else{
-                	breakLine(writer, false, true);
-                }
-
-                writer.writeStartElement(nameSpaceName, reader.getLocalName());                
-            } else {
-                if (prefix != null) {
-                    if(brk && nest == 1){
-                    	breakLine(writer, false, true);
-                    }                    
-                    writer.writeStartElement(prefix, reader.getLocalName(), nameSpaceName);
-                    writer.writeNamespace(prefix, nameSpaceName);
-                    writer.setPrefix(prefix, nameSpaceName);
-                } else {
-                    if(brk && nest == 1){
-                    	breakLine(writer, false, true);
-                    }                                    	
-                    writer.writeStartElement(nameSpaceName, reader.getLocalName());
-                    writer.writeDefaultNamespace(nameSpaceName);
-                    writer.setDefaultNamespace(nameSpaceName);
-                    if(brk && nest == 1){
-                    	breakLine(writer, false, true);
-                    }                    
-                }
-            }
-        } else {
-            writer.writeStartElement(reader.getLocalName());
-        }
- 
-        // add the namespaces
-        int count = reader.getNamespaceCount();
-        String namespacePrefix;
-        for (int i = 0; i < count; i++) {
-            namespacePrefix = reader.getNamespacePrefix(i);
-            if (namespacePrefix != null && namespacePrefix.length() == 0)
-                continue;
-
-            serializeNamespace(namespacePrefix, reader.getNamespaceURI(i), writer);
-        }
-
-        // add attributes
-        serializeAttributes(reader, writer);    	
-    }
-    /**
-     * Method serializeEndElement.
-     * 
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void serializeEndElement(XMLStreamWriter writer) throws XMLStreamException {
-        writer.writeEndElement();
-    }
-
-    /**
-     * Method serializeEndElement.
-     * 
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void serializeEndElementWithOptions(XMLStreamWriter writer) throws XMLStreamException {
-        --nest;
-        if(oldNest > nest+1){
-        	nest++;
-        	breakLine(writer, false, true);
-        	writer.writeEndElement();
-        	breakLine(writer, true, false);
-        	nest--;
-        }
-        else{
-        	writer.writeEndElement();
-        	breakLine(writer, true, false);        	
-        }
-    }
-    /**
-     * @param reader
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void serializeText(XMLStreamReader reader, XMLStreamWriter writer) throws XMLStreamException {
-        writer.writeCharacters(reader.getText());
-    }
-
-    /**
-     * Method serializeCData.
-     * 
-     * @param reader
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void serializeCData(XMLStreamReader reader, XMLStreamWriter writer) throws XMLStreamException {
-        writer.writeCData(reader.getText());
-    }
-
-    /**
-     * Method serializeComment.
-     * 
-     * @param reader
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void serializeComment(XMLStreamReader reader, XMLStreamWriter writer) throws XMLStreamException {
-        writer.writeComment(reader.getText());
-    }
-
-    /**
-     * @param reader
-     * @param writer
-     * @throws XMLStreamException
-     */
-    protected void serializeAttributes(XMLStreamReader reader, XMLStreamWriter writer)
-        throws XMLStreamException {
-        int count = reader.getAttributeCount();
-        String prefix = null;
-        String namespaceName = null;
-        String writerPrefix = null;
-        for (int i = 0; i < count; i++) {
-            prefix = reader.getAttributePrefix(i);
-            namespaceName = reader.getAttributeNamespace(i);
-            if (namespaceName != null) {
-                writerPrefix = writer.getNamespaceContext().getPrefix(namespaceName);
-            }
-
-            if (!"".equals(namespaceName)) {
-                // prefix has already being declared but this particular attrib
-                // has a
-                // no prefix attached. So use the prefix provided by the writer
-                if (writerPrefix != null && (prefix == null || prefix.equals(""))) {
-                    writer.writeAttribute(writerPrefix,
-                                          namespaceName,
-                                          reader.getAttributeLocalName(i),
-                                          reader.getAttributeValue(i));
-
-                    // writer prefix is available but different from the current
-                    // prefix of the attrib. We should be decalring the new
-                    // prefix
-                    // as a namespace declaration
-                } else if (prefix != null && !"".equals(prefix) && !prefix.equals(writerPrefix)) {
-                    writer.writeNamespace(prefix, namespaceName);
-                    writer.writeAttribute(prefix, namespaceName, reader.getAttributeLocalName(i), reader
-                        .getAttributeValue(i));
-
-                    // prefix is null (or empty), but the namespace name is
-                    // valid! it has not
-                    // being written previously also. So we need to generate a
-                    // prefix
-                    // here
-                } else if (prefix == null || prefix.equals("")) {
-                    prefix = generateUniquePrefix(writer.getNamespaceContext());
-                    writer.writeNamespace(prefix, namespaceName);
-                    writer.writeAttribute(prefix, namespaceName, reader.getAttributeLocalName(i), reader
-                        .getAttributeValue(i));
-                } else {
-                    writer.writeAttribute(prefix, namespaceName, reader.getAttributeLocalName(i), reader
-                        .getAttributeValue(i));
-                }
-            } else {
-                // empty namespace is equal to no namespace!
-                writer.writeAttribute(reader.getAttributeLocalName(i), reader.getAttributeValue(i));
-            }
-
-        }
-    }
-
-    /**
-     * Generates a unique namespace prefix that is not in the scope of the NamespaceContext
-     * 
-     * @param nsCtxt
-     * @return string
-     */
-    private String generateUniquePrefix(NamespaceContext nsCtxt) {
-        String prefix = NAMESPACE_PREFIX + namespaceSuffix++;
-        // null should be returned if the prefix is not bound!
-        while (nsCtxt.getNamespaceURI(prefix) != null) {
-            prefix = NAMESPACE_PREFIX + namespaceSuffix++;
-        }
-
-        return prefix;
-    }
-
-    /**
-     * Method serializeNamespace.
-     * 
-     * @param prefix
-     * @param URI
-     * @param writer
-     * @throws XMLStreamException
-     */
-    private void serializeNamespace(String prefix, String URI, XMLStreamWriter writer) throws XMLStreamException {
-        String prefix1 = writer.getPrefix(URI);
-        if (prefix1 == null) {
-            writer.writeNamespace(prefix, URI);
-            writer.setPrefix(prefix, URI);
-        }
-    }
-    private String lineBreak, indent, margin = null;
-
-    private int nest;
-    private int oldNest;
-
-    private void breakLine(XMLStreamWriter writer, boolean breakLine, boolean others) throws XMLStreamException {
-        if (options == null || (lineBreak==null && indent==null && margin==null) )
-            return;    	
-   		if(breakLine) 
-   			writer.writeCharacters(lineBreak);
-
-        if (margin != null){
-            if(others)
-            	writer.writeCharacters(margin);
-        }
-
-        if (indent != null && others){
-            for (int count = nest; count != 1; --count){//!= 0
-                writer.writeCharacters(indent);
-            }
-        }
-    }
-
-    private Map options;
-
-    static private final String STRING_OPTION = "String option";
-    
-    void startElement(XMLStreamWriter writer) throws XMLStreamException {
-        if (options == null)
-            return;
-        lineBreak = (String) options.get(SDOHelper.XMLOptions.XML_SAVE_LINE_BREAK);
-        if (lineBreak == null)
-            return;
-       	margin = (String) options.get(SDOHelper.XMLOptions.XML_SAVE_MARGIN);
-       	indent = (String) options.get(SDOHelper.XMLOptions.XML_SAVE_INDENT);
-    }
-}