86 files changed, 0 insertions, 28420 deletions
diff --git a/tags/java-stable-20060304/sdo/impl/LICENSE.txt b/tags/java-stable-20060304/sdo/impl/LICENSE.txt
deleted file mode 100644
index d645695673..0000000000
--- a/tags/java-stable-20060304/sdo/impl/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
diff --git a/tags/java-stable-20060304/sdo/impl/model/SDO.ecore b/tags/java-stable-20060304/sdo/impl/model/SDO.ecore
deleted file mode 100644
index dce261ecd2..0000000000
--- a/tags/java-stable-20060304/sdo/impl/model/SDO.ecore
+++ /dev/null
@@ -1,962 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="sdo"
-    nsURI="http://www.apache.org/tuscany/2005/SDO" nsPrefix="sdo">
-  <eClassifiers xsi:type="ecore:EClass" name="ChangeSummary" instanceClassName="commonj.sdo.ChangeSummary"
-      eSuperTypes="../../org.eclipse.emf.ecore.change/model/Change.ecore#//ChangeDescription">
-    <eOperations name="beginLogging"/>
-    <eOperations name="endLogging"/>
-    <eOperations name="isCreated" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eParameters name="dataObject" eType="#//DataObject"/>
-    </eOperations>
-    <eOperations name="isDeleted" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eParameters name="dataObject" eType="#//DataObject"/>
-    </eOperations>
-    <eOperations name="getOldValues" eType="#//EJavaList">
-      <eParameters name="dataObject" eType="#//DataObject"/>
-    </eOperations>
-    <eOperations name="isModified" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eParameters name="dataObject" eType="#//DataObject"/>
-    </eOperations>
-    <eOperations name="getOldValue" eType="#//ChangeSummarySetting">
-      <eParameters name="dataObject" eType="#//DataObject"/>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="getOldContainer" eType="#//DataObject">
-      <eParameters name="dataObject" eType="#//DataObject"/>
-    </eOperations>
-    <eOperations name="getOldContainmentProperty" eType="#//Property">
-      <eParameters name="dataObject" eType="#//DataObject"/>
-    </eOperations>
-    <eOperations name="getOldSequence" eType="#//Sequence">
-      <eParameters name="dataObject" eType="#//DataObject"/>
-    </eOperations>
-    <eOperations name="undoChanges"/>
-    <eOperations name="isLogging" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eOperations name="getDataGraph" eType="#//DataGraph"/>
-    <eOperations name="getChangedObjects" eType="#//EJavaList"/>
-    <eOperations name="getRootObject" eType="#//DataObject"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eDataGraph" lowerBound="1"
-        eType="#//DataGraph" transient="true" resolveProxies="false" eOpposite="#//DataGraph/eChangeSummary"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ChangeSummarySetting" instanceClassName="commonj.sdo.ChangeSummary$Setting"
-      eSuperTypes="../../org.eclipse.emf.ecore.change/model/Change.ecore#//FeatureChange">
-    <eOperations name="isSet" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eOperations name="getValue" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
-    <eOperations name="getProperty" eType="#//Property"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DataGraph" instanceClassName="commonj.sdo.DataGraph"
-      eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject">
-    <eOperations name="createRootObject" eType="#//DataObject">
-      <eParameters name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="typeName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="createRootObject" eType="#//DataObject">
-      <eParameters name="type" eType="#//Type"/>
-    </eOperations>
-    <eOperations name="getType" eType="#//Type">
-      <eParameters name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="typeName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getRootObject" eType="#//DataObject"/>
-    <eOperations name="getChangeSummary" eType="#//ChangeSummary"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resourceSet" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EResourceSet"
-        transient="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="rootResource" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EResource"
-        changeable="false" volatile="true" transient="true" derived="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eChangeSummary" lowerBound="1"
-        eType="#//ChangeSummary" resolveProxies="false" eOpposite="#//ChangeSummary/eDataGraph"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="eRootObject" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EObject"
-        resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DataObject" instanceClassName="commonj.sdo.DataObject"
-      abstract="true">
-    <eOperations name="get" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.get(this, path);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="set">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.set(this, path, value);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
-    </eOperations>
-    <eOperations name="isSet" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.isSet(this, path);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="unset">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.unset(this, path);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="get" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.get(this, propertyIndex);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="set">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.set(this, propertyIndex, value);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
-    </eOperations>
-    <eOperations name="isSet" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.isSet(this, propertyIndex);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="unset">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.unset(this, propertyIndex);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="get" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.get(this, property);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="set">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.set(this, property, value);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
-    </eOperations>
-    <eOperations name="isSet" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.isSet(this, property);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="unset">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.unset(this, property);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="getContainer" eType="#//DataObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getContainer(this);"/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="getContainmentProperty" eType="#//Property">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getContainmentProperty(this);"/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="getDataGraph" eType="#//DataGraph">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getDataGraph(this);"/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="getType" eType="#//Type">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getType(this);"/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="getBigDecimal" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBigDecimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getBigDecimal(this, path);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getBigInteger" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBigInteger">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getBigInteger(this, path);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getBoolean" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getBoolean(this, path);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getByte" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EByte">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getByte(this, path);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getBytes" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EByteArray">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getBytes(this, path);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getChar" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EChar">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getChar(this, path);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getDataObject" eType="#//DataObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getDataObject(this, path);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getDate" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDate">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getDate(this, path);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getDouble" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getDouble(this, path);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getFloat" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getFloat(this, path);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getInt" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getInt(this, path);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getList" eType="#//EJavaList">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getList(this, path);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getLong" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getLong(this, path);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getSequence" eType="#//Sequence">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getSequence(this, path);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getShort" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EShort">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getShort(this, path);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getString(this, path);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="setBigDecimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setBigDecimal(this, path, value);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBigDecimal"/>
-    </eOperations>
-    <eOperations name="setBigInteger">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setBigInteger(this, path, value);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBigInteger"/>
-    </eOperations>
-    <eOperations name="setBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setBoolean(this, path, value);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    </eOperations>
-    <eOperations name="setByte">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setByte(this, path, value);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EByte"/>
-    </eOperations>
-    <eOperations name="setBytes">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setBytes(this, path, value);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EByteArray"/>
-    </eOperations>
-    <eOperations name="setChar">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setChar(this, path, value);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EChar"/>
-    </eOperations>
-    <eOperations name="setDataObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setDataObject(this, path, value);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="value" eType="#//DataObject"/>
-    </eOperations>
-    <eOperations name="setDate">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setDate(this, path, value);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDate"/>
-    </eOperations>
-    <eOperations name="setDouble">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setDouble(this, path, value);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
-    </eOperations>
-    <eOperations name="setFloat">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setFloat(this, path, value);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
-    </eOperations>
-    <eOperations name="setInt">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setInt(this, path, value);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="setList">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setList(this, path, value);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="value" eType="#//EJavaList"/>
-    </eOperations>
-    <eOperations name="setLong">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setLong(this, path, value);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
-    </eOperations>
-    <eOperations name="setShort">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setShort(this, path, value);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EShort"/>
-    </eOperations>
-    <eOperations name="setString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setString(this, path, value);"/>
-      </eAnnotations>
-      <eParameters name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getBigDecimal" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBigDecimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getBigDecimal(this, propertyIndex);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="getBigInteger" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBigInteger">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getBigInteger(this, propertyIndex);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="getBoolean" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getBoolean(this, propertyIndex);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="getByte" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EByte">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getByte(this, propertyIndex);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="getBytes" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EByteArray">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getBytes(this, propertyIndex);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="getChar" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EChar">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getChar(this, propertyIndex);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="getDataObject" eType="#//DataObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getDataObject(this, propertyIndex);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="getDate" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDate">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getDate(this, propertyIndex);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="getDouble" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getDouble(this, propertyIndex);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="getFloat" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getFloat(this, propertyIndex);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="getInt" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getInt(this, propertyIndex);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="getList" eType="#//EJavaList">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getList(this, propertyIndex);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="getLong" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getLong(this, propertyIndex);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="getSequence" eType="#//Sequence">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getSequence(this, propertyIndex);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="getShort" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EShort">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getShort(this, propertyIndex);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="getString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getString(this, propertyIndex);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="setBigDecimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setBigDecimal(this, propertyIndex, value);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBigDecimal"/>
-    </eOperations>
-    <eOperations name="setBigInteger">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setBigInteger(this, propertyIndex, value);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBigInteger"/>
-    </eOperations>
-    <eOperations name="setBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setBoolean(this, propertyIndex, value);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    </eOperations>
-    <eOperations name="setByte">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setByte(this, propertyIndex, value);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EByte"/>
-    </eOperations>
-    <eOperations name="setBytes">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setBytes(this, propertyIndex, value);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EByteArray"/>
-    </eOperations>
-    <eOperations name="setChar">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setChar(this, propertyIndex, value);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EChar"/>
-    </eOperations>
-    <eOperations name="setDataObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setDataObject(this, propertyIndex, value);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="value" eType="#//DataObject"/>
-    </eOperations>
-    <eOperations name="setDate">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setDate(this, propertyIndex, value);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDate"/>
-    </eOperations>
-    <eOperations name="setDouble">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setDouble(this, propertyIndex, value);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
-    </eOperations>
-    <eOperations name="setFloat">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setFloat(this, propertyIndex, value);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
-    </eOperations>
-    <eOperations name="setInt">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setInt(this, propertyIndex, value);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="setList">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setList(this, propertyIndex, value);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="value" eType="#//EJavaList"/>
-    </eOperations>
-    <eOperations name="setLong">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setLong(this, propertyIndex, value);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
-    </eOperations>
-    <eOperations name="setShort">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setShort(this, propertyIndex, value);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EShort"/>
-    </eOperations>
-    <eOperations name="setString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setString(this, propertyIndex, value);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getBigDecimal" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBigDecimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getBigDecimal(this, property);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="getBigInteger" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBigInteger">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getBigInteger(this, property);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="getBoolean" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getBoolean(this, property);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="getByte" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EByte">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getByte(this, property);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="getBytes" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EByteArray">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getBytes(this, property);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="getChar" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EChar">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getChar(this, property);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="getDataObject" eType="#//DataObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getDataObject(this, property);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="getDate" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDate">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getDate(this, property);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="getDouble" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getDouble(this, property);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="getFloat" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getFloat(this, property);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="getInt" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getInt(this, property);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="getList" eType="#//EJavaList">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getList(this, property);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="getLong" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getLong(this, property);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="getSequence" eType="#//Sequence">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getSequence(this, property);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="getShort" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EShort">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getShort(this, property);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="getString" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getString(this, property);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="setBigDecimal">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setBigDecimal(this, property, value);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBigDecimal"/>
-    </eOperations>
-    <eOperations name="setBigInteger">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setBigInteger(this, property, value);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EBigInteger"/>
-    </eOperations>
-    <eOperations name="setBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setBoolean(this, property, value);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    </eOperations>
-    <eOperations name="setByte">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setByte(this, property, value);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EByte"/>
-    </eOperations>
-    <eOperations name="setBytes">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setBytes(this, property, value);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EByteArray"/>
-    </eOperations>
-    <eOperations name="setChar">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setChar(this, property, value);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EChar"/>
-    </eOperations>
-    <eOperations name="setDataObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setDataObject(this, property, value);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-      <eParameters name="value" eType="#//DataObject"/>
-    </eOperations>
-    <eOperations name="setDate">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setDate(this, property, value);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDate"/>
-    </eOperations>
-    <eOperations name="setDouble">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setDouble(this, property, value);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDouble"/>
-    </eOperations>
-    <eOperations name="setFloat">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setFloat(this, property, value);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
-    </eOperations>
-    <eOperations name="setInt">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setInt(this, property, value);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="setList">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setList(this, property, value);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-      <eParameters name="value" eType="#//EJavaList"/>
-    </eOperations>
-    <eOperations name="setLong">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setLong(this, property, value);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong"/>
-    </eOperations>
-    <eOperations name="setShort">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setShort(this, property, value);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EShort"/>
-    </eOperations>
-    <eOperations name="setString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.setString(this, property, value);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-      <eParameters name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="createDataObject" eType="#//DataObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.createDataObject(this, propertyName);"/>
-      </eAnnotations>
-      <eParameters name="propertyName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="createDataObject" eType="#//DataObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.createDataObject(this, propertyIndex);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="createDataObject" eType="#//DataObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.createDataObject(this, property);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-    </eOperations>
-    <eOperations name="createDataObject" eType="#//DataObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.createDataObject(this, propertyName, namespaceURI, typeName);"/>
-      </eAnnotations>
-      <eParameters name="propertyName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="typeName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="createDataObject" eType="#//DataObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.createDataObject(this, propertyIndex, namespaceURI, typeName);"/>
-      </eAnnotations>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="namespaceURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="typeName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="createDataObject" eType="#//DataObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.createDataObject(this, property, type);"/>
-      </eAnnotations>
-      <eParameters name="property" eType="#//Property"/>
-      <eParameters name="type" eType="#//Type"/>
-    </eOperations>
-    <eOperations name="delete">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.delete(this);"/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="getSequence" eType="#//Sequence">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getSequence(this);"/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="getInstanceProperties" eType="#//EJavaList">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getInstanceProperties(this);"/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="getProperty" eType="#//Property">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getProperty(this, propertyName);"/>
-      </eAnnotations>
-      <eParameters name="propertyName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="getRootObject" eType="#//DataObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getRootObject(this);"/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="getChangeSummary" eType="#//ChangeSummary">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="return &lt;%org.apache.sdo.util.SDOUtil%>.getChangeSummary(this);"/>
-      </eAnnotations>
-    </eOperations>
-    <eOperations name="detach">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="body" value="&lt;%org.apache.sdo.util.SDOUtil%>.detach(this);"/>
-      </eAnnotations>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Property" instanceClassName="commonj.sdo.Property"
-      abstract="true" interface="true">
-    <eOperations name="getName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eOperations name="getType" eType="#//Type"/>
-    <eOperations name="isMany" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eOperations name="isContainment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eOperations name="isReadOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eOperations name="getContainingType" eType="#//Type"/>
-    <eOperations name="getAliasNames" eType="#//EJavaList"/>
-    <eOperations name="getOpposite" eType="#//Property"/>
-    <eOperations name="getDefault" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Sequence" instanceClassName="commonj.sdo.Sequence"
-      abstract="true" interface="true">
-    <eOperations name="size" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eOperations name="getProperty" eType="#//Property">
-      <eParameters name="index" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="getValue" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject">
-      <eParameters name="index" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="setValue" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject">
-      <eParameters name="index" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
-    </eOperations>
-    <eOperations name="add" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eParameters name="propertyName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
-    </eOperations>
-    <eOperations name="add" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eParameters name="propertIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
-    </eOperations>
-    <eOperations name="add" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eParameters name="property" eType="#//Property"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
-    </eOperations>
-    <eOperations name="add">
-      <eParameters name="index" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="propertyName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
-    </eOperations>
-    <eOperations name="add">
-      <eParameters name="index" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="propertyIndex" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
-    </eOperations>
-    <eOperations name="add">
-      <eParameters name="index" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="property" eType="#//Property"/>
-      <eParameters name="value" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
-    </eOperations>
-    <eOperations name="add">
-      <eParameters name="text" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="add">
-      <eParameters name="index" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-      <eParameters name="text" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Type" instanceClassName="commonj.sdo.Type"
-      abstract="true" interface="true">
-    <eOperations name="getName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eOperations name="getURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eOperations name="getInstanceClass" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaClass"/>
-    <eOperations name="isInstance" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eParameters name="object" eType="ecore:EDataType ../../org.eclipse.emf.ecore/model/Ecore.ecore#//EJavaObject"/>
-    </eOperations>
-    <eOperations name="isDataType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eOperations name="isSequenced" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eOperations name="isOpen" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eOperations name="isAbstract" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eOperations name="getBaseTypes" eType="#//EJavaList"/>
-    <eOperations name="getAliasNames" eType="#//EJavaList"/>
-    <eOperations name="getProperties" eType="#//EJavaList"/>
-    <eOperations name="getDeclaredProperties" eType="#//EJavaList"/>
-    <eOperations name="getProperty" eType="#//Property">
-      <eParameters name="propertyName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EDataType" name="EJavaList" instanceClassName="java.util.List"
-      serializable="false"/>
-  <eClassifiers xsi:type="ecore:EDataType" name="EObjectStreamException" instanceClassName="java.io.ObjectStreamException"
-      serializable="false"/>
-  <eClassifiers xsi:type="ecore:EClass" name="AnyTypeDataObject" eSuperTypes="#//DataObject ../../org.eclipse.emf.ecore/model/XMLType.ecore#//AnyType">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="kind" value="mixed"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SimpleAnyTypeDataObject" eSuperTypes="#//AnyTypeDataObject ../../org.eclipse.emf.ecore/model/XMLType.ecore#//SimpleAnyType">
-    <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-      <details key="kind" value="simple"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Class" instanceClassName="commonj.sdo.Type"
-      eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EClass #//Type"/>
-  <eClassifiers xsi:type="ecore:EClass" name="DataType" instanceClassName="commonj.sdo.Type"
-      eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EDataType #//Type"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Attribute" instanceClassName="commonj.sdo.Property"
-      eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EAttribute #//Property"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Reference" instanceClassName="commonj.sdo.Property"
-      eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EReference #//Property"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Enum" instanceClassName="commonj.sdo.Type"
-      eSuperTypes="../../org.eclipse.emf.ecore/model/Ecore.ecore#//EEnum #//Type"/>
-  <eClassifiers xsi:type="ecore:EClass" name="DynamicDataObject" instanceClassName="commonj.sdo.DataObject"
-      eSuperTypes="#//DataObject"/>
-  <eClassifiers xsi:type="ecore:EClass" name="StoreDataObject" instanceClassName="commonj.sdo.DataObject"
-      eSuperTypes="#//DataObject"/>
-  <eClassifiers xsi:type="ecore:EClass" name="DynamicStoreDataObject" instanceClassName="commonj.sdo.DataObject"
-      eSuperTypes="#//StoreDataObject"/>
-</ecore:EPackage>
diff --git a/tags/java-stable-20060304/sdo/impl/model/SDO.genmodel b/tags/java-stable-20060304/sdo/impl/model/SDO.genmodel
deleted file mode 100644
index d28946204c..0000000000
--- a/tags/java-stable-20060304/sdo/impl/model/SDO.genmodel
+++ /dev/null
@@ -1,564 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.apache.tuscany.sdo.impl/src/main/java"
-    creationCommands="false" modelPluginID="org.apache.tuscany.sdo.impl" runtimeJar="true"
-    modelName="SDO" modelPluginClass="" updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.BasicEObjectImpl"
-    rootImplementsInterface="" testsDirectory="" importerID="org.eclipse.emf.importer.rose"
-    usedGenPackages="../../org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore ../../org.eclipse.emf.ecore/model/XMLType.genmodel#//type ../../org.eclipse.emf.ecore.change/model/Change.genmodel#//change">
-  <foreignModel>SDO.mdl</foreignModel>
-  <foreignModel>VABASE_PLUGINS_PATH</foreignModel>
-  <foreignModel>../..</foreignModel>
-  <genPackages prefix="SDO" basePackage="org.apache.tuscany" disposableProviderFactory="true"
-      adapterFactory="false" generateExampleClass="false" ecorePackage="SDO.ecore#/">
-    <genDataTypes ecoreDataType="SDO.ecore#//EJavaList"/>
-    <genDataTypes ecoreDataType="SDO.ecore#//EObjectStreamException"/>
-    <genClasses ecoreClass="SDO.ecore#//ChangeSummary">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference SDO.ecore#//ChangeSummary/eDataGraph"/>
-      <genOperations ecoreOperation="SDO.ecore#//ChangeSummary/beginLogging"/>
-      <genOperations ecoreOperation="SDO.ecore#//ChangeSummary/endLogging"/>
-      <genOperations ecoreOperation="SDO.ecore#//ChangeSummary/isCreated">
-        <genParameters ecoreParameter="SDO.ecore#//ChangeSummary/isCreated/dataObject"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//ChangeSummary/isDeleted">
-        <genParameters ecoreParameter="SDO.ecore#//ChangeSummary/isDeleted/dataObject"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//ChangeSummary/getOldValues">
-        <genParameters ecoreParameter="SDO.ecore#//ChangeSummary/getOldValues/dataObject"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//ChangeSummary/isModified">
-        <genParameters ecoreParameter="SDO.ecore#//ChangeSummary/isModified/dataObject"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//ChangeSummary/getOldValue">
-        <genParameters ecoreParameter="SDO.ecore#//ChangeSummary/getOldValue/dataObject"/>
-        <genParameters ecoreParameter="SDO.ecore#//ChangeSummary/getOldValue/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//ChangeSummary/getOldContainer">
-        <genParameters ecoreParameter="SDO.ecore#//ChangeSummary/getOldContainer/dataObject"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//ChangeSummary/getOldContainmentProperty">
-        <genParameters ecoreParameter="SDO.ecore#//ChangeSummary/getOldContainmentProperty/dataObject"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//ChangeSummary/getOldSequence">
-        <genParameters ecoreParameter="SDO.ecore#//ChangeSummary/getOldSequence/dataObject"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//ChangeSummary/undoChanges"/>
-      <genOperations ecoreOperation="SDO.ecore#//ChangeSummary/isLogging"/>
-      <genOperations ecoreOperation="SDO.ecore#//ChangeSummary/getDataGraph"/>
-      <genOperations ecoreOperation="SDO.ecore#//ChangeSummary/getChangedObjects"/>
-      <genOperations ecoreOperation="SDO.ecore#//ChangeSummary/getRootObject"/>
-    </genClasses>
-    <genClasses ecoreClass="SDO.ecore#//ChangeSummarySetting">
-      <genOperations ecoreOperation="SDO.ecore#//ChangeSummarySetting/isSet"/>
-      <genOperations ecoreOperation="SDO.ecore#//ChangeSummarySetting/getValue"/>
-      <genOperations ecoreOperation="SDO.ecore#//ChangeSummarySetting/getProperty"/>
-    </genClasses>
-    <genClasses ecoreClass="SDO.ecore#//DataGraph">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute SDO.ecore#//DataGraph/resourceSet"/>
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute SDO.ecore#//DataGraph/rootResource"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference SDO.ecore#//DataGraph/eChangeSummary"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference SDO.ecore#//DataGraph/eRootObject"/>
-      <genOperations ecoreOperation="SDO.ecore#//DataGraph/createRootObject">
-        <genParameters ecoreParameter="SDO.ecore#//DataGraph/createRootObject/namespaceURI"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataGraph/createRootObject/typeName"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataGraph/createRootObject.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataGraph/createRootObject.1/type"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataGraph/getType">
-        <genParameters ecoreParameter="SDO.ecore#//DataGraph/getType/namespaceURI"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataGraph/getType/typeName"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataGraph/getRootObject"/>
-      <genOperations ecoreOperation="SDO.ecore#//DataGraph/getChangeSummary"/>
-    </genClasses>
-    <genClasses ecoreClass="SDO.ecore#//DataObject">
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/get">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/get/path"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/set">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/set/path"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/set/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/isSet">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/isSet/path"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/unset">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/unset/path"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/get.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/get.1/propertyIndex"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/set.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/set.1/propertyIndex"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/set.1/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/isSet.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/isSet.1/propertyIndex"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/unset.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/unset.1/propertyIndex"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/get.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/get.2/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/set.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/set.2/property"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/set.2/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/isSet.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/isSet.2/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/unset.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/unset.2/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getContainer"/>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getContainmentProperty"/>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getDataGraph"/>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getType"/>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getBigDecimal">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getBigDecimal/path"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getBigInteger">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getBigInteger/path"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getBoolean">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getBoolean/path"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getByte">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getByte/path"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getBytes">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getBytes/path"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getChar">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getChar/path"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getDataObject">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getDataObject/path"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getDate">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getDate/path"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getDouble">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getDouble/path"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getFloat">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getFloat/path"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getInt">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getInt/path"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getList">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getList/path"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getLong">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getLong/path"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getSequence">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getSequence/path"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getShort">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getShort/path"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getString">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getString/path"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setBigDecimal">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBigDecimal/path"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBigDecimal/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setBigInteger">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBigInteger/path"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBigInteger/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setBoolean">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBoolean/path"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBoolean/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setByte">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setByte/path"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setByte/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setBytes">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBytes/path"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBytes/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setChar">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setChar/path"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setChar/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setDataObject">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setDataObject/path"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setDataObject/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setDate">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setDate/path"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setDate/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setDouble">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setDouble/path"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setDouble/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setFloat">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setFloat/path"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setFloat/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setInt">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setInt/path"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setInt/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setList">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setList/path"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setList/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setLong">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setLong/path"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setLong/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setShort">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setShort/path"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setShort/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setString">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setString/path"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setString/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getBigDecimal.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getBigDecimal.1/propertyIndex"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getBigInteger.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getBigInteger.1/propertyIndex"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getBoolean.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getBoolean.1/propertyIndex"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getByte.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getByte.1/propertyIndex"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getBytes.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getBytes.1/propertyIndex"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getChar.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getChar.1/propertyIndex"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getDataObject.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getDataObject.1/propertyIndex"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getDate.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getDate.1/propertyIndex"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getDouble.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getDouble.1/propertyIndex"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getFloat.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getFloat.1/propertyIndex"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getInt.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getInt.1/propertyIndex"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getList.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getList.1/propertyIndex"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getLong.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getLong.1/propertyIndex"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getSequence.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getSequence.1/propertyIndex"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getShort.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getShort.1/propertyIndex"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getString.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getString.1/propertyIndex"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setBigDecimal.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBigDecimal.1/propertyIndex"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBigDecimal.1/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setBigInteger.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBigInteger.1/propertyIndex"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBigInteger.1/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setBoolean.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBoolean.1/propertyIndex"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBoolean.1/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setByte.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setByte.1/propertyIndex"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setByte.1/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setBytes.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBytes.1/propertyIndex"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBytes.1/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setChar.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setChar.1/propertyIndex"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setChar.1/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setDataObject.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setDataObject.1/propertyIndex"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setDataObject.1/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setDate.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setDate.1/propertyIndex"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setDate.1/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setDouble.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setDouble.1/propertyIndex"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setDouble.1/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setFloat.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setFloat.1/propertyIndex"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setFloat.1/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setInt.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setInt.1/propertyIndex"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setInt.1/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setList.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setList.1/propertyIndex"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setList.1/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setLong.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setLong.1/propertyIndex"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setLong.1/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setShort.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setShort.1/propertyIndex"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setShort.1/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setString.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setString.1/propertyIndex"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setString.1/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getBigDecimal.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getBigDecimal.2/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getBigInteger.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getBigInteger.2/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getBoolean.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getBoolean.2/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getByte.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getByte.2/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getBytes.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getBytes.2/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getChar.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getChar.2/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getDataObject.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getDataObject.2/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getDate.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getDate.2/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getDouble.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getDouble.2/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getFloat.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getFloat.2/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getInt.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getInt.2/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getList.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getList.2/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getLong.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getLong.2/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getSequence.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getSequence.2/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getShort.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getShort.2/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getString.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getString.2/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setBigDecimal.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBigDecimal.2/property"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBigDecimal.2/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setBigInteger.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBigInteger.2/property"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBigInteger.2/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setBoolean.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBoolean.2/property"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBoolean.2/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setByte.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setByte.2/property"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setByte.2/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setBytes.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBytes.2/property"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setBytes.2/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setChar.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setChar.2/property"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setChar.2/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setDataObject.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setDataObject.2/property"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setDataObject.2/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setDate.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setDate.2/property"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setDate.2/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setDouble.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setDouble.2/property"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setDouble.2/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setFloat.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setFloat.2/property"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setFloat.2/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setInt.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setInt.2/property"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setInt.2/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setList.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setList.2/property"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setList.2/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setLong.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setLong.2/property"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setLong.2/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setShort.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setShort.2/property"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setShort.2/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/setString.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setString.2/property"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/setString.2/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/createDataObject">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/createDataObject/propertyName"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/createDataObject.1">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/createDataObject.1/propertyIndex"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/createDataObject.2">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/createDataObject.2/property"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/createDataObject.3">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/createDataObject.3/propertyName"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/createDataObject.3/namespaceURI"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/createDataObject.3/typeName"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/createDataObject.4">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/createDataObject.4/propertyIndex"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/createDataObject.4/namespaceURI"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/createDataObject.4/typeName"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/createDataObject.5">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/createDataObject.5/property"/>
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/createDataObject.5/type"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/delete"/>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getSequence.3"/>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getInstanceProperties"/>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getProperty">
-        <genParameters ecoreParameter="SDO.ecore#//DataObject/getProperty/propertyName"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getRootObject"/>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/getChangeSummary"/>
-      <genOperations ecoreOperation="SDO.ecore#//DataObject/detach"/>
-    </genClasses>
-    <genClasses ecoreClass="SDO.ecore#//Property">
-      <genOperations ecoreOperation="SDO.ecore#//Property/getName"/>
-      <genOperations ecoreOperation="SDO.ecore#//Property/getType"/>
-      <genOperations ecoreOperation="SDO.ecore#//Property/isMany"/>
-      <genOperations ecoreOperation="SDO.ecore#//Property/isContainment"/>
-      <genOperations ecoreOperation="SDO.ecore#//Property/isReadOnly"/>
-      <genOperations ecoreOperation="SDO.ecore#//Property/getContainingType"/>
-      <genOperations ecoreOperation="SDO.ecore#//Property/getAliasNames"/>
-      <genOperations ecoreOperation="SDO.ecore#//Property/getOpposite"/>
-      <genOperations ecoreOperation="SDO.ecore#//Property/getDefault"/>
-    </genClasses>
-    <genClasses ecoreClass="SDO.ecore#//Sequence">
-      <genOperations ecoreOperation="SDO.ecore#//Sequence/size"/>
-      <genOperations ecoreOperation="SDO.ecore#//Sequence/getProperty">
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/getProperty/index"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//Sequence/getValue">
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/getValue/index"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//Sequence/setValue">
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/setValue/index"/>
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/setValue/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//Sequence/add">
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/add/propertyName"/>
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/add/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//Sequence/add.1">
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/add.1/propertIndex"/>
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/add.1/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//Sequence/add.2">
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/add.2/property"/>
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/add.2/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//Sequence/add.3">
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/add.3/index"/>
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/add.3/propertyName"/>
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/add.3/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//Sequence/add.4">
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/add.4/index"/>
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/add.4/propertyIndex"/>
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/add.4/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//Sequence/add.5">
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/add.5/index"/>
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/add.5/property"/>
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/add.5/value"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//Sequence/add.6">
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/add.6/text"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//Sequence/add.7">
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/add.7/index"/>
-        <genParameters ecoreParameter="SDO.ecore#//Sequence/add.7/text"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="SDO.ecore#//Type">
-      <genOperations ecoreOperation="SDO.ecore#//Type/getName"/>
-      <genOperations ecoreOperation="SDO.ecore#//Type/getURI"/>
-      <genOperations ecoreOperation="SDO.ecore#//Type/getInstanceClass"/>
-      <genOperations ecoreOperation="SDO.ecore#//Type/isInstance">
-        <genParameters ecoreParameter="SDO.ecore#//Type/isInstance/object"/>
-      </genOperations>
-      <genOperations ecoreOperation="SDO.ecore#//Type/isDataType"/>
-      <genOperations ecoreOperation="SDO.ecore#//Type/isSequenced"/>
-      <genOperations ecoreOperation="SDO.ecore#//Type/isOpen"/>
-      <genOperations ecoreOperation="SDO.ecore#//Type/isAbstract"/>
-      <genOperations ecoreOperation="SDO.ecore#//Type/getBaseTypes"/>
-      <genOperations ecoreOperation="SDO.ecore#//Type/getAliasNames"/>
-      <genOperations ecoreOperation="SDO.ecore#//Type/getProperties"/>
-      <genOperations ecoreOperation="SDO.ecore#//Type/getDeclaredProperties"/>
-      <genOperations ecoreOperation="SDO.ecore#//Type/getProperty">
-        <genParameters ecoreParameter="SDO.ecore#//Type/getProperty/propertyName"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="SDO.ecore#//AnyTypeDataObject"/>
-    <genClasses ecoreClass="SDO.ecore#//SimpleAnyTypeDataObject"/>
-    <genClasses ecoreClass="SDO.ecore#//Class"/>
-    <genClasses ecoreClass="SDO.ecore#//DataType"/>
-    <genClasses ecoreClass="SDO.ecore#//Attribute"/>
-    <genClasses ecoreClass="SDO.ecore#//Reference"/>
-    <genClasses ecoreClass="SDO.ecore#//Enum"/>
-    <genClasses ecoreClass="SDO.ecore#//DynamicDataObject"/>
-    <genClasses ecoreClass="SDO.ecore#//StoreDataObject"/>
-    <genClasses ecoreClass="SDO.ecore#//DynamicStoreDataObject"/>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/tags/java-stable-20060304/sdo/impl/model/SDO.mdl b/tags/java-stable-20060304/sdo/impl/model/SDO.mdl
deleted file mode 100644
index 763c521204..0000000000
--- a/tags/java-stable-20060304/sdo/impl/model/SDO.mdl
+++ /dev/null
@@ -1,7670 +0,0 @@
-
-(object Petal
-    version    	42
-    _written   	"Rose 4.5.8163.3"
-    charSet    	0)
-
-(object Design "Logical View"
-    is_unit    	TRUE
-    is_loaded  	TRUE
-    defaults   	(object defaults
-	rightMargin 	0.250000
-	leftMargin 	0.250000
-	topMargin  	0.250000
-	bottomMargin 	0.500000
-	pageOverlap 	0.250000
-	clipIconLabels 	TRUE
-	autoResize 	FALSE
-	snapToGrid 	TRUE
-	gridX      	16
-	gridY      	16
-	defaultFont 	(object Font
-	    size       	10
-	    face       	"Arial"
-	    bold       	FALSE
-	    italics    	FALSE
-	    underline  	FALSE
-	    strike     	FALSE
-	    color      	0
-	    default_color 	TRUE)
-	showMessageNum 	1
-	showClassOfObject 	TRUE
-	notation   	"Unified")
-    root_usecase_package 	(object Class_Category "Use Case View"
-	quid       	"3FAA8E8700BE"
-	exportControl 	"Public"
-	global     	TRUE
-	logical_models 	(list unit_reference_list)
-	logical_presentations 	(list unit_reference_list
-	    (object UseCaseDiagram "Main"
-		quid       	"3FAA8E8700EF"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    root_category 	(object Class_Category "Logical View"
-	quid       	"3FAA8E8700BD"
-	exportControl 	"Public"
-	global     	TRUE
-	subsystem  	"Component View"
-	quidu      	"3FAA8E8700BF"
-	logical_models 	(list unit_reference_list
-	    (object Class_Category "sdo"
-		attributes 	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"sdo")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"http://www.apache.org/tuscany/2005/SDO")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"org.apache.tuscany")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"SDO"))
-		quid       	"3FAA8E8B0306"
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "ChangeSummary"
-			quid       	"3FAB7C360208"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"4361480602D8"
-				supplier   	"Logical View::change::ChangeDescription"
-				quidu      	"4FAB6F110198"))
-			operations 	(list Operations
-			    (object Operation "beginLogging"
-				quid       	"3FAB8899003B"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "endLogging"
-				quid       	"3FAB88AB0145"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "isCreated"
-				quid       	"3FAB89650125"
-				parameters 	(list Parameters
-				    (object Parameter "dataObject"
-					type       	"DataObject"))
-				result     	"boolean"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "isDeleted"
-				quid       	"3FAB896F0314"
-				parameters 	(list Parameters
-				    (object Parameter "dataObject"
-					type       	"DataObject"))
-				result     	"boolean"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOldValues"
-				quid       	"3FAB89A4039C"
-				parameters 	(list Parameters
-				    (object Parameter "dataObject"
-					type       	"DataObject"))
-				result     	"EJavaList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "isModified"
-				quid       	"435500FB024C"
-				parameters 	(list Parameters
-				    (object Parameter "dataObject"
-					type       	"DataObject"))
-				result     	"boolean"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOldValue"
-				quid       	"435501180185"
-				parameters 	(list Parameters
-				    (object Parameter "dataObject"
-					type       	"DataObject")
-				    (object Parameter "property"
-					type       	"Property"))
-				result     	"ChangeSummarySetting"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOldContainer"
-				quid       	"43550265035B"
-				parameters 	(list Parameters
-				    (object Parameter "dataObject"
-					type       	"DataObject"))
-				result     	"DataObject"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOldContainmentProperty"
-				quid       	"4355027F01D2"
-				parameters 	(list Parameters
-				    (object Parameter "dataObject"
-					type       	"DataObject"))
-				result     	"Property"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOldSequence"
-				quid       	"4355029E03A3"
-				parameters 	(list Parameters
-				    (object Parameter "dataObject"
-					type       	"DataObject"))
-				result     	"Sequence"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "undoChanges"
-				quid       	"435502B303D5"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "isLogging"
-				quid       	"435D2CB50354"
-				result     	"boolean"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDataGraph"
-				quid       	"435D2CC200A0"
-				result     	"DataGraph"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getChangedObjects"
-				quid       	"435D2D2B001F"
-				result     	"EJavaList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getRootObject"
-				quid       	"435D2D360151"
-				result     	"DataObject"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "commonj.sdo.ChangeSummary"
-				quid       	"3FAB7C4D0373"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "ChangeSummarySetting"
-			quid       	"3FAB8BF8005A"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"436134F001A6"
-				supplier   	"Logical View::change::FeatureChange"
-				quidu      	"4FC39D6D0177"))
-			operations 	(list Operations
-			    (object Operation "isSet"
-				quid       	"3FD14B5800BD"
-				result     	"boolean"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getValue"
-				quid       	"3FDEF80600EA"
-				result     	"EJavaObject"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getProperty"
-				quid       	"435D2C440045"
-				result     	"Property"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "commonj.sdo.ChangeSummary$Setting"
-				quid       	"3FAB8C05003A"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DataGraph"
-			quid       	"3FAB7BFE03C0"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"43612C7B0243"
-				supplier   	"Logical View::ecore::EObject"
-				quidu      	"3C4F1C860123"))
-			operations 	(list Operations
-			    (object Operation "createRootObject"
-				quid       	"3FAB86D40102"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String")
-				    (object Parameter "typeName"
-					type       	"String"))
-				result     	"DataObject"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createRootObject"
-				quid       	"3FAB87520135"
-				parameters 	(list Parameters
-				    (object Parameter "type"
-					type       	"Type"))
-				result     	"DataObject"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getType"
-				quid       	"3FAB87E20024"
-				parameters 	(list Parameters
-				    (object Parameter "namespaceURI"
-					type       	"String")
-				    (object Parameter "typeName"
-					type       	"String"))
-				result     	"Type"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getRootObject"
-				quid       	"435D2C900120"
-				result     	"DataObject"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getChangeSummary"
-				quid       	"435D2C9B039D"
-				result     	"ChangeSummary"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "commonj.sdo.DataGraph"
-				quid       	"3FAB7C1A0171"
-				stereotype 	"javaclass"
-				exportControl 	"Public")
-			    (object ClassAttribute "resourceSet"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"436129AF0208"
-				type       	"EResourceSet"
-				exportControl 	"Public")
-			    (object ClassAttribute "rootResource"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isChangeable"
-					value      	FALSE))
-				quid       	"436129BF0016"
-				type       	"EResource"
-				exportControl 	"Public"
-				derived    	TRUE)))
-		    (object Class "DataObject"
-			quid       	"3FAB6F7501C4"
-			operations 	(list Operations
-			    (object Operation "get"
-				quid       	"3FAB8EF201A0"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String"))
-				result     	"EJavaObject"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.get(this, path);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "set"
-				quid       	"3FAB8FE502FE"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String")
-				    (object Parameter "value"
-					type       	"EJavaObject"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.set(this, path, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "isSet"
-				quid       	"3FAB901001BF"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String"))
-				result     	"boolean"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.isSet(this, path);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "unset"
-				quid       	"3FAB901803B6"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.unset(this, path);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "get"
-				quid       	"01EDEDEDEDED"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int"))
-				result     	"EJavaObject"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.get(this, propertyIndex);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "set"
-				quid       	"02EDEDEDEDED"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int")
-				    (object Parameter "value"
-					type       	"EJavaObject"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.set(this, propertyIndex, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "isSet"
-				quid       	"03EDEDEDEDED"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int"))
-				result     	"boolean"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.isSet(this, propertyIndex);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "unset"
-				quid       	"04EDEDEDEDED"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.unset(this, propertyIndex);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "get"
-				quid       	"01ADEDEDEDED"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property"))
-				result     	"EJavaObject"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.get(this, property);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "set"
-				quid       	"02ADEDEDEDED"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property")
-				    (object Parameter "value"
-					type       	"EJavaObject"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.set(this, property, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "isSet"
-				quid       	"03ADEDEDEDED"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property"))
-				result     	"boolean"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.isSet(this, property);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "unset"
-				quid       	"04ADEDEDEDED"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.unset(this, property);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getContainer"
-				quid       	"AAEDEDEDEDE0"
-				result     	"DataObject"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getContainer(this);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getContainmentProperty"
-				quid       	"AAEDEDEDEDE2"
-				result     	"Property"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getContainmentProperty(this);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDataGraph"
-				quid       	"AAEDEDEDEDE3"
-				result     	"DataGraph"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getDataGraph(this);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getType"
-				quid       	"AAEDEDEDEDE1"
-				result     	"Type"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getType(this);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBigDecimal"
-				quid       	"EDEDEDED0000"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String"))
-				result     	"EBigDecimal"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getBigDecimal(this, path);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBigInteger"
-				quid       	"EDEDEDED0001"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String"))
-				result     	"EBigInteger"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getBigInteger(this, path);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBoolean"
-				quid       	"EDEDEDED0002"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String"))
-				result     	"boolean"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getBoolean(this, path);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getByte"
-				quid       	"EDEDEDED0003"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String"))
-				result     	"byte"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getByte(this, path);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBytes"
-				quid       	"EDEDEDED0004"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String"))
-				result     	"EByteArray"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getBytes(this, path);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getChar"
-				quid       	"EDEDEDED0005"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String"))
-				result     	"char"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getChar(this, path);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDataObject"
-				quid       	"EDEDEDED0006"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String"))
-				result     	"DataObject"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getDataObject(this, path);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDate"
-				quid       	"EDEDEDED0007"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String"))
-				result     	"EDate"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getDate(this, path);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDouble"
-				quid       	"EDEDEDED0008"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String"))
-				result     	"double"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getDouble(this, path);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getFloat"
-				quid       	"EDEDEDED0009"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String"))
-				result     	"float"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getFloat(this, path);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getInt"
-				quid       	"EDEDEDED000A"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String"))
-				result     	"int"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getInt(this, path);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getList"
-				quid       	"EDEDEDED000B"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String"))
-				result     	"EJavaList"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getList(this, path);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getLong"
-				quid       	"EDEDEDED000C"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String"))
-				result     	"long"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getLong(this, path);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getSequence"
-				quid       	"EDEDEDED000D"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String"))
-				result     	"Sequence"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getSequence(this, path);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getShort"
-				quid       	"EDEDEDED000E"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String"))
-				result     	"short"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getShort(this, path);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getString"
-				quid       	"EDEDEDED000F"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String"))
-				result     	"String"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getString(this, path);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBigDecimal"
-				quid       	"EDEDEDED1000"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String")
-				    (object Parameter "value"
-					type       	"EBigDecimal"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setBigDecimal(this, path, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBigInteger"
-				quid       	"EDEDEDED1001"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String")
-				    (object Parameter "value"
-					type       	"EBigInteger"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setBigInteger(this, path, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBoolean"
-				quid       	"EDEDEDED1002"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String")
-				    (object Parameter "value"
-					type       	"boolean"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setBoolean(this, path, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setByte"
-				quid       	"EDEDEDED1003"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String")
-				    (object Parameter "value"
-					type       	"byte"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setByte(this, path, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBytes"
-				quid       	"EDEDEDED1004"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String")
-				    (object Parameter "value"
-					type       	"EByteArray"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setBytes(this, path, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setChar"
-				quid       	"EDEDEDED1005"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String")
-				    (object Parameter "value"
-					type       	"char"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setChar(this, path, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDataObject"
-				quid       	"EDEDEDED1006"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String")
-				    (object Parameter "value"
-					type       	"DataObject"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setDataObject(this, path, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDate"
-				quid       	"EDEDEDED1007"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String")
-				    (object Parameter "value"
-					type       	"EDate"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setDate(this, path, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDouble"
-				quid       	"EDEDEDED1008"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String")
-				    (object Parameter "value"
-					type       	"double"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setDouble(this, path, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setFloat"
-				quid       	"EDEDEDED1009"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String")
-				    (object Parameter "value"
-					type       	"float"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setFloat(this, path, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setInt"
-				quid       	"EDEDEDED100A"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String")
-				    (object Parameter "value"
-					type       	"int"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setInt(this, path, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setList"
-				quid       	"EDEDEDED100B"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String")
-				    (object Parameter "value"
-					type       	"EJavaList"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setList(this, path, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setLong"
-				quid       	"EDEDEDED100C"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String")
-				    (object Parameter "value"
-					type       	"long"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setLong(this, path, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setShort"
-				quid       	"EDEDEDED100E"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String")
-				    (object Parameter "value"
-					type       	"short"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setShort(this, path, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setString"
-				quid       	"EDEDEDED100F"
-				parameters 	(list Parameters
-				    (object Parameter "path"
-					type       	"String")
-				    (object Parameter "value"
-					type       	"String"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setString(this, path, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBigDecimal"
-				quid       	"EDEDEDED2000"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int"))
-				result     	"EBigDecimal"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getBigDecimal(this, propertyIndex);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBigInteger"
-				quid       	"EDEDEDED2001"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int"))
-				result     	"EBigInteger"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getBigInteger(this, propertyIndex);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBoolean"
-				quid       	"EDEDEDED2002"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int"))
-				result     	"boolean"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getBoolean(this, propertyIndex);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getByte"
-				quid       	"EDEDEDED2003"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int"))
-				result     	"byte"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getByte(this, propertyIndex);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBytes"
-				quid       	"EDEDEDED2004"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int"))
-				result     	"EByteArray"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getBytes(this, propertyIndex);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getChar"
-				quid       	"EDEDEDED2005"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int"))
-				result     	"char"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getChar(this, propertyIndex);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDataObject"
-				quid       	"EDEDEDED2006"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int"))
-				result     	"DataObject"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getDataObject(this, propertyIndex);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDate"
-				quid       	"EDEDEDED2007"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int"))
-				result     	"EDate"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getDate(this, propertyIndex);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDouble"
-				quid       	"EDEDEDED2008"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int"))
-				result     	"double"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getDouble(this, propertyIndex);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getFloat"
-				quid       	"EDEDEDED2009"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int"))
-				result     	"float"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getFloat(this, propertyIndex);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getInt"
-				quid       	"EDEDEDED200A"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int"))
-				result     	"int"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getInt(this, propertyIndex);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getList"
-				quid       	"EDEDEDED200B"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int"))
-				result     	"EJavaList"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getList(this, propertyIndex);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getLong"
-				quid       	"EDEDEDED200C"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int"))
-				result     	"long"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getLong(this, propertyIndex);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getSequence"
-				quid       	"EDEDEDED200D"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int"))
-				result     	"Sequence"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getSequence(this, propertyIndex);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getShort"
-				quid       	"EDEDEDED200E"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int"))
-				result     	"short"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getShort(this, propertyIndex);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getString"
-				quid       	"EDEDEDED200F"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int"))
-				result     	"String"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getString(this, propertyIndex);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBigDecimal"
-				quid       	"EDEDEDED3000"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int")
-				    (object Parameter "value"
-					type       	"EBigDecimal"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setBigDecimal(this, propertyIndex, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBigInteger"
-				quid       	"EDEDEDED3001"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int")
-				    (object Parameter "value"
-					type       	"EBigInteger"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setBigInteger(this, propertyIndex, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBoolean"
-				quid       	"EDEDEDED3002"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int")
-				    (object Parameter "value"
-					type       	"boolean"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setBoolean(this, propertyIndex, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setByte"
-				quid       	"EDEDEDED3003"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int")
-				    (object Parameter "value"
-					type       	"byte"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setByte(this, propertyIndex, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBytes"
-				quid       	"EDEDEDED3004"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int")
-				    (object Parameter "value"
-					type       	"EByteArray"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setBytes(this, propertyIndex, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setChar"
-				quid       	"EDEDEDED3005"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int")
-				    (object Parameter "value"
-					type       	"char"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setChar(this, propertyIndex, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDataObject"
-				quid       	"EDEDEDED3006"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int")
-				    (object Parameter "value"
-					type       	"DataObject"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setDataObject(this, propertyIndex, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDate"
-				quid       	"EDEDEDED3007"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int")
-				    (object Parameter "value"
-					type       	"EDate"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setDate(this, propertyIndex, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDouble"
-				quid       	"EDEDEDED3008"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int")
-				    (object Parameter "value"
-					type       	"double"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setDouble(this, propertyIndex, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setFloat"
-				quid       	"EDEDEDED3009"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int")
-				    (object Parameter "value"
-					type       	"float"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setFloat(this, propertyIndex, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setInt"
-				quid       	"EDEDEDED300A"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int")
-				    (object Parameter "value"
-					type       	"int"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setInt(this, propertyIndex, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setList"
-				quid       	"EDEDEDED300B"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int")
-				    (object Parameter "value"
-					type       	"EJavaList"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setList(this, propertyIndex, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setLong"
-				quid       	"EDEDEDED300C"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int")
-				    (object Parameter "value"
-					type       	"long"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setLong(this, propertyIndex, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setShort"
-				quid       	"EDEDEDED300E"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int")
-				    (object Parameter "value"
-					type       	"short"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setShort(this, propertyIndex, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setString"
-				quid       	"EDEDEDED300F"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int")
-				    (object Parameter "value"
-					type       	"String"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setString(this, propertyIndex, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBigDecimal"
-				quid       	"EDEDEEEE2000"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property"))
-				result     	"EBigDecimal"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getBigDecimal(this, property);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBigInteger"
-				quid       	"EDEDEEEE2001"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property"))
-				result     	"EBigInteger"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getBigInteger(this, property);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBoolean"
-				quid       	"EDEDEEEE2002"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property"))
-				result     	"boolean"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getBoolean(this, property);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getByte"
-				quid       	"EDEDEEEE2003"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property"))
-				result     	"byte"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getByte(this, property);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBytes"
-				quid       	"EDEDEEEE2004"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property"))
-				result     	"EByteArray"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getBytes(this, property);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getChar"
-				quid       	"EDEDEEEE2005"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property"))
-				result     	"char"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getChar(this, property);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDataObject"
-				quid       	"EDEDEEEE2006"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property"))
-				result     	"DataObject"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getDataObject(this, property);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDate"
-				quid       	"EDEDEEEE2007"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property"))
-				result     	"EDate"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getDate(this, property);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDouble"
-				quid       	"EDEDEEEE2008"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property"))
-				result     	"double"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getDouble(this, property);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getFloat"
-				quid       	"EDEDEEEE2009"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property"))
-				result     	"float"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getFloat(this, property);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getInt"
-				quid       	"EDEDEEEE200A"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property"))
-				result     	"int"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getInt(this, property);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getList"
-				quid       	"EDEDEEEE200B"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property"))
-				result     	"EJavaList"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getList(this, property);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getLong"
-				quid       	"EDEDEEEE200C"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property"))
-				result     	"long"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getLong(this, property);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getSequence"
-				quid       	"EDEDEEEE200D"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property"))
-				result     	"Sequence"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getSequence(this, property);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getShort"
-				quid       	"EDEDEEEE200E"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property"))
-				result     	"short"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getShort(this, property);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getString"
-				quid       	"EDEDEEEE200F"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property"))
-				result     	"String"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getString(this, property);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBigDecimal"
-				quid       	"EDEDEEEE3000"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property")
-				    (object Parameter "value"
-					type       	"EBigDecimal"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setBigDecimal(this, property, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBigInteger"
-				quid       	"EDEDEEEE3001"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property")
-				    (object Parameter "value"
-					type       	"EBigInteger"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setBigInteger(this, property, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBoolean"
-				quid       	"EDEDEEEE3002"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property")
-				    (object Parameter "value"
-					type       	"boolean"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setBoolean(this, property, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setByte"
-				quid       	"EDEDEEEE3003"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property")
-				    (object Parameter "value"
-					type       	"byte"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setByte(this, property, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setBytes"
-				quid       	"EDEDEEEE3004"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property")
-				    (object Parameter "value"
-					type       	"EByteArray"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setBytes(this, property, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setChar"
-				quid       	"EDEDEEEE3005"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property")
-				    (object Parameter "value"
-					type       	"char"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setChar(this, property, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDataObject"
-				quid       	"EDEDEEEE3006"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property")
-				    (object Parameter "value"
-					type       	"DataObject"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setDataObject(this, property, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDate"
-				quid       	"EDEDEEEE3007"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property")
-				    (object Parameter "value"
-					type       	"EDate"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setDate(this, property, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setDouble"
-				quid       	"EDEDEEEE3008"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property")
-				    (object Parameter "value"
-					type       	"double"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setDouble(this, property, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setFloat"
-				quid       	"EDEDEEEE3009"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property")
-				    (object Parameter "value"
-					type       	"float"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setFloat(this, property, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setInt"
-				quid       	"EDEDEEEE300A"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property")
-				    (object Parameter "value"
-					type       	"int"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setInt(this, property, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setList"
-				quid       	"EDEDEEEE300B"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property")
-				    (object Parameter "value"
-					type       	"EJavaList"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setList(this, property, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setLong"
-				quid       	"EDEDEEEE300C"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property")
-				    (object Parameter "value"
-					type       	"long"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setLong(this, property, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setShort"
-				quid       	"EDEDEEEE300E"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property")
-				    (object Parameter "value"
-					type       	"short"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setShort(this, property, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setString"
-				quid       	"EDEDEEEE300F"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property")
-				    (object Parameter "value"
-					type       	"String"))
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.setString(this, property, value);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createDataObject"
-				quid       	"EDEDEEEEEEE0"
-				parameters 	(list Parameters
-				    (object Parameter "propertyName"
-					type       	"String"))
-				result     	"DataObject"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.createDataObject(this, propertyName);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createDataObject"
-				quid       	"EDEDEEEEEEE1"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int"))
-				result     	"DataObject"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.createDataObject(this, propertyIndex);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createDataObject"
-				quid       	"EDEDEEEEEEE2"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property"))
-				result     	"DataObject"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.createDataObject(this, property);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createDataObject"
-				quid       	"EDEDEEEEEEE3"
-				parameters 	(list Parameters
-				    (object Parameter "propertyName"
-					type       	"String")
-				    (object Parameter "namespaceURI"
-					type       	"String")
-				    (object Parameter "typeName"
-					type       	"String"))
-				result     	"DataObject"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.createDataObject(this, propertyName, namespaceURI, typeName);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createDataObject"
-				quid       	"EDEDEEEEEEE4"
-				parameters 	(list Parameters
-				    (object Parameter "propertyIndex"
-					type       	"int")
-				    (object Parameter "namespaceURI"
-					type       	"String")
-				    (object Parameter "typeName"
-					type       	"String"))
-				result     	"DataObject"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.createDataObject(this, propertyIndex, namespaceURI, typeName);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "createDataObject"
-				quid       	"EDEDEEEEEEE5"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property")
-				    (object Parameter "type"
-					type       	"Type"))
-				result     	"DataObject"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.createDataObject(this, property, type);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "delete"
-				quid       	"EDEDEEEEEEE6"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.delete(this);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getSequence"
-				quid       	"4354FB2702D3"
-				result     	"Sequence"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getSequence(this);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getInstanceProperties"
-				quid       	"4354FB9F00CC"
-				result     	"EJavaList"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getInstanceProperties(this);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getProperty"
-				quid       	"4354FBB20369"
-				parameters 	(list Parameters
-				    (object Parameter "propertyName"
-					type       	"String"))
-				result     	"Property"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getProperty(this, propertyName);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getRootObject"
-				quid       	"4354FBDD01B2"
-				result     	"DataObject"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getRootObject(this);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getChangeSummary"
-				quid       	"4354FC0400F0"
-				result     	"ChangeSummary"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"return <%org.apache.sdo.util.SDOUtil%>.getChangeSummary(this);")
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "detach"
-				quid       	"4354FC150068"
-				concurrency 	"Sequential"
-				semantics  	(object Semantic_Info
-				    PDL        	"<%org.apache.sdo.util.SDOUtil%>.detach(this);")
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "commonj.sdo.DataObject"
-				quid       	"3FAB6F8B0284"
-				stereotype 	"javaclass"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "Property"
-			quid       	"3FAB7CA1031A"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getName"
-				quid       	"4357B5A1009C"
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getType"
-				quid       	"4358FF1A0291"
-				result     	"Type"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "isMany"
-				quid       	"4357B64B019A"
-				result     	"boolean"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "isContainment"
-				quid       	"4357B76501FA"
-				result     	"boolean"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "isReadOnly"
-				quid       	"4358FF3501DC"
-				result     	"boolean"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getContainingType"
-				quid       	"4358FF3C03D1"
-				result     	"Type"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getAliasNames"
-				quid       	"4358FF4D02EF"
-				result     	"EJavaList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getOpposite"
-				quid       	"4358FF59013D"
-				result     	"Property"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDefault"
-				quid       	"4358FF66029B"
-				result     	"EJavaObject"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "commonj.sdo.Property"
-				quid       	"3FAB7CAB00E4"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "Sequence"
-			quid       	"3FAB7CC302B5"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "size"
-				quid       	"3FD1F958017D"
-				result     	"int"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getProperty"
-				quid       	"3FAC32F4028D"
-				parameters 	(list Parameters
-				    (object Parameter "index"
-					type       	"int"))
-				result     	"Property"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getValue"
-				quid       	"3FAC3318010E"
-				parameters 	(list Parameters
-				    (object Parameter "index"
-					type       	"int"))
-				result     	"EJavaObject"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "setValue"
-				quid       	"3FAC33270259"
-				parameters 	(list Parameters
-				    (object Parameter "index"
-					type       	"int")
-				    (object Parameter "value"
-					type       	"EJavaObject"))
-				result     	"EJavaObject"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "add"
-				quid       	"3FAC333D017C"
-				parameters 	(list Parameters
-				    (object Parameter "propertyName"
-					type       	"String")
-				    (object Parameter "value"
-					type       	"EJavaObject"))
-				result     	"boolean"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "add"
-				quid       	"3FAC3371009F"
-				parameters 	(list Parameters
-				    (object Parameter "propertIndex"
-					type       	"int")
-				    (object Parameter "value"
-					type       	"EJavaObject"))
-				result     	"boolean"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "add"
-				quid       	"3FAC338C00CE"
-				parameters 	(list Parameters
-				    (object Parameter "property"
-					type       	"Property")
-				    (object Parameter "value"
-					type       	"EJavaObject"))
-				result     	"boolean"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "add"
-				quid       	"3FAC33AD02C6"
-				parameters 	(list Parameters
-				    (object Parameter "index"
-					type       	"int")
-				    (object Parameter "propertyName"
-					type       	"String")
-				    (object Parameter "value"
-					type       	"EJavaObject"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "add"
-				quid       	"3FAC33C40263"
-				parameters 	(list Parameters
-				    (object Parameter "index"
-					type       	"int")
-				    (object Parameter "propertyIndex"
-					type       	"int")
-				    (object Parameter "value"
-					type       	"EJavaObject"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "add"
-				quid       	"3FAC33C70375"
-				parameters 	(list Parameters
-				    (object Parameter "index"
-					type       	"int")
-				    (object Parameter "property"
-					type       	"Property")
-				    (object Parameter "value"
-					type       	"EJavaObject"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "add"
-				quid       	"43550F7D01DE"
-				parameters 	(list Parameters
-				    (object Parameter "text"
-					type       	"String"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "add"
-				quid       	"43550F930352"
-				parameters 	(list Parameters
-				    (object Parameter "index"
-					type       	"int")
-				    (object Parameter "text"
-					type       	"String"))
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "commonj.sdo.Sequence"
-				quid       	"3FAB7CEB00D2"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "Type"
-			quid       	"3FAB7C7C0349"
-			stereotype 	"Interface"
-			operations 	(list Operations
-			    (object Operation "getName"
-				quid       	"4357B56E012E"
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getURI"
-				quid       	"4358FE18013C"
-				result     	"String"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getInstanceClass"
-				quid       	"4357B6380265"
-				result     	"EJavaClass"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "isInstance"
-				quid       	"3FAB82AD0027"
-				parameters 	(list Parameters
-				    (object Parameter "object"
-					type       	"EJavaObject"))
-				result     	"boolean"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "isDataType"
-				quid       	"4358FE26031D"
-				result     	"boolean"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "isSequenced"
-				quid       	"4358FE33020D"
-				result     	"boolean"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "isOpen"
-				quid       	"4358FE4000F3"
-				result     	"boolean"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "isAbstract"
-				quid       	"4357B7440365"
-				result     	"boolean"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getBaseTypes"
-				quid       	"4358FE4B0316"
-				result     	"EJavaList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getAliasNames"
-				quid       	"4358FE740351"
-				result     	"EJavaList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getProperties"
-				quid       	"4358FE8D0248"
-				result     	"EJavaList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getDeclaredProperties"
-				quid       	"4358FE9C02A4"
-				result     	"EJavaList"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0)
-			    (object Operation "getProperty"
-				quid       	"3FAB831701D8"
-				parameters 	(list Parameters
-				    (object Parameter "propertyName"
-					type       	"String"))
-				result     	"Property"
-				concurrency 	"Sequential"
-				opExportControl 	"Public"
-				uid        	0))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "commonj.sdo.Type"
-				quid       	"3FAB7C8B0015"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "EJavaList"
-			quid       	"3FAB8A010237"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.util.List"
-				quid       	"3FAB8A0F01F1"
-				stereotype 	"javaclass"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "EObjectStreamException"
-			quid       	"3FC352DE038F"
-			stereotype 	"datatype"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "java.io.ObjectStreamException"
-				quid       	"3FC352F90171"
-				stereotype 	"javaclass"
-				exportControl 	"Public"))
-			abstract   	TRUE)
-		    (object Class "AnyTypeDataObject"
-			attributes 	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"xmlContentKind"
-				value      	("ContentKind" 3)))
-			quid       	"4069645E0146"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"406964870375"
-				supplier   	"Logical View::type::AnyType"
-				quidu      	"40695FE40332")
-			    (object Inheritance_Relationship
-				quid       	"436141F003E7"
-				stereotype 	"extend"
-				supplier   	"Logical View::sdo::DataObject"
-				quidu      	"3FAB6F7501C4")))
-		    (object Class "SimpleAnyTypeDataObject"
-			attributes 	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"xmlContentKind"
-				value      	("ContentKind" 2)))
-			quid       	"406964710189"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"4069648302E3"
-				stereotype 	"extend"
-				supplier   	"Logical View::sdo::AnyTypeDataObject"
-				quidu      	"4069645E0146")
-			    (object Inheritance_Relationship
-				quid       	"4069648D02E8"
-				supplier   	"Logical View::type::SimpleAnyType"
-				quidu      	"406961210099")))
-		    (object Class "Class"
-			quid       	"43559BB702E7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"43559D3A01A3"
-				supplier   	"Logical View::ecore::EClass"
-				quidu      	"3903D5BF000A")
-			    (object Inheritance_Relationship
-				quid       	"435901C600DC"
-				supplier   	"Logical View::sdo::Type"
-				quidu      	"3FAB7C7C0349"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "commonj.sdo.Type"
-				quid       	"435900CF00F5"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DataType"
-			quid       	"43559BE502F7"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"43590C6F016D"
-				supplier   	"Logical View::sdo::Type"
-				quidu      	"3FAB7C7C0349")
-			    (object Inheritance_Relationship
-				quid       	"43590C73038F"
-				supplier   	"Logical View::ecore::EDataType"
-				quidu      	"3903D525033E"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "commonj.sdo.Type"
-				quid       	"4358FFE30331"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "Attribute"
-			quid       	"43559E690004"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"43559ED801E4"
-				supplier   	"Logical View::ecore::EAttribute"
-				quidu      	"39238472039D")
-			    (object Inheritance_Relationship
-				quid       	"43567DFD03B6"
-				supplier   	"Logical View::sdo::Property"
-				quidu      	"3FAB7CA1031A"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "commonj.sdo.Property"
-				quid       	"4359014A0246"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "Reference"
-			quid       	"43559E86025E"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"43559EE0011D"
-				supplier   	"Logical View::ecore::EReference"
-				quidu      	"39238479039D")
-			    (object Inheritance_Relationship
-				quid       	"43567DF9022A"
-				supplier   	"Logical View::sdo::Property"
-				quidu      	"3FAB7CA1031A"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "commonj.sdo.Property"
-				quid       	"4359018E0226"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "Enum"
-			quid       	"4357B1010017"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"4357B1410218"
-				supplier   	"Logical View::sdo::Type"
-				quidu      	"3FAB7C7C0349")
-			    (object Inheritance_Relationship
-				quid       	"4357B14701DA"
-				supplier   	"Logical View::ecore::EEnum"
-				quidu      	"39A473E901D4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "commonj.sdo.Type"
-				quid       	"4359006102CE"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DynamicDataObject"
-			quid       	"435E94210124"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"435E9435008D"
-				supplier   	"Logical View::sdo::DataObject"
-				quidu      	"3FAB6F7501C4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "commonj.sdo.DataObject"
-				quid       	"435E9459021F"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "StoreDataObject"
-			quid       	"43621EBA03B4"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"43621F0B03A6"
-				supplier   	"Logical View::sdo::DataObject"
-				quidu      	"3FAB6F7501C4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "commonj.sdo.DataObject"
-				quid       	"43621EDF015E"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Class "DynamicStoreDataObject"
-			quid       	"43621F4203CD"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"43621F920242"
-				supplier   	"Logical View::sdo::StoreDataObject"
-				quidu      	"43621EBA03B4"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "commonj.sdo.DataObject"
-				quid       	"43621F5701ED"
-				stereotype 	"javaclass"
-				exportControl 	"Public")))
-		    (object Association "$UNNAMED$0"
-			quid       	"3FAD10CA01D5"
-			roles      	(list role_list
-			    (object Role "eDataGraph"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE))
-				quid       	"3FAD10CC001F"
-				label      	"eDataGraph"
-				supplier   	"Logical View::sdo::DataGraph"
-				quidu      	"3FAB7BFE03C0"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)
-			    (object Role "eChangeSummary"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3FAD10CC0020"
-				label      	"eChangeSummary"
-				supplier   	"Logical View::sdo::ChangeSummary"
-				quidu      	"3FAB7C360208"
-				client_cardinality 	(value cardinality "1")
-				Containment 	"By Value"
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$1"
-			quid       	"3FAD26E802F5"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$2"
-				quid       	"3FAD26ED00E9"
-				supplier   	"Logical View::sdo::DataGraph"
-				quidu      	"3FAB7BFE03C0")
-			    (object Role "eRootObject"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"3FAD26ED00F3"
-				label      	"eRootObject"
-				supplier   	"Logical View::ecore::EObject"
-				quidu      	"3C4F1C860123"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE)))
-		    (object Association "$UNNAMED$3"
-			quid       	"406962A200CF"
-			roles      	(list role_list
-			    (object Role "$UNNAMED$4"
-				quid       	"406962A30076"
-				supplier   	"Logical View::type::SimpleAnyType"
-				quidu      	"406961210099")
-			    (object Role "instanceType"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isResolveProxies"
-					value      	FALSE))
-				quid       	"406962A30077"
-				label      	"instanceType"
-				supplier   	"Logical View::ecore::EDataType"
-				quidu      	"3903D525033E"
-				client_cardinality 	(value cardinality "1")
-				is_navigable 	TRUE))))
-		logical_presentations 	(list unit_reference_list
-		    (object ClassDiagram "SDO Interfaces"
-			quid       	"3FAB8BAA0329"
-			title      	"SDO Interfaces"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::sdo::Sequence" @1
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				ShowOperationSignature 	TRUE
-				location   	(2560, 2032)
-				label      	(object ItemLabel
-				    Parent_View 	@1
-				    location   	(1999, 1673)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1122
-				    justify    	0
-				    label      	"Sequence")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@1
-				    location   	(1999, 1623)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	1122
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3FAB7CC302B5"
-				compartment 	(object Compartment
-				    Parent_View 	@1
-				    location   	(1999, 1733)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	14
-				    max_width  	1128)
-				width      	1140
-				height     	842
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::sdo::DataGraph" @2
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				ShowOperationSignature 	TRUE
-				location   	(768, 304)
-				label      	(object ItemLabel
-				    Parent_View 	@2
-				    location   	(65, 48)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1406
-				    justify    	0
-				    label      	"DataGraph")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3FAB7BFE03C0"
-				compartment 	(object Compartment
-				    Parent_View 	@2
-				    location   	(65, 108)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	9
-				    max_width  	1412)
-				width      	1424
-				height     	536
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::sdo::DataObject" @3
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				ShowOperationSignature 	TRUE
-				location   	(976, 1280)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@3
-				    location   	(62, 674)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1828
-				    justify    	0
-				    label      	"DataObject")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3FAB6F7501C4"
-				compartment 	(object Compartment
-				    Parent_View 	@3
-				    location   	(62, 734)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	23
-				    max_width  	1834
-				    compartmentItems 	(list Compartment
-					"+ get(property : Property) : EJavaObject"
-					"+ set(property : Property, value : EJavaObject)"
-					"+ isSet(property : Property) : boolean"
-					"+ unset(property : Property)"
-					"+ getContainer() : DataObject"
-					"+ getContainmentProperty() : Property"
-					"+ getDataGraph() : DataGraph"
-					"+ getType() : Type"
-					"+ createDataObject(propertyName : String) : DataObject"
-					"+ createDataObject(propertyIndex : int) : DataObject"
-					"+ createDataObject(property : Property) : DataObject"
-					"+ createDataObject(propertyName : String, namespaceURI : String, typeName : String) : DataObject"
-					"+ createDataObject(propertyIndex : int, namespaceURI : String, typeName : String) : DataObject"
-					"+ createDataObject(property : Property, type : Type) : DataObject"
-					"+ delete()"
-					"+ getSequence() : Sequence"
-					"+ getInstanceProperties() : EJavaList"
-					"+ getProperty(propertyName : String) : Property"
-					"+ getRootObject() : DataObject"
-					"+ getChangeSummary() : ChangeSummary"
-					"+ detach()"))
-				width      	1846
-				height     	1236
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::sdo::ChangeSummary" @4
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				ShowOperationSignature 	TRUE
-				location   	(2784, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@4
-				    location   	(1995, 76)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1578
-				    justify    	0
-				    label      	"ChangeSummary")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3FAB7C360208"
-				compartment 	(object Compartment
-				    Parent_View 	@4
-				    location   	(1995, 136)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	17
-				    max_width  	1584)
-				width      	1596
-				height     	992
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::sdo::Type" @5
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				ShowOperationSignature 	TRUE
-				location   	(512, 2448)
-				label      	(object ItemLabel
-				    Parent_View 	@5
-				    location   	(75, 2064)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	874
-				    justify    	0
-				    label      	"Type")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@5
-				    location   	(75, 2014)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	874
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3FAB7C7C0349"
-				compartment 	(object Compartment
-				    Parent_View 	@5
-				    location   	(75, 2124)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	15
-				    max_width  	881)
-				width      	892
-				height     	892
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::sdo::Property" @6
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				ShowOperationSignature 	TRUE
-				location   	(1424, 2352)
-				label      	(object ItemLabel
-				    Parent_View 	@6
-				    location   	(1054, 2068)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	740
-				    justify    	0
-				    label      	"Property")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@6
-				    location   	(1054, 2018)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	740
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3FAB7CA1031A"
-				compartment 	(object Compartment
-				    Parent_View 	@6
-				    location   	(1054, 2128)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	11
-				    max_width  	746)
-				width      	758
-				height     	692
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::sdo::ChangeSummarySetting" @7
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				ShowOperationSignature 	TRUE
-				location   	(2528, 1328)
-				label      	(object ItemLabel
-				    Parent_View 	@7
-				    location   	(2003, 1144)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1050
-				    justify    	0
-				    label      	"ChangeSummarySetting")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3FAB8BF8005A"
-				compartment 	(object Compartment
-				    Parent_View 	@7
-				    location   	(2003, 1204)
-				    icon_style 	"Icon"
-				    fill_color 	16777215
-				    anchor     	2
-				    nlines     	5
-				    max_width  	1056)
-				width      	1068
-				height     	392
-				annotation 	8
-				autoResize 	TRUE)))
-		    (object ClassDiagram "SDO DataObject Access"
-			quid       	"3FAC2D8D008D"
-			title      	"SDO DataObject Access"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::sdo::DataObject" @8
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				ShowOperationSignature 	TRUE
-				location   	(528, 1360)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@8
-				    location   	(53, 79)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	950
-				    justify    	0
-				    label      	"DataObject")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16316638
-				quidu      	"3FAB6F7501C4"
-				compartment 	(object Compartment
-				    Parent_View 	@8
-				    location   	(53, 139)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	50
-				    max_width  	0
-				    compartmentItems 	(list Compartment
-					"+ getBigDecimal(path : String) : EBigDecimal"
-					"+ getBigInteger(path : String) : EBigInteger"
-					"+ getBoolean(path : String) : boolean"
-					"+ getByte(path : String) : byte"
-					"+ getBytes(path : String) : EByteArray"
-					"+ getChar(path : String) : char"
-					"+ getDataObject(path : String) : DataObject"
-					"+ getDate(path : String) : EDate"
-					"+ getDouble(path : String) : double"
-					"+ getFloat(path : String) : float"
-					"+ getInt(path : String) : int"
-					"+ getList(path : String) : EJavaList"
-					"+ getLong(path : String) : long"
-					"+ getSequence(path : String) : Sequence"
-					"+ getShort(path : String) : short"
-					"+ getString(path : String) : String"
-					"+ getBigDecimal(propertyIndex : int) : EBigDecimal"
-					"+ getBigInteger(propertyIndex : int) : EBigInteger"
-					"+ getBoolean(propertyIndex : int) : boolean"
-					"+ getByte(propertyIndex : int) : byte"
-					"+ getBytes(propertyIndex : int) : EByteArray"
-					"+ getChar(propertyIndex : int) : char"
-					"+ getDataObject(propertyIndex : int) : DataObject"
-					"+ getDate(propertyIndex : int) : EDate"
-					"+ getDouble(propertyIndex : int) : double"
-					"+ getFloat(propertyIndex : int) : float"
-					"+ getInt(propertyIndex : int) : int"
-					"+ getList(propertyIndex : int) : EJavaList"
-					"+ getLong(propertyIndex : int) : long"
-					"+ getSequence(propertyIndex : int) : Sequence"
-					"+ getShort(propertyIndex : int) : short"
-					"+ getString(propertyIndex : int) : String"
-					"+ getBigDecimal(property : Property) : EBigDecimal"
-					"+ getBigInteger(property : Property) : EBigInteger"
-					"+ getBoolean(property : Property) : boolean"
-					"+ getByte(property : Property) : byte"
-					"+ getBytes(property : Property) : EByteArray"
-					"+ getChar(property : Property) : char"
-					"+ getDataObject(property : Property) : DataObject"
-					"+ getDate(property : Property) : EDate"
-					"+ getDouble(property : Property) : double"
-					"+ getFloat(property : Property) : float"
-					"+ getInt(property : Property) : int"
-					"+ getList(property : Property) : EJavaList"
-					"+ getLong(property : Property) : long"
-					"+ getSequence(property : Property) : Sequence"
-					"+ getShort(property : Property) : short"
-					"+ getString(property : Property) : String"
-					"<<javaclass>> + commonj.sdo.DataObject"))
-				width      	968
-				height     	2586
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::sdo::DataObject" @9
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				ShowOperationSignature 	TRUE
-				location   	(1664, 1280)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@9
-				    location   	(1131, 74)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1066
-				    justify    	0
-				    label      	"DataObject")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	16316638
-				quidu      	"3FAB6F7501C4"
-				compartment 	(object Compartment
-				    Parent_View 	@9
-				    location   	(1131, 134)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	47
-				    max_width  	0
-				    compartmentItems 	(list Compartment
-					"+ setBigDecimal(path : String, value : EBigDecimal)"
-					"+ setBigInteger(path : String, value : EBigInteger)"
-					"+ setBoolean(path : String, value : boolean)"
-					"+ setByte(path : String, value : byte)"
-					"+ setBytes(path : String, value : EByteArray)"
-					"+ setChar(path : String, value : char)"
-					"+ setDataObject(path : String, value : DataObject)"
-					"+ setDate(path : String, value : EDate)"
-					"+ setDouble(path : String, value : double)"
-					"+ setFloat(path : String, value : float)"
-					"+ setInt(path : String, value : int)"
-					"+ setList(path : String, value : EJavaList)"
-					"+ setLong(path : String, value : long)"
-					"+ setShort(path : String, value : short)"
-					"+ setString(path : String, value : String)"
-					"+ setBigDecimal(propertyIndex : int, value : EBigDecimal)"
-					"+ setBigInteger(propertyIndex : int, value : EBigInteger)"
-					"+ setBoolean(propertyIndex : int, value : boolean)"
-					"+ setByte(propertyIndex : int, value : byte)"
-					"+ setBytes(propertyIndex : int, value : EByteArray)"
-					"+ setChar(propertyIndex : int, value : char)"
-					"+ setDataObject(propertyIndex : int, value : DataObject)"
-					"+ setDate(propertyIndex : int, value : EDate)"
-					"+ setDouble(propertyIndex : int, value : double)"
-					"+ setFloat(propertyIndex : int, value : float)"
-					"+ setInt(propertyIndex : int, value : int)"
-					"+ setList(propertyIndex : int, value : EJavaList)"
-					"+ setLong(propertyIndex : int, value : long)"
-					"+ setShort(propertyIndex : int, value : short)"
-					"+ setString(propertyIndex : int, value : String)"
-					"+ setBigDecimal(property : Property, value : EBigDecimal)"
-					"+ setBigInteger(property : Property, value : EBigInteger)"
-					"+ setBoolean(property : Property, value : boolean)"
-					"+ setByte(property : Property, value : byte)"
-					"+ setBytes(property : Property, value : EByteArray)"
-					"+ setChar(property : Property, value : char)"
-					"+ setDataObject(property : Property, value : DataObject)"
-					"+ setDate(property : Property, value : EDate)"
-					"+ setDouble(property : Property, value : double)"
-					"+ setFloat(property : Property, value : float)"
-					"+ setInt(property : Property, value : int)"
-					"+ setList(property : Property, value : EJavaList)"
-					"+ setLong(property : Property, value : long)"
-					"+ setShort(property : Property, value : short)"
-					"+ setString(property : Property, value : String)"
-					"<<javaclass>> + commonj.sdo.DataObject"))
-				width      	1084
-				height     	2436
-				annotation 	8
-				autoResize 	TRUE)))
-		    (object ClassDiagram "Ecore SDO"
-			quid       	"3FAC379A02D5"
-			title      	"Ecore SDO"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::sdo::DataGraph" @10
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				location   	(464, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@10
-				    location   	(74, 104)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	780
-				    justify    	0
-				    label      	"DataGraph")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3FAB7BFE03C0"
-				compartment 	(object Compartment
-				    Parent_View 	@10
-				    location   	(74, 164)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	0
-				    compartmentItems 	(list Compartment
-					"<<javaclass>> + commonj.sdo.DataGraph"))
-				width      	798
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::sdo::ChangeSummary" @11
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				location   	(528, 400)
-				label      	(object ItemLabel
-				    Parent_View 	@11
-				    location   	(78, 344)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	900
-				    justify    	0
-				    label      	"ChangeSummary")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3FAB7C360208"
-				compartment 	(object Compartment
-				    Parent_View 	@11
-				    location   	(78, 404)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	0
-				    compartmentItems 	(list Compartment
-					"<<javaclass>> + commonj.sdo.ChangeSummary"))
-				width      	918
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::sdo::Type" @12
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				location   	(416, 1088)
-				label      	(object ItemLabel
-				    Parent_View 	@12
-				    location   	(79, 1054)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	674
-				    justify    	0
-				    label      	"Type")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@12
-				    location   	(79, 1004)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	674
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3FAB7C7C0349"
-				compartment 	(object Compartment
-				    Parent_View 	@12
-				    location   	(79, 1114)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	0
-				    compartmentItems 	(list Compartment
-					"<<javaclass>> + commonj.sdo.Type"))
-				width      	692
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::sdo::Property" @13
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				location   	(448, 1648)
-				label      	(object ItemLabel
-				    Parent_View 	@13
-				    location   	(78, 1614)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	740
-				    justify    	0
-				    label      	"Property")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@13
-				    location   	(78, 1564)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	740
-				    justify    	0
-				    label      	"<<Interface>>")
-				icon       	"Interface"
-				icon_style 	"Label"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3FAB7CA1031A"
-				compartment 	(object Compartment
-				    Parent_View 	@13
-				    location   	(78, 1674)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	0
-				    compartmentItems 	(list Compartment
-					"<<javaclass>> + commonj.sdo.Property"))
-				width      	758
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::sdo::ChangeSummarySetting" @14
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeOperation 	TRUE
-				location   	(608, 640)
-				label      	(object ItemLabel
-				    Parent_View 	@14
-				    location   	(83, 584)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	1050
-				    justify    	0
-				    label      	"ChangeSummarySetting")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3FAB8BF8005A"
-				compartment 	(object Compartment
-				    Parent_View 	@14
-				    location   	(83, 644)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	0
-				    compartmentItems 	(list Compartment
-					"<<javaclass>> + commonj.sdo.ChangeSummary$Setting"))
-				width      	1068
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::change::ChangeDescription" @15
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2496, 400)
-				label      	(object ItemLabel
-				    Parent_View 	@15
-				    location   	(2311, 350)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	370
-				    justify    	0
-				    label      	"ChangeDescription")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"4FAB6F110198"
-				width      	388
-				height     	124
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::ecore::EObject" @16
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				location   	(2592, 160)
-				label      	(object ItemLabel
-				    Parent_View 	@16
-				    location   	(2503, 110)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	178
-				    justify    	0
-				    label      	"EObject")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3C4F1C860123"
-				width      	196
-				height     	124
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::change::FeatureChange" @17
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2528, 640)
-				label      	(object ItemLabel
-				    Parent_View 	@17
-				    location   	(2374, 590)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	308
-				    justify    	0
-				    label      	"FeatureChange")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"4FC39D6D0177"
-				width      	326
-				height     	124
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::sdo::Class" @18
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1648, 1296)
-				label      	(object ItemLabel
-				    Parent_View 	@18
-				    location   	(1311, 1241)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	674
-				    justify    	0
-				    label      	"Class")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"43559BB702E7"
-				width      	692
-				height     	134
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::sdo::DataType" @19
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1648, 880)
-				label      	(object ItemLabel
-				    Parent_View 	@19
-				    location   	(1311, 825)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	674
-				    justify    	0
-				    label      	"DataType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"43559BE502F7"
-				width      	692
-				height     	134
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::ecore::EClass" @20
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2592, 1296)
-				label      	(object ItemLabel
-				    Parent_View 	@20
-				    location   	(2502, 1246)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	181
-				    justify    	0
-				    label      	"EClass")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3903D5BF000A"
-				width      	199
-				height     	124
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::ecore::EDataType" @21
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2560, 880)
-				label      	(object ItemLabel
-				    Parent_View 	@21
-				    location   	(2444, 830)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	232
-				    justify    	0
-				    label      	"EDataType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3903D525033E"
-				width      	250
-				height     	124
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::sdo::Attribute" @22
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1664, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@22
-				    location   	(1294, 1481)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	740
-				    justify    	0
-				    label      	"Attribute")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"43559E690004"
-				width      	758
-				height     	134
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::sdo::Reference" @23
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1664, 1760)
-				label      	(object ItemLabel
-				    Parent_View 	@23
-				    location   	(1294, 1705)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	740
-				    justify    	0
-				    label      	"Reference")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"43559E86025E"
-				width      	758
-				height     	134
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::ecore::EAttribute" @24
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2576, 1536)
-				label      	(object ItemLabel
-				    Parent_View 	@24
-				    location   	(2470, 1486)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	212
-				    justify    	0
-				    label      	"EAttribute")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"39238472039D"
-				width      	230
-				height     	124
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::ecore::EReference" @25
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2576, 1760)
-				label      	(object ItemLabel
-				    Parent_View 	@25
-				    location   	(2458, 1710)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	236
-				    justify    	0
-				    label      	"EReference")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"39238479039D"
-				width      	254
-				height     	124
-				annotation 	8)
-			    (object InheritView "" @26
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"43559ED801E4"
-				client     	@22
-				supplier   	@24
-				line_style 	0)
-			    (object InheritView "" @27
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"43559EE0011D"
-				client     	@23
-				supplier   	@25
-				line_style 	0)
-			    (object InheritView "" @28
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"43567DF9022A"
-				client     	@23
-				supplier   	@13
-				line_style 	0)
-			    (object InheritView "" @29
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"43567DFD03B6"
-				client     	@22
-				supplier   	@13
-				line_style 	0)
-			    (object ClassView "Class" "Logical View::sdo::Enum" @30
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1648, 1088)
-				label      	(object ItemLabel
-				    Parent_View 	@30
-				    location   	(1311, 1033)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	674
-				    justify    	0
-				    label      	"Enum")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"4357B1010017"
-				width      	692
-				height     	134
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::ecore::EEnum" @31
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(2592, 1088)
-				label      	(object ItemLabel
-				    Parent_View 	@31
-				    location   	(2502, 1038)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	181
-				    justify    	0
-				    label      	"EEnum")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"39A473E901D4"
-				width      	199
-				height     	124
-				annotation 	8)
-			    (object InheritView "" @32
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"4357B1410218"
-				client     	@30
-				supplier   	@12
-				line_style 	0)
-			    (object InheritView "" @33
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"4357B14701DA"
-				client     	@30
-				supplier   	@31
-				line_style 	0)
-			    (object InheritView "" @34
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"43559D3A01A3"
-				client     	@18
-				supplier   	@20
-				line_style 	0)
-			    (object InheritView "" @35
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"435901C600DC"
-				client     	@18
-				supplier   	@12
-				line_style 	0)
-			    (object InheritView "" @36
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"43590C6F016D"
-				client     	@19
-				supplier   	@12
-				line_style 	0)
-			    (object InheritView "" @37
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"43590C73038F"
-				client     	@19
-				supplier   	@21
-				line_style 	0)
-			    (object InheritView "" @38
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"43612C7B0243"
-				client     	@10
-				supplier   	@16
-				line_style 	0)
-			    (object InheritView "" @39
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"436134F001A6"
-				client     	@14
-				supplier   	@17
-				line_style 	0)
-			    (object InheritView "" @40
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"4361480602D8"
-				client     	@11
-				supplier   	@15
-				line_style 	0)))
-		    (object ClassDiagram "Ecore Data Graph"
-			quid       	"3FAD029E0142"
-			title      	"Ecore Data Graph"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::ecore::EObject" @41
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(464, 832)
-				label      	(object ItemLabel
-				    Parent_View 	@41
-				    location   	(375, 782)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	178
-				    justify    	0
-				    label      	"EObject")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3C4F1C860123"
-				width      	196
-				height     	124
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::sdo::DataGraph" @42
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(768, 256)
-				label      	(object ItemLabel
-				    Parent_View 	@42
-				    location   	(378, 150)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	780
-				    justify    	0
-				    label      	"DataGraph")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3FAB7BFE03C0"
-				width      	798
-				height     	236
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$1" @43
-				location   	(469, 572)
-				stereotype 	TRUE
-				quidu      	"3FAD26E802F5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "$UNNAMED$2" @44
-					Parent_View 	@43
-					location   	(-1067, -932)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3FAD26ED00E9"
-					client     	@43
-					supplier   	@42
-					line_style 	3
-					origin_attachment 	(469, 572)
-					terminal_attachment 	(469, 374))
-				    (object RoleView "eRootObject" @45
-					Parent_View 	@43
-					location   	(-1067, -932)
-					label      	(object SegLabel @46
-					    Parent_View 	@45
-					    location   	(324, 683)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	252
-					    justify    	0
-					    label      	"+eRootObject"
-					    pctDist    	0.567708
-					    height     	146
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3FAD26ED00F3"
-					client     	@43
-					supplier   	@41
-					line_style 	3
-					origin_attachment 	(469, 572)
-					terminal_attachment 	(469, 770)
-					label      	(object SegLabel @47
-					    Parent_View 	@45
-					    location   	(512, 690)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.598958
-					    height     	43
-					    orientation 	0))))
-			    (object ClassView "Class" "Logical View::sdo::ChangeSummary" @48
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1072, 832)
-				label      	(object ItemLabel
-				    Parent_View 	@48
-				    location   	(881, 782)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	382
-				    justify    	0
-				    label      	"ChangeSummary")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3FAB7C360208"
-				width      	400
-				height     	125
-				annotation 	8)
-			    (object AssociationViewNew "$UNNAMED$0" @49
-				location   	(1078, 572)
-				stereotype 	TRUE
-				quidu      	"3FAD10CA01D5"
-				roleview_list 	(list RoleViews
-				    (object RoleView "eDataGraph" @50
-					Parent_View 	@49
-					location   	(662, -692)
-					label      	(object SegLabel @51
-					    Parent_View 	@50
-					    location   	(929, 437)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	240
-					    justify    	0
-					    label      	"+eDataGraph"
-					    pctDist    	0.686170
-					    height     	150
-					    orientation 	0)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3FAD10CC001F"
-					client     	@49
-					supplier   	@42
-					line_style 	3
-					origin_attachment 	(1078, 572)
-					terminal_attachment 	(1078, 374)
-					label      	(object SegLabel @52
-					    Parent_View 	@50
-					    location   	(1115, 437)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.686170
-					    height     	37
-					    orientation 	1))
-				    (object RoleView "eChangeSummary" @53
-					Parent_View 	@49
-					location   	(662, -692)
-					label      	(object SegLabel @54
-					    Parent_View 	@53
-					    location   	(876, 692)
-					    anchor     	1
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	360
-					    justify    	0
-					    label      	"+eChangeSummary"
-					    pctDist    	0.611702
-					    height     	203
-					    orientation 	1)
-					stereotype 	TRUE
-					line_color 	3342489
-					quidu      	"3FAD10CC0020"
-					client     	@49
-					supplier   	@48
-					line_style 	3
-					origin_attachment 	(1078, 572)
-					terminal_attachment 	(1078, 770)
-					label      	(object SegLabel @55
-					    Parent_View 	@53
-					    location   	(1114, 692)
-					    anchor     	2
-					    anchor_loc 	1
-					    nlines     	1
-					    max_width  	15
-					    justify    	0
-					    label      	"1"
-					    pctDist    	0.611702
-					    height     	36
-					    orientation 	0))))))
-		    (object ClassDiagram "External Types"
-			quid       	"3FAB907F00F7"
-			title      	"External Types"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::sdo::EObjectStreamException" @56
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				ShowOperationSignature 	TRUE
-				location   	(1184, 176)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@56
-				    location   	(741, 142)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	886
-				    justify    	0
-				    label      	"EObjectStreamException")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@56
-				    location   	(741, 92)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	886
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	12303359
-				quidu      	"3FC352DE038F"
-				width      	904
-				height     	192
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::sdo::EJavaList" @57
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				ShowOperationSignature 	TRUE
-				location   	(352, 176)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@57
-				    location   	(80, 142)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"EJavaList")
-				stereotype 	(object ItemLabel
-				    Parent_View 	@57
-				    location   	(80, 92)
-				    fill_color 	13434879
-				    anchor     	10
-				    nlines     	1
-				    max_width  	544
-				    justify    	0
-				    label      	"<<datatype>>")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	8963327
-				quidu      	"3FAB8A010237"
-				width      	562
-				height     	192
-				annotation 	8)))
-		    (object ClassDiagram "SDO XML Type"
-			quid       	"406964270056"
-			title      	"SDO XML Type"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::type::AnyType" @58
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				ShowOperationSignature 	TRUE
-				location   	(1488, 576)
-				label      	(object ItemLabel
-				    Parent_View 	@58
-				    location   	(1075, 421)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	826
-				    justify    	0
-				    label      	"AnyType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"40695FE40332"
-				width      	844
-				height     	334
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::type::SimpleAnyType" @59
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				ShowOperationSignature 	TRUE
-				location   	(1488, 1040)
-				label      	(object ItemLabel
-				    Parent_View 	@59
-				    location   	(1272, 910)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	432
-				    justify    	0
-				    label      	"SimpleAnyType")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"406961210099"
-				width      	450
-				height     	284
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::sdo::AnyTypeDataObject" @60
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				ShowOperationSignature 	TRUE
-				location   	(448, 560)
-				label      	(object ItemLabel
-				    Parent_View 	@60
-				    location   	(250, 509)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	396
-				    justify    	0
-				    label      	"AnyTypeDataObject")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"4069645E0146"
-				width      	414
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::sdo::SimpleAnyTypeDataObject" @61
-				ShowCompartmentStereotypes 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				ShowOperationSignature 	TRUE
-				location   	(464, 1024)
-				label      	(object ItemLabel
-				    Parent_View 	@61
-				    location   	(201, 973)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	526
-				    justify    	0
-				    label      	"SimpleAnyTypeDataObject")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"406964710189"
-				width      	544
-				height     	126
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::sdo::DataObject" @62
-				ShowCompartmentStereotypes 	TRUE
-				SuppressAttribute 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(448, 208)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@62
-				    location   	(328, 165)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	240
-				    justify    	0
-				    label      	"DataObject")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3FAB6F7501C4"
-				width      	258
-				height     	110
-				annotation 	8)
-			    (object InheritView "" @63
-				stereotype 	(object SegLabel @64
-				    Parent_View 	@63
-				    location   	(298, 791)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"<<extend>>"
-				    pctDist    	0.502959
-				    height     	150
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"4069648302E3"
-				client     	@61
-				supplier   	@60
-				line_style 	3
-				origin_attachment 	(448, 961)
-				terminal_attachment 	(448, 623))
-			    (object InheritView "" @65
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"4069648D02E8"
-				client     	@61
-				supplier   	@59
-				line_style 	3
-				origin_attachment 	(736, 1002)
-				terminal_attachment 	(1263, 1002))
-			    (object InheritView "" @66
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"40696143020B"
-				client     	@59
-				supplier   	@58
-				line_style 	3
-				origin_attachment 	(1479, 898)
-				terminal_attachment 	(1479, 743))
-			    (object InheritView "" @67
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"406964870375"
-				client     	@60
-				supplier   	@58
-				line_style 	3
-				origin_attachment 	(655, 561)
-				terminal_attachment 	(1066, 561))
-			    (object InheritView "" @68
-				stereotype 	(object SegLabel @69
-				    Parent_View 	@68
-				    location   	(294, 403)
-				    anchor     	10
-				    anchor_loc 	1
-				    nlines     	1
-				    max_width  	450
-				    justify    	0
-				    label      	"<<extend>>"
-				    pctDist    	0.405229
-				    height     	155
-				    orientation 	0)
-				line_color 	3342489
-				quidu      	"436141F003E7"
-				client     	@60
-				supplier   	@62
-				line_style 	0)))
-		    (object ClassDiagram "SDO DataObject Implementations"
-			quid       	"43621DF90149"
-			title      	"SDO DataObject Implementations"
-			zoom       	100
-			max_height 	28350
-			max_width  	21600
-			origin_x   	0
-			origin_y   	0
-			items      	(list diagram_item_list
-			    (object ClassView "Class" "Logical View::sdo::DataObject" @70
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				location   	(1056, 368)
-				font       	(object Font
-				    italics    	TRUE)
-				label      	(object ItemLabel
-				    Parent_View 	@70
-				    location   	(661, 312)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	790
-				    justify    	0
-				    label      	"DataObject")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"3FAB6F7501C4"
-				compartment 	(object Compartment
-				    Parent_View 	@70
-				    location   	(661, 372)
-				    icon_style 	"Icon"
-				    fill_color 	13434879
-				    anchor     	2
-				    nlines     	1
-				    max_width  	0
-				    compartmentItems 	(list Compartment
-					"<<javaclass>> + commonj.sdo.DataObject"))
-				width      	808
-				height     	136
-				annotation 	8
-				autoResize 	TRUE)
-			    (object ClassView "Class" "Logical View::sdo::DynamicDataObject" @71
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(576, 720)
-				label      	(object ItemLabel
-				    Parent_View 	@71
-				    location   	(181, 664)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	790
-				    justify    	0
-				    label      	"DynamicDataObject")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"435E94210124"
-				width      	808
-				height     	136
-				annotation 	8)
-			    (object ClassView "Class" "Logical View::sdo::StoreDataObject" @72
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1680, 720)
-				label      	(object ItemLabel
-				    Parent_View 	@72
-				    location   	(1285, 664)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	790
-				    justify    	0
-				    label      	"StoreDataObject")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"43621EBA03B4"
-				width      	808
-				height     	136
-				annotation 	8)
-			    (object InheritTreeView "" @73
-				location   	(1053, 559)
-				line_color 	3342489
-				fill_color 	13434879
-				supplier   	@70
-				vertices   	(list Points
-				    (1053, 559)
-				    (1053, 436)))
-			    (object InheritView "" @74
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"435E9435008D"
-				client     	@71
-				supplier   	@70
-				line_style 	3
-				origin_attachment 	(562, 652)
-				terminal_attachment 	(562, 559)
-				drawSupplier 	@73)
-			    (object ClassView "Class" "Logical View::sdo::DynamicStoreDataObject" @75
-				ShowCompartmentStereotypes 	TRUE
-				SuppressOperation 	TRUE
-				IncludeAttribute 	TRUE
-				IncludeOperation 	TRUE
-				location   	(1680, 1056)
-				label      	(object ItemLabel
-				    Parent_View 	@75
-				    location   	(1285, 1000)
-				    fill_color 	13434879
-				    nlines     	1
-				    max_width  	790
-				    justify    	0
-				    label      	"DynamicStoreDataObject")
-				icon_style 	"Icon"
-				line_color 	3342489
-				fill_color 	13434879
-				quidu      	"43621F4203CD"
-				width      	808
-				height     	136
-				annotation 	8)
-			    (object InheritView "" @76
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"43621F920242"
-				client     	@75
-				supplier   	@72
-				line_style 	0)
-			    (object InheritView "" @77
-				stereotype 	TRUE
-				line_color 	3342489
-				quidu      	"43621F0B03A6"
-				client     	@72
-				supplier   	@70
-				line_style 	3
-				origin_attachment 	(1681, 652)
-				terminal_attachment 	(1681, 559)
-				drawSupplier 	@73)))))
-	    (object Class_Category "ecore"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$VABASE_PLUGINS_PATH\\org.eclipse.emf.ecore\\model\\org.eclipse.emf.Ecore.cat"
-		quid       	"39A5ED04004E")
-	    (object Class_Category "change"
-		is_unit    	TRUE
-		is_loaded  	FALSE
-		file_name  	"$VABASE_PLUGINS_PATH\\org.eclipse.emf.ecore.change\\model\\org.eclipse.emf.ecore.Change.cat"
-		quid       	"4FAA8E8B0306")
-	    (object Class_Category "type"
-		attributes 	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"type")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"xml.type")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"http://www.eclipse.org/emf/2003/XMLType")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"org.eclipse.emf.ecore.xml")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"XMLType"))
-		quid       	"40696924000C"
-		exportControl 	"Public"
-		logical_models 	(list unit_reference_list
-		    (object Class "AnyType"
-			attributes 	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"xmlContentKind"
-				value      	("ContentKind" 3)))
-			quid       	"40695FE40332"
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "mixed"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnique"
-					value      	FALSE))
-				quid       	"40696039001D"
-				stereotype 	"0..*"
-				type       	"EFeatureMapEntry"
-				exportControl 	"Public")
-			    (object ClassAttribute "any"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnique"
-					value      	FALSE))
-				quid       	"40696084002F"
-				stereotype 	"0..*"
-				type       	"EFeatureMapEntry"
-				exportControl 	"Public"
-				derived    	TRUE)
-			    (object ClassAttribute "anyAttribute"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnique"
-					value      	FALSE))
-				quid       	"4069609A0153"
-				stereotype 	"0..*"
-				type       	"EFeatureMapEntry"
-				exportControl 	"Public")))
-		    (object Class "SimpleAnyType"
-			attributes 	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"xmlContentKind"
-				value      	("ContentKind" 2)))
-			quid       	"406961210099"
-			superclasses 	(list inheritance_relationship_list
-			    (object Inheritance_Relationship
-				quid       	"40696143020B"
-				supplier   	"Logical View::type::AnyType"
-				quidu      	"40695FE40332"))
-			class_attributes 	(list class_attribute_list
-			    (object ClassAttribute "rawValue"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnique"
-					value      	FALSE))
-				quid       	"4069612E0391"
-				type       	"String"
-				exportControl 	"Public"
-				derived    	TRUE)
-			    (object ClassAttribute "value"
-				attributes 	(list Attribute_Set
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isTransient"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isVolatile"
-					value      	TRUE)
-				    (object Attribute
-					tool       	"Ecore"
-					name       	"isUnique"
-					value      	FALSE))
-				quid       	"406961A40106"
-				type       	"EJavaObject"
-				exportControl 	"Public"
-				derived    	TRUE))))
-		logical_presentations 	(list unit_reference_list)))
-	logical_presentations 	(list unit_reference_list
-	    (object ClassDiagram "Main"
-		quid       	"3FAA8E8700D0"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list
-		    (object CategoryView "Logical View::ecore" @78
-			location   	(912, 272)
-			label      	(object ItemLabel
-			    Parent_View 	@78
-			    location   	(768, 188)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"ecore")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"39A5ED04004E"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::sdo" @79
-			location   	(368, 272)
-			label      	(object ItemLabel
-			    Parent_View 	@79
-			    location   	(224, 188)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"sdo")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"3FAA8E8B0306"
-			width      	300
-			height     	180)
-		    (object CategoryView "Logical View::change" @80
-			location   	(1440, 272)
-			label      	(object ItemLabel
-			    Parent_View 	@80
-			    location   	(1296, 188)
-			    fill_color 	13434879
-			    nlines     	2
-			    max_width  	288
-			    justify    	0
-			    label      	"change")
-			icon_style 	"Icon"
-			line_color 	3342489
-			fill_color 	13434879
-			quidu      	"4FAA8E8B0306"
-			width      	300
-			height     	180)))))
-    root_subsystem 	(object SubSystem "Component View"
-	quid       	"3FAA8E8700BF"
-	physical_models 	(list unit_reference_list)
-	physical_presentations 	(list unit_reference_list
-	    (object Module_Diagram "Main"
-		quid       	"3FAA8E8700EE"
-		title      	"Main"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    process_structure 	(object Processes
-	quid       	"3FAA8E8700C0"
-	ProcsNDevs 	(list
-	    (object Process_Diagram "Deployment View"
-		quid       	"3FAA8E8700C2"
-		title      	"Deployment View"
-		zoom       	100
-		max_height 	28350
-		max_width  	21600
-		origin_x   	0
-		origin_y   	0
-		items      	(list diagram_item_list))))
-    properties 	(object Properties
-	attributes 	(list Attribute_Set
-	    (object Attribute
-		tool       	"DDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBase"
-			value      	("DataBaseSet" 800))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DataBaseSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"DDL"
-				name       	"ANSI"
-				value      	800)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Oracle"
-				value      	801)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"SQLServer"
-				value      	802)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Sybase"
-				value      	803)
-			    (object Attribute
-				tool       	"DDL"
-				name       	"Watcom"
-				value      	804)))
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnName"
-			value      	"Id")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5)")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ViewName"
-			value      	"V_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"TableName"
-			value      	"T_")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"InheritSuffix"
-			value      	"_V")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"BaseViews"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"DDL"
-			name       	"ColumnType"
-			value      	"VARCHAR")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"DDL"
-			name       	"NullsOK"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"PrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"Unique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"DDL"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"DDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"IDL"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"StopOnError"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DefaultSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLElement"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecificationType"
-			value      	("IDLSpecSet" 22))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IDLSpecSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Interface"
-				value      	22)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Typedef"
-				value      	54)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Enumeration"
-				value      	8)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Const"
-				value      	71)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Exception"
-				value      	61)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Struct"
-				value      	51)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Union"
-				value      	81)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/org.eclipse.emf.ecore.sdo/model/SDO.mdl, emf.ecore.sdo, org.eclipse.dev"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateIDLModule"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CmIdentification"
-			value      	(value Text "  %X%  @(#) plugins/org.eclipse.emf.ecore.sdo/model/SDO.mdl, emf.ecore.sdo, org.eclipse.dev"))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"ConstValue"
-			value      	"")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"IDL"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"IDL"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"IDL"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"IDL"
-			name       	"Directory"
-			value      	"AUTO GENERATE")))
-	    (object Attribute
-		tool       	"IDL"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"SCC"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"propertyId"
-		value      	"809135969")
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"packageName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsPrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"nsURI"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"basePackage"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"prefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"classifierName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlContentKind"
-			value      	("ContentKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"ContentKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Empty"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Mixed"
-				value      	3)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"ElementOnly"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"operationName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"attributeName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnique"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isID"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"Ecore"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"referenceName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isTransient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isChangeable"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isUnsettable"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"isResolveProxies"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlName"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlNamespace"
-			value      	"")
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"xmlFeatureKind"
-			value      	("FeatureKind" 0))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"FeatureKind"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Unspecified"
-				value      	0)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Simple"
-				value      	1)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Attribute"
-				value      	2)
-			    (object Attribute
-				tool       	"Ecore"
-				name       	"Element"
-				value      	4)))
-		    (object Attribute
-			tool       	"Ecore"
-			name       	"annotation"
-			value      	"")))
-	    (object Attribute
-		tool       	"framework"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Java"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"Java"
-			name       	"UsePrefixes"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"InstanceVariablePrefix"
-			value      	"m_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"ClassVariablePrefix"
-			value      	"s_")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultAttributeDataType"
-			value      	"int")
-		    (object Attribute
-			tool       	"Java"
-			name       	"DefaultOperationReturnType"
-			value      	"void")))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDefaultConstructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ConstructorIs"
-			value      	("Ctor_Set" 62))
-		    (object Attribute
-			tool       	"Java"
-			name       	"Ctor_Set"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Java"
-				name       	"Public"
-				value      	62)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Protected"
-				value      	63)
-			    (object Attribute
-				tool       	"Java"
-				name       	"Private"
-				value      	64)))
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateFinalizer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateStaticInitializer"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateInstanceInitializer"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"CmIdentification"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Java"
-			name       	"AdditionalImports"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"Abstract"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Static"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Native"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Synchronized"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Java"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"InitialValue"
-			value      	"")
-		    (object Attribute
-			tool       	"Java"
-			name       	"Final"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Transient"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Java"
-			name       	"Volatile"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Java"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"propertyId"
-		value      	"360000002")
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DDLScriptFilename"
-			value      	"DDL1.SQL")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"DropClause"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnName"
-			value      	"_ID")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"PrimaryKeyColumnType"
-			value      	"NUMBER(5,0)")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"SchemaNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TypeNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ViewNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"VarrayNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NestedTableNameSuffix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNamePrefix"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"ObjectTableNameSuffix"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSchema"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"WhereClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeLength"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypePrecision"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionTypeScale"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CollectionOfREFS"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKind"
-			value      	("MethodKindSet" 1903))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OverloadID"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsReadNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoDataState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsWriteNoProcessState"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsSelfish"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerType"
-			value      	("TriggerTypeSet" 1801))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEvent"
-			value      	("TriggerEventSet" 1601))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerText"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerReferencingNames"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEach"
-			value      	("TriggerForEachSet" 1701))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerWhenClause"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"MethodKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"MapMethod"
-				value      	1901)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"OrderMethod"
-				value      	1902)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Function"
-				value      	1903)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Procedure"
-				value      	1904)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Operator"
-				value      	1905)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Constructor"
-				value      	1906)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Destructor"
-				value      	1907)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Trigger"
-				value      	1908)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"Calculated"
-				value      	1909)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"AFTER"
-				value      	1801)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"BEFORE"
-				value      	1802)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSTEAD OF"
-				value      	1803)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerForEachSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"ROW"
-				value      	1701)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"STATEMENT"
-				value      	1702)))
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"TriggerEventSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT"
-				value      	1601)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE"
-				value      	1602)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"DELETE"
-				value      	1603)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE"
-				value      	1604)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR DELETE"
-				value      	1605)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"UPDATE OR DELETE"
-				value      	1606)
-			    (object Attribute
-				tool       	"Oracle8"
-				name       	"INSERT OR UPDATE OR DELETE"
-				value      	1607)))))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"OrderNumber"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"NullsAllowed"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Length"
-			value      	"")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Precision"
-			value      	"2")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"Scale"
-			value      	"6")
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsIndex"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"IsPrimaryKey"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CompositeUnique"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Oracle8"
-			name       	"CheckConstraint"
-			value      	"")))
-	    (object Attribute
-		tool       	"Oracle8"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Repository"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"cg"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"UseMSVC"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileExtension"
-			value      	"h")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileBackupExtension"
-			value      	"h~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"HeaderFileTemporaryExtension"
-			value      	"h#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileExtension"
-			value      	"cpp")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileBackupExtension"
-			value      	"cp~")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeFileTemporaryExtension"
-			value      	"cp#")
-		    (object Attribute
-			tool       	"cg"
-			name       	"CreateMissingDirectories"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StopOnError"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ErrorLimit"
-			value      	30)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"$ROSECPP_SOURCE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"PathSeparator"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileNameFormat"
-			value      	"128vx_b")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BooleanType"
-			value      	"int")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowTemplates"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExplicitInstantiations"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowProtectedInheritance"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CommentWidth"
-			value      	60)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByValueContainer"
-			value      	"$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OneByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByValueContainer"
-			value      	"OptionalByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OptionalByReferenceContainer"
-			value      	"$targetClass *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByValueContainer"
-			value      	"$targetClass[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"FixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedFixedByReferenceContainer"
-			value      	"$targetClass *[$limit]")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByValueContainer"
-			value      	"BoundedListByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByValueContainer"
-			value      	"BoundedSetByValue<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedByReferenceContainer"
-			value      	"BoundedListByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedBoundedByReferenceContainer"
-			value      	"BoundedSetByReference<$targetClass,$limit>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByValueContainer"
-			value      	"UnboundedListByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByValueContainer"
-			value      	"UnboundedSetByValue<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnboundedByReferenceContainer"
-			value      	"UnboundedListByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedUnboundedByReferenceContainer"
-			value      	"UnboundedSetByReference<$targetClass>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByValueContainer"
-			value      	"AssociationByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByValueContainer"
-			value      	"DictionaryByValue<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedByReferenceContainer"
-			value      	"AssociationByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"UnorderedQualifiedByReferenceContainer"
-			value      	"DictionaryByReference<$qualtype, $qualcont>")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GeneratePreserveRegions"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ImplementationType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ClassKey"
-			value      	"class")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"PutBodiesInSpec"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitDefaultConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateCopyConstructor"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyConstructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExplicitCopyConstructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDestructor"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DestructorKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDestructor"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssignmentOperation"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssignmentKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssignmentOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEqualityOperations"
-			value      	("GenerateSet" 199))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"EqualityKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineEqualityOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"RelationalKind"
-			value      	("FriendKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineRelationalOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StorageMgmtVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStorageMgmtOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"SubscriptResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSubscriptOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DereferenceResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineDereferenceOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionKind"
-			value      	("ThreeKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IndirectionResultType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineIndirectionOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"StreamVisibility"
-			value      	("VisibilitySet" 45))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineStreamOperations"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ThreeKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"KindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FriendKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareAndDefine"
-				value      	199)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DeclareOnly"
-				value      	205)
-			    (object Attribute
-				tool       	"cg"
-				name       	"DoNotDeclare"
-				value      	206)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"VisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ConstValue"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDefaultSpecifier"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DefaultSpecifier"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InclusionProtectionSymbol"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Generate"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CmIdentification"
-			value      	(value Text "  %X% %Q% %Z% %W%"))
-		    (object Attribute
-			tool       	"cg"
-			name       	"CopyrightNotice"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"FileName"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AllowExtensionlessFileName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeFormat"
-			value      	(value Text 
-|// $package
-|#include "$file"
-|
-			))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeBySimpleName"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludePrecompiledHeader"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeOrder"
-			value      	"AMIR")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AdditionalIncludes"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyle"
-			value      	("InliningStyleSet" 207))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InliningStyleSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"InClassDeclaration"
-				value      	208)
-			    (object Attribute
-				tool       	"cg"
-				name       	"FollowingClassDeclaration"
-				value      	207)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"TypesDefined"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"IncludeClosure"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKind"
-			value      	("OperationKindSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationKindSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsExplicit"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Inline"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ExitCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyAnnotations"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"OperationIsOneWay"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Context"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Raises"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"Ordered"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$supplier")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$relationship")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SelectorType"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedHasRelType"
-			value      	("HasRelTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"HasRelTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Association"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"InstanceArguments"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"NameIfUnlabeled"
-			value      	"the_$targetClass")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"InitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerClass"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerGet"
-			value      	"$data.get($keys)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"ContainerSet"
-			value      	"$data.set($keys,$value)")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedContainer"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassContainer"
-			value      	"$supplier *")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassInitialValue"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReference"
-			value      	("QualifiedGetSetByReferenceSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetSetByReferenceSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_GetSetByReference"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateQualifiedSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"QualifiedSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineQualifiedSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberName"
-			value      	"$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtRelationshipVisibility"
-				value      	210)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassDataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetName"
-			value      	"get_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassGetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateAssocClassSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetName"
-			value      	"set_$target")
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassSetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineAssocClassSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocClassForwardReferenceOnly"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BoundedRoleType"
-			value      	("AssocTypeSet" 47))
-		    (object Attribute
-			tool       	"cg"
-			name       	"AssocTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Array"
-				value      	24)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Sequence"
-				value      	47)))))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberName"
-			value      	"$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibility"
-			value      	("DataMemberVisibilitySet" 14))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberVisibilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Public"
-				value      	45)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Protected"
-				value      	44)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Private"
-				value      	43)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Implementation"
-				value      	14)
-			    (object Attribute
-				tool       	"cg"
-				name       	"AtAttributeVisibility"
-				value      	211)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutability"
-			value      	("DataMemberMutabilitySet" 0))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberMutabilitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unrestricted"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Mutable"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Const"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberIsVolatile"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"DataMemberFieldSize"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateGetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateSetOperation"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetName"
-			value      	"get_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetName"
-			value      	"set_$attribute")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKinds"
-			value      	("GetSetKindsSet" 200))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetKindsSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"Common"
-				value      	200)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Virtual"
-				value      	201)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Abstract"
-				value      	202)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Static"
-				value      	203)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Friend"
-				value      	204)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetIsConst"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConst"
-			value      	("GetResultIsConstSet" 2))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetResultIsConstSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"False"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"True"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Same_As_Function"
-				value      	2)))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GetSetByReference"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineGet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"SetReturnsValue"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"InlineSet"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CaseSpecifier"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsReadOnly"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Uses"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"ForwardReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"BodyReferenceOnly"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateForwardReference"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Subsystem"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"Directory"
-			value      	"AUTO GENERATE")
-		    (object Attribute
-			tool       	"cg"
-			name       	"DirectoryIsOnSearchList"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"PrecompiledHeader"
-			value      	"")))
-	    (object Attribute
-		tool       	"cg"
-		name       	"default__Category"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"cg"
-			name       	"IsNamespace"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"cg"
-			name       	"Indent"
-			value      	2)
-		    (object Attribute
-			tool       	"cg"
-			name       	"CodeName"
-			value      	"")
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegions"
-			value      	("GenerateEmptyRegionSet" 3))
-		    (object Attribute
-			tool       	"cg"
-			name       	"GenerateEmptyRegionSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"cg"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Preserved"
-				value      	1)
-			    (object Attribute
-				tool       	"cg"
-				name       	"Unpreserved"
-				value      	2)
-			    (object Attribute
-				tool       	"cg"
-				name       	"All"
-				value      	3)))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"propertyId"
-		value      	"809135966")
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Project"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Version"
-			value      	"5.0")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCClassTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCClassTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Interface_Part"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Connection_Part"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Class_Factory"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionality"
-			value      	("CObjectFunctionalitySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CObjectFunctionalitySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dynamic"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dyncreate"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Serial"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOverrideGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDataGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DATA_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateFieldGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_FIELD_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMessageMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactory"
-			value      	("OLEFactorySet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEFactorySet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"None"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Built_in"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Simple"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Licensed"
-				value      	3)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEName"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEClassID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLECtlType"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECtlType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateOLETypeLib"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMajor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLETypeLibMinor"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropPageIDs"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLEPropPageIDs"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispatchMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockProperties"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockFunctions"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DispatchDefValue"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateDispIdEnum"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISP_ID_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInterfaceMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"INTERFACE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InitInterface"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockEvents"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateEventSinkMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PropNotifySinks"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ConnectionPointIID"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"InheritanceType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"OLECommands"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCDeclares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MFCImplements"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"ATL_Declares"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateCOMMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"COM_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateConnectionPointMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CONNECTION_POINT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateMsgMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GeneratePropertyMap"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PROPERTY_MAP_Entries"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCOperationTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCOperationTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Virtual_Override"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Message_Handler"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dispatch_Handler"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Firing_Function"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Event_Sink_Handler"
-				value      	5)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Std_OLE_Method"
-				value      	6)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Command_Parser"
-				value      	7)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Get_Function"
-				value      	8)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Set_Function"
-				value      	9)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Property_Notify_Function"
-				value      	10)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Macro_Generated_Function"
-				value      	11)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_MSG_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MESSAGE_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENT_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"EVENTSINK_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"BodyImage"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Has"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"Type"
-			value      	("MSVCAttributeTypeSet" 0))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"MSVCAttributeTypeSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Normal"
-				value      	0)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Member_Property"
-				value      	1)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Get_Set_Property"
-				value      	2)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Dialog_Data"
-				value      	3)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Field_Data"
-				value      	4)
-			    (object Attribute
-				tool       	"MSVC"
-				name       	"Stock_Property"
-				value      	5)))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DISPATCH_MAP_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"DeclSpec"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"PointerBase"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"CallType"
-			value      	"")
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"StockPropertyImplementation"
-			value      	"")))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"MSVC"
-		name       	"default__Module-Body"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateIncludesGroup"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"AFX_INCLUDES_Entries"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"MSVC"
-			name       	"GenerateInsertLocation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"cg"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"TypeLibImporter"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"propertyId"
-		value      	"783606378")
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Class"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CreatableSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Private"
-				value      	221)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"PublicNotCreatable"
-				value      	213)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"SingleUse"
-				value      	214)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalSingleUse"
-				value      	215)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"MultiUse"
-				value      	219)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"GlobalMultiUse"
-				value      	220)))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionBase"
-			value      	"0")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionExplicit"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OptionCompare"
-			value      	("CompareSet" 202))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Creatable"
-			value      	("CreatableSet" 221))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateInitialization"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateTermination"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CollectionClass"
-			value      	"Collection")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"CompareSet"
-			value      	(list Attribute_Set
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"None"
-				value      	202)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Binary"
-				value      	203)
-			    (object Attribute
-				tool       	"Visual Basic"
-				name       	"Text"
-				value      	204)))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Operation"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"OperationName"
-			value      	"$operation")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"LibraryName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"AliasName"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsStatic"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"EntryCode"
-			value      	(value Text ""))
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ExitCode"
-			value      	(value Text ""))))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Attribute"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"IsConst"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Role"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"New"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"WithEvents"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"Subscript"
-			value      	"")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"NameIfUnlabeled"
-			value      	"the$supplier")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateDataMember"
-			value      	TRUE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"DataMemberName"
-			value      	"$relationship")
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateGetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateSetOperation"
-			value      	FALSE)
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"GenerateLetOperation"
-			value      	FALSE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Inherit"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ImplementsDelegation"
-			value      	TRUE)))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"default__Module-Spec"
-		value      	(list Attribute_Set
-		    (object Attribute
-			tool       	"Visual Basic"
-			name       	"ProjectFile"
-			value      	"")))
-	    (object Attribute
-		tool       	"Visual Basic"
-		name       	"HiddenTool"
-		value      	FALSE)
-	    (object Attribute
-		tool       	"VisualStudio"
-		name       	"HiddenTool"
-		value      	FALSE))
-	quid       	"3FAA8E8700C1"))
diff --git a/tags/java-stable-20060304/sdo/impl/pom.xml b/tags/java-stable-20060304/sdo/impl/pom.xml
deleted file mode 100644
index 2d96426735..0000000000
--- a/tags/java-stable-20060304/sdo/impl/pom.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.
- -->
-<project>
-    <parent>
-        <groupId>org.apache.tuscany</groupId>
-        <artifactId>tuscany-sdo</artifactId>
-        <version>SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>tuscany-sdo-impl</artifactId>
-    <name>Tuscany SDO Implementation</name>
-    <description>Tuscany implementation of SDO API.</description>
-    <version>SNAPSHOT</version>
-
-    <repositories>
-        <repository>
-            <id>jeremy</id>
-            <url>http://people.apache.org/~jboynes/maven2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>commonj</groupId>
-            <artifactId>sdo-api</artifactId>
-            <version>SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm</artifactId>
-            <version>2.2</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>common</artifactId>
-            <version>2.2.0-I200602160000</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>ecore</artifactId>
-            <version>2.2.0-I200602160000</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>ecore-change</artifactId>
-            <version>2.2.0-I200602160000</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>ecore-xmi</artifactId>
-            <version>2.2.0-I200602160000</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.xsd</groupId>
-            <artifactId>xsd</artifactId>
-            <version>2.2.0-I200602160000</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java
deleted file mode 100644
index 5eea403613..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/AnyTypeDataObject.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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;
-
-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/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java
deleted file mode 100644
index 5b066bb6e3..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOFactory.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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;
-
-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 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/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java
deleted file mode 100644
index caa154baf5..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOPackage.java
+++ /dev/null
@@ -1,1599 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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;
-
-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;
-
-  /**
-   * The number of structural features of the '<em>Change Summary</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  int CHANGE_SUMMARY_FEATURE_COUNT = ChangePackage.CHANGE_DESCRIPTION_FEATURE_COUNT + 1;
-
-  /**
-   * 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 '<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 = 17;
-
-  /**
-   * 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 = 18;
-
-
-  /**
-   * 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();
-
-  /**
-   * 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 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/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java
deleted file mode 100644
index ced62cc058..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/SDOTypeVisitor.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- *
- * Copyright 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;
-
-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/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java
deleted file mode 100644
index 5fed5829ae..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/SimpleAnyTypeDataObject.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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;
-
-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/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java
deleted file mode 100644
index 534505a613..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGenerator.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- *
- * Copyright 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.codegen;
-
-import java.util.List;
-
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-import org.objectweb.asm.ClassWriter;
-import static 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(V1_5, ACC_PUBLIC + ACC_ABSTRACT + 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(ACC_PUBLIC + ACC_ABSTRACT, "get" + propertyName, "()Ljava/util/List;", null, null).visitEnd();
-        } else {
-            if (boolean.class.equals(javaType)) {
-                cw.visitMethod(ACC_PUBLIC + ACC_ABSTRACT, "is" + propertyName, "()Z", null, null).visitEnd();
-            } else {
-                cw.visitMethod(ACC_PUBLIC + ACC_ABSTRACT, "get" + propertyName, "()" + desc, null, null).visitEnd();
-            }
-            if (!property.isReadOnly()) {
-                cw.visitMethod(ACC_PUBLIC + 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/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java
deleted file mode 100644
index 15ff8a7502..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/GenerationException.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- *
- * Copyright 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.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/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java
deleted file mode 100644
index 64fc52d89a..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGenerator.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- *
- * Copyright 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.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 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 = property.getType().getInstanceClass().getCanonicalName();
-
-        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();
-    }
-}
-\ No newline at end of file
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java
deleted file mode 100644
index 5b9b3742d5..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/codegen/NoJavaImplementationException.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- *
- * Copyright 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.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/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java
deleted file mode 100644
index 060bd381dc..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/CopyHelperImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.helper;
-
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.EcoreUtil.Copier;
-
-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)
-        {
-        }
-      };
-    EObject result = copier.copy((EObject)dataObject);
-    copier.copyReferences();
-    return (DataObject)result;
-  }
-
-  public DataObject copy(DataObject dataObject)
-  {
-    return (DataObject)EcoreUtil.copy((EObject)dataObject);
-  }
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java
deleted file mode 100644
index 5fcf3fa4c1..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataFactoryImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.helper;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-import commonj.sdo.helper.DataFactory;
-import commonj.sdo.helper.TypeHelper;
-
-/**
- * A Factory for creating DataObjects.  
- * The created DataObjects are not connected to any other DataObjects.
- */
-public class DataFactoryImpl implements DataFactory
-{
-  protected TypeHelper typeHelper;
-  
-  public DataFactoryImpl(TypeHelper typeHelper)
-  {
-    this.typeHelper = typeHelper;
-  }
-
-  public DataObject create(String uri, String typeName)
-  {
-    Type type = typeHelper.getType(uri, typeName);
-    return create(type);
-  }
-
-  public DataObject create(Class interfaceClass)
-  {
-    //TODO more efficient implementation ... this is a really bad one!
-    Type type = typeHelper.getType(interfaceClass);
-    return create(type);
-  }
-  
-  public DataObject create(Type type)
-  {
-    EClass eClass = (EClass)type;
-    return (DataObject)EcoreUtil.create(eClass);
-  }
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java
deleted file mode 100644
index 3986fa4be7..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/DataHelperImpl.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.helper;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.Locale;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-
-
-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;
-    }
-    
-    DateFormat [] DATE_PATTERNS =
-    {
-      new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'.'SSS Z"),
-      new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'.'SSS"),
-      new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"),
-      new SimpleDateFormat("yyyy-MM-dd'T'HH:mm"),
-      new SimpleDateFormat("yyyy-MM-dd")
-    };
-    
-    for (int i = 0; i < DATE_PATTERNS.length; ++i)
-    {
-      try
-      {
-        return DATE_PATTERNS[i].parse(dateString);
-      }
-      catch (ParseException parseException)
-      {
-      }
-    }
-    
-    return null;
-  }
-  
-  public synchronized Calendar toCalendar(String dateString)
-  {
-    if (dateString == null)
-    {
-      return null;
-    }
-    
-    Date date = toDate(dateString);
-    if (date == null)
-    {
-      return null;
-    }
-    
-    Calendar calendar = new GregorianCalendar();
-    calendar.setTime(date);
-    
-    return calendar;
-  }
-  
-  public synchronized Calendar toCalendar(String dateString, Locale locale)
-  {
-    if (dateString == null || locale == null)
-    {
-      return null;
-    }
-    
-    Date date = toDate(dateString);
-    if (date == null)
-    {
-      return null;
-    }
-    
-    Calendar calendar = new GregorianCalendar(locale);
-    calendar.setTime(date);
-    return calendar;
-  }
-
-  public synchronized String toDateTime(Date date)
-  {
-    if (date == null)
-    {
-      return null;
-    }
-    
-    SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'.'SSS zz");
-    
-    return f.format(date);
-  }
-  
-  public synchronized String toDuration(Date date)
-  {
-    if (date == null)
-    {
-      return null;
-    }
-    
-    SimpleDateFormat f = new SimpleDateFormat("'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;
-    }
-    
-    SimpleDateFormat f = new SimpleDateFormat("HH:mm:ss'.'SSS zz");
-    
-    return f.format(date);
-  }
-  
-  public synchronized String toDay(Date date)
-  {
-    if (date == null)
-    {
-      return null;
-    }
-    
-    SimpleDateFormat f = new SimpleDateFormat("---dd zz");
-    
-    return f.format(date);
-  }
-  
-  public synchronized String toMonth(Date date)
-  {
-    if (date == null)
-    {
-      return null;
-    }
-    
-    SimpleDateFormat f = new SimpleDateFormat("--MM zz");
-    
-    return f.format(date);
-  }
-
-  public synchronized String toMonthDay(Date date)
-  {
-    if (date == null)
-    {
-      return null;
-    }
-    
-    SimpleDateFormat f = new SimpleDateFormat("--MM-dd zz");
-    
-    return f.format(date);
-  }
-
-  public synchronized String toYear(Date date)
-  {
-    if (date == null)
-    {
-      return null;
-    }
-    
-    SimpleDateFormat f = new SimpleDateFormat("yyyy zz");
-    
-    return f.format(date); 
-  }
-
-  public synchronized String toYearMonth(Date date)
-  {
-    if (date == null)
-    {
-      return null;
-    }
-    
-    SimpleDateFormat f = new SimpleDateFormat("yyyy-MM zz");
-    
-    return f.format(date);
-  }
-
-  public synchronized String toYearMonthDay(Date date)
-  {
-    if (date == null)
-    {
-      return null;
-    }
-    
-    SimpleDateFormat f = new SimpleDateFormat("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());
-  }
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java
deleted file mode 100644
index a31066d598..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/EqualityHelperImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.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)
-          {
-              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)
-  {
-    return EcoreUtil.equals((EObject)dataObject1, (EObject)dataObject2);
-  }
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
deleted file mode 100644
index d0ece134e3..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/HelperProviderImpl.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.helper;
-
-
-import org.apache.tuscany.sdo.helper.CopyHelperImpl;
-import org.apache.tuscany.sdo.helper.DataHelperImpl;
-import org.apache.tuscany.sdo.helper.EqualityHelperImpl;
-import org.apache.tuscany.sdo.util.SDOUtil;
-
-import commonj.sdo.helper.CopyHelper;
-import commonj.sdo.helper.DataFactory;
-import commonj.sdo.helper.DataHelper;
-import commonj.sdo.helper.EqualityHelper;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XMLHelper;
-import commonj.sdo.helper.XSDHelper;
-import commonj.sdo.impl.ExternalizableDelegator.Resolvable;
-import commonj.sdo.impl.HelperProvider;
-
-
-/**
- * Create and manage all the default helper INSTANCEs
- */
-public class HelperProviderImpl extends HelperProvider
-{
-  protected CopyHelper copyHelper;
-
-  protected DataFactory dataFactory;
-
-  protected DataHelper dataHelper;
-
-  protected EqualityHelper equalityHelper;
-
-  protected TypeHelper typeHelper;
-
-  protected XMLHelper xmlHelper;
-
-  protected XSDHelper xsdHelper;
-
-  public HelperProviderImpl()
-  {
-    typeHelper = SDOUtil.createTypeHelper();
-    dataFactory = SDOUtil.createDataFactory(typeHelper);
-    xmlHelper = SDOUtil.createXMLHelper(typeHelper);
-    xsdHelper = SDOUtil.createXSDHelper(typeHelper);
-    copyHelper = new CopyHelperImpl();
-    equalityHelper = new EqualityHelperImpl();
-    dataHelper = new DataHelperImpl();
-  }
-
-  public CopyHelper copyHelper()
-  {
-    return copyHelper;
-  }
-
-  public DataFactory dataFactory()
-  {
-    return dataFactory;
-  }
-
-  public DataHelper dataHelper()
-  {
-    return dataHelper;
-  }
-
-  public EqualityHelper equalityHelper()
-  {
-    return equalityHelper;
-  }
-
-  public TypeHelper typeHelper()
-  {
-    return typeHelper;
-  }
-
-  public XMLHelper xmlHelper()
-  {
-    return xmlHelper;
-  }
-
-  public XSDHelper xsdHelper()
-  {
-    return xsdHelper;
-  }
-
-  public Resolvable resolvable()
-  {
-    throw new UnsupportedOperationException(); //TODO
-  }
-
-  public Resolvable resolvable(Object target)
-  {
-    throw new UnsupportedOperationException(); //TODO
-  }
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
deleted file mode 100644
index 38c4c962e7..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/TypeHelperImpl.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.helper;
-
-
-import java.util.Iterator;
-import java.util.List;
-
-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.Type;
-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 ExtendedMetaData extendedMetaData;
-  
-  public TypeHelperImpl(ExtendedMetaData extendedMetaData)
-  {
-    this.extendedMetaData = extendedMetaData;
-  }
-  
-  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;
-  }
-  
-  public Type getType(Class interfaceClass)
-  {
-    //TODO more efficient implementation ... this is a really bad one!
-    for (Iterator iter = EPackage.Registry.INSTANCE.values().iterator(); iter.hasNext(); )
-    {
-      Object value = iter.next();
-      if (value instanceof EPackage)
-      {
-        EPackage ePackage = (EPackage)value;
-        for (Iterator iter2 = ePackage.getEClassifiers().iterator(); iter2.hasNext(); )
-        {
-          EClassifier eClassifier = (EClassifier)iter2.next();
-          if (eClassifier.getInstanceClass() == interfaceClass)
-          {
-            return (Type)eClassifier;
-          }
-        }
-      }
-    }
-    return null;
-  }
-
-  public Type define(DataObject type)
-  {
-    throw new UnsupportedOperationException(); //TODO
-  }
-
-  public List /*Type*/define(List /*DataObject*/types)
-  {
-    throw new UnsupportedOperationException(); //TODO
-  }
-  
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
deleted file mode 100644
index 2626eb12ff..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLDocumentImpl.java
+++ /dev/null
@@ -1,349 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.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.List;
-import java.util.Map;
-
-import org.apache.tuscany.sdo.SDOPackage;
-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.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-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.xmi.XMLOptions;
-import org.eclipse.emf.ecore.xmi.XMLParserPool;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.XMLOptionsImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMLParserPoolImpl;
-import org.xml.sax.InputSource;
-
-import commonj.sdo.DataObject;
-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 static XMLParserPool globalXMLParserPool = new XMLParserPoolImpl();
-  
-  //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"));
-    
-    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);
-  }
-
-  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
-  {
-    EObject oldContainer = null;
-    EReference oldContainmentReference = null;
-    int oldContainmentIndex = -1;
-
-    if (documentRoot != null)
-    {
-      //TODO also check if rootObject is directly contained in a resource
-      oldContainer = rootObject.eContainer();
-      if (oldContainer != null)
-      {
-        oldContainmentReference = rootObject.eContainmentFeature();
-      }
-      if (oldContainer != documentRoot || oldContainmentReference != rootElement)
-      {
-        if (oldContainmentReference != null && oldContainmentReference.isMany())
-        {
-          oldContainmentIndex = ((List)oldContainer.eGet(oldContainmentReference)).indexOf(rootObject);
-        }
-        documentRoot.eSet(rootElement, rootObject);
-      }
-    }
-
-    resource.save(outputStream, (Map)options);
-
-    if (oldContainer != null)
-    {
-      if (oldContainer != documentRoot || oldContainmentReference != rootElement)
-      {
-        if (oldContainmentReference.isMany())
-        {
-          ((List)oldContainer.eGet(oldContainmentReference)).add(oldContainmentIndex, rootObject);
-        }
-        else
-        {
-          oldContainer.eSet(oldContainmentReference, rootObject);
-        }
-      }
-    }
-    else if (documentRoot != null)
-    {
-      documentRoot.eSet(rootElement, null);
-    }
-  }
-
-  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 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 void load(InputSource inputSource, String locationURI, Object options) throws IOException
-  {
-    rootObject = null;
-    rootElement = null;
-    documentRoot = null;
-
-    if (locationURI != null)
-    {
-      inputSource.setSystemId(locationURI);
-      resource.setURI(URI.createURI(locationURI));
-    }
-
-    resource.load(inputSource, (Map)options);
-
-    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?
-      {
-        if (!documentRoot.eContents().isEmpty())
-        {
-          rootObject = (EObject)documentRoot.eContents().get(0);
-          rootElement = rootObject.eContainmentFeature();
-          documentRoot.eUnset(rootElement);
-        }
-      }
-      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 "1.0"; //TODO
-  }
-
-  public void setXMLVersion(String xmlVersion)
-  {
-    throw new UnsupportedOperationException(); //TODO
-  }
-
-  public String getSchemaLocation()
-  {
-    throw new UnsupportedOperationException(); //TODO
-  }
-
-  public void setSchemaLocation(String schemaLocation)
-  {
-    throw new UnsupportedOperationException(); //TODO
-  }
-
-  public String getNoNamespaceSchemaLocation()
-  {
-    throw new UnsupportedOperationException(); //TODO
-  }
-
-  public void setNoNamespaceSchemaLocation(String schemaLocation)
-  {
-    throw new UnsupportedOperationException(); //TODO
-  }
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
deleted file mode 100644
index 653665e1b8..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XMLHelperImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.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 org.eclipse.emf.ecore.util.ExtendedMetaData;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.TypeHelper;
-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
-{
-  ExtendedMetaData extendedMetaData;
-  
-  public XMLHelperImpl(ExtendedMetaData extendedMetaData)
-  {
-    this.extendedMetaData = extendedMetaData;
-  }
-  
-  public XMLHelperImpl(TypeHelper typeHelper)
-  {
-    this.extendedMetaData = ((TypeHelperImpl)typeHelper).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(InputStream inputStream) throws IOException
-  {
-    return load(inputStream, null, null);
-  }
-  
-  public XMLDocument load(InputStream inputStream, String locationURI, Object options) throws IOException
-  {
-    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);
-    document.load(inputReader, locationURI, options);
-    return document;
-  }
-  
-  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 void save(DataObject dataObject, String rootElementURI, String rootElementName, OutputStream outputStream) throws IOException
-  {
-    save(createDocument(dataObject, rootElementURI, rootElementName), outputStream, null);
-  }
-  
-  public void save(XMLDocument xmlDocument, OutputStream outputStream, Object options) throws IOException
-  {
-    ((XMLDocumentImpl)xmlDocument).save(outputStream, options);
-  }
-
-  public void save(XMLDocument xmlDocument, Writer outputWriter, Object options) throws IOException
-  {
-    ((XMLDocumentImpl)xmlDocument).save(outputWriter, options);
-   }
-
-  public XMLDocument createDocument(DataObject dataObject, String rootElementURI, String rootElementName)
-  {
-    return new XMLDocumentImpl(extendedMetaData, dataObject, rootElementURI, rootElementName);
-  }
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
deleted file mode 100644
index 3173601861..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/helper/XSDHelperImpl.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.helper;
-
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.Reader;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-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.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.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.ecore.XSDEcoreBuilder;
-import org.eclipse.xsd.util.XSDResourceImpl;
-import org.w3c.dom.Element;
-import org.xml.sax.InputSource;
-
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-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
-{
-  private XSDEcoreBuilder ecoreBuilder;
-
-  private ExtendedMetaData extendedMetaData;
-
-  public XSDHelperImpl(ExtendedMetaData extendedMetaData)
-  {
-    this.extendedMetaData = extendedMetaData;
-    ecoreBuilder = new SDOXSDEcoreBuilder(extendedMetaData);
-  }
-
-  public XSDHelperImpl(TypeHelper typeHelper)
-  {
-    this(((TypeHelperImpl)typeHelper).extendedMetaData);
-  }
-  
-  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
-    {
-      ResourceSet resourceSet = DataObjectUtil.createResourceSet();
-      Resource model = resourceSet.createResource(URI.createURI(schemaLocation != null ? schemaLocation : "null.xsd"));
-      ((XSDResourceImpl)model).load(inputSource, null);
-      XSDSchema schema = (XSDSchema)model.getContents().get(0);
-      
-      // If define() is called more than once for the same XMLSchema, return the existing defined types
-      //FIXME ... need to rethink this design
-      //if (!ecoreBuilder.getTargetNamespaceToEPackageMap().containsKey(schema.getTargetNamespace()))
-      // also return generated types registered via SDOUtil.registerStaticTypes()
-      EPackage ePackage = extendedMetaData.getPackage(schema.getTargetNamespace());
-      if (ePackage == null)
-      {
-        ecoreBuilder.generate(schema);
-        Collection newEPackages = ecoreBuilder.getTargetNamespaceToEPackageMap().values();
-      
-        for (Iterator iter = newEPackages.iterator(); iter.hasNext();)
-        {
-          EPackage currentPackage = (EPackage)iter.next();
-          currentPackage.setEFactoryInstance(new DynamicDataObjectImpl.FactoryImpl());
-          EcoreUtil.freeze(currentPackage);
-        }
-      }
-      ePackage = extendedMetaData.getPackage(schema.getTargetNamespace());
-      return ePackage.getEClassifiers();
-    }
-    catch (Exception e)
-    {
-      throw new IllegalArgumentException();
-    }
-  }
-
-  public String generate(List /*Type*/types)
-  {
-    throw new UnsupportedOperationException(); //TODO
-  }
-
-  public String generate(List /*Type*/types, Map /*String, String*/namespaceToSchemaLocation)
-  {
-    throw new UnsupportedOperationException(); //TODO
-  }
-  
-  protected static class SDOXSDEcoreBuilder extends XSDEcoreBuilder
-  {
-    public SDOXSDEcoreBuilder(ExtendedMetaData extendedMetaData)
-    {
-      super(extendedMetaData);
-    }
-
-    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";
-      
-      if (sdoAttribute != null)
-      {
-        return 
-          element != null && element.hasAttributeNS("commonj.sdo/xml", sdoAttribute) ? 
-            element.getAttributeNS("commonj.sdo/xml", sdoAttribute) : 
-            null;
-      }
-      
-      if ("package".equals(attribute))
-        sdoAttribute = "package";
-      else if ("instanceClass".equals(attribute))
-        sdoAttribute = "instanceClass";
-
-      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 XSDTypeDefinition getEcoreTypeQNameAttribute(XSDConcreteComponent xsdConcreteComponent, String attribute)
-    {
-      String sdoAttribute = null;
-      
-      if ("reference".equals(attribute)) sdoAttribute = "propertyType";
-      
-      if (sdoAttribute != null)
-      {
-        Element element = xsdConcreteComponent.getElement();
-        return  element == null ? null : getEcoreTypeQNameAttribute(xsdConcreteComponent, element, "commonj.sdo/xml", sdoAttribute);
-      }
-
-      return super.getEcoreTypeQNameAttribute(xsdConcreteComponent, attribute);
-    }
-     
-  }
-
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java
deleted file mode 100644
index a1bb922d69..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AnyTypeDataObjectImpl.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.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/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
deleted file mode 100644
index 415787f1e8..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/AttributeImpl.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.impl;
-
-import java.util.List;
-
-//import org.apache.tuscany.sdo.SDOPackage;
-
-import org.apache.tuscany.sdo.util.BasicSequence;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EAttributeImpl;
-import org.eclipse.emf.ecore.util.FeatureMap;
-
-import commonj.sdo.Property;
-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
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected AttributeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  protected EClass eStaticClass()
-  {
-    return EcorePackage.eINSTANCE.getEAttribute();
-  }
-
-  /**
-   * <!-- 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?
-  }
-  
-  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();
-  }
-
-  /**
-   * <!-- 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;
-    }
-  }
-
-} //AttributeImpl
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java
deleted file mode 100644
index 9c749ff598..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummaryImpl.java
+++ /dev/null
@@ -1,692 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.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.EClass;
-import org.eclipse.emf.ecore.EObject;
-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.DelegatingFeatureMap;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import commonj.sdo.ChangeSummary;
-//import commonj.sdo.ChangeSummary.Setting;
-
-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 ChangeRecorder changeRecorder = null;
-  protected EList cachedObjectsToDetach = null;
-  protected HashMap cachedSDOObjectChanges = new HashMap();  
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ChangeSummaryImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- 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));
-  }
-
-  /**
-   * <!-- 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;
-    changeRecorder = new SDOChangeRecorder();
-    changeRecorder.beginRecording(Collections.singleton(((DataGraphImpl)getEDataGraph()).getRootResource()));
-//    if (eNotificationRequired())
-//      eNotify(new ENotificationImpl(this, Notification.SET, SDOPackage.ECHANGE_SUMMARY__LOGGING, false, true));
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void resumeLogging()
-  {
-    if (isLogging())
-    {
-      throw new IllegalStateException("Already logging");
-    }
-
-    oldContainmentInformation = null;
-    
-    changeRecorder = new SDOChangeRecorder();
-    changeRecorder.beginRecording(this, Collections.singleton(((DataGraphImpl)getEDataGraph()).getRootResource()));
-
-//    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();
-    }
-    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 class SDOChangeRecorder extends ChangeRecorder
-  {
-    public SDOChangeRecorder()
-    {
-      super();
-    }
-    
-    public void beginRecording(ChangeDescription changeDescription, Collection rootObjects)
-    {
-      deletedObjects = null;
-      cachedObjectsToDetach = null;
-      cachedSDOObjectChanges.clear();
-      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()
-    {
-      deletedObjects = null;
-      cachedObjectsToDetach = null;
-      cachedSDOObjectChanges.clear();
-      super.consolidateChanges();
-    }
-
-    protected void addAdapter(Notifier notifier)
-    {
-      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);
-    }
-    
-  } 
-
-  /**
-   * <!-- 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 getObjectsToDetach().contains(dataObject);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isDeleted(DataObject dataObject)
-  {
-    return getDeletedObjects().contains(dataObject);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getOldValues(DataObject dataObject)
-  {
-    List sdoSettings = (List)cachedSDOObjectChanges.get(dataObject);
-    if (sdoSettings != null)
-    {
-      return sdoSettings;
-    }
-    
-    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
-   */
-  public boolean isModified(DataObject dataObject)
-  {
-    // TODO: implement this method
-    // Ensure that you remove @generated or mark it @generated NOT
-    throw new UnsupportedOperationException();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void summarize()
-  {
-    if (!isLogging())
-    {
-      throw new IllegalStateException("Not currently logging");
-    }
-    
-    changeRecorder.summarize();
-  }
-
-  public boolean isChanged(DataObject dataObject)
-  {
-    return getObjectChanges().containsKey(dataObject) && !isDeleted(dataObject) && !isCreated(dataObject);
-  }
-
-  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
-   */
-  public Sequence getOldSequence(DataObject dataObject)
-  {
-    // TODO: implement this method
-    // Ensure that you remove @generated or mark it @generated NOT
-    throw new UnsupportedOperationException();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void undoChanges()
-  {
-    // TODO: implement this method
-    // Ensure that you remove @generated or mark it @generated NOT
-    throw new UnsupportedOperationException();
-  }
-
-  public EList getObjectsToDetach()
-  {
-    if (cachedObjectsToDetach == null)
-    {
-      cachedObjectsToDetach = super.getObjectsToDetach();
-    }
-    return cachedObjectsToDetach;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataGraph getDataGraph()
-  {
-    return getEDataGraph();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getChangedObjects()
-  {
-    // TODO: implement this method
-    // Ensure that you remove @generated or mark it @generated NOT
-    throw new UnsupportedOperationException();
-  }
-
-  protected Set deletedObjects;
-
-  protected void preApply(boolean reverse)
-  {
-    super.preApply(reverse);
-    deletedObjects = null;
-  }
-
-  protected Set getDeletedObjects()
-  {
-    if (deletedObjects == null)
-    {
-      deletedObjects = new HashSet();
-      for (Iterator i = EcoreUtil.getAllContents(getObjectsToAttach()); i.hasNext(); )
-      {
-        deletedObjects.add(i.next());
-      }
-    }
-    return deletedObjects;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public EList getChangedDataObjectsGen()
-  {
-    EList result = new UniqueEList.FastCompare(getDeletedObjects());
-    result.addAll(getObjectsToDetach());
-    for (Iterator i = getObjectChanges().iterator(); i.hasNext(); )
-    {
-      Map.Entry entry = (Map.Entry)i.next();
-      result.add(entry.getKey());
-    }
-    return result;
-  }
-
-  public List getChangedDataObjects()
-  {
-    return getChangedDataObjectsGen();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public DataObject getRootObject()
-  {
-    // TODO: implement this method
-    // Ensure that you remove @generated or mark it @generated NOT
-    throw new UnsupportedOperationException();
-  }
-
-} //EChangeSummaryImpl
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java
deleted file mode 100644
index 9f714b9cfa..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ChangeSummarySettingImpl.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.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/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
deleted file mode 100644
index a56c5f9fb2..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ClassImpl.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.impl;
-
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.eclipse.emf.ecore.EClass;
-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.ExtendedMetaData;
-
-import commonj.sdo.Property;
-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
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ClassImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  protected EClass eStaticClass()
-  {
-    return EcorePackage.eINSTANCE.getEClass();
-  }
-
-  /**
-   * <!-- 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()
-  {
-    for (int i = 0, count = getFeatureCount(); i < count; ++i)
-    {
-      EStructuralFeature eStructuralFeature = getEStructuralFeature(i);
-      switch (ExtendedMetaData.INSTANCE.getFeatureKind(eStructuralFeature))
-      {
-        case ExtendedMetaData.ELEMENT_WILDCARD_FEATURE:
-        case ExtendedMetaData.ATTRIBUTE_WILDCARD_FEATURE:
-        case ExtendedMetaData.GROUP_FEATURE:
-          return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isSequenced()
-  {
-    // isSequenced == isMixed 
-    return ExtendedMetaData.INSTANCE.getMixedFeature(this) != 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;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getDeclaredProperties()
-  {
-    return getEStructuralFeatures();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getProperties()
-  {
-    return getEAllStructuralFeatures();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getBaseTypes()
-  {
-    return getESuperTypes();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Property getProperty(String propertyName)
-  {
-    if (propertyNameToPropertyMap == null) //FB use eNameToFeatureMap for this?
-    {
-      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;
-    }
-
-    return (Property)propertyNameToPropertyMap.get(propertyName);
-  }
-  
-  protected Map propertyNameToPropertyMap;
-
-} //ClassTypeImpl
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java
deleted file mode 100644
index 725c0211dc..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataGraphImpl.java
+++ /dev/null
@@ -1,816 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.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 java.util.Map;
-
-import org.apache.tuscany.sdo.SDOFactory;
-import org.apache.tuscany.sdo.SDOPackage;
-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.notify.impl.AdapterImpl;
-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)
-  {
-    DataObject dataObject = DataObjectUtil.create(getType(namespaceURI, typeName));
-    setERootObject((EObject)dataObject);
-    return dataObject;
-  }
-
-  public DataObject createRootObject(Type type)
-  {
-    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"));
-      resource.load(new ByteArrayInputStream(bytes), null);
-      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/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java
deleted file mode 100644
index a815d28e4d..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataObjectImpl.java
+++ /dev/null
@@ -1,1705 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.impl;
-
-
-import java.io.InvalidObjectException;
-import java.io.ObjectStreamException;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-//import org.apache.sdo.util.SDOUtil;
-
-import org.apache.tuscany.sdo.SDOPackage;
-import org.apache.tuscany.sdo.impl.ChangeSummaryImpl.SDOChangeRecorder;
-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.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.UniqueEList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-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.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.BasicExtendedMetaData;
-import org.eclipse.emf.ecore.util.EContentsEList;
-import org.eclipse.emf.ecore.util.ECrossReferenceEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.FeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-
-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 -->
- * 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)
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected DataObjectImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return SDOPackage.eINSTANCE.getDataObject();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Object writeReplace() throws ObjectStreamException
-  {
-    //TODO implement this method properly
-    DataGraph dataGraph = getDataGraph();
-    if (dataGraph != null)
-    {
-      return ((DataGraphImpl)dataGraph).getWriteReplacement(this);
-    }
-    else
-    {
-      throw new InvalidObjectException("The object must be in a datagraph to be serialized " + this);
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Object get(String path)
-  {
-    Property property = getType().getProperty(path);
-    if (property != null)
-    {
-      return get(property);
-    }
-    else
-    {
-      return DataObjectUtil.Accessor.create(this, path).getAndRecyle();
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void set(String path, Object value)
-  {
-    Property property = getType().getProperty(path);
-    if (property != null)
-    {
-      set(property, value);
-    }
-    else
-    {
-      DataObjectUtil.Accessor.create(this, path).setAndRecyle(value);
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isSet(String path)
-  {
-    Property property = getType().getProperty(path);
-    if (property != null)
-    {
-      return isSet(property);
-    }
-    else
-    {
-      return DataObjectUtil.Accessor.create(this, path).isSetAndRecyle();
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void unset(String path)
-  {
-    Property property = getType().getProperty(path);
-    if (property != null)
-    {
-      unset(property);
-    }
-    else
-    {
-      DataObjectUtil.Accessor.create(this, path).unsetAndRecyle();
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Object get(int propertyIndex)
-  {
-    return eGet(propertyIndex, true, false);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void set(int propertyIndex, Object value)
-  {
-    eSet(propertyIndex, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isSet(int propertyIndex)
-  {
-    return eIsSet(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void unset(int propertyIndex)
-  {
-    eUnset(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 DataGraph getDataGraph()
-  {
-    Resource resource = eResource();
-    if (resource != null)
-    {
-      ResourceSet resourceSet = resource.getResourceSet();
-      if (resourceSet != null)
-      {
-        return (DataGraphImpl)EcoreUtil.getAdapter(resourceSet.eAdapters(), DataGraph.class);
-      }
-    }
-    return null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Type getType()
-  {
-    return (Type)eClass();
-  }
-
-  /**
-   * <!-- 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)
-  {
-    return (List)get(path);
-  }
-
-  /**
-   * <!-- 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)
-  {
-    Property property = getType().getProperty(path);
-    if (property != null)
-    {
-      set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create(this, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBigInteger(String path, BigInteger value)
-  {
-    Property property = getType().getProperty(path);
-    if (property != null)
-    {
-      set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create(this, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBoolean(String path, boolean value)
-  {
-    Property property = getType().getProperty(path);
-    if (property != null)
-    {
-      set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create(this, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setByte(String path, byte value)
-  {
-    Property property = getType().getProperty(path);
-    if (property != null)
-    {
-      set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create(this, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBytes(String path, byte[] value)
-  {
-    Property property = getType().getProperty(path);
-    if (property != null)
-    {
-      set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create(this, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setChar(String path, char value)
-  {
-    Property property = getType().getProperty(path);
-    if (property != null)
-    {
-      set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create(this, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDataObject(String path, DataObject value)
-  {
-    set(path, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDate(String path, Date value)
-  {
-    Property property = getType().getProperty(path);
-    if (property != null)
-    {
-      set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create(this, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDouble(String path, double value)
-  {
-    Property property = getType().getProperty(path);
-    if (property != null)
-    {
-      set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create(this, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setFloat(String path, float value)
-  {
-    Property property = getType().getProperty(path);
-    if (property != null)
-    {
-      set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create(this, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setInt(String path, int value)
-  {
-    Property property = getType().getProperty(path);
-    if (property != null)
-    {
-      set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create(this, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setList(String path, List value)
-  {
-    set(path, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setLong(String path, long value)
-  {
-    Property property = getType().getProperty(path);
-    if (property != null)
-    {
-      set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create(this, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setShort(String path, short value)
-  {
-    Property property = getType().getProperty(path);
-    if (property != null)
-    {
-      set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create(this, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setString(String path, String value)
-  {
-    Property property = getType().getProperty(path);
-    if (property != null)
-    {
-      set(property, DataObjectUtil.getSetValue(property, value));
-    }
-    else
-    {
-      DataObjectUtil.Accessor accessor = DataObjectUtil.Accessor.create(this, path);
-      accessor.setAndRecyle(DataObjectUtil.getSetValue(accessor.getProperty(), value));
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public BigDecimal getBigDecimal(int propertyIndex)
-  {
-    return DataObjectUtil.getBigDecimal(get(propertyIndex));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public BigInteger getBigInteger(int propertyIndex)
-  {
-    return DataObjectUtil.getBigInteger(get(propertyIndex));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean getBoolean(int propertyIndex)
-  {
-    return DataObjectUtil.getBoolean(get(propertyIndex));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public byte getByte(int propertyIndex)
-  {
-    return DataObjectUtil.getByte(get(propertyIndex));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public byte[] getBytes(int propertyIndex)
-  {
-    return DataObjectUtil.getBytes(get(propertyIndex));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public char getChar(int propertyIndex)
-  {
-    return DataObjectUtil.getChar(get(propertyIndex));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject getDataObject(int propertyIndex)
-  {
-    return (DataObject)get(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Date getDate(int propertyIndex)
-  {
-    return DataObjectUtil.getDate(get(propertyIndex));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public double getDouble(int propertyIndex)
-  {
-    return DataObjectUtil.getDouble(get(propertyIndex));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public float getFloat(int propertyIndex)
-  {
-    return DataObjectUtil.getFloat(get(propertyIndex));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public int getInt(int propertyIndex)
-  {
-    return DataObjectUtil.getInt(get(propertyIndex));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getList(int propertyIndex)
-  {
-    return (List)get(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public long getLong(int propertyIndex)
-  {
-    return DataObjectUtil.getLong(get(propertyIndex));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Sequence getSequence(int propertyIndex)
-  {
-    return (Sequence)get(propertyIndex);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public short getShort(int propertyIndex)
-  {
-    return DataObjectUtil.getShort(get(propertyIndex));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String getString(int propertyIndex)
-  {
-    return DataObjectUtil.getString(get(propertyIndex));
-  }
-  
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBigDecimal(int propertyIndex, BigDecimal value)
-  {
-    set(propertyIndex, DataObjectUtil.getSetValue((Property)eClass().getEStructuralFeature(propertyIndex), value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBigInteger(int propertyIndex, BigInteger value)
-  {
-    set(propertyIndex, DataObjectUtil.getSetValue((Property)eClass().getEStructuralFeature(propertyIndex), value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBoolean(int propertyIndex, boolean value)
-  {
-    set(propertyIndex, DataObjectUtil.getSetValue((Property)eClass().getEStructuralFeature(propertyIndex), value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setByte(int propertyIndex, byte value)
-  {
-    set(propertyIndex, DataObjectUtil.getSetValue((Property)eClass().getEStructuralFeature(propertyIndex), value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBytes(int propertyIndex, byte[] value)
-  {
-    set(propertyIndex, DataObjectUtil.getSetValue((Property)eClass().getEStructuralFeature(propertyIndex), value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setChar(int propertyIndex, char value)
-  {
-    set(propertyIndex, DataObjectUtil.getSetValue((Property)eClass().getEStructuralFeature(propertyIndex), value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDataObject(int propertyIndex, DataObject value)
-  {
-    set(propertyIndex, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDate(int propertyIndex, Date value)
-  {
-    set(propertyIndex, DataObjectUtil.getSetValue((Property)eClass().getEStructuralFeature(propertyIndex), value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDouble(int propertyIndex, double value)
-  {
-    set(propertyIndex, DataObjectUtil.getSetValue((Property)eClass().getEStructuralFeature(propertyIndex), value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setFloat(int propertyIndex, float value)
-  {
-    set(propertyIndex, DataObjectUtil.getSetValue((Property)eClass().getEStructuralFeature(propertyIndex), value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setInt(int propertyIndex, int value)
-  {
-    set(propertyIndex, DataObjectUtil.getSetValue((Property)eClass().getEStructuralFeature(propertyIndex), value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setList(int propertyIndex, List value)
-  {
-    set(propertyIndex, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setLong(int propertyIndex, long value)
-  {
-    set(propertyIndex, DataObjectUtil.getSetValue((Property)eClass().getEStructuralFeature(propertyIndex), value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setShort(int propertyIndex, short value)
-  {
-    set(propertyIndex, DataObjectUtil.getSetValue((Property)eClass().getEStructuralFeature(propertyIndex), value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setString(int propertyIndex, String value)
-  {
-    set(propertyIndex, DataObjectUtil.getSetValue((Property)eClass().getEStructuralFeature(propertyIndex), value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public BigDecimal getBigDecimal(Property property)
-  {
-    return DataObjectUtil.getBigDecimal(get(property));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public BigInteger getBigInteger(Property property)
-  {
-    return DataObjectUtil.getBigInteger(get(property));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean getBoolean(Property property)
-  {
-    return DataObjectUtil.getBoolean(get(property));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public byte getByte(Property property)
-  {
-    return DataObjectUtil.getByte(get(property));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public byte[] getBytes(Property property)
-  {
-    return DataObjectUtil.getBytes(get(property));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public char getChar(Property property)
-  {
-    return DataObjectUtil.getChar(get(property));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject getDataObject(Property property)
-  {
-    return (DataObject)get(property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Date getDate(Property property)
-  {
-    return DataObjectUtil.getDate(get(property));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public double getDouble(Property property)
-  {
-    return DataObjectUtil.getDouble(get(property));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public float getFloat(Property property)
-  {
-    return DataObjectUtil.getFloat(get(property));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public int getInt(Property property)
-  {
-    return DataObjectUtil.getInt(get(property));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getList(Property property)
-  {
-    return (List)get(property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public long getLong(Property property)
-  {
-    return DataObjectUtil.getLong(get(property));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Sequence getSequence(Property property)
-  {
-    return (Sequence)get(property);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public short getShort(Property property)
-  {
-    return DataObjectUtil.getShort(get(property));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public String getString(Property property)
-  {
-    return DataObjectUtil.getString(get(property));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBigDecimal(Property property, BigDecimal value)
-  {
-    set(property, DataObjectUtil.getSetValue(property, value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBigInteger(Property property, BigInteger value)
-  {
-    set(property, DataObjectUtil.getSetValue(property, value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBoolean(Property property, boolean value)
-  {
-    set(property, DataObjectUtil.getSetValue(property, value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setByte(Property property, byte value)
-  {
-    set(property, DataObjectUtil.getSetValue(property, value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setBytes(Property property, byte[] value)
-  {
-    set(property, DataObjectUtil.getSetValue(property, value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setChar(Property property, char value)
-  {
-    set(property, DataObjectUtil.getSetValue(property, value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDataObject(Property property, DataObject value)
-  {
-    set(property, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDate(Property property, Date value)
-  {
-    set(property, DataObjectUtil.getSetValue(property, value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setDouble(Property property, double value)
-  {
-    set(property, DataObjectUtil.getSetValue(property, value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setFloat(Property property, float value)
-  {
-    set(property, DataObjectUtil.getSetValue(property, value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setInt(Property property, int value)
-  {
-    set(property, DataObjectUtil.getSetValue(property, value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setList(Property property, List value)
-  {
-    set(property, value);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setLong(Property property, long value)
-  {
-    set(property, DataObjectUtil.getSetValue(property, value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setShort(Property property, short value)
-  {
-    set(property, DataObjectUtil.getSetValue(property, value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void setString(Property property, String value)
-  {
-    set(property, DataObjectUtil.getSetValue(property, value));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject createDataObject(String propertyName)
-  {
-    Property property = (Property)DataObjectUtil.getProperty(this, propertyName);
-    Type type = property.getType();
-    return createDataObject(property, type);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject createDataObject(int propertyIndex)
-  {
-    Property property = DataObjectUtil.getProperty(this, propertyIndex);
-    Type type = property.getType();
-    return createDataObject(property, type);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject createDataObject(Property property)
-  {
-    Type type = property.getType();
-    return createDataObject(property, type);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject createDataObject(String propertyName, String namespaceURI, String typeName)
-  {
-    Property property = DataObjectUtil.getProperty(this, propertyName);
-    Type type = DataObjectUtil.getType(this, namespaceURI, typeName);
-    return createDataObject(property, type);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject createDataObject(int propertyIndex, String namespaceURI, String typeName)
-  {
-    Property property = DataObjectUtil.getProperty(this, propertyIndex);
-    Type type = DataObjectUtil.getType(this, namespaceURI, typeName);
-    return createDataObject(property, type);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject createDataObject(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(this, (EStructuralFeature)property))
-    {
-      ((List)get(property)).add(result);
-    }
-    else
-    {
-      set(property, result);
-    }
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void delete()
-  {
-    EcoreUtil.remove(this);
-    List contents = new ArrayList(eContents());
-    for (int i = 0, size = contents.size(); i < size; ++i)
-    {
-      ((DataObject)contents.get(i)).delete();
-    }
-    EClass eClass = eClass();
-    for (int i = 0, size = eClass.getFeatureCount(); i < size; ++i)
-    {
-      EStructuralFeature eStructuralFeature = eClass.getEStructuralFeature(i);
-      if (eStructuralFeature.isChangeable() && !eStructuralFeature.isDerived() && !((Property)eStructuralFeature).isReadOnly())
-      {
-        eUnset(eStructuralFeature);
-      }
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Sequence getSequence()
-  {
-    EAttribute mixedFeature = BasicExtendedMetaData.INSTANCE.getMixedFeature(eClass());
-    return mixedFeature != null ? (Sequence)eGet(mixedFeature, true, false) : null;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public List getInstanceProperties()
-  {
-    //TODO maybe optimize this to just return type.getProperties if type.isOpen (isOpen would need to be cached)
-    List result = new UniqueEList(eClass().getEAllStructuralFeatures());
-    for (int i = 0, count = result.size(); i < count; ++i)
-    {
-      EStructuralFeature eStructuralFeature = (EStructuralFeature)result.get(i);
-      if (!eStructuralFeature.isDerived() && FeatureMapUtil.isFeatureMap(eStructuralFeature))
-      {
-        List features = (List)eGet(eStructuralFeature);
-        for (int j = 0, size = features.size(); j < size; ++j)
-        {
-          FeatureMap.Entry entry = (FeatureMap.Entry)features.get(j);
-          EStructuralFeature entryFeature = entry.getEStructuralFeature();
-          result.add(entryFeature);
-        }
-      }
-    }
-    return result;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public Property getProperty(String propertyName)
-  {
-    Property property = getType().getProperty(propertyName);
-    if (property == null)
-    {
-      property = (Property)DataObjectUtil.getOpenFeature(this, propertyName);
-    }
-    return property;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public DataObject getRootObject()
-  {
-    return (DataObject)EcoreUtil.getRootContainer(this);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public ChangeSummary getChangeSummary()
-  {
-    // TODO: implement this method
-    throw new UnsupportedOperationException();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public void detach()
-  {
-    EcoreUtil.remove(this);
-  }
-  
-  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-  // Following methods customize BasicEObjectImpl, optimized for SDO 
-  ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-  public boolean eNotificationRequired()
-  {
-    return changeRecorder != null;
-  }
-
-  public void eNotify(Notification notification)
-  {
-    changeRecorder.notifyChanged(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));
-  }
-  
-} //EDataObjectImpl
-
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
deleted file mode 100644
index cbe5f36cab..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DataTypeImpl.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.impl;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EDataTypeImpl;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-
-import commonj.sdo.Property;
-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
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected DataTypeImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  protected EClass eStaticClass()
-  {
-    return EcorePackage.eINSTANCE.getEDataType();
-  }
-
-  /**
-   * <!-- 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;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  public boolean isAbstract()
-  {
-    return false;
-  }
-
-} //DataTypeImpl
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java
deleted file mode 100644
index dd9cdfa779..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicDataObjectImpl.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.impl;
-
-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;
-
-/**
- * <!-- 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);
-  }
-
-  /**
-   * <!-- 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);
-      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 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/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java
deleted file mode 100644
index d3b709c070..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/DynamicStoreDataObjectImpl.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.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/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
deleted file mode 100644
index 5f7256da9a..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/EnumImpl.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.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
- */
-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;
-  }
-
-} //EnumTypeImpl
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
deleted file mode 100644
index 8dbdec3d41..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/ReferenceImpl.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.impl;
-
-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.EReferenceImpl;
-
-import commonj.sdo.Property;
-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
-{
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected ReferenceImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated NOT
-   */
-  protected EClass eStaticClass()
-  {
-    return EcorePackage.eINSTANCE.getEReference();
-  }
-
-  /**
-   * <!-- 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?
-  }
-
-  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();
-  }
-
-  /**
-   * <!-- 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();
-  }
-
-} //ReferenceImpl
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java
deleted file mode 100644
index fa299cb95e..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOFactoryImpl.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.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.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.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.emf.ecore.impl.EcoreFactoryImpl;
-
-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
-   */
-  public static SDOFactory init()
-  {
-    try
-    {
-      SDOFactory theSDOFactory = (SDOFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/emf/2003/SDO"); 
-      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();
-      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 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/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java
deleted file mode 100644
index 15011fc37f..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SDOPackageImpl.java
+++ /dev/null
@@ -1,2133 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.impl;
-
-import java.io.ObjectStreamException;
-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.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.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 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
-   */
-  private SDOPackageImpl()
-  {
-    super(eNS_URI, SDOFactory.eINSTANCE);
-  }
-
-  /**
-   * <!-- 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 -->
-   * @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 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);
-
-    // Create data types
-    eJavaListEDataType = createEDataType(EJAVA_LIST);
-    eObjectStreamExceptionEDataType = createEDataType(EOBJECT_STREAM_EXCEPTION);
-  }
-
-  /**
-   * <!-- 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());
-
-    // 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);
-
-    // 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/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java
deleted file mode 100644
index 33ca015ac9..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/SimpleAnyTypeDataObjectImpl.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.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/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java
deleted file mode 100644
index 06bb3a6d05..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/impl/StoreDataObjectImpl.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.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/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java
deleted file mode 100644
index 5a631dde77..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/BasicSequence.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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;
-
-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.Property;
-import commonj.sdo.Sequence;
-
-/**
- *  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);
-    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(int propertyIndex)
-  {
-    return featureMap.getEObject().eClass().getEStructuralFeature(propertyIndex);
-  }
-
-  public boolean add(String propertyName, Object value)
-  {
-    return featureMap.add(getEStructuralFeature(propertyName), 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);
-  }
-
-  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);
-  }
-
-  public void add(String text)
-  {
-    FeatureMapUtil.addText(featureMap, text);
-  }
-
-  public void add(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/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
deleted file mode 100644
index 3631a88203..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataGraphResourceFactoryImpl.java
+++ /dev/null
@@ -1,644 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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;
-
-
-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.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.xml.sax.helpers.DefaultHandler;
-
-import commonj.sdo.ChangeSummary;
-
-
-public class DataGraphResourceFactoryImpl extends ResourceFactoryImpl
-{
-  /**
-   * Constructor for DataGraphResourceFactoryImpl.
-   */
-  public DataGraphResourceFactoryImpl()
-  {
-    super();
-  }
-
-  public Resource createResource(URI uri)
-  {
-    XMLResourceImpl result = new DataGraphResourceImpl(uri);
-
-    result.setEncoding("UTF-8");
-
-    result.getDefaultLoadOptions().put(XMLResource.OPTION_USE_LEXICAL_HANDLER, Boolean.TRUE);
-
-    result.getDefaultLoadOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-    result.getDefaultSaveOptions().put(XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-
-    result.getDefaultSaveOptions().put(XMLResource.OPTION_USE_ENCODED_ATTRIBUTE_STYLE, Boolean.TRUE);
-    result.getDefaultSaveOptions().put(XMLResource.OPTION_LINE_WIDTH, new Integer(80));
-
-    result.getDefaultLoadOptions().put(XMLResource.OPTION_ANY_TYPE, SDOPackage.eINSTANCE.getAnyTypeDataObject());
-    result.getDefaultSaveOptions().put(XMLResource.OPTION_ANY_TYPE, SDOPackage.eINSTANCE.getAnyTypeDataObject());
-
-    result.getDefaultLoadOptions().put(XMLResource.OPTION_ANY_SIMPLE_TYPE, SDOPackage.eINSTANCE.getSimpleAnyTypeDataObject());
-    result.getDefaultSaveOptions().put(XMLResource.OPTION_ANY_SIMPLE_TYPE, SDOPackage.eINSTANCE.getSimpleAnyTypeDataObject());
-
-    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)
-      {
-        return super.getIDREF(eObject);
-      }
-
-      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=\"" + XML_VERSION + "\" 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", "");
-          }
-          else
-          {
-            ((Element)currentNode).setAttributeNS(ExtendedMetaData.XMLNS_URI, ExtendedMetaData.XMLNS_PREFIX, "");
-          }
-        }
-      }
-
-      protected EObject getSchemaLocationRoot(EObject eObject)
-      {
-        return eDataGraph.getERootObject();
-      }
-    }
-
-    protected XMLSave createXMLSave()
-    {
-      return new SaveImpl(createXMLHelper());
-    }
-
-    public static class LoadImpl extends XMLLoadImpl
-    {
-      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 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, "EChangeSummary");
-                  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 (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());
-                    }
-                  }
-
-                  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;
-              }
-              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, "EDataGraph");
-                }
-              }
-              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/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
deleted file mode 100644
index 6c816090a4..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/DataObjectUtil.java
+++ /dev/null
@@ -1,1727 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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;
-
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.tuscany.sdo.impl.SDOFactoryImpl;
-import org.eclipse.emf.common.util.BasicEList;
-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.EFactory;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-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.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.impl.EMOFResourceFactoryImpl;
-import org.eclipse.emf.ecore.xmi.impl.EcoreResourceFactoryImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceFactoryImpl;
-import org.eclipse.emf.ecore.xml.type.internal.XMLCalendar;
-import org.eclipse.xsd.util.XSDResourceFactoryImpl;
-
-import commonj.sdo.DataGraph;
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-import commonj.sdo.helper.TypeHelper;
-
-
-public final class DataObjectUtil
-{
-  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 Number)
-    {
-      return new BigDecimal(((Number)value).doubleValue());
-    }
-
-    if (value instanceof String)
-    {
-      return new BigDecimal((String)value);
-    }
-
-    if (value == null)
-    {
-      return null;
-    }
-
-    throw new IllegalArgumentException("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 IllegalArgumentException 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 IllegalArgumentException("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 IllegalArgumentException 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 IllegalArgumentException("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 IllegalArgumentException 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 IllegalArgumentException("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 IllegalArgumentException 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 == null)
-    {
-      return null;
-    }
-
-    throw new IllegalArgumentException("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);
-    }
-
-    //Instead of throwing an IllegalArgumentException 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 IllegalArgumentException("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 IllegalArgumentException we will pass the value to the property
-    return new Character(value);
-  }
-
-  public static Date getDate(Object 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 IllegalArgumentException("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.Object")
-    {
-      String typeName = getDateTypeName((EDataType)eType);
-      if ("Date".equals(typeName))
-      {
-        return new XMLCalendar(value, XMLCalendar.DATE);
-      }
-      if ("DateTime".equals(typeName))
-      {
-        return new XMLCalendar(value, XMLCalendar.DATETIME);
-      }
-      // Instead of throwing an IllegalArgumentException we will pass the value to the property
-      return value;
-    }
-
-    if (name == "java.lang.Long" || name == "long")
-    {
-      return new Long(value.getTime());
-    }
-    if (name == "java.lang.String")
-    {
-      return value.toString();
-    }
-
-    // Instead of throwing an IllegalArgumentException we will pass the value to the property
-    return value;
-  }
-
-  protected static String getDateTypeName(EDataType eDataType)
-  {
-    String name = eDataType.getName();
-    if (("DateTime".equals(name)) || ("Date".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)) || ("Date".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 IllegalArgumentException("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 IllegalArgumentException 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 IllegalArgumentException("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 IllegalArgumentException 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 IllegalArgumentException("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 IllegalArgumentException 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 IllegalArgumentException("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 IllegalArgumentException 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 IllegalArgumentException("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 IllegalArgumentException 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 == null)
-    {
-      return null;
-    }
-
-    throw new IllegalArgumentException("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.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);
-    }
-
-    // Instead of throwing an IllegalArgumentException 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 EStructuralFeature getOpenFeature(EObject eObject, String featureName)
-  {
-    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 (/*!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))
-          {
-            Property property = (Property)entryFeature;
-            if (property.getName().equals(featureName)) return entryFeature;
-
-            List aliasNames = property.getAliasNames();
-            for (int aliasCount = aliasNames.size(); aliasCount > 0; )
-            {
-              if (aliasNames.get(--aliasCount).equals(featureName)) return entryFeature;
-            }
-          }
-        }
-      }
-    }
-    throw new IllegalArgumentException("Class '" + eObject.eClass().getName() + "' does not have a feature named '" + featureName + "'");
-  }
-  
-  public static List getAliasNames(EStructuralFeature eStructuralFeature)
-  {
-    List aliasNames = new ArrayList();
-    String xmlName = ExtendedMetaData.INSTANCE.getName(eStructuralFeature);
-    if (!xmlName.equals(eStructuralFeature.getName()))
-    {
-      aliasNames.add(xmlName);
-    }
-    return aliasNames;
-  }
-
-  public static List getAliasNames(EClassifier eClassifier)
-  {
-    List aliasNames = new ArrayList();
-    String xmlName = ExtendedMetaData.INSTANCE.getName(eClassifier);
-    if (!xmlName.equals(eClassifier.getName()))
-    {
-      aliasNames.add(xmlName);
-    }
-    return aliasNames;
-  }
-
-  /**
-   * 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)
-    {
-      Accessor result = pool.get();
-      result.init(eObject, path);
-      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 EStructuralFeature feature;
-
-    protected int index;
-
-    protected Accessor()
-    {
-    }
-
-    protected Accessor(EObject eObject, String path)
-    {
-      init(eObject, path);
-    }
-
-    protected void init(EObject eObject, String path)
-    {
-      this.eObject = eObject;
-
-      // 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;
-    }
-
-    public void set(Object newValue)
-    {
-      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 eObject.eIsSet(feature);
-    }
-
-    public boolean isSetAndRecyle()
-    {
-      boolean result = isSet();
-      pool.recycle(this);
-      return result;
-    }
-
-    public void unset()
-    {
-      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()
-    {
-      return (Property)feature;
-    }
-
-    protected void setFeatureName(String name)
-    {
-      if (name != null)
-      {
-        feature = (EStructuralFeature)((DataObject)eObject).getProperty(name);
-      }
-      else
-      {
-        feature = null;
-      }
-      index = NO_INDEX;
-    }
-
-    protected int getIndex()
-    {
-      return index;
-    }
-
-    protected void setIndex(int index)
-    {
-      this.index = index;
-      if (!FeatureMapUtil.isMany(eObject, feature))
-      {
-        throw new IndexOutOfBoundsException("Index applies only to multi-valued features.");
-      }
-    }
-
-    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());
-        }
-        else if ("..".equals(token))
-        {
-          EObject container = eObject.eContainer();
-          if (container == null)
-          {
-            throw new IllegalArgumentException("No containing object for " + eObject);
-          }
-          setEObject(container);
-        }
-        else if ('.' == c)
-        {
-          x++; // skip .
-          token = tokens.peek(x);
-          int index = Integer.parseInt(token);
-          setIndex(index);
-        }
-        else if ('[' == c)
-        {
-          x++; // skip [
-          token = tokens.peek(x); // name or index
-          char following = tokens.peek(x + 1).charAt(0);
-          if ('=' != following)
-          {
-            int index = Integer.parseInt(token) - 1;
-            setIndex(index);
-            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);
-            }
-            else
-            {
-              setIndex(index);
-            }
-          }
-        }
-        else if ('@' == c)
-        {
-          x++; // skip @
-        }
-        else
-        {
-          setFeatureName(token);
-        }
-      }
-    }
-
-    protected static int matchingIndex(List eObjects, String attributeName, String attributeValue)
-    {
-      for (int i = 0, size = eObjects.size(); i < size; i++)
-      {
-        EObject eObject = (EObject)eObjects.get(i);
-        EStructuralFeature feature = (EStructuralFeature)((Type)eObject.eClass()).getProperty(attributeName);
-        if (feature != null)
-        {
-          Object test = eObject.eGet(feature, true);
-          if (test != null)
-          {
-            String testString = EcoreUtil.convertToString((EDataType)feature.getEType(), 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 ':':
-              case '.':
-                if (cPrev != c)
-                {
-                  endToken(token, false);
-                }
-                token.append(c);
-                if (cNext != c)
-                {
-                  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 getProperty(DataObject dataObject, String propertyName)
-  {
-    Property property = dataObject.getProperty(propertyName);
-    if (property == null)
-    {
-      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();
-    
-    Property property = propertyIndex < typeProperties.size() ?
-        (Property)typeProperties.get(propertyIndex) :
-        (Property)dataObject.getInstanceProperties().get(propertyIndex);
-    
-    //FB maybe should catch bad index exception and throw IllegalArgumentException?
-    return property;
-  }
-
-  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);
-  }
-  
-  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();
-
-      if (!(Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.datagraph")) instanceof DataGraphResourceFactoryImpl))
-      {
-        result.put("datagraph", new DataGraphResourceFactoryImpl());
-      }
-      if (!(Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.ecore")) instanceof EcoreResourceFactoryImpl))
-      {
-        result.put("ecore", new EcoreResourceFactoryImpl());
-      }
-
-      if (!(Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.emof")) instanceof EMOFResourceFactoryImpl))
-      {
-        result.put("emof", new EMOFResourceFactoryImpl());
-      }
-
-      if (Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.xsd")) == null)
-      {
-        result.put("xsd", new XSDResourceFactoryImpl());
-      }
-
-      //FIXME ClassCastException in XSDHelper.define() if you give it a WSDL file
-      // Patch for JIRA TUSCANY-42
-      if (Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.wsdl")) == null)
-      {
-        result.put("wsdl", new XSDResourceFactoryImpl());
-      }
-
-      if (Resource.Factory.Registry.INSTANCE.getFactory(URI.createURI("*.*")) == null)
-      {
-        result.put("*", new XMLResourceFactoryImpl());
-      }
-
-      registrations = result;
-    }
-
-    return registrations;
-  }
-
-  protected static void configureResourceSet(ResourceSet resourceSet)
-  {
-    resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().putAll(getRegistrations());
-  }
-
-  /**
-   * 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();
-        }
-      });
-  }
-  
-  public static void initRuntime()
-  {
-    // NOOP since init is done during static initialization of this class. See above.
-  }
-  
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java b/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
deleted file mode 100644
index 521bdec886..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/java/org/apache/tuscany/sdo/util/SDOUtil.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.lang.reflect.Field;
-import java.util.Map;
-
-import org.apache.tuscany.sdo.SDOFactory;
-import org.apache.tuscany.sdo.SDOPackage;
-import org.apache.tuscany.sdo.helper.DataFactoryImpl;
-import org.apache.tuscany.sdo.helper.TypeHelperImpl;
-import org.apache.tuscany.sdo.helper.XMLHelperImpl;
-import org.apache.tuscany.sdo.helper.XSDHelperImpl;
-import org.apache.tuscany.sdo.impl.DataGraphImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-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.BasicExtendedMetaData;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-import commonj.sdo.DataGraph;
-import commonj.sdo.Type;
-import commonj.sdo.helper.DataFactory;
-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.
- */
-public final class SDOUtil
-{
-  /**
-   * Creates an instance of a data type from the specified string.
-   * @param dataType a Type, for which isDataType() returns true, to instantiate.
-   * @param literal the string value of the dataType.
-   * @return an instance of the dataType.
-   * @see #convertToString(Type, Object)
-   */
-  public static Object createFromString(Type dataType, String literal)
-  {
-    return EcoreUtil.createFromString((EDataType)dataType, literal);
-  }
-  
-  /**
-   * Converts an instance of a data type to a string literal representation.
-   * @param dataType the Type, for which isDataType() returns true, of the value to convert.
-   * @param value a value of the dataType.
-   * @return the string literal representation of the value.
-   * @see #createFromString(Type, String)
-   */
-  public static String convertToString(Type dataType, Object value)
-  {
-    return EcoreUtil.convertToString((EDataType)dataType, value);
-  }
-
-  /**
-   * Get the SDO built-in type corresponding to the specified XSD type in the XML Schema
-   * namespace ("http://www.w3.org/2001/XMLSchema").
-   * @param xsdType a type name in the XML Schema namespace.
-   * @return the SDO built-in Type corresponding to the specified XSD type.
-   */
-  public static Type getXSDSDOType(String xsdType)
-  {
-    //FIXME Temporary impl to be replaced with proper XSD to SDO mapping (see SDO spec - pg 95)
-    return (Type)
-      ("anyType".equals(xsdType) ?
-        SDOPackage.eINSTANCE.getDataObject() :
-        ExtendedMetaData.INSTANCE.getType(XMLTypePackage.eINSTANCE, xsdType));
-  }
-  
-  /**
-   * Create an empty data graph.
-   * @return the new data graph instance.
-   */
-  public static DataGraph createDataGraph()
-  {
-    return SDOFactory.eINSTANCE.createDataGraph();
-  }
-  
-  /**
-   * Load a serialized data graph from the specified insputStream.
-   * @param inputStream the inputStream of the data graph.
-   * @param options loader control options, or null.
-   * @return the de-serialized data graph.
-   * @throws IOException
-   */
-  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);
-  }
-  
-  /**
-   * Serialize the specified data graph to the specified outputStream.
-   * @param dataGraph the data graph to save.
-   * @param outputStream the outputStream for the data graph.
-   * @param options serializer control options, or null.
-   * @throws IOException
-   */
-  public static void saveDataGraph(DataGraph dataGraph, OutputStream outputStream, Map options) throws IOException
-  {
-    ((DataGraphImpl)dataGraph).getDataGraphResource().save(outputStream, options);
-  }
-  
-  /**
-   * 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.
-   */
-  public static TypeHelper createTypeHelper()
-  {
-    EPackage.Registry registry = new EPackageRegistryImpl(EPackage.Registry.INSTANCE);
-    ExtendedMetaData extendedMetaData = new BasicExtendedMetaData(registry); //TODO create subclass that makes demand() methods synchronous
-    return new TypeHelperImpl(extendedMetaData);
-  }
-
-  /**
-   * 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.
-   */
-  public static DataFactory createDataFactory(TypeHelper scope)
-  {
-    return new DataFactoryImpl(scope);
-  }
-
-  /**
-   * 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.
-   */
-  public static XMLHelper createXMLHelper(TypeHelper scope)
-  {
-    return new XMLHelperImpl(scope);
-  }
-
-  /**
-   * 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.
-   */
-  public static XSDHelper createXSDHelper(TypeHelper scope)
-  {
-    return new XSDHelperImpl(scope);
-  }
-  
-  /**
-   * 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.
-   */
-  public static void registerStaticTypes(Class factoryClass)
-  {
-    //TODO this implementation is a temporary kludge until the SDO generated factory pattern is decided
-    String temp = factoryClass.getName().replaceFirst("Factory$", "PackageImpl");
-    int lastDot = temp.lastIndexOf('.');
-    String packageName = temp.substring(0, lastDot) + ".impl" + temp.substring(lastDot);
-    try
-    {
-      Class javaClass = factoryClass.getClassLoader().loadClass(packageName);
-      Field field = javaClass.getField("eINSTANCE");
-      field.get(null); 
-    }
-    catch (Exception e1)
-    {
-      packageName = factoryClass.getName().replaceFirst("Factory$", "Package");
-      try
-      {
-        Class javaClass = factoryClass.getClassLoader().loadClass(packageName);
-        Field field = javaClass.getField("eINSTANCE");
-        field.get(null); 
-      }
-      catch (Exception e)
-      {
-        e.printStackTrace();
-      }
-    }
-  }
-
-  /**
-   * Initialize SDO runtime.
-   */
-  static
-  {
-    DataObjectUtil.initRuntime();
-  }
-  
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/resources/META-INF/MANIFEST.MF b/tags/java-stable-20060304/sdo/impl/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 240400a930..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: SDO Runtime Implementation
-Bundle-SymbolicName: org.apache.tuscany.sdo.impl
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Bundle-Vendor: Apache
-Require-Bundle: org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.change,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.xsd,
- org.apache.tuscany.sdo.spec;visibility:=reexport
-Export-Package: commonj.sdo.impl,
- org.apache.tuscany.sdo,
- org.apache.tuscany.sdo.helper,
- org.apache.tuscany.sdo.impl,
- org.apache.tuscany.sdo.test,
- org.apache.tuscany.sdo.util
diff --git a/tags/java-stable-20060304/sdo/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider b/tags/java-stable-20060304/sdo/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider
deleted file mode 100644
index 73693d6556..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/main/resources/META-INF/services/commonj.sdo.impl.HelperProvider
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.tuscany.sdo.helper.HelperProviderImpl
-\ No newline at end of file
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java b/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java
deleted file mode 100644
index f862837715..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar1.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- *
- * Copyright 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.codegen;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface Bar1 {
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java b/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java
deleted file mode 100644
index 35a878015f..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Bar2.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- *
- * Copyright 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.codegen;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface Bar2 {
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java b/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java
deleted file mode 100644
index 61f0ebd4fe..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/BytecodeInterfaceGeneratorTestCase.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/**
- *
- * Copyright 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.codegen;
-
-import java.lang.reflect.Method;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-/**
- * @version $Rev$ $Date$
- */
-public class BytecodeInterfaceGeneratorTestCase extends TestCase {
-    private MockType foo;
-    private BytecodeInterfaceGenerator gen;
-    private TestClassLoader cl;
-
-    public void testHeaderNoBaseClass() {
-        gen.visitType(foo);
-        gen.visitEnd();
-        Class<?> c = cl.addClass(gen.getClassData());
-        assertEquals("Foo", c.getName());
-        assertTrue(c.isInterface());
-        assertEquals(0, c.getInterfaces().length);
-        assertEquals(0, c.getMethods().length);
-    }
-
-    public void testHeaderWithPackage() {
-        gen.visitType(new MockType("org.apache.Foo", null));
-        gen.visitEnd();
-        Class<?> c = cl.addClass(gen.getClassData());
-        assertEquals("org.apache.Foo", c.getName());
-        assertEquals(0, c.getInterfaces().length);
-        assertEquals(0, c.getMethods().length);
-    }
-
-    public void testHeaderOneBaseClass() throws NoJavaImplementationException {
-        foo.addBaseType(new MockType("bar1", Bar1.class));
-        gen.visitType(foo);
-        gen.visitEnd();
-        Class<?> c = cl.addClass(gen.getClassData());
-        assertEquals("Foo", c.getName());
-        assertEquals(1, c.getInterfaces().length);
-        assertEquals(Bar1.class, c.getInterfaces()[0]);
-        assertEquals(0, c.getMethods().length);
-    }
-
-    public void testHeaderMultipleBaseClass() throws NoJavaImplementationException {
-        foo.addBaseType(new MockType("bar1", Bar1.class));
-        foo.addBaseType(new MockType("bar2", Bar2.class));
-        gen.visitType(foo);
-        gen.visitEnd();
-        Class<?> c = cl.addClass(gen.getClassData());
-        assertEquals("Foo", c.getName());
-        assertEquals(2, c.getInterfaces().length);
-        assertEquals(Bar1.class, c.getInterfaces()[0]);
-        assertEquals(Bar2.class, c.getInterfaces()[1]);
-        assertEquals(0, c.getMethods().length);
-    }
-
-    public void testBooleanProperty() throws NoJavaImplementationException, NoSuchMethodException {
-        gen.visitType(foo);
-        gen.visitProperty(new MockProperty("true", Boolean.TYPE, false, false));
-        gen.visitEnd();
-        Class<?> c = cl.addClass(gen.getClassData());
-        assertEquals(2, c.getMethods().length);
-        Method getter = c.getMethod("isTrue");
-        assertEquals(boolean.class, getter.getReturnType());
-        Method setter = c.getMethod("setTrue", boolean.class);
-        assertEquals(void.class, setter.getReturnType());
-    }
-
-    public void testByteArrayProperty() throws NoJavaImplementationException, NoSuchMethodException {
-        gen.visitType(foo);
-        gen.visitProperty(new MockProperty("bytes", byte[].class, false, false));
-        gen.visitEnd();
-        Class<?> c = cl.addClass(gen.getClassData());
-        assertEquals(2, c.getMethods().length);
-        Method getter = c.getMethod("getBytes");
-        assertEquals(byte[].class, getter.getReturnType());
-        Method setter = c.getMethod("setBytes", byte[].class);
-        assertEquals(void.class, setter.getReturnType());
-    }
-
-    public void testObjectProperty() throws NoJavaImplementationException, NoSuchMethodException {
-        gen.visitType(foo);
-        gen.visitProperty(new MockProperty("bar", Bar1.class, false, false));
-        gen.visitEnd();
-        Class<?> c = cl.addClass(gen.getClassData());
-        assertEquals(2, c.getMethods().length);
-        Method getter = c.getMethod("getBar");
-        assertEquals(Bar1.class, getter.getReturnType());
-        Method setter = c.getMethod("setBar", Bar1.class);
-        assertEquals(void.class, setter.getReturnType());
-    }
-
-    public void testReadOnlyProperty() throws NoJavaImplementationException, NoSuchMethodException {
-        gen.visitType(foo);
-        gen.visitProperty(new MockProperty("int", Integer.TYPE, false, true));
-        gen.visitEnd();
-        Class<?> c = cl.addClass(gen.getClassData());
-        assertEquals(1, c.getMethods().length);
-        Method getter = c.getMethod("getInt");
-        assertEquals(int.class, getter.getReturnType());
-    }
-
-    public void testManyProperty() throws NoJavaImplementationException, NoSuchMethodException {
-        gen.visitType(foo);
-        gen.visitProperty(new MockProperty("list", Integer.TYPE, true, false));
-        gen.visitEnd();
-        Class<?> c = cl.addClass(gen.getClassData());
-        assertEquals(1, c.getMethods().length);
-        Method getter = c.getMethod("getList");
-        assertEquals(List.class, getter.getReturnType());
-    }
-
-    public void testTwoProperties() throws NoJavaImplementationException, NoSuchMethodException {
-        gen.visitType(foo);
-        gen.visitProperty(new MockProperty("true", Boolean.TYPE, false, false));
-        gen.visitProperty(new MockProperty("int", Integer.TYPE, false, false));
-        gen.visitEnd();
-        Class<?> c = cl.addClass(gen.getClassData());
-        assertEquals(4, c.getMethods().length);
-        Method getter = c.getMethod("isTrue");
-        assertEquals(boolean.class, getter.getReturnType());
-        Method setter = c.getMethod("setTrue", boolean.class);
-        assertEquals(void.class, setter.getReturnType());
-        getter = c.getMethod("getInt");
-        assertEquals(int.class, getter.getReturnType());
-        setter = c.getMethod("setInt", int.class);
-        assertEquals(void.class, setter.getReturnType());
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        foo = new MockType("foo", null);
-        gen = new BytecodeInterfaceGenerator();
-        cl = new TestClassLoader();
-    }
-
-    private class TestClassLoader extends ClassLoader {
-        public TestClassLoader() {
-            super(TestClassLoader.class.getClassLoader());
-        }
-
-        Class<?> addClass(byte[] bytes) {
-            return defineClass(null, bytes, 0, bytes.length);
-        }
-    }
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java b/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java
deleted file mode 100644
index 6a401d48bb..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/Foo.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- *
- * Copyright 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.codegen;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface Foo {
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java b/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java
deleted file mode 100644
index ada15e151d..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/JavaInterfaceGeneratorTestCase.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/**
- *
- * Copyright 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.codegen;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import junit.framework.TestCase;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JavaInterfaceGeneratorTestCase extends TestCase {
-    private static final String SEP = System.getProperty("line.separator");
-
-    private JavaInterfaceGenerator gen;
-    private StringWriter writer;
-    private MockType foo;
-
-    public void testHeaderNoBaseClass() {
-        gen.visitType(foo);
-        gen.visitEnd();
-        assertEquals(localize("public interface Foo {\n}\n"), writer.toString());
-    }
-
-    public void testHeaderWithPackage() {
-        gen.visitType(new MockType("org.apache.Foo", null));
-        gen.visitEnd();
-        assertEquals(localize("package org.apache;\n\npublic interface Foo {\n}\n"), writer.toString());
-    }
-
-    public void testHeaderOneBaseClass() throws NoJavaImplementationException {
-        foo.addBaseType(new MockType("bar1", Bar1.class));
-        gen.visitType(foo);
-        gen.visitEnd();
-        assertEquals(localize("public interface Foo extends org.apache.tuscany.sdo.codegen.Bar1 {\n}\n"), writer.toString());
-    }
-
-    public void testHeaderMultipleBaseClass() throws NoJavaImplementationException {
-        foo.addBaseType(new MockType("bar1", Bar1.class));
-        foo.addBaseType(new MockType("bar2", Bar2.class));
-        gen.visitType(foo);
-        gen.visitEnd();
-        assertEquals(localize("public interface Foo extends org.apache.tuscany.sdo.codegen.Bar1, org.apache.tuscany.sdo.codegen.Bar2 {\n}\n"), writer.toString());
-    }
-
-    public void testBooleanProperty() throws NoJavaImplementationException {
-        gen.visitType(foo);
-        gen.visitProperty(new MockProperty("true", Boolean.TYPE, false, false));
-        gen.visitEnd();
-        assertEquals(localize("public interface Foo {\n\tboolean isTrue();\n\tvoid setTrue(boolean value);\n}\n"), writer.toString());
-    }
-
-    public void testByteArrayProperty() throws NoJavaImplementationException {
-        gen.visitType(foo);
-        gen.visitProperty(new MockProperty("bytes", byte[].class, false, false));
-        gen.visitEnd();
-        assertEquals(localize("public interface Foo {\n\tbyte[] getBytes();\n\tvoid setBytes(byte[] value);\n}\n"), writer.toString());
-    }
-
-    public void testObjectProperty() throws NoJavaImplementationException {
-        gen.visitType(foo);
-        gen.visitProperty(new MockProperty("bar", Bar1.class, false, false));
-        gen.visitEnd();
-        assertEquals(localize("public interface Foo {\n\torg.apache.tuscany.sdo.codegen.Bar1 getBar();\n\tvoid setBar(org.apache.tuscany.sdo.codegen.Bar1 value);\n}\n"), writer.toString());
-    }
-
-    public void testReadOnlyProperty() throws NoJavaImplementationException {
-        gen.visitType(foo);
-        gen.visitProperty(new MockProperty("int", Integer.TYPE, false, true));
-        gen.visitEnd();
-        assertEquals(localize("public interface Foo {\n\tint getInt();\n}\n"), writer.toString());
-    }
-
-    public void testManyProperty() throws NoJavaImplementationException {
-        gen.visitType(foo);
-        gen.visitProperty(new MockProperty("list", Integer.TYPE, true, false));
-        gen.visitEnd();
-        assertEquals(localize("public interface Foo {\n\tjava.util.List getList();\n}\n"), writer.toString());
-    }
-
-    public void testTwoProperties() throws NoJavaImplementationException {
-        gen.visitType(foo);
-        gen.visitProperty(new MockProperty("true", Boolean.TYPE, false, false));
-        gen.visitProperty(new MockProperty("int", Integer.TYPE, false, false));
-        gen.visitEnd();
-        assertEquals(localize("public interface Foo {\n\tboolean isTrue();\n\tvoid setTrue(boolean value);\n\tint getInt();\n\tvoid setInt(int value);\n}\n"), writer.toString());
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        writer = new StringWriter();
-        gen = new JavaInterfaceGenerator(new PrintWriter(writer));
-        foo = new MockType("foo", null);
-    }
-
-    private String localize(String s) {
-        StringBuilder b = new StringBuilder(s.length() + s.length()/10);
-        for (int i = 0; i < s.length(); i++) {
-            char ch = s.charAt(i);
-            if (ch == '\t') {
-                b.append("    ");
-            } else if (ch == '\n') {
-                b.append(SEP);
-            } else {
-                b.append(ch);
-            }
-        }
-        return b.toString();
-    }
-
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java b/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java
deleted file mode 100644
index 5cee856217..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockProperty.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- *
- * Copyright 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.codegen;
-
-import java.util.List;
-
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-
-/**
- * @version $Rev$ $Date$
- */
-class MockProperty implements Property {
-    private final String name;
-    private final Type type;
-    private final boolean many;
-    private final boolean readOnly;
-
-    public MockProperty(String name, Class type, boolean many, boolean readOnly) {
-        this.name = name;
-        this.type = new MockType(null, type);
-        this.many = many;
-        this.readOnly = readOnly;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public Type getType() {
-        return type;
-    }
-
-    public boolean isMany() {
-        return many;
-    }
-
-    public boolean isContainment() {
-        throw new UnsupportedOperationException();
-    }
-
-    public Type getContainingType() {
-        throw new UnsupportedOperationException();
-    }
-
-    public Object getDefault() {
-        throw new UnsupportedOperationException();
-    }
-
-    public boolean isReadOnly() {
-        return readOnly;
-    }
-
-    public Property getOpposite() {
-        throw new UnsupportedOperationException();
-    }
-
-    public List /*String*/ getAliasNames() {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java b/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java
deleted file mode 100644
index 7aa880b1e9..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/codegen/MockType.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- *
- * Copyright 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.codegen;
-
-import java.util.List;
-import java.util.ArrayList;
-
-import commonj.sdo.Type;
-import commonj.sdo.Property;
-
-/**
- * @version $Rev$ $Date$
- */
-class MockType implements Type {
-    private final String name;
-    private final Class javaClass;
-    private final List<Type> baseTypes = new ArrayList<Type>();
-
-    public MockType(String name, Class javaClass) {
-        this.javaClass = javaClass;
-        this.name = name;
-    }
-
-    public void addBaseType(Type baseType) {
-        baseTypes.add(baseType);
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getURI() {
-        throw new UnsupportedOperationException();
-    }
-
-    public Class getInstanceClass() {
-        return javaClass;
-    }
-
-    public boolean isInstance(Object object) {
-        throw new UnsupportedOperationException();
-    }
-
-    public List /*Property*/ getProperties() {
-        throw new UnsupportedOperationException();
-    }
-
-    public Property getProperty(String propertyName) {
-        throw new UnsupportedOperationException();
-    }
-
-    public boolean isDataType() {
-        throw new UnsupportedOperationException();
-    }
-
-    public boolean isOpen() {
-        throw new UnsupportedOperationException();
-    }
-
-    public boolean isSequenced() {
-        throw new UnsupportedOperationException();
-    }
-
-    public boolean isAbstract() {
-        throw new UnsupportedOperationException();
-    }
-
-    public List /*Type*/ getBaseTypes() {
-        return baseTypes;
-    }
-
-    public List /*Property*/ getDeclaredProperties() {
-        throw new UnsupportedOperationException();
-    }
-
-    public List /*String*/ getAliasNames() {
-        throw new UnsupportedOperationException();
-    }
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java b/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java
deleted file mode 100644
index dbb6b7af46..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryTestCase.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.test;
-
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.net.URL;
-
-import commonj.sdo.ChangeSummary;
-import commonj.sdo.DataGraph;
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.XSDHelper;
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sdo.util.SDOUtil;
-
-
-public class ChangeSummaryTestCase extends TestCase {
-    private final String TEST_MODEL = "/simple.xsd";
-    private final String TEST_DATA = "/simplechangesummary.xml";
-
-    /**
-     * Simple ChangeSummary test.
-     */
-    public void testChangeSummary() throws IOException {
-        // Create an empty data graph and add a root object, an instance of type Quote
-        //
-      
-        DataGraph dataGraph = SDOUtil.createDataGraph();
-        DataObject quote = dataGraph.createRootObject("http://www.example.com/simple", "Quote");
-
-        // Begin logging changes
-        //
-        ChangeSummary changeSummary = dataGraph.getChangeSummary();
-        changeSummary.beginLogging();
-
-        // Modify the data graph in various fun and interesting ways
-        //
-        quote.setString("symbol", "fbnt");
-        quote.setString("companyName", "FlyByNightTechnology");
-        quote.setBigDecimal("price", new BigDecimal("1000.0"));
-        quote.setBigDecimal("open1", new BigDecimal("1000.0"));
-        quote.setBigDecimal("high", new BigDecimal("1000.0"));
-        quote.setBigDecimal("low", new BigDecimal("1000.0"));
-        quote.setDouble("volume", 1000);
-        quote.setDouble("change1", 1000);
-
-        DataObject child = quote.createDataObject("quotes");
-        child.setBigDecimal("price", new BigDecimal("2000.0"));
-
-        // Stop logging changes and print the resulting data graph to stdout
-        //
-        changeSummary.endLogging();
-        
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        SDOUtil.saveDataGraph(dataGraph, baos, null);
-
-        assertTrue(TestUtil.equalXmlFiles(new ByteArrayInputStream(baos.toByteArray()), getClass().getResource(TEST_DATA)));
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        // Populate the meta data for the test (Stock Quote) model
-        URL url = getClass().getResource(TEST_MODEL);
-        InputStream inputStream = url.openStream();
-        XSDHelper.INSTANCE.define(inputStream, url.toString());
-        inputStream.close();
-    }
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java b/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java
deleted file mode 100644
index faa8782a77..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/DataTypeBaseTypeTestCase.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.test;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import commonj.sdo.Type;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XSDHelper;
-
-
-public class DataTypeBaseTypeTestCase extends TestCase {
-    private final String TEST_MODEL = "/datatype.xsd";
-    private final String TEST_NAMESPACE = "http://www.example.com/datatype";
-
-    public void testSimpleSDOType() throws IOException
-    {
-      Type type = TypeHelper.INSTANCE.getType(TEST_NAMESPACE, "SimpleSDOType");
-      List baseTypes = type.getBaseTypes();
-      assertTrue(baseTypes.size() == 1);
-    }
-    
-    public void testSimpleSDOTypeInstanceClass() throws IOException
-    {
-      Type type = TypeHelper.INSTANCE.getType(TEST_NAMESPACE, "SimpleSDOTypeInstanceClass");
-      List baseTypes = type.getBaseTypes();
-      assertTrue(baseTypes.size() == 0);
-    }
-    
-    public void testSimpleSDOTypeExtendedInstanceClass() throws IOException
-    {
-      Type type = TypeHelper.INSTANCE.getType(TEST_NAMESPACE, "SimpleSDOTypeExtendedInstanceClass");
-      List baseTypes = type.getBaseTypes();
-      assertTrue(baseTypes.size() == 1);
-    }
-
-    public void setUp() throws Exception
-    {
-      URL url = getClass().getResource(TEST_MODEL);
-      InputStream inputStream = url.openStream();
-      XSDHelper.INSTANCE.define(inputStream, url.toString());
-      inputStream.close();   
-    }
-
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java b/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java
deleted file mode 100644
index e46f9858e2..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/MixedTypeTestCase.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.test;
-
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.net.URL;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Sequence;
-import commonj.sdo.Type;
-import commonj.sdo.helper.DataFactory;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XMLHelper;
-import commonj.sdo.helper.XSDHelper;
-import junit.framework.TestCase;
-
-
-public class MixedTypeTestCase extends TestCase {
-    private final String TEST_MODEL = "/mixed.xsd";
-    private final String TEST_NAMESPACE = "http://www.example.com/mixed";
-    private final String TEST_DATA = "/mixed.xml";
-
-    /**
-     * Sequenced type SDO 2 test.
-     */
-    public void testSequencedType() throws IOException {
-        Type quoteType = TypeHelper.INSTANCE.getType(TEST_NAMESPACE, "MixedQuote");
-        DataObject quote = DataFactory.INSTANCE.create(quoteType);
-
-        Sequence sequence = quote.getSequence();
-
-        sequence.add("\n  ");
-
-        quote.setString("symbol", "fbnt");
-
-        sequence.add("\n  ");
-
-        quote.setString("companyName", "FlyByNightTechnology");
-
-        sequence.add("\n  some text\n  ");
-
-        DataObject child = quote.createDataObject("quotes");
-        child.setBigDecimal("price", new BigDecimal("2000.0"));
-
-        sequence.add("\n  more text\n  ");
-
-        // quote.setBigDecimal("price", new BigDecimal("1000.0"));
-        sequence.add("price", new BigDecimal("1000.0"));
-
-        sequence.add("\n");
-
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        XMLHelper.INSTANCE.save(quote, TEST_NAMESPACE, "mixedStockQuote", baos);
-
-        assertTrue(TestUtil.equalXmlFiles(new ByteArrayInputStream(baos.toByteArray()), getClass().getResource(TEST_DATA)));
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        // Populate the meta data for the test (Stock Quote) model
-        URL url = getClass().getResource(TEST_MODEL);
-        InputStream inputStream = url.openStream();
-        XSDHelper.INSTANCE.define(inputStream, url.toString());
-        inputStream.close();
-    }
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java b/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java
deleted file mode 100644
index 7e743e296a..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/OpenTypeTestCase.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.test;
-
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.math.BigDecimal;
-import java.net.URL;
-import java.util.Iterator;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Property;
-import commonj.sdo.Type;
-import commonj.sdo.helper.DataFactory;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XMLHelper;
-import commonj.sdo.helper.XSDHelper;
-import junit.framework.TestCase;
-
-
-public class OpenTypeTestCase extends TestCase {
-    private final String TEST_MODEL = "/open.xsd";
-    private final String TEST_NAMESPACE = "http://www.example.com/open";
-    private final String TEST_DATA = "/open.xml";
-
-    /**
-     * Open content SDO 2 test.
-     */
-    public void testOpenType() throws IOException {
-        Type quoteType = TypeHelper.INSTANCE.getType(TEST_NAMESPACE, "OpenQuote");
-        DataObject quote = DataFactory.INSTANCE.create(quoteType);
-
-        quote.setString("symbol", "s1");
-
-        for (Iterator iter = quote.getInstanceProperties().iterator(); iter.hasNext();) {
-            Property property = (Property) iter.next();
-        }
-
-        Property companyProperty = XSDHelper.INSTANCE.getGlobalProperty(TEST_NAMESPACE, "company", true);
-        DataObject company = quote.createDataObject(companyProperty);
-        company.setString("name", "FlyByNightTechnology");
-
-        Property priceProperty = XSDHelper.INSTANCE.getGlobalProperty(TEST_NAMESPACE, "price", true);
-        quote.getList(priceProperty).add(new BigDecimal("1000.0"));
-
-        for (Iterator iter = quote.getInstanceProperties().iterator(); iter.hasNext();) {
-            Property property = (Property) iter.next();
-        }
-
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        XMLHelper.INSTANCE.save(quote, TEST_NAMESPACE, "openStockQuote", baos);
-        
-        assertTrue(TestUtil.equalXmlFiles(new ByteArrayInputStream(baos.toByteArray()), getClass().getResource(TEST_DATA)));
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        // Populate the meta data for the test (Stock Quote) model
-        URL url = getClass().getResource(TEST_MODEL);
-        InputStream inputStream = url.openStream();
-        XSDHelper.INSTANCE.define(inputStream, url.toString());
-        inputStream.close();
-    }
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java b/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java
deleted file mode 100644
index 2e91a1a66f..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleCopyTestCase.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.test;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.CopyHelper;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XMLHelper;
-import commonj.sdo.helper.XSDHelper;
-import junit.framework.TestCase;
-
-public class SimpleCopyTestCase extends TestCase {
-
-  private final String TEST_MODEL = "/simple.xsd";
-  private final String TEST_NAMESPACE = "http://www.example.com/simple";
-  private final String QUOTE_XML = "/quote.xml";
-  private final String SHALLOW_QUOTE_XML = "/shallowquote.xml";
-
-  public void testSimpleCopy() throws IOException {
-      XMLDocument doc = XMLHelper.INSTANCE.load(getClass().getResourceAsStream(QUOTE_XML));
-      DataObject sdo = doc.getRootObject();
-
-      DataObject copiedSdo = CopyHelper.INSTANCE.copyShallow(sdo);
-
-      ByteArrayOutputStream baos = new ByteArrayOutputStream();
-      XMLHelper.INSTANCE.save(copiedSdo, TEST_NAMESPACE, "stockQuote", baos);
-      assertTrue(TestUtil.equalXmlFiles(new ByteArrayInputStream(baos.toByteArray()), getClass().getResource(SHALLOW_QUOTE_XML)));
-      assertFalse(TestUtil.equalXmlFiles(new ByteArrayInputStream(baos.toByteArray()), getClass().getResource(QUOTE_XML)));
-
-      copiedSdo = CopyHelper.INSTANCE.copy(sdo);
-      
-      baos.reset();
-      XMLHelper.INSTANCE.save(copiedSdo, TEST_NAMESPACE, "stockQuote", baos);
-      assertFalse(TestUtil.equalXmlFiles(new ByteArrayInputStream(baos.toByteArray()), getClass().getResource(SHALLOW_QUOTE_XML)));
-      assertTrue(TestUtil.equalXmlFiles(new ByteArrayInputStream(baos.toByteArray()), getClass().getResource(QUOTE_XML)));
-  }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        // Populate the meta data for the test (Stock Quote) model
-        URL url = getClass().getResource(TEST_MODEL);
-        InputStream inputStream = url.openStream();
-        XSDHelper.INSTANCE.define(inputStream, url.toString());
-        inputStream.close();
-    }
-
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java b/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java
deleted file mode 100644
index d4f425457f..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleDynamicTestCase.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.test;
-
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.math.BigDecimal;
-import java.net.URL;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.Type;
-import commonj.sdo.helper.DataFactory;
-import commonj.sdo.helper.TypeHelper;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XMLHelper;
-import commonj.sdo.helper.XSDHelper;
-import junit.framework.TestCase;
-
-
-public class SimpleDynamicTestCase extends TestCase {
-    private final String TEST_MODEL = "/simple.xsd";
-    private final String TEST_NAMESPACE = "http://www.example.com/simple";
-    private final String QUOTE_XML = "/quote.xml";
-
-    /**
-     * Simple Dynamic SDO 2 test.
-     */
-    public void testDynamic() throws IOException {
-        Type quoteType = TypeHelper.INSTANCE.getType(TEST_NAMESPACE, "Quote");
-        DataObject quote = DataFactory.INSTANCE.create(quoteType);
-
-        quote.setString("symbol", "fbnt");
-        quote.setString("companyName", "FlyByNightTechnology");
-        quote.setBigDecimal("price", new BigDecimal("1000.0"));
-        quote.setBigDecimal("open1", new BigDecimal("1000.0"));
-        quote.setBigDecimal("high", new BigDecimal("1000.0"));
-        quote.setBigDecimal("low", new BigDecimal("1000.0"));
-        quote.setDouble("volume", 1000);
-        quote.setDouble("change1", 1000);
-
-        DataObject child = quote.createDataObject("quotes");
-        child.setBigDecimal("price", new BigDecimal("2000.0"));
-
-        ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        XMLHelper.INSTANCE.save(quote, TEST_NAMESPACE, "stockQuote", baos);
-        
-        assertTrue(TestUtil.equalXmlFiles(new ByteArrayInputStream(baos.toByteArray()), getClass().getResource(QUOTE_XML)));
-    }
-
-
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        // Populate the meta data for the test (Stock Quote) model
-        URL url = getClass().getResource(TEST_MODEL);
-        InputStream inputStream = url.openStream();
-        XSDHelper.INSTANCE.define(inputStream, url.toString());
-        inputStream.close();
-    }
-
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java b/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java
deleted file mode 100644
index ac05b362d9..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/SimpleEqualityTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.test;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.EqualityHelper;
-import commonj.sdo.helper.XMLDocument;
-import commonj.sdo.helper.XMLHelper;
-import commonj.sdo.helper.XSDHelper;
-import junit.framework.TestCase;
-
-public class SimpleEqualityTestCase extends TestCase {
-    private static final String TEST_MODEL = "/simple.xsd";
-    private static final String QUOTE_XML = "/quote.xml";
-    private static final String SHALLOW_QUOTE_XML = "/shallowquote.xml";
-
-    public void testEquality() throws IOException {
-
-        XMLDocument doc = XMLHelper.INSTANCE.load(getClass().getResourceAsStream(QUOTE_XML));
-        DataObject sdo = doc.getRootObject();
-
-        doc = XMLHelper.INSTANCE.load(getClass().getResourceAsStream(SHALLOW_QUOTE_XML));
-        DataObject shallowSdo = doc.getRootObject();
-
-        boolean result = EqualityHelper.INSTANCE.equalShallow(sdo, shallowSdo);
-        assertTrue(result);
-
-        result = EqualityHelper.INSTANCE.equal(sdo, shallowSdo);
-        assertFalse(result);
-    }
-
-
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        // Populate the meta data for the test (Stock Quote) model
-        URL url = getClass().getResource(TEST_MODEL);
-        InputStream inputStream = url.openStream();
-        XSDHelper.INSTANCE.define(inputStream, url.toString());
-        inputStream.close();
-    }
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java b/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
deleted file mode 100644
index a377281622..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/TestUtil.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.test;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-public class TestUtil
-{
-  private static void getAllNodes(NodeList nodeList, List<Node> nodes)
-  {
-    int length = nodeList.getLength();
-    if (length == 0)
-    {
-      return;
-    }
-    
-    for (int i=0; i<length; i++)
-    {
-      Node node = nodeList.item(i);
-      nodes.add(node);
-      getAllNodes(node.getChildNodes(), nodes);
-    } // for
-  }
-  
-  private static boolean equalNodes(NodeList sourceNodeList, NodeList targetNodeList)
-  {
-    ArrayList<Node> sourceNodes = new ArrayList<Node>();
-    ArrayList<Node> targetNodes = new ArrayList<Node>();
-    
-    getAllNodes(sourceNodeList, sourceNodes);
-    getAllNodes(targetNodeList, targetNodes);
-    
-    int sourceLength = sourceNodes.size();
-    int targetLength = targetNodes.size();
-    
-    if (sourceLength != targetLength)
-    {
-      return false;
-    }
-    
-    for (int i=0; i<sourceLength; i++)
-    {
-      Node sourceNode = sourceNodes.get(i);
-      Node targetNode = targetNodes.get(i);
-      
-      if (!sourceNode.isEqualNode(targetNode))
-      {
-        return false;
-      }
-    } // for
-    
-    return true;
-  }
-  
-  public static boolean equalXmlFiles(URL source, URL target)
-  { 
-    try {
-      return equalXmlFiles(source.openStream(), target.openStream());
-    }
-    catch (IOException e)
-    {
-      return false;
-    }
-  }
-  
-  public static boolean equalXmlFiles(InputStream sourceStream, URL target)
-  {
-    try {
-      return equalXmlFiles(sourceStream, target.openStream());
-    }
-    catch (IOException e)
-    {
-      return false;
-    }
-  }
-  
-  public static boolean equalXmlFiles(URL source, InputStream targetStream)
-  {
-    try {
-      return equalXmlFiles(source.openStream(), targetStream);
-    }
-    catch (IOException e)
-    {
-      return false;
-    }
-  }
-  
-  public static boolean equalXmlFiles(InputStream sourceStream, InputStream targetStream)
-  {
-    DocumentBuilder builder;
-    Document sourceDocument;
-    Document targetDocument;
-    
-    try {
-      builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-      sourceDocument = builder.parse(sourceStream);
-      targetDocument = builder.parse(targetStream);
-    }
-    catch (FactoryConfigurationError fce) {
-      return false;
-    }
-    catch (ParserConfigurationException ce) {
-      return false;
-    }
-    catch (SAXException se)
-    {
-      return false;
-    }
-    catch (IOException ie)
-    {
-      return false;
-    }
-
-    sourceDocument.normalizeDocument();
-    targetDocument.normalizeDocument();
-    
-    if (!sourceDocument.getXmlVersion().equals(targetDocument.getXmlVersion()))
-    {
-      return false;
-    }
-    
-    String sourceXmlEncoding = sourceDocument.getXmlEncoding();
-    String targetXmlEncoding = targetDocument.getXmlEncoding();
-    
-    if (sourceXmlEncoding != null && targetXmlEncoding != null &&
-        sourceXmlEncoding.equalsIgnoreCase(targetXmlEncoding))
-    {
-      // continue
-    }
-    else
-    {
-      return false;
-    }
-
-    NodeList sourceNodes = sourceDocument.getChildNodes();
-    NodeList targetNodes = targetDocument.getChildNodes();
-    
-    return equalNodes(sourceNodes, targetNodes);
-  }
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java b/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
deleted file mode 100644
index db66034928..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/java/org/apache/tuscany/sdo/test/XSDHelperTestCase.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- *
- *  Copyright 2005 BEA Systems Inc.
- *  Copyright 2005 International Business Machines Corporation
- *
- *  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.test;
-
-import java.util.List;
-import java.net.URL;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-import commonj.sdo.helper.XSDHelper;
-import commonj.sdo.Type;
-
-/**
- * @version $Rev$ $Date$
- */
-public class XSDHelperTestCase extends TestCase {
-    private static final String TEST_MODEL = "/simple.xsd";
-    private URL modelURL;
-
-    public void testDefineWithLocation() throws IOException {
-        List<Type> types = XSDHelper.INSTANCE.define(modelURL.openStream(), modelURL.toString());
-        assertEquals(2, types.size());
-    }
-
-    public void testDefineWithNoLocation() {
-        List<Type> types = XSDHelper.INSTANCE.define(getClass().getResourceAsStream(TEST_MODEL), null);
-        assertEquals(2, types.size());
-    }
-
-    public void testDuplicateDefineWithLocation() throws IOException {
-        List<Type> types = XSDHelper.INSTANCE.define(modelURL.openStream(), modelURL.toString());
-        assertEquals(2, types.size());
-
-        List<Type> types2 = XSDHelper.INSTANCE.define(modelURL.openStream(), modelURL.toString());
-        assertEquals(types, types2);
-    }
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        modelURL = getClass().getResource(TEST_MODEL);
-    }
-}
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/resources/datatype.xsd b/tags/java-stable-20060304/sdo/impl/src/test/resources/datatype.xsd
deleted file mode 100644
index 73b2c25e79..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/resources/datatype.xsd
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:datatype="http://www.example.com/datatype" xmlns:sdoJava="commonj.sdo/java" targetNamespace="http://www.example.com/datatype"> 
-
-	<xsd:simpleType name="SimpleSDOType">
-		<xsd:restriction base="xsd:string"/>
-	</xsd:simpleType>
-	
-	<xsd:simpleType name="SimpleSDOTypeInstanceClass" sdoJava:instanceClass="java.lang.Integer">
-		<xsd:restriction base="xsd:string"/>
-	</xsd:simpleType>
-	
-	<xsd:simpleType name="SimpleSDOTypeExtendedInstanceClass" sdoJava:extendedInstanceClass="java.lang.String">
-		<xsd:restriction base="xsd:string"/>
-	</xsd:simpleType>
-
-</xsd:schema>
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/resources/mixed.xml b/tags/java-stable-20060304/sdo/impl/src/test/resources/mixed.xml
deleted file mode 100644
index 42ff3a3a5b..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/resources/mixed.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<mixed:mixedStockQuote xmlns:mixed="http://www.example.com/mixed">
-  <symbol>fbnt</symbol>
-  <companyName>FlyByNightTechnology</companyName>
-  some text
-  <quotes><price>2000.0</price></quotes>
-  more text
-  <price>1000.0</price>
-</mixed:mixedStockQuote>
-\ No newline at end of file
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/resources/mixed.xsd b/tags/java-stable-20060304/sdo/impl/src/test/resources/mixed.xsd
deleted file mode 100644
index d4881d915e..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/resources/mixed.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema 
-  targetNamespace="http://www.example.com/mixed"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-  xmlns:simple="http://www.example.com/mixed"> 
-  
-   <xsd:element name="mixedStockQuote" type="simple:MixedQuote"/>
-
-   <xsd:complexType name="MixedQuote" mixed="true">
-       <xsd:sequence>
-          <xsd:element name="symbol" type="xsd:string"/>
-          <xsd:element name="companyName" type="xsd:string"/>
-          <xsd:element name="price" type="xsd:decimal"/>
-          <xsd:element name="open1" type="xsd:decimal"/>
-          <xsd:element name="high" type="xsd:decimal"/>
-          <xsd:element name="low" type="xsd:decimal"/>
-          <xsd:element name="volume" type="xsd:double"/>
-          <xsd:element name="change1" type="xsd:double"/>
-          <xsd:element name="quotes" type="simple:MixedQuote" minOccurs="0" maxOccurs="unbounded"/>
-       </xsd:sequence>
-   </xsd:complexType>
-
-</xsd:schema>
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/resources/open.xml b/tags/java-stable-20060304/sdo/impl/src/test/resources/open.xml
deleted file mode 100644
index d4a5b92e0c..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/resources/open.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<open:openStockQuote xmlns:open="http://www.example.com/open">
-  <symbol>s1</symbol>
-  <open:company>
-    <name>FlyByNightTechnology</name>
-  </open:company>
-  <open:price>1000.0</open:price>
-</open:openStockQuote>
-\ No newline at end of file
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/resources/open.xsd b/tags/java-stable-20060304/sdo/impl/src/test/resources/open.xsd
deleted file mode 100644
index bac23dd051..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/resources/open.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema 
-  xmlns:simple="http://www.example.com/open" 
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-  targetNamespace="http://www.example.com/open"> 
-  
-   <xsd:element name="openStockQuote" type="simple:OpenQuote"/>
-   
-   <xsd:element name="price" type="xsd:decimal"/>
-   
-   <xsd:element name="company">
-     <xsd:complexType>
-     	<xsd:sequence>
-     		<xsd:element name="name" type="xsd:string"/>
-     	</xsd:sequence>
-     </xsd:complexType>
-   </xsd:element>
-
-   <xsd:complexType name="OpenQuote">
-       <xsd:sequence>
-          <xsd:element name="symbol" type="xsd:string"/>
-          <xsd:any maxOccurs="unbounded" namespace="##any"/>
-       </xsd:sequence>
-   </xsd:complexType>
-
-</xsd:schema>
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/resources/quote.xml b/tags/java-stable-20060304/sdo/impl/src/test/resources/quote.xml
deleted file mode 100644
index d7b5969e23..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/resources/quote.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<simple:stockQuote xmlns:simple="http://www.example.com/simple">
-  <symbol>fbnt</symbol>
-  <companyName>FlyByNightTechnology</companyName>
-  <price>1000.0</price>
-  <open1>1000.0</open1>
-  <high>1000.0</high>
-  <low>1000.0</low>
-  <volume>1000.0</volume>
-  <change1>1000.0</change1>
-  <quotes>
-    <price>2000.0</price>
-  </quotes>
-</simple:stockQuote>
-\ No newline at end of file
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/resources/shallowquote.xml b/tags/java-stable-20060304/sdo/impl/src/test/resources/shallowquote.xml
deleted file mode 100644
index a56f2fe2b7..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/resources/shallowquote.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<simple:stockQuote xmlns:simple="http://www.example.com/simple">
-  <symbol>fbnt</symbol>
-  <companyName>FlyByNightTechnology</companyName>
-  <price>1000.0</price>
-  <open1>1000.0</open1>
-  <high>1000.0</high>
-  <low>1000.0</low>
-  <volume>1000.0</volume>
-  <change1>1000.0</change1>
-</simple:stockQuote>
-\ No newline at end of file
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/resources/simple.xsd b/tags/java-stable-20060304/sdo/impl/src/test/resources/simple.xsd
deleted file mode 100644
index f5b0b982af..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/resources/simple.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema 
-  targetNamespace="http://www.example.com/simple"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-  xmlns:simple="http://www.example.com/simple"> 
-  
-   <xsd:element name="stockQuote" type="simple:Quote"/>
-
-   <xsd:complexType name="Quote">
-       <xsd:sequence>
-          <xsd:element name="symbol" type="xsd:string"/>
-          <xsd:element name="companyName" type="xsd:string"/>
-          <xsd:element name="price" type="xsd:decimal"/>
-          <xsd:element name="open1" type="xsd:decimal"/>
-          <xsd:element name="high" type="xsd:decimal"/>
-          <xsd:element name="low" type="xsd:decimal"/>
-          <xsd:element name="volume" type="xsd:double"/>
-          <xsd:element name="change1" type="xsd:double"/>
-          <xsd:element name="quotes" type="simple:Quote" minOccurs="0" maxOccurs="unbounded"/>
-       </xsd:sequence>
-   </xsd:complexType>
-
-</xsd:schema>
diff --git a/tags/java-stable-20060304/sdo/impl/src/test/resources/simplechangesummary.xml b/tags/java-stable-20060304/sdo/impl/src/test/resources/simplechangesummary.xml
deleted file mode 100644
index 7ac7a7cb2a..0000000000
--- a/tags/java-stable-20060304/sdo/impl/src/test/resources/simplechangesummary.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<sdo:datagraph xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sdo="commonj.sdo"
-    xmlns:sdo_1="http://www.apache.org/tuscany/2005/SDO" xmlns:simple="http://www.example.com/simple">
-  <changeSummary xmlns="">
-    <objectChanges key="#//@eRootObject">
-      <value xsi:type="sdo_1:ChangeSummarySetting" featureName="symbol" set="false"/>
-      <value xsi:type="sdo_1:ChangeSummarySetting" featureName="companyName" set="false"/>
-      <value xsi:type="sdo_1:ChangeSummarySetting" featureName="price" set="false"/>
-      <value xsi:type="sdo_1:ChangeSummarySetting" featureName="open1" set="false"/>
-      <value xsi:type="sdo_1:ChangeSummarySetting" featureName="high" set="false"/>
-      <value xsi:type="sdo_1:ChangeSummarySetting" featureName="low" set="false"/>
-      <value xsi:type="sdo_1:ChangeSummarySetting" featureName="volume" dataValue="0.0"
-          set="false"/>
-      <value xsi:type="sdo_1:ChangeSummarySetting" featureName="change1" dataValue="0.0"
-          set="false"/>
-      <value xsi:type="sdo_1:ChangeSummarySetting" featureName="quotes" set="false"/>
-    </objectChanges>
-    <objectChanges key="#//@eRootObject/@quotes.0">
-      <value xsi:type="sdo_1:ChangeSummarySetting" featureName="price" set="false"/>
-    </objectChanges>
-  </changeSummary>
-  <simple:Quote>
-    <symbol>fbnt</symbol>
-    <companyName>FlyByNightTechnology</companyName>
-    <price>1000.0</price>
-    <open1>1000.0</open1>
-    <high>1000.0</high>
-    <low>1000.0</low>
-    <volume>1000.0</volume>
-    <change1>1000.0</change1>
-    <quotes>
-      <price>2000.0</price>
-    </quotes>
-  </simple:Quote>
-</sdo:datagraph>
diff --git a/tags/java-stable-20060304/sdo/plugin/pom.xml b/tags/java-stable-20060304/sdo/plugin/pom.xml
deleted file mode 100644
index 925c1de881..0000000000
--- a/tags/java-stable-20060304/sdo/plugin/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.
- -->
-<project>
-    <parent>
-        <groupId>org.apache.tuscany</groupId>
-        <artifactId>tuscany-sdo</artifactId>
-        <version>SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>tuscany-sdo-plugin</artifactId>
-    <packaging>maven-plugin</packaging>
-    <version>SNAPSHOT</version>
-    <name>Tuscany SDO Maven Plugin</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-            <version>2.0</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany</groupId>
-            <artifactId>tuscany-sdo-tools</artifactId>
-            <version>${pom.version}</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java-stable-20060304/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java b/tags/java-stable-20060304/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java
deleted file mode 100644
index 9ded67e657..0000000000
--- a/tags/java-stable-20060304/sdo/plugin/src/main/java/org/apache/tuscany/sdo/plugin/GeneratorMojo.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- *
- *  Copyright 2005 BEA Systems Inc.
- *  Copyright 2005 International Business Machines Corporation
- *
- *  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.plugin;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-
-import org.apache.tuscany.sdo.generate.JavaGenerator;
-
-/**
- * @version $Rev$ $Date$
- * @goal generate
- * @phase generate-sources
- * @description Generate SDO interface classes from an XML Schema
- */
-public class GeneratorMojo extends AbstractMojo {
-    /**
-     * The directory containing schema files; defaults to ${basedir}/src/main/xsd
-     * @parameter expression="${basedir}/src/main/xsd"
-     */
-    private String schemaDir;
-
-    /**
-     * Name of the schema file; if omitted all files in the directory are processed
-     * @parameter
-     */
-    private File schemaFile;
-
-    /**
-     * The Java package to generate into. By default the value is derived from the schema URI.
-     *
-     * @parameter
-     */
-    private String javaPackage;
-
-    /**
-     * The directory to generate into; defaults to ${project.build.directory}/sdo-source
-     *
-     * @parameter expression="${project.build.directory}/sdo-source"
-     */
-    private String targetDirectory;
-
-    /**
-     * Specifies the prefix string to use for naming the generated factory. 
-     * @parameter
-     */
-    private String prefix;
-
-    /**
-     * This option can be used to eliminate the generated interface and to generate only an implementation class. 
-     * @parameter
-     */
-    private boolean noInterfaces;
-
-    /**
-     * Turns off container management for containment properties.  
-     * @parameter
-     */
-    private boolean noContainment;
-
-    /**
-     * This option eliminates all change notification overhead in the generated classes.   
-     * @parameter
-     */
-    private boolean noNotification;
-
-    /**
-     * With this option, all generated properties will not record their unset state. 
-     * @parameter
-     */
-    private boolean noUnsettable;
-
-    /**
-     * Generate a fast XML parser/loader for instances of the model.   
-     * @parameter
-     */
-    private boolean generateLoader;
-
-    /**
-     * Generate a Switch class for the model.   
-     * @parameter
-     */
-    private boolean generateSwitch;
-
-    /**
-     * @parameter expression="${project.compileSourceRoots}"
-     * @readonly
-     */
-    private List compilerSourceRoots;
-
-    public void execute() throws MojoExecutionException {
-        File[] files;
-        if (schemaFile == null) {
-            files = new File(schemaDir).listFiles(FILTER);
-        } else {
-            files = new File[]{schemaFile};
-        }
-        
-        int genOptions = 0;
-        if (noInterfaces) {
-          genOptions |= JavaGenerator.OPTION_NO_INTERFACES;
-        }
-        if (noContainment) {
-          genOptions |= JavaGenerator.OPTION_NO_CONTAINMENT;
-        }
-        if (noNotification) {
-          genOptions |= JavaGenerator.OPTION_NO_NOTIFICATION;
-        }
-        if (generateLoader) {
-          genOptions |= JavaGenerator.OPTION_GENERATE_LOADER;
-        }
-        if (noUnsettable) {
-          genOptions |= JavaGenerator.OPTION_NO_UNSETTABLE;
-        }
-        if (generateSwitch) {
-            genOptions |= JavaGenerator.OPTION_GENERATE_SWITCH;
-          }
-
-        for (int i = 0; i < files.length; i++) {
-            File file = files[i];
-            File marker = new File(targetDirectory, ".gen#" + file.getName());
-            if (file.lastModified() > marker.lastModified()) {
-                getLog().info("Generating SDO interfaces from " + file);
-                JavaGenerator.generateFromXMLSchema(file.toString(), targetDirectory, javaPackage, prefix, genOptions);
-            }
-            try {
-                marker.createNewFile();
-            } catch (IOException e) {
-                throw new MojoExecutionException(e.getMessage(), e);
-            }
-            marker.setLastModified(System.currentTimeMillis());
-        }
-
-        compilerSourceRoots.add(targetDirectory);
-    }
-
-    private static final FileFilter FILTER = new FileFilter() {
-        public boolean accept(File pathname) {
-            return (pathname.isFile() || !pathname.isHidden());
-        }
-    };
-}
-\ No newline at end of file
diff --git a/tags/java-stable-20060304/sdo/pom.xml b/tags/java-stable-20060304/sdo/pom.xml
deleted file mode 100644
index 32a072fa46..0000000000
--- a/tags/java-stable-20060304/sdo/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.
- -->
-<project>
-    <parent>
-        <groupId>org.apache.tuscany</groupId>
-        <artifactId>tuscany-project</artifactId>
-        <version>SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>tuscany-sdo</artifactId>
-    <packaging>pom</packaging>
-    <name>Tuscany SDO Implementation Project</name>
-    <version>SNAPSHOT</version>
-
-    <modules>
-        <module>impl</module>
-        <module>tools</module>
-        <module>plugin</module>
-    </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <includes>
-                        <include>**/*TestCase.java</include>
-                    </includes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/tags/java-stable-20060304/sdo/tools/.settings/org.eclipse.core.resources.prefs b/tags/java-stable-20060304/sdo/tools/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index f7f32994f2..0000000000
--- a/tags/java-stable-20060304/sdo/tools/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Nov 28 13:32:35 EST 2005
-eclipse.preferences.version=1
-encoding//src/test/resources/enum.xsd=UTF8
-encoding//src/test/resources/simple.xsd=UTF8
diff --git a/tags/java-stable-20060304/sdo/tools/LICENSE.txt b/tags/java-stable-20060304/sdo/tools/LICENSE.txt
deleted file mode 100644
index d645695673..0000000000
--- a/tags/java-stable-20060304/sdo/tools/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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.
diff --git a/tags/java-stable-20060304/sdo/tools/pom.xml b/tags/java-stable-20060304/sdo/tools/pom.xml
deleted file mode 100644
index 7a87b1392c..0000000000
--- a/tags/java-stable-20060304/sdo/tools/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- *  Copyright (c) 2005-2006 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.
- -->
-<project>
-    <parent>
-        <groupId>org.apache.tuscany</groupId>
-        <artifactId>tuscany-sdo</artifactId>
-        <version>SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>tuscany-sdo-tools</artifactId>
-    <name>Tuscany SDO Tools</name>
-    <description>SDO Tools.</description>
-    <version>SNAPSHOT</version>
-
-    <repositories>
-        <repository>
-            <id>jeremy</id>
-            <url>http://people.apache.org/~jboynes/maven2</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany</groupId>
-            <artifactId>tuscany-sdo-impl</artifactId>
-            <version>SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>codegen</artifactId>
-            <version>2.2.0-I200602160000</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.emf</groupId>
-            <artifactId>codegen-ecore</artifactId>
-            <version>2.2.0-I200602160000</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/tags/java-stable-20060304/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java b/tags/java-stable-20060304/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
deleted file mode 100644
index 517f150c09..0000000000
--- a/tags/java-stable-20060304/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
+++ /dev/null
@@ -1,535 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.generate;
-
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.apache.tuscany.sdo.helper.XSDHelperImpl;
-import org.apache.tuscany.sdo.util.DataObjectUtil;
-import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
-import org.eclipse.emf.codegen.ecore.genmodel.GenDelegationKind;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModelFactory;
-import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
-import org.eclipse.emf.codegen.ecore.genmodel.GenResourceKind;
-import org.eclipse.emf.codegen.util.CodeGenUtil;
-import org.eclipse.emf.common.util.BasicMonitor;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-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.BasicExtendedMetaData;
-import org.eclipse.emf.ecore.util.Diagnostician;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDResourceImpl;
-
-import commonj.sdo.helper.XSDHelper;
-
-
-public class JavaGenerator
-{
-  public static int OPTION_NO_INTERFACES=0x1;
-  public static int OPTION_SPARSE_PATTERN=0x2;
-  public static int OPTION_STORE_PATTERN=0x4;
-  public static int OPTION_NO_CONTAINMENT=0x8;
-  public static int OPTION_NO_NOTIFICATION=0x10;
-  public static int OPTION_ARRAY_ACCESSORS=0x20;
-  public static int OPTION_GENERATE_LOADER=0x40;
-  public static int OPTION_NO_UNSETTABLE=0x80;
-  //FIXME Temporary, I need this option for now to get Switch classes generated for the SCDL models
-  public static int OPTION_GENERATE_SWITCH=0x100;
-  
-  /**
-   * Generate static SDOs from XML Schema
-   * 
-   *   Usage arguments:
-   *   
-   *     [ -targetDirectory <target-root-directory> ]
-   *     [ -javaPackage <java-package-name> ]
-   *     [ -prefix <prefix-string> ]
-   *     [ -sparsePattern | -storePattern ]
-   *     [ -noInterfaces ]
-   *     [ -noContainment ]
-   *     [ -noNotification ]
-   *     [ -arrayAccessors ]
-   *     [ -generateLoader ]
-   *     [ -noUnsettable ]
-   *     <xsd-file> | <wsdl-file>
-   *
-   *   For example:
-   *   
-   *     generate somedir/somefile.xsd
-   *     
-   *   Basic options:
-   *   
-   *     -targetDirectory
-   *         Generates the Java source code in the specified directory. By default, the code is generated
-   *         in the same directory as the input xsd or wsdl file.
-   *     -javaPackage
-   *         Overrides the Java package for the generated classes. By default the package name is derived
-   *         from the targetNamespace of the XML schema being generated. For example, if the targetNamespace is
-   *         "http://www.example.com/simple", the default package will be "com.example.simple".
-   *     -prefix
-   *         Specifies the prefix string to use for naming the generated factory. For example "-prefix Foo" will
-   *         result in a factory interface with the name "FooFactory".
-   *     -sparsePattern
-   *         For SDO metamodels that have classes with many properties of which only a few are typically set at
-   *         runtime, this option can be used to produce a space-optimized implementation (at the expense of speed).
-   *     -storePattern
-   *         This option can be used to generate static classes that work with a Store-based DataObject
-   *         implementation. It changes the generator pattern to generate accessors which delegate to the
-   *         reflective methods (as opposed to the other way around) and changes the DataObject base class
-   *         to org.apache.tuscany.sdo.impl.StoreDataObjectImpl. Note that this option generates classes that
-   *         require a Store implementation to be provided before they can be run.    
-   *         
-   *   The following options can be used to increase performance, but with some loss of SDO functionality:
-   *   
-   *     -noInterfaces
-   *         By default, each DataObject generates both a Java interface and a corresponding implementation
-   *         class. If an SDO metamodel does not use multiple inheritance (which is always the case for
-   *         XML Schema derived models), then this option can be used to eliminate the interface and to generate
-   *         only an implementation class.
-   *         
-   *   Following are planned but not supported yet:
-   *   
-   *     -noNotification
-   *         This option eliminates all change notification overhead in the generated classes. Changes to
-   *         DataObjects generated using this option cannot be recorded, and consequently the classes cannot
-   *         be used with an SDO ChangeSummary or DataGraph.
-   *     -noContainment
-   *         Turns off container management for containment properties. DataObject.getContainer() will always
-   *         return null for data objects generated with this option, even if a containment reference is set.
-   *         Setting a containment reference will also not automatically remove the target object from its
-   *         previous container, if it had one, so it will need to be explicitly removed by the client. Use
-   *         of this option is only recommended for scenarios where this kind of container movement/management
-   *         is not necessary.
-   *     -arrayAccessors
-   *         Generates Java array getters/setters for multiplicity-many properties. With this option, 
-   *         the set of "standard" JavaBean array accessor methods (e.g., Foo[] getFoo(), Foo getFoo(int),
-   *         int getFooLength(), setFoo(Foo[]), and void setFoo(int, Foo)) are generated. The normal
-   *         List-returning accessor is renamed with the suffix "List" (e.g., List getFooList()). The array
-   *         returned by the generated method is not a copy, but instead a pointer to the underlying storage 
-   *         array, so directly modifying it can have undesirable consequences and should be avoided.
-   *     -generateLoader
-   *         Generate a fast XML parser/loader for instances of the model. The details of this option are 
-   *         subject to change, but currently it generates two additional classes in a "util" package: 
-   *         <prefix>ResourceImpl and <prefix>ResourceFactoryImpl. To use the generated loader at runtime,
-   *         you need to pass an option to the XMLHelper.load() method like this:
-   *           Map options = new HashMap();
-   *           options.put("GENERATED_LOADER", <prefix>ResourceFactoryImpl.class);
-   *           XMLDocument doc = XMLHelper.INSTANCE.load(new FileInputStream("somefile.xml"), null, options);
-   *         Note: this option currently only works for simple schemas without substitution groups or wildcards.
-   *     -noUnsettable
-   *         By default, some XML constructs result in SDO property implementations that maintain additional
-   *         state information to record when the property has been set to the "default value", as opposed to
-   *         being truly unset (see DataObject.isSet() and DataObject.unset()). The SDO specification allows an
-   *         implementation to choose to provide this behavior or not. With this option, all generated properties
-   *         will not record their unset state. The generated isSet() methods simply returns whether the current
-   *         value is equal to the property's "default value".
-   */
-  public static void main(String args[])
-  {
-    if (args.length == 0)
-    {
-      printUsage();
-      return;
-    }
-
-    String targetDirectory = null;
-    String javaPackage = null;
-    String prefix = null;
-    
-    int genOptions = 0;
-
-    int index = 0;
-    for (; index < args.length && args[index].startsWith("-"); ++index)
-    {
-      if (args[index].equalsIgnoreCase("-targetDirectory"))
-      {
-        targetDirectory = args[++index];
-      }
-      else if (args[index].equalsIgnoreCase("-javaPackage"))
-      {
-        javaPackage = args[++index];
-      }
-      else if (args[index].equalsIgnoreCase("-prefix"))
-      {
-        prefix = args[++index];
-      }
-      else if (args[index].equalsIgnoreCase("-noInterfaces"))
-      {
-        genOptions |= OPTION_NO_INTERFACES;
-      }
-      else if (args[index].equalsIgnoreCase("-sparsePattern"))
-      {
-        genOptions |= OPTION_SPARSE_PATTERN;
-      }
-      else if (args[index].equalsIgnoreCase("-storePattern"))
-      {
-        genOptions |= OPTION_STORE_PATTERN;
-      }
-      else if (args[index].equalsIgnoreCase("-noContainment"))
-      {
-        genOptions |= OPTION_NO_CONTAINMENT;
-      }
-      else if (args[index].equalsIgnoreCase("-noNotification"))
-      {
-        genOptions |= OPTION_NO_NOTIFICATION;
-      }
-      else if (args[index].equalsIgnoreCase("-arrayAccessors"))
-      {
-        genOptions |= OPTION_ARRAY_ACCESSORS;
-      }
-      else if (args[index].equalsIgnoreCase("-generateLoader"))
-      {
-        genOptions |= OPTION_GENERATE_LOADER;
-      }
-      else if (args[index].equalsIgnoreCase("-noUnsettable"))
-      {
-        genOptions |= OPTION_NO_UNSETTABLE;
-      }
-      //else if (...)
-      else
-      {
-        printUsage();
-        return;
-      }
-    }
-
-    String xsdFileName = args[index];
-    
-    generateFromXMLSchema(xsdFileName, targetDirectory, javaPackage, prefix, genOptions);
-  }
-
-  public static void generateFromXMLSchema(String xsdFileName, String targetDirectory, String javaPackage, String prefix, int genOptions)
-  {
-    DataObjectUtil.initRuntime();
-    EPackage.Registry packageRegistry = new EPackageRegistryImpl(EPackage.Registry.INSTANCE)
-    {
-      public EPackage firstPackage = null;
-            
-    };
-    ExtendedMetaData extendedMetaData = new BasicExtendedMetaData(packageRegistry);
-    XSDHelper xsdHelper = new XSDHelperImpl(extendedMetaData);
-
-    try
-    {
-      File inputFile = new File(xsdFileName).getAbsoluteFile();
-      InputStream inputStream = new FileInputStream(inputFile);
-      xsdHelper.define(inputStream, inputFile.toURI().toString());
-
-      if (targetDirectory == null)
-      {
-        targetDirectory = new File(xsdFileName).getCanonicalFile().getParent();
-      }
-      else
-      {
-        targetDirectory = new File(targetDirectory).getCanonicalPath();
-      }
-
-      if (!packageRegistry.values().isEmpty())
-      {
-        String packageURI = getSchemaNamespace(xsdFileName);
-        ResourceSet resourceSet = DataObjectUtil.createResourceSet();
-        
-        List usedGenPackages = new ArrayList();
-        GenModel genModel = null;
-        
-        for (Iterator iter = packageRegistry.values().iterator(); iter.hasNext();)
-        {
-          EPackage currentEPackage = (EPackage)iter.next();
-          String currentBasePackage = extractBasePackageName(currentEPackage, javaPackage);
-          String currentPrefix = prefix == null ? CodeGenUtil.capName(currentEPackage.getName()) : prefix;
-          
-          GenPackage currentGenPackage = createGenPackage(currentEPackage, currentBasePackage, currentPrefix, genOptions, resourceSet);
-          if (currentEPackage.getNsURI().equals(packageURI))
-          {
-            genModel = currentGenPackage.getGenModel();
-          }
-          else
-          {
-            usedGenPackages.add(currentGenPackage);
-          }
-        }
-        
-        genModel.getUsedGenPackages().addAll(usedGenPackages);
-        generateFromGenModel(genModel, targetDirectory);
-      }
-
-      /*
-      for (Iterator iter = packageRegistry.values().iterator(); iter.hasNext();)
-      {
-        EPackage ePackage = (EPackage)iter.next();
-        String basePackage = extractBasePackageName(ePackage, javaPackage);
-        if (prefix == null)
-        {
-          prefix = CodeGenUtil.capName(ePackage.getName());
-        }
-        generateFromEPackage(ePackage, targetDirectory, basePackage, prefix, genOptions);
-      }
-      */
-    }
-    catch (IOException e)
-    {
-      e.printStackTrace();
-    }
-  }
-  
-  public static String getSchemaNamespace(String xsdFileName)
-  {
-    File inputFile = new File(xsdFileName).getAbsoluteFile();
-    ResourceSet resourceSet = DataObjectUtil.createResourceSet();
-    Resource model = resourceSet.createResource(URI.createURI(inputFile.toURI().toString()));
-    try {
-      InputStream inputStream = new FileInputStream(inputFile);
-      ((XSDResourceImpl)model).load(inputStream, null);
-    }
-    catch (Exception e) {}
-    XSDSchema schema = (XSDSchema)model.getContents().get(0);
-    return schema.getTargetNamespace();
-
-  }
-
-  public static GenPackage createGenPackage(EPackage ePackage, String basePackage, String prefix, int genOptions, ResourceSet resourceSet)
-  {
-    GenModel genModel = ecore2GenModel(ePackage, basePackage, prefix, genOptions);
-
-    URI ecoreURI = URI.createURI("file:///" + ePackage.getName() + ".ecore");
-    URI genModelURI = ecoreURI.trimFileExtension().appendFileExtension("genmodel");
-
-    Resource ecoreResource = resourceSet.createResource(ecoreURI);
-    ecoreResource.getContents().add(ePackage);
-
-    Resource genModelResource = resourceSet.createResource(genModelURI);
-    genModelResource.getContents().add(genModel);
-
-    return (GenPackage)genModel.getGenPackages().get(0);
-  }
-
-  public static void generateFromEPackage(EPackage ePackage, String targetDirectory, String basePackage, String prefix, int genOptions)
-  {
-    GenModel genModel = ecore2GenModel(ePackage, basePackage, prefix, genOptions);
-
-    ResourceSet resourceSet = DataObjectUtil.createResourceSet();
-    URI ecoreURI = URI.createURI("file:///temp.ecore");
-    URI genModelURI = ecoreURI.trimFileExtension().appendFileExtension("genmodel");
-
-    Resource ecoreResource = resourceSet.createResource(ecoreURI);
-    ecoreResource.getContents().add(ePackage);
-
-    Resource genModelResource = resourceSet.createResource(genModelURI);
-    genModelResource.getContents().add(genModel);
-
-    generateFromGenModel(genModel, targetDirectory);
-  }
-
-  public static void generateFromGenModel(GenModel genModel, String targetDirectory)
-  {
-    Resource resource = genModel.eResource();
-
-    if (targetDirectory != null)
-    {
-      resource.getResourceSet().getURIConverter().getURIMap().put(
-        URI.createURI("platform:/resource/TargetProject/"),
-        URI.createFileURI(targetDirectory + "/"));
-      genModel.setModelDirectory("/TargetProject");
-    }
-
-    genModel.gen(new BasicMonitor.Printing(System.out));
-
-    for (Iterator j = resource.getContents().iterator(); j.hasNext();)
-    {
-      EObject eObject = (EObject)j.next();
-      Diagnostic diagnostic = Diagnostician.INSTANCE.validate(eObject);
-      if (diagnostic.getSeverity() != Diagnostic.OK)
-      {
-        printDiagnostic(diagnostic, "");
-      }
-    }
-  }
-
-  public static GenModel ecore2GenModel(EPackage ePackage, String basePackage, String prefix, int genOptions)
-  {
-    GenModel genModel = GenModelFactory.eINSTANCE.createGenModel();
-    genModel.initialize(Collections.singleton(ePackage));
-    
-    genModel.setRootExtendsInterface("");
-    genModel.setRootImplementsInterface("commonj.sdo.DataObject");
-    genModel.setRootExtendsClass("org.apache.tuscany.sdo.impl.DataObjectImpl");
-    genModel.setFeatureMapWrapperInterface("commonj.sdo.Sequence");
-    genModel.setFeatureMapWrapperInternalInterface("org.apache.tuscany.sdo.util.BasicSequence");
-    genModel.setFeatureMapWrapperClass("org.apache.tuscany.sdo.util.BasicSequence");
-    genModel.setSuppressEMFTypes(true);
-    genModel.setSuppressEMFMetaData(true);
-    genModel.setSuppressEMFModelTags(true);
-    genModel.setCanGenerate(true);
-    //FIXME workaround java.lang.NoClassDefFoundError: org/eclipse/jdt/core/jdom/IDOMNode with 02162006 build
-    genModel.setFacadeHelperClass("Hack");
-    genModel.setForceOverwrite(true);
-    
-    if ((genOptions & OPTION_NO_INTERFACES) != 0)
-    {
-      genModel.setSuppressInterfaces(true);
-    }
-    
-    if ((genOptions & OPTION_SPARSE_PATTERN) != 0)
-    {
-      genModel.setFeatureDelegation(GenDelegationKind.VIRTUAL_LITERAL);
-    }
-    else if ((genOptions & OPTION_STORE_PATTERN) != 0)
-    {
-      genModel.setFeatureDelegation(GenDelegationKind.REFLECTIVE_LITERAL);
-      genModel.setRootExtendsClass("org.apache.tuscany.sdo.impl.StoreDataObjectImpl");
-    }
-
-    if ((genOptions & OPTION_NO_CONTAINMENT) != 0)
-    {
-      genModel.setSuppressContainment(true);
-    }
-    
-    if ((genOptions & OPTION_NO_NOTIFICATION) != 0)
-    {
-      genModel.setSuppressNotification(true);
-    }
-    
-    if ((genOptions & OPTION_ARRAY_ACCESSORS) != 0)
-    {
-      genModel.setArrayAccessors(true);
-    }
-    
-    if ((genOptions & OPTION_NO_UNSETTABLE) != 0)
-    {
-      genModel.setSuppressUnsettable(true);
-    }
-    
-    GenPackage genPackage = (GenPackage)genModel.getGenPackages().get(0);
-
-    if (basePackage != null)
-    {
-      genPackage.setBasePackage(basePackage);
-    }
-    if (prefix != null) 
-    {
-      genPackage.setPrefix(prefix);
-    }
-
-    //FIXME Temporary, I need this option for now to get Switch classes generated for the SCDL models
-    if ((genOptions & OPTION_GENERATE_SWITCH) == 0)
-    {
-        genPackage.setAdapterFactory(false);
-    }
-
-    if ((genOptions & OPTION_GENERATE_LOADER) != 0)
-    {
-      //FIXME workaround compile error with 02162006 build, generated code references non-existent EcoreResourceImpl class
-      genPackage.setResource(GenResourceKind.XML_LITERAL);
-      //genPackage.setDataTypeConverters(true);
-    }
-    else
-    {
-      genPackage.setResource(GenResourceKind.NONE_LITERAL);
-      for (Iterator iter = genPackage.getGenClasses().iterator(); iter.hasNext();)
-      {
-        GenClass genClass = (GenClass)iter.next();
-        if ("DocumentRoot".equals(genClass.getName()))
-        {
-          genClass.setDynamic(true); // Don't generate DocumentRoot class
-          break;
-        }
-      }
-    }
-
-    return genModel;
-  }
-
-  public static String extractBasePackageName(EPackage ePackage, String javaPackage)
-  {
-    String qualifiedName = javaPackage != null ? javaPackage : ePackage.getName();
-    String name = /*CodeGenUtil.*/shortName(qualifiedName);
-    String baseName = qualifiedName.substring(0, qualifiedName.length() - name.length());
-    if (javaPackage != null || !name.equals(qualifiedName))
-    {
-      ePackage.setName(name);
-    }
-    return baseName != null ? /*CodeGenUtil.*/safeQualifiedName(baseName) : null;
-  }
-
-  public static String shortName(String qualifiedName)
-  {
-    int index = qualifiedName.lastIndexOf(".");
-    return index != -1 ? qualifiedName.substring(index + 1) : qualifiedName;
-  }
-
-  public static String safeQualifiedName(String qualifiedName)
-  {
-    StringBuffer safeQualifiedName = new StringBuffer();
-    for (StringTokenizer stringTokenizer = new StringTokenizer(qualifiedName, "."); stringTokenizer.hasMoreTokens();)
-    {
-      String name = stringTokenizer.nextToken();
-      safeQualifiedName.append(CodeGenUtil.safeName(name));
-      if (stringTokenizer.hasMoreTokens())
-      {
-        safeQualifiedName.append('.');
-      }
-    }
-    return safeQualifiedName.toString();
-  }
-
-  protected static void printDiagnostic(Diagnostic diagnostic, String indent)
-  {
-    System.out.print(indent);
-    System.out.println(diagnostic.getMessage());
-    for (Iterator i = diagnostic.getChildren().iterator(); i.hasNext();)
-    {
-      printDiagnostic((Diagnostic)i.next(), indent + "  ");
-    }
-  }
-
-  protected static void printUsage()
-  {
-    System.out.println("Usage arguments:");
-    System.out.println("  [ -targetDirectory <target-root-directory> ]");
-    System.out.println("  [ -javaPackage <java-package-name> ]");
-    System.out.println("  [ -prefix <prefix-string> ]");
-    System.out.println("  [ -sparsePattern | -storePattern ]");
-    System.out.println("  [ -noInterfaces ]");
-    System.out.println("  [ -noContainment ]");
-    System.out.println("  [ -noNotification ]");
-    System.out.println("  [ -arrayAccessors ]");
-    System.out.println("  [ -generateLoader ]");
-    System.out.println("  [ -noUnsettable ]");
-    System.out.println("  <xsd-file> | <wsdl-file>");
-    System.out.println("");
-    System.out.println("For example:");
-    System.out.println("");
-    System.out.println("  generate somedir/somefile.xsd");
-  }
-
-}
diff --git a/tags/java-stable-20060304/sdo/tools/src/main/resources/META-INF/MANIFEST.MF b/tags/java-stable-20060304/sdo/tools/src/main/resources/META-INF/MANIFEST.MF
deleted file mode 100644
index 59c4a00c07..0000000000
--- a/tags/java-stable-20060304/sdo/tools/src/main/resources/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: SDO Tools
-Bundle-SymbolicName: org.apache.tuscany.sdo.tools
-Bundle-Version: 1.0.0
-Bundle-Localization: plugin
-Bundle-Vendor: Apache
-Require-Bundle: org.apache.tuscany.sdo.impl,
- org.eclipse.emf.codegen.ecore,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.xsd
diff --git a/tags/java-stable-20060304/sdo/tools/src/test/java/com/example/simple/Quote.java b/tags/java-stable-20060304/sdo/tools/src/test/java/com/example/simple/Quote.java
deleted file mode 100644
index 57b12ef331..0000000000
--- a/tags/java-stable-20060304/sdo/tools/src/test/java/com/example/simple/Quote.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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 com.example.simple;
-
-import java.math.BigDecimal;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Quote</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link com.example.simple.Quote#getSymbol <em>Symbol</em>}</li>
- *   <li>{@link com.example.simple.Quote#getCompanyName <em>Company Name</em>}</li>
- *   <li>{@link com.example.simple.Quote#getPrice <em>Price</em>}</li>
- *   <li>{@link com.example.simple.Quote#getOpen1 <em>Open1</em>}</li>
- *   <li>{@link com.example.simple.Quote#getHigh <em>High</em>}</li>
- *   <li>{@link com.example.simple.Quote#getLow <em>Low</em>}</li>
- *   <li>{@link com.example.simple.Quote#getVolume <em>Volume</em>}</li>
- *   <li>{@link com.example.simple.Quote#getChange1 <em>Change1</em>}</li>
- *   <li>{@link com.example.simple.Quote#getQuotes <em>Quotes</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public interface Quote
-{
-  /**
-   * Returns the value of the '<em><b>Symbol</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Symbol</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Symbol</em>' attribute.
-   * @see #setSymbol(String)
-   * @generated
-   */
-  String getSymbol();
-
-  /**
-   * Sets the value of the '{@link com.example.simple.Quote#getSymbol <em>Symbol</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Symbol</em>' attribute.
-   * @see #getSymbol()
-   * @generated
-   */
-  void setSymbol(String value);
-
-  /**
-   * Returns the value of the '<em><b>Company Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Company 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>Company Name</em>' attribute.
-   * @see #setCompanyName(String)
-   * @generated
-   */
-  String getCompanyName();
-
-  /**
-   * Sets the value of the '{@link com.example.simple.Quote#getCompanyName <em>Company Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Company Name</em>' attribute.
-   * @see #getCompanyName()
-   * @generated
-   */
-  void setCompanyName(String value);
-
-  /**
-   * Returns the value of the '<em><b>Price</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Price</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Price</em>' attribute.
-   * @see #setPrice(BigDecimal)
-   * @generated
-   */
-  BigDecimal getPrice();
-
-  /**
-   * Sets the value of the '{@link com.example.simple.Quote#getPrice <em>Price</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Price</em>' attribute.
-   * @see #getPrice()
-   * @generated
-   */
-  void setPrice(BigDecimal value);
-
-  /**
-   * Returns the value of the '<em><b>Open1</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Open1</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Open1</em>' attribute.
-   * @see #setOpen1(BigDecimal)
-   * @generated
-   */
-  BigDecimal getOpen1();
-
-  /**
-   * Sets the value of the '{@link com.example.simple.Quote#getOpen1 <em>Open1</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Open1</em>' attribute.
-   * @see #getOpen1()
-   * @generated
-   */
-  void setOpen1(BigDecimal value);
-
-  /**
-   * Returns the value of the '<em><b>High</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>High</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>High</em>' attribute.
-   * @see #setHigh(BigDecimal)
-   * @generated
-   */
-  BigDecimal getHigh();
-
-  /**
-   * Sets the value of the '{@link com.example.simple.Quote#getHigh <em>High</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>High</em>' attribute.
-   * @see #getHigh()
-   * @generated
-   */
-  void setHigh(BigDecimal value);
-
-  /**
-   * Returns the value of the '<em><b>Low</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Low</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Low</em>' attribute.
-   * @see #setLow(BigDecimal)
-   * @generated
-   */
-  BigDecimal getLow();
-
-  /**
-   * Sets the value of the '{@link com.example.simple.Quote#getLow <em>Low</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Low</em>' attribute.
-   * @see #getLow()
-   * @generated
-   */
-  void setLow(BigDecimal value);
-
-  /**
-   * Returns the value of the '<em><b>Volume</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Volume</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Volume</em>' attribute.
-   * @see #isSetVolume()
-   * @see #unsetVolume()
-   * @see #setVolume(double)
-   * @generated
-   */
-  double getVolume();
-
-  /**
-   * Sets the value of the '{@link com.example.simple.Quote#getVolume <em>Volume</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Volume</em>' attribute.
-   * @see #isSetVolume()
-   * @see #unsetVolume()
-   * @see #getVolume()
-   * @generated
-   */
-  void setVolume(double value);
-
-  /**
-   * Unsets the value of the '{@link com.example.simple.Quote#getVolume <em>Volume</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetVolume()
-   * @see #getVolume()
-   * @see #setVolume(double)
-   * @generated
-   */
-  void unsetVolume();
-
-  /**
-   * Returns whether the value of the '{@link com.example.simple.Quote#getVolume <em>Volume</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Volume</em>' attribute is set.
-   * @see #unsetVolume()
-   * @see #getVolume()
-   * @see #setVolume(double)
-   * @generated
-   */
-  boolean isSetVolume();
-
-  /**
-   * Returns the value of the '<em><b>Change1</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Change1</em>' attribute isn't clear,
-   * there really should be more of a description here...
-   * </p>
-   * <!-- end-user-doc -->
-   * @return the value of the '<em>Change1</em>' attribute.
-   * @see #isSetChange1()
-   * @see #unsetChange1()
-   * @see #setChange1(double)
-   * @generated
-   */
-  double getChange1();
-
-  /**
-   * Sets the value of the '{@link com.example.simple.Quote#getChange1 <em>Change1</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @param value the new value of the '<em>Change1</em>' attribute.
-   * @see #isSetChange1()
-   * @see #unsetChange1()
-   * @see #getChange1()
-   * @generated
-   */
-  void setChange1(double value);
-
-  /**
-   * Unsets the value of the '{@link com.example.simple.Quote#getChange1 <em>Change1</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #isSetChange1()
-   * @see #getChange1()
-   * @see #setChange1(double)
-   * @generated
-   */
-  void unsetChange1();
-
-  /**
-   * Returns whether the value of the '{@link com.example.simple.Quote#getChange1 <em>Change1</em>}' attribute is set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return whether the value of the '<em>Change1</em>' attribute is set.
-   * @see #unsetChange1()
-   * @see #getChange1()
-   * @see #setChange1(double)
-   * @generated
-   */
-  boolean isSetChange1();
-
-  /**
-   * Returns the value of the '<em><b>Quotes</b></em>' containment reference list.
-   * The list contents are of type {@link com.example.simple.Quote}.
-   * <!-- begin-user-doc -->
-   * <p>
-   * If the meaning of the '<em>Quotes</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>Quotes</em>' containment reference list.
-   * @generated
-   */
-  List getQuotes();
-
-} // Quote
diff --git a/tags/java-stable-20060304/sdo/tools/src/test/java/com/example/simple/SimpleFactory.java b/tags/java-stable-20060304/sdo/tools/src/test/java/com/example/simple/SimpleFactory.java
deleted file mode 100644
index 9203976521..0000000000
--- a/tags/java-stable-20060304/sdo/tools/src/test/java/com/example/simple/SimpleFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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 com.example.simple;
-
-
-/**
- * <!-- 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 SimpleFactory
-{
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  SimpleFactory INSTANCE = com.example.simple.impl.SimpleFactoryImpl.eINSTANCE;
-
-  /**
-   * Returns a new object of class '<em>Quote</em>'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return a new object of class '<em>Quote</em>'.
-   * @generated
-   */
-  Quote createQuote();
-
-} //SimpleFactory
diff --git a/tags/java-stable-20060304/sdo/tools/src/test/java/com/example/simple/impl/QuoteImpl.java b/tags/java-stable-20060304/sdo/tools/src/test/java/com/example/simple/impl/QuoteImpl.java
deleted file mode 100644
index 5b407dd311..0000000000
--- a/tags/java-stable-20060304/sdo/tools/src/test/java/com/example/simple/impl/QuoteImpl.java
+++ /dev/null
@@ -1,712 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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 com.example.simple.impl;
-
-import com.example.simple.Quote;
-
-import java.math.BigDecimal;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.tuscany.sdo.impl.DataObjectImpl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Quote</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link com.example.simple.impl.QuoteImpl#getSymbol <em>Symbol</em>}</li>
- *   <li>{@link com.example.simple.impl.QuoteImpl#getCompanyName <em>Company Name</em>}</li>
- *   <li>{@link com.example.simple.impl.QuoteImpl#getPrice <em>Price</em>}</li>
- *   <li>{@link com.example.simple.impl.QuoteImpl#getOpen1 <em>Open1</em>}</li>
- *   <li>{@link com.example.simple.impl.QuoteImpl#getHigh <em>High</em>}</li>
- *   <li>{@link com.example.simple.impl.QuoteImpl#getLow <em>Low</em>}</li>
- *   <li>{@link com.example.simple.impl.QuoteImpl#getVolume <em>Volume</em>}</li>
- *   <li>{@link com.example.simple.impl.QuoteImpl#getChange1 <em>Change1</em>}</li>
- *   <li>{@link com.example.simple.impl.QuoteImpl#getQuotes <em>Quotes</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class QuoteImpl extends DataObjectImpl implements Quote
-{
-  /**
-   * The default value of the '{@link #getSymbol() <em>Symbol</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSymbol()
-   * @generated
-   * @ordered
-   */
-  protected static final String SYMBOL_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getSymbol() <em>Symbol</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getSymbol()
-   * @generated
-   * @ordered
-   */
-  protected String symbol = SYMBOL_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getCompanyName() <em>Company Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getCompanyName()
-   * @generated
-   * @ordered
-   */
-  protected static final String COMPANY_NAME_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getCompanyName() <em>Company Name</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getCompanyName()
-   * @generated
-   * @ordered
-   */
-  protected String companyName = COMPANY_NAME_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getPrice() <em>Price</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPrice()
-   * @generated
-   * @ordered
-   */
-  protected static final BigDecimal PRICE_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getPrice() <em>Price</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getPrice()
-   * @generated
-   * @ordered
-   */
-  protected BigDecimal price = PRICE_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getOpen1() <em>Open1</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getOpen1()
-   * @generated
-   * @ordered
-   */
-  protected static final BigDecimal OPEN1_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getOpen1() <em>Open1</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getOpen1()
-   * @generated
-   * @ordered
-   */
-  protected BigDecimal open1 = OPEN1_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getHigh() <em>High</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getHigh()
-   * @generated
-   * @ordered
-   */
-  protected static final BigDecimal HIGH_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getHigh() <em>High</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getHigh()
-   * @generated
-   * @ordered
-   */
-  protected BigDecimal high = HIGH_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getLow() <em>Low</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLow()
-   * @generated
-   * @ordered
-   */
-  protected static final BigDecimal LOW_EDEFAULT = null;
-
-  /**
-   * The cached value of the '{@link #getLow() <em>Low</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getLow()
-   * @generated
-   * @ordered
-   */
-  protected BigDecimal low = LOW_EDEFAULT;
-
-  /**
-   * The default value of the '{@link #getVolume() <em>Volume</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getVolume()
-   * @generated
-   * @ordered
-   */
-  protected static final double VOLUME_EDEFAULT = 0.0;
-
-  /**
-   * The cached value of the '{@link #getVolume() <em>Volume</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getVolume()
-   * @generated
-   * @ordered
-   */
-  protected double volume = VOLUME_EDEFAULT;
-
-  /**
-   * This is true if the Volume attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean volumeESet = false;
-
-  /**
-   * The default value of the '{@link #getChange1() <em>Change1</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getChange1()
-   * @generated
-   * @ordered
-   */
-  protected static final double CHANGE1_EDEFAULT = 0.0;
-
-  /**
-   * The cached value of the '{@link #getChange1() <em>Change1</em>}' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getChange1()
-   * @generated
-   * @ordered
-   */
-  protected double change1 = CHANGE1_EDEFAULT;
-
-  /**
-   * This is true if the Change1 attribute has been set.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  protected boolean change1ESet = false;
-
-  /**
-   * The cached value of the '{@link #getQuotes() <em>Quotes</em>}' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see #getQuotes()
-   * @generated
-   * @ordered
-   */
-  protected EList quotes = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected QuoteImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  protected EClass eStaticClass()
-  {
-    return SimplePackageImpl.Literals.QUOTE;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getSymbol()
-  {
-    return symbol;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setSymbol(String newSymbol)
-  {
-    String oldSymbol = symbol;
-    symbol = newSymbol;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SimplePackageImpl.QUOTE__SYMBOL, oldSymbol, symbol));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String getCompanyName()
-  {
-    return companyName;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setCompanyName(String newCompanyName)
-  {
-    String oldCompanyName = companyName;
-    companyName = newCompanyName;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SimplePackageImpl.QUOTE__COMPANY_NAME, oldCompanyName, companyName));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BigDecimal getPrice()
-  {
-    return price;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setPrice(BigDecimal newPrice)
-  {
-    BigDecimal oldPrice = price;
-    price = newPrice;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SimplePackageImpl.QUOTE__PRICE, oldPrice, price));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BigDecimal getOpen1()
-  {
-    return open1;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setOpen1(BigDecimal newOpen1)
-  {
-    BigDecimal oldOpen1 = open1;
-    open1 = newOpen1;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SimplePackageImpl.QUOTE__OPEN1, oldOpen1, open1));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BigDecimal getHigh()
-  {
-    return high;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setHigh(BigDecimal newHigh)
-  {
-    BigDecimal oldHigh = high;
-    high = newHigh;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SimplePackageImpl.QUOTE__HIGH, oldHigh, high));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public BigDecimal getLow()
-  {
-    return low;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setLow(BigDecimal newLow)
-  {
-    BigDecimal oldLow = low;
-    low = newLow;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SimplePackageImpl.QUOTE__LOW, oldLow, low));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public double getVolume()
-  {
-    return volume;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setVolume(double newVolume)
-  {
-    double oldVolume = volume;
-    volume = newVolume;
-    boolean oldVolumeESet = volumeESet;
-    volumeESet = true;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SimplePackageImpl.QUOTE__VOLUME, oldVolume, volume, !oldVolumeESet));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetVolume()
-  {
-    double oldVolume = volume;
-    boolean oldVolumeESet = volumeESet;
-    volume = VOLUME_EDEFAULT;
-    volumeESet = false;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.UNSET, SimplePackageImpl.QUOTE__VOLUME, oldVolume, VOLUME_EDEFAULT, oldVolumeESet));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetVolume()
-  {
-    return volumeESet;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public double getChange1()
-  {
-    return change1;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void setChange1(double newChange1)
-  {
-    double oldChange1 = change1;
-    change1 = newChange1;
-    boolean oldChange1ESet = change1ESet;
-    change1ESet = true;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.SET, SimplePackageImpl.QUOTE__CHANGE1, oldChange1, change1, !oldChange1ESet));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void unsetChange1()
-  {
-    double oldChange1 = change1;
-    boolean oldChange1ESet = change1ESet;
-    change1 = CHANGE1_EDEFAULT;
-    change1ESet = false;
-    if (eNotificationRequired())
-      eNotify(new ENotificationImpl(this, Notification.UNSET, SimplePackageImpl.QUOTE__CHANGE1, oldChange1, CHANGE1_EDEFAULT, oldChange1ESet));
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean isSetChange1()
-  {
-    return change1ESet;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public List getQuotes()
-  {
-    if (quotes == null)
-    {
-      quotes = new EObjectContainmentEList(Quote.class, this, SimplePackageImpl.QUOTE__QUOTES);
-    }
-    return quotes;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)
-  {
-    switch (featureID)
-    {
-      case SimplePackageImpl.QUOTE__QUOTES:
-        return ((InternalEList)getQuotes()).basicRemove(otherEnd, msgs);
-    }
-    return super.eInverseRemove(otherEnd, featureID, msgs);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Object eGet(int featureID, boolean resolve, boolean coreType)
-  {
-    switch (featureID)
-    {
-      case SimplePackageImpl.QUOTE__SYMBOL:
-        return getSymbol();
-      case SimplePackageImpl.QUOTE__COMPANY_NAME:
-        return getCompanyName();
-      case SimplePackageImpl.QUOTE__PRICE:
-        return getPrice();
-      case SimplePackageImpl.QUOTE__OPEN1:
-        return getOpen1();
-      case SimplePackageImpl.QUOTE__HIGH:
-        return getHigh();
-      case SimplePackageImpl.QUOTE__LOW:
-        return getLow();
-      case SimplePackageImpl.QUOTE__VOLUME:
-        return new Double(getVolume());
-      case SimplePackageImpl.QUOTE__CHANGE1:
-        return new Double(getChange1());
-      case SimplePackageImpl.QUOTE__QUOTES:
-        return getQuotes();
-    }
-    return super.eGet(featureID, resolve, coreType);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eSet(int featureID, Object newValue)
-  {
-    switch (featureID)
-    {
-      case SimplePackageImpl.QUOTE__SYMBOL:
-        setSymbol((String)newValue);
-        return;
-      case SimplePackageImpl.QUOTE__COMPANY_NAME:
-        setCompanyName((String)newValue);
-        return;
-      case SimplePackageImpl.QUOTE__PRICE:
-        setPrice((BigDecimal)newValue);
-        return;
-      case SimplePackageImpl.QUOTE__OPEN1:
-        setOpen1((BigDecimal)newValue);
-        return;
-      case SimplePackageImpl.QUOTE__HIGH:
-        setHigh((BigDecimal)newValue);
-        return;
-      case SimplePackageImpl.QUOTE__LOW:
-        setLow((BigDecimal)newValue);
-        return;
-      case SimplePackageImpl.QUOTE__VOLUME:
-        setVolume(((Double)newValue).doubleValue());
-        return;
-      case SimplePackageImpl.QUOTE__CHANGE1:
-        setChange1(((Double)newValue).doubleValue());
-        return;
-      case SimplePackageImpl.QUOTE__QUOTES:
-        getQuotes().clear();
-        getQuotes().addAll((Collection)newValue);
-        return;
-    }
-    super.eSet(featureID, newValue);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public void eUnset(int featureID)
-  {
-    switch (featureID)
-    {
-      case SimplePackageImpl.QUOTE__SYMBOL:
-        setSymbol(SYMBOL_EDEFAULT);
-        return;
-      case SimplePackageImpl.QUOTE__COMPANY_NAME:
-        setCompanyName(COMPANY_NAME_EDEFAULT);
-        return;
-      case SimplePackageImpl.QUOTE__PRICE:
-        setPrice(PRICE_EDEFAULT);
-        return;
-      case SimplePackageImpl.QUOTE__OPEN1:
-        setOpen1(OPEN1_EDEFAULT);
-        return;
-      case SimplePackageImpl.QUOTE__HIGH:
-        setHigh(HIGH_EDEFAULT);
-        return;
-      case SimplePackageImpl.QUOTE__LOW:
-        setLow(LOW_EDEFAULT);
-        return;
-      case SimplePackageImpl.QUOTE__VOLUME:
-        unsetVolume();
-        return;
-      case SimplePackageImpl.QUOTE__CHANGE1:
-        unsetChange1();
-        return;
-      case SimplePackageImpl.QUOTE__QUOTES:
-        getQuotes().clear();
-        return;
-    }
-    super.eUnset(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public boolean eIsSet(int featureID)
-  {
-    switch (featureID)
-    {
-      case SimplePackageImpl.QUOTE__SYMBOL:
-        return SYMBOL_EDEFAULT == null ? symbol != null : !SYMBOL_EDEFAULT.equals(symbol);
-      case SimplePackageImpl.QUOTE__COMPANY_NAME:
-        return COMPANY_NAME_EDEFAULT == null ? companyName != null : !COMPANY_NAME_EDEFAULT.equals(companyName);
-      case SimplePackageImpl.QUOTE__PRICE:
-        return PRICE_EDEFAULT == null ? price != null : !PRICE_EDEFAULT.equals(price);
-      case SimplePackageImpl.QUOTE__OPEN1:
-        return OPEN1_EDEFAULT == null ? open1 != null : !OPEN1_EDEFAULT.equals(open1);
-      case SimplePackageImpl.QUOTE__HIGH:
-        return HIGH_EDEFAULT == null ? high != null : !HIGH_EDEFAULT.equals(high);
-      case SimplePackageImpl.QUOTE__LOW:
-        return LOW_EDEFAULT == null ? low != null : !LOW_EDEFAULT.equals(low);
-      case SimplePackageImpl.QUOTE__VOLUME:
-        return isSetVolume();
-      case SimplePackageImpl.QUOTE__CHANGE1:
-        return isSetChange1();
-      case SimplePackageImpl.QUOTE__QUOTES:
-        return quotes != null && !quotes.isEmpty();
-    }
-    return super.eIsSet(featureID);
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public String toString()
-  {
-    if (eIsProxy()) return super.toString();
-
-    StringBuffer result = new StringBuffer(super.toString());
-    result.append(" (symbol: ");
-    result.append(symbol);
-    result.append(", companyName: ");
-    result.append(companyName);
-    result.append(", price: ");
-    result.append(price);
-    result.append(", open1: ");
-    result.append(open1);
-    result.append(", high: ");
-    result.append(high);
-    result.append(", low: ");
-    result.append(low);
-    result.append(", volume: ");
-    if (volumeESet) result.append(volume); else result.append("<unset>");
-    result.append(", change1: ");
-    if (change1ESet) result.append(change1); else result.append("<unset>");
-    result.append(')');
-    return result.toString();
-  }
-
-} //QuoteImpl
diff --git a/tags/java-stable-20060304/sdo/tools/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java b/tags/java-stable-20060304/sdo/tools/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java
deleted file mode 100644
index 06b0e3891e..0000000000
--- a/tags/java-stable-20060304/sdo/tools/src/test/java/com/example/simple/impl/SimpleFactoryImpl.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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 com.example.simple.impl;
-
-import com.example.simple.*;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SimpleFactoryImpl extends EFactoryImpl implements SimpleFactory
-{
-  /**
-   * The singleton instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final SimpleFactoryImpl eINSTANCE = init();
-
-  /**
-   * Creates the default factory implementation.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static SimpleFactoryImpl init()
-  {
-    try
-    {
-      SimpleFactoryImpl theSimpleFactory = (SimpleFactoryImpl)EPackage.Registry.INSTANCE.getEFactory("http://www.example.com/simple"); 
-      if (theSimpleFactory != null)
-      {
-        return theSimpleFactory;
-      }
-    }
-    catch (Exception exception)
-    {
-      EcorePlugin.INSTANCE.log(exception);
-    }
-    return new SimpleFactoryImpl();
-  }
-
-  /**
-   * Creates an instance of the factory.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public SimpleFactoryImpl()
-  {
-    super();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EObject create(EClass eClass)
-  {
-    switch (eClass.getClassifierID())
-    {
-      case SimplePackageImpl.DOCUMENT_ROOT: return (EObject)createDocumentRoot();
-      case SimplePackageImpl.QUOTE: return (EObject)createQuote();
-      default:
-        throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-    }
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public EObject createDocumentRoot()
-  {
-    EObject documentRoot = super.create(SimplePackageImpl.Literals.DOCUMENT_ROOT);
-    return documentRoot;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public Quote createQuote()
-  {
-    QuoteImpl quote = new QuoteImpl();
-    return quote;
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public SimplePackageImpl getSimplePackageImpl()
-  {
-    return (SimplePackageImpl)getEPackage();
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @deprecated
-   * @generated
-   */
-  public static SimplePackageImpl getPackage()
-  {
-    return SimplePackageImpl.eINSTANCE;
-  }
-
-} //SimpleFactoryImpl
diff --git a/tags/java-stable-20060304/sdo/tools/src/test/java/com/example/simple/impl/SimplePackageImpl.java b/tags/java-stable-20060304/sdo/tools/src/test/java/com/example/simple/impl/SimplePackageImpl.java
deleted file mode 100644
index e8fe40c24d..0000000000
--- a/tags/java-stable-20060304/sdo/tools/src/test/java/com/example/simple/impl/SimplePackageImpl.java
+++ /dev/null
@@ -1,908 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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 com.example.simple.impl;
-
-import com.example.simple.Quote;
-import com.example.simple.SimpleFactory;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-
-/**
- * <!-- 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 com.example.simple.SimpleFactory
- * @generated
- */
-public class SimplePackageImpl extends EPackageImpl
-{
-  /**
-   * The package name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String eNAME = "simple";
-
-  /**
-   * The package namespace URI.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String eNS_URI = "http://www.example.com/simple";
-
-  /**
-   * The package namespace name.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final String eNS_PREFIX = "simple";
-
-  /**
-   * The singleton instance of the package.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  public static final SimplePackageImpl eINSTANCE = com.example.simple.impl.SimplePackageImpl.init();
-
-  /**
-   * The meta object id for the '{@link com.example.simple.impl.DocumentRootImpl <em>Document Root</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see com.example.simple.impl.DocumentRootImpl
-   * @see com.example.simple.impl.SimplePackageImpl#getDocumentRoot()
-   * @generated
-   */
-  public static final int DOCUMENT_ROOT = 0;
-
-  /**
-   * The feature id for the '<em><b>Mixed</b></em>' attribute list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int DOCUMENT_ROOT__MIXED = 0;
-
-  /**
-   * The feature id for the '<em><b>XMLNS Prefix Map</b></em>' map.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int DOCUMENT_ROOT__XMLNS_PREFIX_MAP = 1;
-
-  /**
-   * The feature id for the '<em><b>XSI Schema Location</b></em>' map.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = 2;
-
-  /**
-   * The feature id for the '<em><b>Stock Quote</b></em>' containment reference.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int DOCUMENT_ROOT__STOCK_QUOTE = 3;
-
-  /**
-   * The number of structural features of the '<em>Document Root</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int DOCUMENT_ROOT_FEATURE_COUNT = 4;
-
-  /**
-   * The meta object id for the '{@link com.example.simple.impl.QuoteImpl <em>Quote</em>}' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @see com.example.simple.impl.QuoteImpl
-   * @see com.example.simple.impl.SimplePackageImpl#getQuote()
-   * @generated
-   */
-  public static final int QUOTE = 1;
-
-  /**
-   * The feature id for the '<em><b>Symbol</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int QUOTE__SYMBOL = 0;
-
-  /**
-   * The feature id for the '<em><b>Company Name</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int QUOTE__COMPANY_NAME = 1;
-
-  /**
-   * The feature id for the '<em><b>Price</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int QUOTE__PRICE = 2;
-
-  /**
-   * The feature id for the '<em><b>Open1</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int QUOTE__OPEN1 = 3;
-
-  /**
-   * The feature id for the '<em><b>High</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int QUOTE__HIGH = 4;
-
-  /**
-   * The feature id for the '<em><b>Low</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int QUOTE__LOW = 5;
-
-  /**
-   * The feature id for the '<em><b>Volume</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int QUOTE__VOLUME = 6;
-
-  /**
-   * The feature id for the '<em><b>Change1</b></em>' attribute.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int QUOTE__CHANGE1 = 7;
-
-  /**
-   * The feature id for the '<em><b>Quotes</b></em>' containment reference list.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int QUOTE__QUOTES = 8;
-
-  /**
-   * The number of structural features of the '<em>Quote</em>' class.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   * @ordered
-   */
-  public static final int QUOTE_FEATURE_COUNT = 9;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass documentRootEClass = null;
-
-  /**
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @generated
-   */
-  private EClass quoteEClass = 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 com.example.simple.impl.SimplePackageImpl#eNS_URI
-   * @see #init()
-   * @generated
-   */
-  private SimplePackageImpl()
-  {
-    super(eNS_URI, ((EFactory)SimpleFactory.INSTANCE));
-  }
-
-  /**
-   * <!-- 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 SimplePackageImpl init()
-  {
-    if (isInited) return (SimplePackageImpl)EPackage.Registry.INSTANCE.getEPackage(SimplePackageImpl.eNS_URI);
-
-    // Obtain or create and register package
-    SimplePackageImpl theSimplePackageImpl = (SimplePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof SimplePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new SimplePackageImpl());
-
-    isInited = true;
-
-    // Initialize simple dependencies
-    XMLTypePackage.eINSTANCE.eClass();
-
-    // Create package meta-data objects
-    theSimplePackageImpl.createPackageContents();
-
-    // Initialize created meta-data
-    theSimplePackageImpl.initializePackageContents();
-
-    // Mark meta-data to indicate it can't be changed
-    theSimplePackageImpl.freeze();
-
-    return theSimplePackageImpl;
-  }
-
-
-  /**
-   * Returns the meta object for class '{@link org.eclipse.emf.ecore.EObject <em>Document Root</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Document Root</em>'.
-   * @see org.eclipse.emf.ecore.EObject
-   * @generated
-   */
-  public EClass getDocumentRoot()
-  {
-    return documentRootEClass;
-  }
-
-  /**
-   * Returns the meta object for the attribute list '{@link org.eclipse.emf.ecore.EObject#getMixed <em>Mixed</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute list '<em>Mixed</em>'.
-   * @see org.eclipse.emf.ecore.EObject#getMixed()
-   * @see #getDocumentRoot()
-   * @generated
-   */
-  public EAttribute getDocumentRoot_Mixed()
-  {
-    return (EAttribute)documentRootEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * Returns the meta object for the map '{@link org.eclipse.emf.ecore.EObject#getXMLNSPrefixMap <em>XMLNS Prefix Map</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the map '<em>XMLNS Prefix Map</em>'.
-   * @see org.eclipse.emf.ecore.EObject#getXMLNSPrefixMap()
-   * @see #getDocumentRoot()
-   * @generated
-   */
-  public EReference getDocumentRoot_XMLNSPrefixMap()
-  {
-    return (EReference)documentRootEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * Returns the meta object for the map '{@link org.eclipse.emf.ecore.EObject#getXSISchemaLocation <em>XSI Schema Location</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the map '<em>XSI Schema Location</em>'.
-   * @see org.eclipse.emf.ecore.EObject#getXSISchemaLocation()
-   * @see #getDocumentRoot()
-   * @generated
-   */
-  public EReference getDocumentRoot_XSISchemaLocation()
-  {
-    return (EReference)documentRootEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * Returns the meta object for the containment reference '{@link org.eclipse.emf.ecore.EObject#getStockQuote <em>Stock Quote</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference '<em>Stock Quote</em>'.
-   * @see org.eclipse.emf.ecore.EObject#getStockQuote()
-   * @see #getDocumentRoot()
-   * @generated
-   */
-  public EReference getDocumentRoot_StockQuote()
-  {
-    return (EReference)documentRootEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * Returns the meta object for class '{@link com.example.simple.Quote <em>Quote</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for class '<em>Quote</em>'.
-   * @see com.example.simple.Quote
-   * @generated
-   */
-  public EClass getQuote()
-  {
-    return quoteEClass;
-  }
-
-  /**
-   * Returns the meta object for the attribute '{@link com.example.simple.Quote#getSymbol <em>Symbol</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Symbol</em>'.
-   * @see com.example.simple.Quote#getSymbol()
-   * @see #getQuote()
-   * @generated
-   */
-  public EAttribute getQuote_Symbol()
-  {
-    return (EAttribute)quoteEClass.getEStructuralFeatures().get(0);
-  }
-
-  /**
-   * Returns the meta object for the attribute '{@link com.example.simple.Quote#getCompanyName <em>Company Name</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Company Name</em>'.
-   * @see com.example.simple.Quote#getCompanyName()
-   * @see #getQuote()
-   * @generated
-   */
-  public EAttribute getQuote_CompanyName()
-  {
-    return (EAttribute)quoteEClass.getEStructuralFeatures().get(1);
-  }
-
-  /**
-   * Returns the meta object for the attribute '{@link com.example.simple.Quote#getPrice <em>Price</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Price</em>'.
-   * @see com.example.simple.Quote#getPrice()
-   * @see #getQuote()
-   * @generated
-   */
-  public EAttribute getQuote_Price()
-  {
-    return (EAttribute)quoteEClass.getEStructuralFeatures().get(2);
-  }
-
-  /**
-   * Returns the meta object for the attribute '{@link com.example.simple.Quote#getOpen1 <em>Open1</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Open1</em>'.
-   * @see com.example.simple.Quote#getOpen1()
-   * @see #getQuote()
-   * @generated
-   */
-  public EAttribute getQuote_Open1()
-  {
-    return (EAttribute)quoteEClass.getEStructuralFeatures().get(3);
-  }
-
-  /**
-   * Returns the meta object for the attribute '{@link com.example.simple.Quote#getHigh <em>High</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>High</em>'.
-   * @see com.example.simple.Quote#getHigh()
-   * @see #getQuote()
-   * @generated
-   */
-  public EAttribute getQuote_High()
-  {
-    return (EAttribute)quoteEClass.getEStructuralFeatures().get(4);
-  }
-
-  /**
-   * Returns the meta object for the attribute '{@link com.example.simple.Quote#getLow <em>Low</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Low</em>'.
-   * @see com.example.simple.Quote#getLow()
-   * @see #getQuote()
-   * @generated
-   */
-  public EAttribute getQuote_Low()
-  {
-    return (EAttribute)quoteEClass.getEStructuralFeatures().get(5);
-  }
-
-  /**
-   * Returns the meta object for the attribute '{@link com.example.simple.Quote#getVolume <em>Volume</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Volume</em>'.
-   * @see com.example.simple.Quote#getVolume()
-   * @see #getQuote()
-   * @generated
-   */
-  public EAttribute getQuote_Volume()
-  {
-    return (EAttribute)quoteEClass.getEStructuralFeatures().get(6);
-  }
-
-  /**
-   * Returns the meta object for the attribute '{@link com.example.simple.Quote#getChange1 <em>Change1</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the attribute '<em>Change1</em>'.
-   * @see com.example.simple.Quote#getChange1()
-   * @see #getQuote()
-   * @generated
-   */
-  public EAttribute getQuote_Change1()
-  {
-    return (EAttribute)quoteEClass.getEStructuralFeatures().get(7);
-  }
-
-  /**
-   * Returns the meta object for the containment reference list '{@link com.example.simple.Quote#getQuotes <em>Quotes</em>}'.
-   * <!-- begin-user-doc -->
-   * <!-- end-user-doc -->
-   * @return the meta object for the containment reference list '<em>Quotes</em>'.
-   * @see com.example.simple.Quote#getQuotes()
-   * @see #getQuote()
-   * @generated
-   */
-  public EReference getQuote_Quotes()
-  {
-    return (EReference)quoteEClass.getEStructuralFeatures().get(8);
-  }
-
-  /**
-   * 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
-   */
-  public SimpleFactory getSimpleFactory()
-  {
-    return (SimpleFactory)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
-    documentRootEClass = createEClass(DOCUMENT_ROOT);
-    createEAttribute(documentRootEClass, DOCUMENT_ROOT__MIXED);
-    createEReference(documentRootEClass, DOCUMENT_ROOT__XMLNS_PREFIX_MAP);
-    createEReference(documentRootEClass, DOCUMENT_ROOT__XSI_SCHEMA_LOCATION);
-    createEReference(documentRootEClass, DOCUMENT_ROOT__STOCK_QUOTE);
-
-    quoteEClass = createEClass(QUOTE);
-    createEAttribute(quoteEClass, QUOTE__SYMBOL);
-    createEAttribute(quoteEClass, QUOTE__COMPANY_NAME);
-    createEAttribute(quoteEClass, QUOTE__PRICE);
-    createEAttribute(quoteEClass, QUOTE__OPEN1);
-    createEAttribute(quoteEClass, QUOTE__HIGH);
-    createEAttribute(quoteEClass, QUOTE__LOW);
-    createEAttribute(quoteEClass, QUOTE__VOLUME);
-    createEAttribute(quoteEClass, QUOTE__CHANGE1);
-    createEReference(quoteEClass, QUOTE__QUOTES);
-  }
-
-  /**
-   * <!-- 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
-    XMLTypePackage theXMLTypePackage = (XMLTypePackage)EPackage.Registry.INSTANCE.getEPackage(XMLTypePackage.eNS_URI);
-
-    // Add supertypes to classes
-
-    // Initialize classes and features; add operations and parameters
-    initEClass(documentRootEClass, null, "DocumentRoot", !IS_ABSTRACT, !IS_INTERFACE, !IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getDocumentRoot_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(getDocumentRoot_XMLNSPrefixMap(), 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(getDocumentRoot_XSISchemaLocation(), 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);
-    initEReference(getDocumentRoot_StockQuote(), this.getQuote(), null, "stockQuote", null, 0, -2, null, IS_TRANSIENT, IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-    initEClass(quoteEClass, Quote.class, "Quote", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-    initEAttribute(getQuote_Symbol(), theXMLTypePackage.getString(), "symbol", null, 1, 1, Quote.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getQuote_CompanyName(), theXMLTypePackage.getString(), "companyName", null, 1, 1, Quote.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getQuote_Price(), theXMLTypePackage.getDecimal(), "price", null, 1, 1, Quote.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getQuote_Open1(), theXMLTypePackage.getDecimal(), "open1", null, 1, 1, Quote.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getQuote_High(), theXMLTypePackage.getDecimal(), "high", null, 1, 1, Quote.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getQuote_Low(), theXMLTypePackage.getDecimal(), "low", null, 1, 1, Quote.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getQuote_Volume(), theXMLTypePackage.getDouble(), "volume", null, 1, 1, Quote.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEAttribute(getQuote_Change1(), theXMLTypePackage.getDouble(), "change1", null, 1, 1, Quote.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_UNSETTABLE, !IS_ID, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-    initEReference(getQuote_Quotes(), this.getQuote(), null, "quotes", null, 0, -1, Quote.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-    // Create resource
-    createResource(eNS_URI);
-
-    // Create annotations
-    // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
-    createExtendedMetaDataAnnotations();
-  }
-
-  /**
-   * 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
-      (documentRootEClass, 
-       source, 
-       new String[] 
-       {
-       "name", "",
-       "kind", "mixed"
-       });		
-    addAnnotation
-      (getDocumentRoot_Mixed(), 
-       source, 
-       new String[] 
-       {
-       "kind", "elementWildcard",
-       "name", ":mixed"
-       });		
-    addAnnotation
-      (getDocumentRoot_XMLNSPrefixMap(), 
-       source, 
-       new String[] 
-       {
-       "kind", "attribute",
-       "name", "xmlns:prefix"
-       });		
-    addAnnotation
-      (getDocumentRoot_XSISchemaLocation(), 
-       source, 
-       new String[] 
-       {
-       "kind", "attribute",
-       "name", "xsi:schemaLocation"
-       });		
-    addAnnotation
-      (getDocumentRoot_StockQuote(), 
-       source, 
-       new String[] 
-       {
-       "kind", "element",
-       "name", "stockQuote",
-       "namespace", "##targetNamespace"
-       });		
-    addAnnotation
-      (quoteEClass, 
-       source, 
-       new String[] 
-       {
-       "name", "Quote",
-       "kind", "elementOnly"
-       });		
-    addAnnotation
-      (getQuote_Symbol(), 
-       source, 
-       new String[] 
-       {
-       "kind", "element",
-       "name", "symbol"
-       });		
-    addAnnotation
-      (getQuote_CompanyName(), 
-       source, 
-       new String[] 
-       {
-       "kind", "element",
-       "name", "companyName"
-       });		
-    addAnnotation
-      (getQuote_Price(), 
-       source, 
-       new String[] 
-       {
-       "kind", "element",
-       "name", "price"
-       });		
-    addAnnotation
-      (getQuote_Open1(), 
-       source, 
-       new String[] 
-       {
-       "kind", "element",
-       "name", "open1"
-       });		
-    addAnnotation
-      (getQuote_High(), 
-       source, 
-       new String[] 
-       {
-       "kind", "element",
-       "name", "high"
-       });		
-    addAnnotation
-      (getQuote_Low(), 
-       source, 
-       new String[] 
-       {
-       "kind", "element",
-       "name", "low"
-       });		
-    addAnnotation
-      (getQuote_Volume(), 
-       source, 
-       new String[] 
-       {
-       "kind", "element",
-       "name", "volume"
-       });		
-    addAnnotation
-      (getQuote_Change1(), 
-       source, 
-       new String[] 
-       {
-       "kind", "element",
-       "name", "change1"
-       });		
-    addAnnotation
-      (getQuote_Quotes(), 
-       source, 
-       new String[] 
-       {
-       "kind", "element",
-       "name", "quotes"
-       });
-  }
-
-  /**
-   * <!-- begin-user-doc -->
-   * Defines literals for the meta objects that 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 -->
-   * @generated
-   */
-  public interface Literals
-  {
-    /**
-     * The meta object literal for the '{@link com.example.simple.impl.DocumentRootImpl <em>Document Root</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see com.example.simple.impl.DocumentRootImpl
-     * @see com.example.simple.impl.SimplePackageImpl#getDocumentRoot()
-     * @generated
-     */
-    public static final EClass DOCUMENT_ROOT = eINSTANCE.getDocumentRoot();
-
-    /**
-     * The meta object literal for the '<em><b>Mixed</b></em>' attribute list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EAttribute DOCUMENT_ROOT__MIXED = eINSTANCE.getDocumentRoot_Mixed();
-
-    /**
-     * The meta object literal for the '<em><b>XMLNS Prefix Map</b></em>' map feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EReference DOCUMENT_ROOT__XMLNS_PREFIX_MAP = eINSTANCE.getDocumentRoot_XMLNSPrefixMap();
-
-    /**
-     * The meta object literal for the '<em><b>XSI Schema Location</b></em>' map feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EReference DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = eINSTANCE.getDocumentRoot_XSISchemaLocation();
-
-    /**
-     * The meta object literal for the '<em><b>Stock Quote</b></em>' containment reference feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EReference DOCUMENT_ROOT__STOCK_QUOTE = eINSTANCE.getDocumentRoot_StockQuote();
-
-    /**
-     * The meta object literal for the '{@link com.example.simple.impl.QuoteImpl <em>Quote</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see com.example.simple.impl.QuoteImpl
-     * @see com.example.simple.impl.SimplePackageImpl#getQuote()
-     * @generated
-     */
-    public static final EClass QUOTE = eINSTANCE.getQuote();
-
-    /**
-     * The meta object literal for the '<em><b>Symbol</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EAttribute QUOTE__SYMBOL = eINSTANCE.getQuote_Symbol();
-
-    /**
-     * The meta object literal for the '<em><b>Company Name</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EAttribute QUOTE__COMPANY_NAME = eINSTANCE.getQuote_CompanyName();
-
-    /**
-     * The meta object literal for the '<em><b>Price</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EAttribute QUOTE__PRICE = eINSTANCE.getQuote_Price();
-
-    /**
-     * The meta object literal for the '<em><b>Open1</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EAttribute QUOTE__OPEN1 = eINSTANCE.getQuote_Open1();
-
-    /**
-     * The meta object literal for the '<em><b>High</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EAttribute QUOTE__HIGH = eINSTANCE.getQuote_High();
-
-    /**
-     * The meta object literal for the '<em><b>Low</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EAttribute QUOTE__LOW = eINSTANCE.getQuote_Low();
-
-    /**
-     * The meta object literal for the '<em><b>Volume</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EAttribute QUOTE__VOLUME = eINSTANCE.getQuote_Volume();
-
-    /**
-     * The meta object literal for the '<em><b>Change1</b></em>' attribute feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EAttribute QUOTE__CHANGE1 = eINSTANCE.getQuote_Change1();
-
-    /**
-     * The meta object literal for the '<em><b>Quotes</b></em>' containment reference list feature.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final EReference QUOTE__QUOTES = eINSTANCE.getQuote_Quotes();
-
-  }
-
-} //SimplePackageImpl
diff --git a/tags/java-stable-20060304/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTest.java b/tags/java-stable-20060304/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTest.java
deleted file mode 100644
index 520cf707e7..0000000000
--- a/tags/java-stable-20060304/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- *
- *  Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- *  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.test;
-
-import java.math.BigDecimal;
-
-import org.apache.tuscany.sdo.util.SDOUtil;
-
-import com.example.simple.Quote;
-import com.example.simple.SimpleFactory;
-import commonj.sdo.DataObject;
-import commonj.sdo.helper.XMLHelper;
-
-
-public class SimpleStaticTest
-{
-  /**
-   * Simple Static SDO 2 test.
-   */
-  public static void main(String[] args)
-  {
-    try
-    {
-      SDOUtil.registerStaticTypes(SimpleFactory.class);
-      
-      //Quote quote = (Quote)DataFactory.INSTANCE.create(Quote.class);
-      Quote quote = SimpleFactory.INSTANCE.createQuote();
-      
-      quote.setSymbol("fbnt");
-      quote.setCompanyName("FlyByNightTechnology");
-      quote.setPrice(new BigDecimal("1000.0"));
-      quote.setOpen1(new BigDecimal("1000.0"));
-      quote.setHigh(new BigDecimal("1000.0"));
-      quote.setLow(new BigDecimal("1000.0"));
-      quote.setVolume(1000);
-      quote.setChange1(1000);
-
-      //Quote child = (Quote)((DataObject)quote).createDataObject(8);
-      Quote child = SimpleFactory.INSTANCE.createQuote();
-      quote.getQuotes().add(child);
-      child.setPrice(new BigDecimal("2000.0"));
-
-      XMLHelper.INSTANCE.save((DataObject)quote, "http://www.example.com/simple", "stockQuote", System.out);
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }
-  }
-}
diff --git a/tags/java-stable-20060304/sdo/tools/src/test/resources/enum.xsd b/tags/java-stable-20060304/sdo/tools/src/test/resources/enum.xsd
deleted file mode 100644
index 4cbde32849..0000000000
--- a/tags/java-stable-20060304/sdo/tools/src/test/resources/enum.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema 
-  targetNamespace="http://www.example.com/simple"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-  xmlns:simple="http://www.example.com/simple"> 
-  
-   <xsd:element name="stockQuote" type="simple:Quote"/>
-   
-   <xsd:simpleType name="PriceClass">
-       <xsd:restriction base="xsd:string">
-           <xsd:enumeration value="Large"/>
-           <xsd:enumeration value="Medium"/>
-           <xsd:enumeration value="Small"/>
-       </xsd:restriction>
-   </xsd:simpleType>
-   
-   <xsd:complexType name="Quote">
-       <xsd:sequence>
-          <xsd:element name="symbol" type="xsd:string"/>
-          <xsd:element name="companyName" type="xsd:string"/>
-          <xsd:element name="priceClass" type="simple:PriceClass"/>
-          <xsd:element name="price" type="xsd:decimal"/>
-          <xsd:element name="open1" type="xsd:decimal"/>
-          <xsd:element name="high" type="xsd:decimal"/>
-          <xsd:element name="low" type="xsd:decimal"/>
-          <xsd:element name="volume" type="xsd:double"/>
-          <xsd:element name="change1" type="xsd:double"/>
-          <xsd:element name="quotes" type="simple:Quote" minOccurs="0" maxOccurs="unbounded"/>
-       </xsd:sequence>
-   </xsd:complexType>
-
-</xsd:schema>
diff --git a/tags/java-stable-20060304/sdo/tools/src/test/resources/simple.xsd b/tags/java-stable-20060304/sdo/tools/src/test/resources/simple.xsd
deleted file mode 100644
index c15028544e..0000000000
--- a/tags/java-stable-20060304/sdo/tools/src/test/resources/simple.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema 
-  targetNamespace="http://www.example.com/simple"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-  xmlns:simple="http://www.example.com/simple"> 
-  
-   <xsd:element name="stockQuote" type="simple:Quote"/>
-   
-   <xsd:complexType name="Quote">
-       <xsd:sequence>
-          <xsd:element name="symbol" type="xsd:string"/>
-          <xsd:element name="companyName" type="xsd:string"/>
-          <xsd:element name="price" type="xsd:decimal"/>
-          <xsd:element name="open1" type="xsd:decimal"/>
-          <xsd:element name="high" type="xsd:decimal"/>
-          <xsd:element name="low" type="xsd:decimal"/>
-          <xsd:element name="volume" type="xsd:double"/>
-          <xsd:element name="change1" type="xsd:double"/>
-          <xsd:element name="quotes" type="simple:Quote" minOccurs="0" maxOccurs="unbounded"/>
-       </xsd:sequence>
-   </xsd:complexType>
-
-</xsd:schema>