11 files changed, 0 insertions, 962 deletions
diff --git a/java/sdo/sdo-api/src/main/resources/META-INF/DISCLAIMER b/java/sdo/sdo-api/src/main/resources/META-INF/DISCLAIMER
deleted file mode 100644
index a65af91c5a..0000000000
--- a/java/sdo/sdo-api/src/main/resources/META-INF/DISCLAIMER
+++ /dev/null
@@ -1,7 +0,0 @@
-Apache Tuscany is an effort undergoing incubation at The Apache Software
-Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is
-required of all newly accepted projects until a further review indicates that
-the infrastructure, communications, and decision making process have stabilized
-in a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the
-code, it does indicate that the project has yet to be fully endorsed by the ASF.
-\ No newline at end of file
diff --git a/java/sdo/sdo-api/src/main/resources/META-INF/LICENSE b/java/sdo/sdo-api/src/main/resources/META-INF/LICENSE
deleted file mode 100644
index e07ae24f31..0000000000
--- a/java/sdo/sdo-api/src/main/resources/META-INF/LICENSE
+++ /dev/null
@@ -1,284 +0,0 @@
-Each file in this JAR is covered by one of the two liceses listed below.
-
-
-License applicable to the files ...
-
-commonj/sdo/impl/NoHelperProviderException.class
-
-
-                                 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.
-
-
-==================================================================================
-
-License applicable to the files ....
-
-commonj/sdo/ChangeSummary$Setting.class
-commonj/sdo/ChangeSummary.class
-commonj/sdo/DataGraph.class
-commonj/sdo/DataObject.class
-commonj/sdo/helper/CopyHelper.class
-commonj/sdo/helper/DataFactory.class
-commonj/sdo/helper/DataHelper.class
-commonj/sdo/helper/EqualityHelper.class
-commonj/sdo/helper/HelperContext.class
-commonj/sdo/helper/TypeHelper.class
-commonj/sdo/helper/XMLDocument.class
-commonj/sdo/helper/XMLHelper.class
-commonj/sdo/helper/XSDHelper.class
-commonj/sdo/impl/ExternalizableDelegator$Resolvable.class
-commonj/sdo/impl/ExternalizableDelegator.class
-commonj/sdo/Property.class
-commonj/sdo/Sequence.class
-commonj/sdo/Type.class
-xml/datagraph.xsd
-xml/sdoJava.xml
-xml/sdoJava.xsd
-xml/sdoModel.xml
-xml/sdoModel.xsd
-xml/sdoXML.xml
-xml/sdoXML.xsd
-
-License for the Service Data Objects JavaDoc, Interface Definition files
-and XSD files.
-
-The Service Data Objects JavaDoc, Interface Definition files and XSD files
-are being provided by the copyright holders under the following license.
-By using and/or copying this work, you agree that you have read,
-understood and will comply with the following terms and conditions:
-
-Permission to copy, display, make derivative works of and distribute
-the Service Data Objects JavaDoc, Interface Definition files and XSD files
-(the "Artifacts") in any medium without fee or royalty is hereby granted,
-provided that you include the following on ALL copies of the Artifacts,
-or portions thereof, that you make:
-
-1.    A link or URL to the Artifacts at this location:
-http://www.osoa.org/display/Main/Service+Data+Objects+Specifications
-
-2.    The full text of this copyright notice as shown in the Artifacts.
-
-
-
-THE ARTIFACTS ARE PROVIDED "AS IS" AND THE AUTHORS MAKE NO
-REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THE
-ARTIFACTS AND THE IMPLEMENTATION OF THEIR CONTENTS,
-INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT OR TITLE.
-
-THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL,
-INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY
-USE OR DISTRIBUTION OF THE ARTIFACTS.
-
-The name and trademarks of the Authors may NOT be used in any manner,
-including advertising or publicity pertaining to the Service Data
-Objects Specification or its contents without specific, written prior
-permission. Title to copyright in the Service Data Objects
-Specification will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.11, last updated on 2007/12/21
-
-============================================================================================================
-
diff --git a/java/sdo/sdo-api/src/main/resources/META-INF/NOTICE b/java/sdo/sdo-api/src/main/resources/META-INF/NOTICE
deleted file mode 100644
index 7b44f1014d..0000000000
--- a/java/sdo/sdo-api/src/main/resources/META-INF/NOTICE
+++ /dev/null
@@ -1,10 +0,0 @@
-Apache Tuscany
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product also includes software developed by the Open Service Oriented Architecture organisation
-(http://osoa.org). 
-
-Please see the LICENSE file present in the META-INF directory of this archive.
diff --git a/java/sdo/sdo-api/src/main/resources/META-INF/README.txt b/java/sdo/sdo-api/src/main/resources/META-INF/README.txt
deleted file mode 100644
index a3c36b7705..0000000000
--- a/java/sdo/sdo-api/src/main/resources/META-INF/README.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-Apache Tuscany 1.1-incubating build (February 2008)
-===============================================
-
-http://incubator.apache.org/tuscany/
-
-Support
--------
-
-Any problem with this release can be reported to the Tuscany mailing list 
-or in the JIRA issue tracker.
-
-Mailing list subscription:
-    tuscany-dev-subscribe@ws.apache.org
-
-Jira:
-    http://issues.apache.org/jira/browse/Tuscany
-
-
-Thank you for using Tuscany!
-
-
-The Tuscany Team. 
-
diff --git a/java/sdo/sdo-api/src/main/resources/xml/datagraph.xsd b/java/sdo/sdo-api/src/main/resources/xml/datagraph.xsd
deleted file mode 100644
index e6b9697a8d..0000000000
--- a/java/sdo/sdo-api/src/main/resources/xml/datagraph.xsd
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.1.0
- * Licensed Materials
- *
- * (c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
- * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
- * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
- * 2005, 2006. All rights reserved.
- *
- * </copyright>
- * 
- */
--->
-
-<xsd:schema
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:sdo="commonj.sdo"
-  xmlns:sdoJava="commonj.sdo/java"
-  targetNamespace="commonj.sdo">
-
-  <xsd:element name="datagraph" type="sdo:DataGraphType"/>
-  
-  <xsd:complexType name="DataGraphType">
-    <xsd:complexContent>
-      <xsd:extension base="sdo:BaseDataGraphType">
-        <xsd:sequence>
-          <xsd:any minOccurs="0" maxOccurs="1" namespace="##other" processContents="lax"/>
-        </xsd:sequence>
-      </xsd:extension>
-    </xsd:complexContent>
-  </xsd:complexType>
-
-  <xsd:complexType name="BaseDataGraphType" abstract="true">
-    <xsd:sequence>
-      <xsd:element name="models" type="sdo:ModelsType" minOccurs="0"/>
-      <xsd:element name="xsd" type="sdo:XSDType" minOccurs="0"/>
-      <xsd:element name="changeSummary" type="sdo:ChangeSummaryType" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:anyAttribute namespace="##other" processContents="lax"/>
-  </xsd:complexType>
-    
-  <xsd:complexType name="ModelsType">
-    <xsd:annotation>
-      <xsd:documentation>
-        Expected type is emof:Package.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:complexType name="XSDType">
-    <xsd:annotation>
-      <xsd:documentation>
-        Expected type is xsd:schema.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="unbounded" namespace="http://www.w3.org/2001/XMLSchema" processContents="lax"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-<!-- FB TEMP -->
-  <xsd:simpleType name="ChangeSummaryType" sdoJava:instanceClass="commonj.sdo.ChangeSummary">
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-<!--
-  <xsd:complexType name="ChangeSummaryType">
-    <xsd:sequence>
-      <xsd:any minOccurs="0" maxOccurs="unbounded" namespace="##any" processContents="lax"/>
-    </xsd:sequence>
-    <xsd:attribute name="create" type="xsd:string"/>
-    <xsd:attribute name="delete" type="xsd:string"/>
-    <xsd:attribute name="logging" type="xsd:boolean"/>
-  </xsd:complexType>
--->
-
-  <xsd:attribute name="ref" type="xsd:string"/>
-  <xsd:attribute name="unset" type="xsd:string"/>
-
-</xsd:schema>
diff --git a/java/sdo/sdo-api/src/main/resources/xml/sdoJava.xml b/java/sdo/sdo-api/src/main/resources/xml/sdoJava.xml
deleted file mode 100644
index 01d3d9e1ac..0000000000
--- a/java/sdo/sdo-api/src/main/resources/xml/sdoJava.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.1.0
- * Licensed Materials
- *
- * (c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
- * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
- * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
- * 2005, 2006. All rights reserved.
- *
- * </copyright>
- * 
- */
--->
-
-<types xmlns="commonj.sdo"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xmlns:sdoJava="commonj.sdo/java"
-  xsi:schemaLocation="commonj.sdo sdoModel.xsd commonj.sdo/java sdoJava.xsd commonj.sdo/xml sdoXML.xsd">
-
-<!--
-   Global properties used in open content for 
-   the Java binding of SDO Types and Properties.
--->
-
-  <type uri="commonj.sdo/java">
-    <property name="javaClass" type="commonj.sdo#String"/>
-  </type>
-
-  <!-- JavaInfo deprecated in 2.1.0 -->
-  <type name="JavaInfo" uri="commonj.sdo/java">
-    <property name="javaClass" type="commonj.sdo#String"/>
-  </type>
-
-<!--
-   The Java object data types.
--->
-
-  <type name="BooleanObject" dataType="true" sdoJava:instanceClass="java.lang.Boolean" uri="commonj.sdo/java"/>
-  <type name="ByteObject" dataType="true" sdoJava:instanceClass="java.lang.Byte" uri="commonj.sdo/java"/>
-  <type name="CharacterObject" dataType="true" sdoJava:instanceClass="java.lang.Character" uri="commonj.sdo/java"/>
-  <type name="DoubleObject" dataType="true" sdoJava:instanceClass="java.lang.Double" uri="commonj.sdo/java"/>
-  <type name="FloatObject" dataType="true" sdoJava:instanceClass="java.lang.Float" uri="commonj.sdo/java"/>
-  <type name="IntObject" dataType="true" sdoJava:instanceClass="java.lang.Int" uri="commonj.sdo/java"/>
-  <type name="LongObject" dataType="true" sdoJava:instanceClass="java.lang.Long" uri="commonj.sdo/java"/>
-  <type name="ShortObject" dataType="true" sdoJava:instanceClass="java.lang.Short" uri="commonj.sdo/java"/>
-
-</types>
diff --git a/java/sdo/sdo-api/src/main/resources/xml/sdoJava.xsd b/java/sdo/sdo-api/src/main/resources/xml/sdoJava.xsd
deleted file mode 100644
index 7387568942..0000000000
--- a/java/sdo/sdo-api/src/main/resources/xml/sdoJava.xsd
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.1.0
- * Licensed Materials
- *
- * (c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
- * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
- * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
- * 2005, 2006. All rights reserved.
- *
- * </copyright>
- * 
- */
--->
-
-<xsd:schema
-  targetNamespace="commonj.sdo/java"
-  xmlns:sdoJava="commonj.sdo/java"
-  xmlns:sdo="commonj.sdo"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-<xsd:import namespace="commonj.sdo" schemaLocation="sdoModel.xsd"/>
-
-<!--
-   These attributes are used to customize the Java mapping of 
-   XSD to SDO Types and Properties.
--->
-
-<xsd:attribute name="package" type="xsd:string" />
-<xsd:attribute name="instanceClass" type="xsd:string" />
-<xsd:attribute name="extendedInstanceClass" type="xsd:string" />
-<xsd:attribute name="nestedInterfaces" type="xsd:boolean" />
-
-<!--
-   Global properties used in open content for 
-   the Java binding of SDO Types and Properties.
--->
-
-<xsd:attribute name="javaClass" type="sdo:String"/>
-
-<!-- JavaInfo deprecated in 2.1.0 -->
-<xsd:complexType name="JavaInfo">
-  <xsd:attribute name="javaClass" type="sdo:String"/>
-</xsd:complexType>
-
-<!--
-   The Java object data types.
--->
-
-<xsd:simpleType name="BooleanObject" sdoJava:instanceClass="java.lang.Boolean">
-  <xsd:restriction base="xsd:boolean"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="ByteObject" sdoJava:instanceClass="java.lang.Byte">
-  <xsd:restriction base="xsd:byte"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="CharacterObject" sdoJava:instanceClass="java.lang.Character">
-  <xsd:restriction base="xsd:string"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="DoubleObject" sdoJava:instanceClass="java.lang.Double">
-  <xsd:restriction base="xsd:double"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="FloatObject" sdoJava:instanceClass="java.lang.Float">
-  <xsd:restriction base="xsd:float"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="IntObject" sdoJava:instanceClass="java.lang.Integer">
-  <xsd:restriction base="xsd:int"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="LongObject" sdoJava:instanceClass="java.lang.Long">
-  <xsd:restriction base="xsd:long"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="ShortObject" sdoJava:instanceClass="java.lang.Short">
-  <xsd:restriction base="xsd:short"/>
-</xsd:simpleType>
-
-</xsd:schema>
diff --git a/java/sdo/sdo-api/src/main/resources/xml/sdoModel.xml b/java/sdo/sdo-api/src/main/resources/xml/sdoModel.xml
deleted file mode 100644
index 7fdf82d1be..0000000000
--- a/java/sdo/sdo-api/src/main/resources/xml/sdoModel.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.1.0
- * Licensed Materials
- *
- * (c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
- * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
- * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
- * 2005, 2006. All rights reserved.
- *
- * </copyright>
- * 
- */
--->
-
-<types xmlns="commonj.sdo"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xmlns:sdoJava="commonj.sdo/java"
-  xsi:schemaLocation="commonj.sdo sdoModel.xsd commonj.sdo/java sdoJava.xsd commonj.sdo/xml sdoXML.xsd">
-
-<!-- Model Types 
-   SDO Type and Property are defined in terms of themselves.
--->
-
-  <type name="Type" open="true" uri="commonj.sdo">
-	  <property name="baseType" type="#Type" many="true"/>
-	  <property name="property" type="#Property" containment="true" many="true"/>
-	  <property name="aliasName" type="#String" many="true"/>
-    <property name="name" type="#String"/>
-    <property name="uri" type="#String"/>
-	  <property name="dataType" type="#Boolean"/>
-	  <property name="open" type="#Boolean"/>
-	  <property name="sequenced" type="#Boolean"/>
-	  <property name="abstract" type="#Boolean"/>
-  </type>
-  
-  <type name="Property" open="true" uri="commonj.sdo">
-	  <property name="aliasName" type="#String" many="true"/>
-	  <property name="name" type="#String"/>
-	  <property name="many" type="#Boolean"/>
-	  <property name="containment" type="#Boolean"/>
-	  <property name="type" type="#Type" />
-	  <property name="default" type="#String"/>
-	  <property name="readOnly" type="#Boolean"/>
-	  <property name="opposite" type="#Property"/>
-	  <property name="nullable" type="#Boolean"/>
-  </type>
-
-<!-- SDO special types -->
-
-  <type name="DataObject" abstract="true" sdoJava:instanceClass="commonj.sdo.DataObject" uri="commonj.sdo"/>
-  <type name="Object" abstract="true" datatype="true" sdoJava:instanceClass="java.lang.Object" uri="commonj.sdo"/>
-  <type name="ChangeSummaryType" abstract="true" datatype="true" sdoJava:instanceClass="commonj.sdo.ChangeSummary" uri="commonj.sdo"/>
-  
-  <!-- TextType deprecated in 2.1.0 -->
-      <type name="TextType" abstract="true">
-        <property name="text" type="#String" many="true"/>
-      </type>
-
-<!-- SDO data types -->
-
-  <type name="Boolean" datatype="true" sdoJava:instanceClass="boolean" uri="commonj.sdo"/>
-  <type name="Byte" datatype="true" sdoJava:instanceClass="byte" uri="commonj.sdo"/>
-  <type name="Bytes" datatype="true" sdoJava:instanceClass="byte[]" uri="commonj.sdo"/>
-  <type name="Character" datatype="true" sdoJava:instanceClass="char" uri="commonj.sdo"/>
-  <type name="Date" datatype="true" sdoJava:instanceClass="java.util.Date" uri="commonj.sdo"/>
-  <type name="DateTime" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
-  <type name="Day" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
-  <type name="Decimal" datatype="true" sdoJava:instanceClass="java.math.BigDecimal" uri="commonj.sdo"/>
-  <type name="Duration" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
-  <type name="Double" datatype="true" sdoJava:instanceClass="double" uri="commonj.sdo"/>
-  <type name="Float" datatype="true" sdoJava:instanceClass="float" uri="commonj.sdo"/>
-  <type name="Int" datatype="true" sdoJava:instanceClass="int" uri="commonj.sdo"/>
-  <type name="Integer" datatype="true" sdoJava:instanceClass="java.math.BigInteger" uri="commonj.sdo"/>
-  <type name="Long" datatype="true" sdoJava:instanceClass="long" uri="commonj.sdo"/>
-  <type name="MonthDay" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
-  <type name="Month" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
-  <type name="Short" datatype="true" sdoJava:instanceClass="short" uri="commonj.sdo"/>
-  <type name="String" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
-  <type name="Strings" datatype="true" sdoJava:instanceClass="java.util.List" uri="commonj.sdo"/>
-  <type name="Time" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
-  <type name="Year" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
-  <type name="YearMonth" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
-  <type name="YearMonthDay" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
-  <type name="URI" datatype="true" sdoJava:instanceClass="java.lang.String" uri="commonj.sdo"/>
-  
-</types>
diff --git a/java/sdo/sdo-api/src/main/resources/xml/sdoModel.xsd b/java/sdo/sdo-api/src/main/resources/xml/sdoModel.xsd
deleted file mode 100644
index c5aabc9cc8..0000000000
--- a/java/sdo/sdo-api/src/main/resources/xml/sdoModel.xsd
+++ /dev/null
@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.1.0
- * Licensed Materials
- *
- * (c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
- * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
- * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
- * 2005, 2006. All rights reserved.
- *
- * </copyright>
- * 
- */
-
--->
-
-<xsd:schema 
-  targetNamespace="commonj.sdo"
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xmlns:sdo="commonj.sdo"
-  xmlns:sdoXML="commonj.sdo/xml"
-  xmlns:sdoJava="commonj.sdo/java"
-  elementFormDefault="qualified"
-  xsi:schemaLocation="commonj.sdo/xml sdoXML.xsd
-                  commonj.sdo/java sdoJava.xsd"> 
-  
-<xsd:include schemaLocation="datagraph.xsd"/>
-  
-<!-- Root element for defining several Types in one document.
-       Is not part of the model.
--->
-<xsd:element name="types" type="sdo:Types"/>
-<xsd:complexType name="Types">
-  <xsd:sequence>
-    <xsd:element name="type" type="sdo:Type" minOccurs="0" maxOccurs="unbounded"/>
-  </xsd:sequence>
-</xsd:complexType>
-
-<!-- Any data object may be serialized with this element,
-      with xsi:type to declare the
-      actual type of the DataObject serialized.
--->      
-<xsd:element name="dataObject" type="xsd:anyType"/>
-
-<!-- Model Types 
-   SDO Type and Property are defined in terms of themselves.
--->
-<xsd:element name="type" type="sdo:Type"/>
-<xsd:complexType name="Type">
-  <xsd:sequence>
-    <xsd:element name="baseType" type="sdo:URI" 
-      minOccurs="0" maxOccurs="unbounded"
-      sdoXML:propertyType="sdo:Type" />
-    <xsd:element name="property" type="sdo:Property" 
-      minOccurs="0" maxOccurs="unbounded" />
-    <xsd:element name="aliasName" type="sdo:String"
-      minOccurs="0" maxOccurs="unbounded" />
-    <xsd:any namespace="##other" processContents="lax" 
-      minOccurs="0" maxOccurs="unbounded" />
-  </xsd:sequence>
-  <xsd:attribute name="name" type="xsd:ID" sdoXML:dataType="sdo:String"/>
-  <xsd:attribute name="uri" type="sdo:URI"/>
-  <xsd:attribute name="dataType" type="sdo:Boolean"/>
-  <xsd:attribute name="open" type="sdo:Boolean"/>
-  <xsd:attribute name="sequenced" type="sdo:Boolean"/>
-  <xsd:attribute name="abstract" type="sdo:Boolean"/>
-  <xsd:anyAttribute namespace="##any" processContents="lax"/>
-</xsd:complexType>
-
-<xsd:complexType name="Property">
-  <xsd:sequence>
-    <xsd:element name="aliasName" type="sdo:String"
-      minOccurs="0" maxOccurs="unbounded" />
-    <xsd:any namespace="##other" processContents="lax" 
-      minOccurs="0" maxOccurs="unbounded" />
-  </xsd:sequence>
-  <xsd:attribute name="name" type="sdo:String"/>
-  <xsd:attribute name="many" type="sdo:Boolean"/>
-  <xsd:attribute name="containment" type="sdo:Boolean"/>
-  <xsd:attribute name="default" type="sdo:String"/>
-  <xsd:attribute name="readOnly" type="sdo:Boolean"/>
-  <xsd:attribute name="type" type="sdo:URI" sdoXML:propertyType="sdo:Type"/>
-  <xsd:attribute name="opposite" type="sdo:URI" sdoXML:propertyType="sdo:Property"/>
-  <xsd:attribute name="nullable" type="sdo:Boolean"/>
-  <xsd:anyAttribute namespace="##any" processContents="lax"/>
-</xsd:complexType>
-
-<!-- Special Types -->
-<xsd:complexType name="DataObject" abstract="true"/>
-
-<!-- TextType deprecated in 2.1.0 -->
-      <xsd:complexType name="TextType" abstract="true">
-        <xsd:sequence>
-          <xsd:element name="text" minOccurs="0" maxOccurs="unbounded" type="xsd:string"/>
-        </xsd:sequence>
-      </xsd:complexType>
-
-<!-- ChangeSummaryType is defined in datagraph.xsd.
-       Although declared there as a ComplexType,
-       at the model level it is treated as a SimpleType
-       with a special XML serialization.
--->
-
-<!-- Data Types -->
-<xsd:simpleType name="Boolean" sdoJava:instanceClass="boolean">
-  <xsd:restriction base="xsd:boolean"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Byte" sdoJava:instanceClass="byte">
-  <xsd:restriction base="xsd:byte"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Bytes" sdoJava:instanceClass="byte[]">
-  <xsd:restriction base="xsd:hexBinary"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Character" sdoJava:instanceClass="char">
-  <xsd:restriction base="xsd:string"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Date" sdoJava:instanceClass="java.util.Date">
-  <xsd:restriction base="xsd:dateTime"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="DateTime" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:dateTime"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Day" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:gDay"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Decimal" sdoJava:instanceClass="java.math.BigDecimal">
-  <xsd:restriction base="xsd:decimal"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Double" sdoJava:instanceClass="double">
-  <xsd:restriction base="xsd:double"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Duration" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:duration"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Float" sdoJava:instanceClass="float">
-  <xsd:restriction base="xsd:float"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Int" sdoJava:instanceClass="int">
-  <xsd:restriction base="xsd:int"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Integer" sdoJava:instanceClass="java.math.BigInteger">
-  <xsd:restriction base="xsd:integer"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Long"  sdoJava:instanceClass="long">
-  <xsd:restriction base="xsd:long"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Month" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:gMonth"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="MonthDay" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:gMonthDay"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Object"  sdoJava:instanceClass="java.lang.Object">
-  <!-- Only the schema for schemas is allowed to restrict anySimpleType.
-         <xsd:restriction base="xsd:anySimpleType"/>
-       The equivalent declaration is a union of the predefined XSD data types.
-  -->
-  <xsd:union memberTypes="xsd:anyURI xsd:base64Binary xsd:boolean xsd:byte
-    xsd:date xsd:dateTime xsd:decimal xsd:double xsd:duration xsd:ENTITIES xsd:ENTITY xsd:float
-    xsd:gDay xsd:gMonth xsd:gMonthDay xsd:gYear xsd:gYearMonth xsd:hexBinary xsd:ID xsd:IDREF xsd:IDREFS
-    xsd:int xsd:integer xsd:language xsd:long xsd:Name xsd:NCName xsd:negativeInteger
-    xsd:NMTOKEN xsd:NMTOKENS xsd:nonNegativeInteger xsd:nonPositiveInteger
-    xsd:normalizedString xsd:NOTATION xsd:positiveInteger xsd:QName xsd:short xsd:string
-    xsd:time xsd:token xsd:unsignedByte xsd:unsignedInt xsd:unsignedLong xsd:unsignedShort"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Short" sdoJava:instanceClass="short">
-  <xsd:restriction base="xsd:short"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="String" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:string"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Strings" sdoJava:instanceClass="java.util.List">
-  <xsd:restriction base="xsd:string"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Time" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:time"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="Year" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:gYear"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="YearMonth" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:gYearMonth"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="YearMonthDay" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:date"/>
-</xsd:simpleType>
-
-<xsd:simpleType name="URI" sdoJava:instanceClass="java.lang.String">
-  <xsd:restriction base="xsd:anyURI"/>
-</xsd:simpleType>
-
-</xsd:schema>
diff --git a/java/sdo/sdo-api/src/main/resources/xml/sdoXML.xml b/java/sdo/sdo-api/src/main/resources/xml/sdoXML.xml
deleted file mode 100644
index f0fbeac49b..0000000000
--- a/java/sdo/sdo-api/src/main/resources/xml/sdoXML.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.1.0
- * Licensed Materials
- *
- * (c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
- * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
- * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
- * 2005, 2006. All rights reserved.
- *
- * </copyright>
- * 
- */
--->
-
-<types xmlns="commonj.sdo"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-  xmlns:sdoXML="commonj.sdo/xml"
-  xsi:schemaLocation="commonj.sdo sdoModel.xsd commonj.sdo/java sdoJava.xsd commonj.sdo/xml sdoXML.xsd">
-
-<!--
-   Global properties used in open content for 
-   the XML binding of SDO Types and Properties.
--->
-
-  <type uri="commonj.sdo/xml">
-    <property name="xmlElement" type="commonj.sdo#Boolean"/>
-  </type>
-
-  <!-- XMLInfo deprecated in 2.1.0 -->
-  <type name="XMLInfo" uri="commonj.sdo/xml">
-    <property name="xmlElement" type="commonj.sdo#Boolean"/>
-  </type>
-
-</types>
diff --git a/java/sdo/sdo-api/src/main/resources/xml/sdoXML.xsd b/java/sdo/sdo-api/src/main/resources/xml/sdoXML.xsd
deleted file mode 100644
index 39dd3840ec..0000000000
--- a/java/sdo/sdo-api/src/main/resources/xml/sdoXML.xsd
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-/**
- * <copyright>
- *
- * Service Data Objects
- * Version 2.1.0
- * Licensed Materials
- *
- * (c) Copyright BEA Systems, Inc., International Business Machines Corporation, 
- * Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
- * Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
- * 2005, 2006. All rights reserved.
- *
- * </copyright>
- * 
- */
--->
-
-<xsd:schema
-    targetNamespace="commonj.sdo/xml"
-    xmlns:sdo="commonj.sdo"
-    xmlns:sdoXML="commonj.sdo/xml"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-<xsd:import namespace="commonj.sdo" schemaLocation="sdoModel.xsd"/>
-
-
-<!--
-   These attributes are used to customize the XSD mapping of SDO Types and Properties.
--->
-
-<xsd:attribute name="name" type="xsd:string" />
-<xsd:attribute name="propertyType" type="xsd:QName" />
-<xsd:attribute name="oppositeProperty" type="xsd:string" />
-<xsd:attribute name="sequence" type="xsd:boolean" />
-<xsd:attribute name="string" type="xsd:boolean" />
-<xsd:attribute name="dataType" type="xsd:QName" />
-<xsd:attribute name="aliasName" type="xsd:string" />
-<xsd:attribute name="readOnly" type="xsd:boolean" />
-<xsd:attribute name="many" type="xsd:boolean" />
-
-<!--
-   Global properties used in open content for 
-   the XML binding of SDO Types and Properties.
--->
-
-<xsd:attribute name="xmlElement" type="sdo:Boolean"/>
-
-<!-- XMLInfo deprecated in 2.1.0 -->
-<xsd:complexType name="XMLInfo">
-  <xsd:attribute name="xmlElement" type="sdo:Boolean"/>
-</xsd:complexType>
-
-</xsd:schema>