Remove reference to OSOA license as 2.x has moved to OASIS and fix up some other inaccuracies

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

1 files changed, 5 insertions, 98 deletions

diff --git a/sca-java-2.x/trunk/LICENSE b/sca-java-2.x/trunk/LICENSE
index ddd30126af..e1b908d391 100644
--- a/sca-java-2.x/trunk/LICENSE
+++ b/sca-java-2.x/trunk/LICENSE
@@ -212,52 +212,6 @@ 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.
 
-===============================================================================================================
-
-The module itest/databindings/common includes the test schema; datagraph.xsd, sdoJava.xsd, and sdoModel.xsd
-under the following license:
-
-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
-
 =================================================================================================================
 
 The module implementation-script temporarily includes one file under the following BSD license:
@@ -297,52 +251,7 @@ The module implementation-script temporarily includes one file under the followi
 
 =================================================================================================================
 
-The module assembly-xsd includes XSD files under the following license:
-
-License for the Service Component Architecture JavaDoc, Interface 
-Definition files and XSD files.
-
-The Service Component Architecture 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 Component Architecture 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+Component+Architecture+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 Component 
-Architecture Specification or its contents without specific, written 
-prior permission. Title to copyright in the Service Component 
-Architecture Specification and the JavaDoc, Interface Definition Files 
-and XSD Files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-Revision level 1.1, last updated on 2007/11/19
-
-=================================================================================================================
-
-The modules assembly-xsd and definitions-xml includes XSD and XML files under the following license:
+The module assembly-xsd includes XSD and XML files under the following license:
 
 Copyright OASIS 2005, 2009. All Rights Reserved.
 All capitalized terms in the following text have the meanings assigned to them in the OASIS Intellectual 
@@ -427,25 +336,23 @@ at all times remain with copyright holders.
 
 =================================================================================================================
 
-The module assembly-xsd includes XSD files under the following license:
-
 The modules 
 
-binding-ws-xml
+binding-ws
 databinding
 databinding-axiom
 databinding-jaxb
+databinding-jaxb-axiom
 databinding-json
 databinding-sdo
 databinding-sdo-axiom
-databinding-xmlbeans
-interface-wsdl-xml
+interface-wsdl
 
 Include the ipo.xsd and address.xsd information from the XML Schema Primer 
 (http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) combined into the 
 file ipo.xsd and extended with UK postcode structures.
 
-The ipo.xsd file is also included under the following license:
+The ipo.xsd and address.xml information included under the following license:
 
 W3C(c) SOFTWARE NOTICE AND LICENSE
 http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231