making equivalent rearrangements in trunk as those that were done in the 1.1 branch in commit 640209

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

7 files changed, 0 insertions, 466 deletions

diff --git a/java/sdo/distribution/src/main/release/DISCLAIMER b/java/sdo/distribution/src/main/release/DISCLAIMER
deleted file mode 100644
index a65af91c5a..0000000000
--- a/java/sdo/distribution/src/main/release/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/distribution/src/main/release/README b/java/sdo/distribution/src/main/release/README
deleted file mode 100644
index fedf7bb130..0000000000
--- a/java/sdo/distribution/src/main/release/README
+++ /dev/null
@@ -1,23 +0,0 @@
-Tuscany SDO for {$sdo.version} Binary Distribution Readme File
-
-Legal Notices
-
-See the LICENSE and NOTICE files for legal information concerning this distribution. 
-
-Release Information
-
-See the RELEASE_NOTES file for a summary of what's new with this release since the M2 release.
-
-Documentation
-
-For general documentation about the Tuscany project and the SDO for Java, see the Tuscany website
-http://incubator.apache.org/tuscany
-
-This distribution contains javadoc for the SDO 2.1 API, the Tuscany SDO API,  and the Tuscany SDO samples.
-
-Samples
-
-Sample source code is included with this binary distribution. 
-
-
-
diff --git a/java/sdo/distribution/src/main/release/RELEASE_NOTES b/java/sdo/distribution/src/main/release/RELEASE_NOTES
deleted file mode 100644
index aaeb03fb55..0000000000
--- a/java/sdo/distribution/src/main/release/RELEASE_NOTES
+++ /dev/null
@@ -1,95 +0,0 @@
-What's New in SDO Java ${sdo.version}

-

-Apache Tuscany's SDO Java Release ${sdo.version} is the first such release

-with full coverage of the SDO 2.1 specification.

-

-In addition to adding the few remaining SDO 2.1 features not included in the

-${sdo.previousversion} release and fixing a number of bugs (see below for detail)

-there are a number of new features relating to XML serialization, and new

-support for handling dynamic derivation from static classes.

-

-For previous revision history, take a look at

-http://svn.apache.org/viewvc/incubator/tuscany/tags/java/sdo/${sdo.previousversion}/sdo/distribution/RELEASE_NOTES.txt

-

-SDO Java ${sdo.version} is a superset of previous SDO ${sdo.previousversion} release.

-Anything in ${sdo.previousversion} is also in ${sdo.version}, but ${sdo.version} contains

-features and bugfixes not present in ${sdo.previousversion} release.

-

-Downloading

-===========

-

-Please visit  http://incubator.apache.org/tuscany/sdo-java-releases.html

-

-Binary Artifact Changes

-=======================

-

-PLEASE NOTE that

-Since the 1.0-incubating-beta release the following binary artifacts have been renamed

-

-The maven groupId of the SDO API binary artifact has changed from "commonj" to "org.apache.tuscany.sdo"

-

-The maven artifactId for the SDO API binary artifact has changed from "sdo-api-r2.1" to "tuscany-sdo-api-r2.1"

-

-The jar file containing the SDO API has a new "tuscany-" prefix,  so what was ..

-sdo-api-r2.1-1.0-incubating-beta1.jar in the beta1 release becomes

-tuscany-sdo-api-r2.1-1.0-incubating.jar in this release.

-

-In addition a new maven artifact and jar has appeared.

-

-maven groupId=org.apache.tuscany.sdo

-maven artifactId=tuscany-sdo-lib

-jar archive=tuscany-sdo-lib-${sdo.version}

-

-This artifact provides a cleear distinction between Tuscany SDO implementation,  and the Tuscany

-API which extends the SDO API.  See the javadoc contained in the binary release for details of

-the function provded by this artifact.

-

-

-New Features and Fixes

-======================

-

-For more detail on these fixes and features please see ...

-https://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&&pid=12310210&fixfor=12312521&resolution=1&sorter/field=issuekey&sorter/order=DESC&sorter/field=issuetype&sorter/order=DESC

-

-New Feature

-	TUSCANY-1197	Sequence composition

-	TUSCANY-1212	SDO 2.1 feature: Property.isNullable() and Property.isOpenContent()

-	TUSCANY-1213	SDO 2.1 feature: DataHelper.convert()

-	TUSCANY-1214	SDO 2.1 feature: XMLHelper.load(Source) and XMLHelper.save(Result)

-	TUSCANY-1317	Provide a way to set default XML load options to be used during Java deserialization

-Improvement

-	TUSCANY-513	Implement support for dynamic subclasses of statically generated types

-	TUSCANY-1110	Improve the performance of TypeHelperImpl.getType(Class)

-	TUSCANY-1233	Enhance SDO static codegen (XSD2Java) to support multiple namespaces in a single pass.

-	TUSCANY-1284	Manifest version number in Java SDO Impl and Tools jars

-	TUSCANY-1350	Reorganise SDO build / distribution layout

-	TUSCANY-1391	Provide capability to load and save XML with unknown features

-	TUSCANY-1459	Remove package registry delegation to EPackage.Registry.INSTANCE

-Bug

-	TUSCANY-578	Exceptions thrown by SDO runtime not the same as defined in the spec

-	TUSCANY-993	Problems with sdoModelExtended.xsd

-	TUSCANY-1122	TypeConversionTestCase fails for JDK 1.4.2

-	TUSCANY-1127	ObtainingDataGraphFromXml, and maybe other samples, incorrectly accessing xsd:any content

-	TUSCANY-1143	Generated code should separate metadata creation from registration to permit proper scoping

-	TUSCANY-1207	TCCL-specific EcoreBuilders must be used by default XSDHelper

-	TUSCANY-1223	XSD base64Binary type mapping to wrong SDO type

-	TUSCANY-1250	Static SDO generator generates an erroneous factory class, when inheritance and different Java packages are used

-	TUSCANY-1251	Code generated from xsd:base64Binary types fail to compile

-	TUSCANY-1254	Codegen on a type inheriting from a type in different namespace will result in mis-mapping the feature IDs

-	TUSCANY-1305	Changesummary of datagraph using static interfaces.

-	TUSCANY-1324	DeserializationNoSchemaTestCase took a long time to run

-	TUSCANY-1325	Property value with xsd:QName type is not deserialized and serialized correctly

-	TUSCANY-1333	[Java SDO] ClassCastException when defining schema file without .xsd extension

-	TUSCANY-1352	NPE in SDOXSDEcoreBuilder.XSDSchemaAdapterFactoryImpl.SchemaLocator.locateSchema

-	TUSCANY-1369	EMF 2.2.2 Dependencies from ISU are Stale

-	TUSCANY-1385	Duplicate namespace was serialized when SDO QName property value containing existing namespace

-	TUSCANY-1393	ClassCastException saving codegen-based DataGraph with ChangeSummary containing an xsd:int

-	TUSCANY-1408	Cannot programmatically define a SDO property matching to XSD element

-	TUSCANY-1410	DataHelperImpl.toCalendar() with null locale should use default locale

-	TUSCANY-1421	XMLHelper.save on root object of DataGraph gives serialization of href="root.xml#/"

-	TUSCANY-1428	XSD2JavaGenerator.GeneratePackage information is invalid

-	TUSCANY-1429	Using default helper context got ClassCastException due to T-1317

-	TUSCANY-1430	SDO codegen is needs to use internal property numbers for inverseAdd, inverseRemove, and notify calls

-	TUSCANY-1436	TypeHelper.getType(java.util.List.class) throws ClassCastException

-	TUSCANY-1446	Java SDO samples don't compile with JDK 1.4.2

-	TUSCANY-1457	Unable to code gen SDOModel.xsd

diff --git a/java/sdo/distribution/src/main/release/src/BUILDING b/java/sdo/distribution/src/main/release/src/BUILDING
deleted file mode 100644
index ff5e3a29f9..0000000000
--- a/java/sdo/distribution/src/main/release/src/BUILDING
+++ /dev/null
@@ -1,34 +0,0 @@
-Building the SDO Release from a Source Distribution

-===================================================

-

-

-Note,  these instructions are for building the SDO binary release from

-source, not for establishing a development environment.  If you wish to

-participate in sdo development, follow the instructions at 

-http://incubator.apache.org/tuscany/developing-sdo-java.html

-

-

-Initial Setup

--------------

-

-1) Install J2SE JDK 1.4.2 or above

-2) Install Maven: Download Maven 2.0.7 (download from http://maven.apache.org/download.html) Follow the maven instructions for

-configuring the JAVA_HOME environment variable, and ensuring that the "mvn" command is on your execution PATH.

-

-Building

---------

-

-1) If you have chosen to install a JDK at version 5 then all will be fine,  but there is one value add component in the

-   Tuscany SDO implementation which relies on new JDK 5.0 features.  If you do not wish to use JDK 5 for the following

-   build step, then you will need to do mvn -Pjava_1_4_maven, as this profile option excludes the JDK5 dependent features.

-2) In a command window/shell, change to the top level directory of the Tuscany SDO Java source distribution.

-3) Execute: mvn

-   This will install the sdo implementation and tools jars in your local maven repository

-4) If you wish to rebuild the Tuscany SDO Java binary dstribution change directory to "distribution" and run mvn

-   This will create archives of the binary and source distributions in the target subdirectory of the distribution directory

-

-Note: Depending on the load being experienced by remote Maven 2.0 repositories you may have to execute mvn several

-    times until required dependencies are all located in your local maven repository.  After you have completed a

-    full successful build you can use "mvn -o" which builds without trying to access updated build dependencies (offline mode) and is much faster.

-

-

diff --git a/java/sdo/distribution/src/main/release/src/LICENSE b/java/sdo/distribution/src/main/release/src/LICENSE
deleted file mode 100644
index e05521b589..0000000000
--- a/java/sdo/distribution/src/main/release/src/LICENSE
+++ /dev/null
@@ -1,280 +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.
-
-===============================================================================================================
-
-Apache Tuscany SDO for Java Subcomponents
-=========================================: 
-
-The Tuscany SDO for Java release includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-These files being ...
-commonj/sdo/ChangeSummary.java
-commonj/sdo/DataGraph.java
-commonj/sdo/DataObject.java
-commonj/sdo/helper/CopyHelper.java
-commonj/sdo/helper/DataFactory.java
-commonj/sdo/helper/DataHelper.java
-commonj/sdo/helper/EqualityHelper.java
-commonj/sdo/helper/HelperContext.java
-commonj/sdo/helper/TypeHelper.java
-commonj/sdo/helper/XMLDocument.java
-commonj/sdo/helper/XMLHelper.java
-commonj/sdo/helper/XSDHelper.java
-commonj/sdo/impl/ExternalizableDelegator.java
-commonj/sdo/Property.java
-commonj/sdo/Sequence.java
-commonj/sdo/Type.java
-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/distribution/src/main/release/src/NOTICE b/java/sdo/distribution/src/main/release/src/NOTICE
deleted file mode 100644
index 365ebf1293..0000000000
--- a/java/sdo/distribution/src/main/release/src/NOTICE
+++ /dev/null
@@ -1,11 +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 root directory of this

-distribution.

diff --git a/java/sdo/distribution/src/main/release/src/README b/java/sdo/distribution/src/main/release/src/README
deleted file mode 100644
index a34bf2b1bc..0000000000
--- a/java/sdo/distribution/src/main/release/src/README
+++ /dev/null
@@ -1,16 +0,0 @@
-Tuscany SDO for ${sdo.version} Source Distribution Readme File

-

-See the LICENSE, DISCLAIMER and NOTICE files for legal information concerning this distribution. 

-

-See the RELEASE_NOTES file for a summary of what's new with this release.

-

-See the BUILDING file for instructions on how to build Tuscany SDO Java from this source distribution.

-

-Documentation

-

-For general documentation about the Tuscany project and the SDO for Java, see the Tuscany website

-http://incubator.apache.org/tuscany

-

-

-

-