You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2008/01/27 13:35:32 UTC

svn commit: r615588 - in /incubator/tuscany/branches/sca-java-1.1: distribution/src/main/release/bin/ distribution/src/main/release/src/ modules/assembly-xsd/ modules/binding-jsonrpc/ modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/bin...

Author: slaws
Date: Sun Jan 27 04:35:30 2008
New Revision: 615588

URL: http://svn.apache.org/viewvc?rev=615588&view=rev
Log:
Fix notices/licenses for SCA/SDO, ipo.xsd and jsonrpc.js

Modified:
    incubator/tuscany/branches/sca-java-1.1/distribution/src/main/release/bin/LICENSE
    incubator/tuscany/branches/sca-java-1.1/distribution/src/main/release/bin/NOTICE
    incubator/tuscany/branches/sca-java-1.1/distribution/src/main/release/src/LICENSE
    incubator/tuscany/branches/sca-java-1.1/distribution/src/main/release/src/NOTICE
    incubator/tuscany/branches/sca-java-1.1/modules/assembly-xsd/NOTICE
    incubator/tuscany/branches/sca-java-1.1/modules/binding-jsonrpc/NOTICE
    incubator/tuscany/branches/sca-java-1.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
    incubator/tuscany/branches/sca-java-1.1/modules/databinding-axiom/src/test/resources/ipo.xsd
    incubator/tuscany/branches/sca-java-1.1/modules/databinding-jaxb/src/test/resources/ipo.xsd
    incubator/tuscany/branches/sca-java-1.1/modules/databinding-json/src/test/resources/ipo.xsd
    incubator/tuscany/branches/sca-java-1.1/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
    incubator/tuscany/branches/sca-java-1.1/modules/databinding-sdo/src/test/resources/ipo.xsd
    incubator/tuscany/branches/sca-java-1.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
    incubator/tuscany/branches/sca-java-1.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
    incubator/tuscany/branches/sca-java-1.1/modules/domain-impl/NOTICE
    incubator/tuscany/branches/sca-java-1.1/modules/implementation-widget/NOTICE
    incubator/tuscany/branches/sca-java-1.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd

Modified: incubator/tuscany/branches/sca-java-1.1/distribution/src/main/release/bin/LICENSE
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/distribution/src/main/release/bin/LICENSE?rev=615588&r1=615587&r2=615588&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/distribution/src/main/release/bin/LICENSE (original)
+++ incubator/tuscany/branches/sca-java-1.1/distribution/src/main/release/bin/LICENSE Sun Jan 27 04:35:30 2008
@@ -2170,7 +2170,7 @@
 
 ================================================================================
 
-The jar tuscany-assembly-xsd-1.1-incubating.jar includes XSD files under the following SCA Collaboration license:
+The jar tuscany-assembly-xsd-1.1-incubating.jar includes XSD files under the following license:
 
 License for the Service Component Architecture JavaDoc, Interface 
 Definition files and XSD files.

Modified: incubator/tuscany/branches/sca-java-1.1/distribution/src/main/release/bin/NOTICE
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/distribution/src/main/release/bin/NOTICE?rev=615588&r1=615587&r2=615588&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/distribution/src/main/release/bin/NOTICE (original)
+++ incubator/tuscany/branches/sca-java-1.1/distribution/src/main/release/bin/NOTICE Sun Jan 27 04:35:30 2008
@@ -82,9 +82,8 @@
    Copyright (c) 2006, Sun Microsystems, Inc.
    All rights reserved.
 
-This product also includes software under the OSOA license 
-(see the LICENSE file contained in this distribution), with
-the following copyright:
+This product also includes software under the Service Component Architecture JavaDoc, 
+Interface Definition files and XSD files license, with the following copyright:
 
 (c) Copyright SCA Collaboration 2006, 2007
 
@@ -95,6 +94,12 @@
 Oracle Corporation, Primeton Technologies Ltd., Rogue Wave Software, SAP AG., 
 Software AG., Sun Microsystems, Sybase Inc., Xcalia, Zend Technologies, 
 2005, 2006. All rights reserved.
+
+This product includes software under the Apache License Version 2.0
+with the following copyright:
+
+Copyright (c) 2003-2004 Jan-Klaas Kollhof
+Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
 
 Please see the LICENSE file present in the root directory of this
 distribution.

Modified: incubator/tuscany/branches/sca-java-1.1/distribution/src/main/release/src/LICENSE
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/distribution/src/main/release/src/LICENSE?rev=615588&r1=615587&r2=615588&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/distribution/src/main/release/src/LICENSE (original)
+++ incubator/tuscany/branches/sca-java-1.1/distribution/src/main/release/src/LICENSE Sun Jan 27 04:35:30 2008
@@ -214,37 +214,50 @@
 
 ===============================================================================================================
 
-The module itest/databindings/common includes the test schema; datagraph.xsd, sdoJava.xsd, and sdoModel.xsd
+The 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 and Interface Definition files. (sdo-api-r2.0.1-1.0-incubator-M2.jar)
+License for the Service Data Objects JavaDoc, Interface Definition files
+and XSD files.
 
-Permission to copy, make derivative works of, and distribute the Service Data Objects 
-JavaDoc and Interface Definition Files files in any medium without fee or royalty as part 
-of a compliant implementation of the Service Data Objects Specification is hereby granted.  
-The Service Data Objects Specification may be found at any of the following locations:
-
-http://dev2dev.bea.com/technologies/commonj/index.jsp
-http://www.ibm.com/developerworks/library/specification/ws-sdo/
-http://oracle.com/technology/webservices/sca
-https://www.sdn.sap.com/
-http://www.xcalia/xdn/specs/sdo
-
-THE SERVICE DATA OBJECTS SPECIFICATION AND THE JAVADOC AND INTERFACE DEFINITION FILES 
-ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS 
-SPECIFICATION OR THE JAVADOC AND INTERFACE DEFINITION FILES 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 
-SERVICE DATA OBJECTS SPECIFICATION OR THE JAVADOC OR INTERFACE DEFINTION FILES.
-
-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 Data Objects Specification and the 
-JavaDoc and Interface Definition Files will at all times remain with the Authors.
+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:
@@ -284,7 +297,7 @@
 
 =================================================================================================================
 
-The module assembly-xsd includes XSD files under the following SCA Collaboration license:
+The module assembly-xsd includes XSD files under the following license:
 
 License for the Service Component Architecture JavaDoc, Interface 
 Definition files and XSD files.
@@ -328,3 +341,57 @@
 Revision level 1.1, last updated on 2007/11/19
 
 =================================================================================================================
+The modules 
+
+binding-ws-xml
+databinding
+databinding-axiom
+databinding-jaxb
+databinding-json
+databinding-sdo
+databinding-sdo-axiom
+databinding-xmlbeans
+interface-wsdl-xml
+
+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 include under the following license:
+
+W3C(c) SOFTWARE NOTICE AND LICENSE
+http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+This work (and included software, documentation such as READMEs, or other 
+related items) is being provided by the copyright holders under the following 
+license. By obtaining, using and/or copying this work, you (the licensee) agree 
+that you have read, understood, and will comply with the following terms and conditions.
+
+Permission to copy, modify, and distribute this software and its documentation, 
+with or without modification, for any purpose and without fee or royalty is 
+hereby granted, provided that you include the following on ALL copies of the 
+software and documentation or portions thereof, including modifications:
+
+   1. The full text of this NOTICE in a location viewable to users of the 
+      redistributed or derivative work.
+   2. Any pre-existing intellectual property disclaimers, notices, or terms 
+      and conditions. If none exist, the W3C Software Short Notice should be 
+      included (hypertext is preferred, text is permitted) within the body of 
+      any redistributed or derivative code.
+   3. Notice of any changes or modifications to the files, including the date 
+      changes were made. (We recommend you provide URIs to the location from which 
+      the code is derived.)
+
+THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE 
+NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE 
+USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, 
+COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+
+COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR 
+CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+
+The name and trademarks of copyright holders may NOT be used in advertising or 
+publicity pertaining to the software without specific, written prior permission. 
+Title to copyright in this software and any associated documentation will at all 
+times remain with copyright holders.

Modified: incubator/tuscany/branches/sca-java-1.1/distribution/src/main/release/src/NOTICE
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/distribution/src/main/release/src/NOTICE?rev=615588&r1=615587&r2=615588&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/distribution/src/main/release/src/NOTICE (original)
+++ incubator/tuscany/branches/sca-java-1.1/distribution/src/main/release/src/NOTICE Sun Jan 27 04:35:30 2008
@@ -15,19 +15,46 @@
 A copy of the AL is provided with this distribution as the LICENSE file present in the
 root directory, and is also available at http://www.apache.org/licenses/.
 
-This product also includes software under the BSD license 
+This product includes software under the BSD license 
 (see the LICENSE file contained in this distribution), with
 the following copyright:
 
    Copyright (c) 2006, Sun Microsystems, Inc.
    All rights reserved.
 
-This product also includes software under the OSOA license 
-(see the LICENSE file contained in this distribution), with
-the following copyright:
+This product includes software under the Service Component Architecture JavaDoc, 
+Interface Definition files and XSD files license, with the following copyright:
+
+(c) Copyright SCA Collaboration 2006, 2007
+
+This product includes software under the Service Data Objects JavaDoc and 
+Interface Definition file license
+
+(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.
+
+This product includes software under the Apache License Version 2.0
+with the following copyright:
+
+Copyright (c) 2003-2004 Jan-Klaas Kollhof
+Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
+
+This product includes software under the W3C(c) Software License
+with the following copyright:
+    
+Copyright (c) 2008 World Wide Web Consortium, (Massachusetts Institute of Technology, 
+European Research Consortium for Informatics and Mathematics, Keio University). 
+All Rights Reserved. This work is distributed under the W3C(c) Software License [1] in 
+the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied 
+warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+[1] http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+
+Please see the LICENSE file present in the root directory of this
+distribution.
+
+
 
-   (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.
 

Modified: incubator/tuscany/branches/sca-java-1.1/modules/assembly-xsd/NOTICE
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/assembly-xsd/NOTICE?rev=615588&r1=615587&r2=615588&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/modules/assembly-xsd/NOTICE (original)
+++ incubator/tuscany/branches/sca-java-1.1/modules/assembly-xsd/NOTICE Sun Jan 27 04:35:30 2008
@@ -4,9 +4,9 @@
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
-This product also includes software under the SCA Collaboration license 
-(see the LICENSE file contained in this distribution), with the following
-copyright:
+This product also includes software under the Service Component Architecture 
+JavaDoc, Interface Definition files and XSD files license (see the LICENSE 
+file contained in this distribution), with the following copyright:
 
 (c) Copyright SCA Collaboration 2006, 2007
 

Modified: incubator/tuscany/branches/sca-java-1.1/modules/binding-jsonrpc/NOTICE
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/binding-jsonrpc/NOTICE?rev=615588&r1=615587&r2=615588&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/modules/binding-jsonrpc/NOTICE (original)
+++ incubator/tuscany/branches/sca-java-1.1/modules/binding-jsonrpc/NOTICE Sun Jan 27 04:35:30 2008
@@ -4,3 +4,9 @@
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
+This product includes software under the Apache License Version 2.0
+with the following copyright:
+
+Copyright (c) 2003-2004 Jan-Klaas Kollhof
+Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
+

Modified: incubator/tuscany/branches/sca-java-1.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd?rev=615588&r1=615587&r2=615588&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd (original)
+++ incubator/tuscany/branches/sca-java-1.1/modules/binding-ws-xml/src/test/resources/org/apache/tuscany/sca/binding/ws/xml/ipo.xsd Sun Jan 27 04:35:30 2008
@@ -1,20 +1,47 @@
 <!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * W3C(c) SOFTWARE NOTICE AND LICENSE
+ * http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ * 
+ * This work (and included software, documentation such as READMEs, or other 
+ * related items) is being provided by the copyright holders under the following 
+ * license. By obtaining, using and/or copying this work, you (the licensee) agree 
+ * that you have read, understood, and will comply with the following terms and conditions.
+ * 
+ * Permission to copy, modify, and distribute this software and its documentation, 
+ * with or without modification, for any purpose and without fee or royalty is 
+ * hereby granted, provided that you include the following on ALL copies of the 
+ * software and documentation or portions thereof, including modifications:
+ * 
+ *    1. The full text of this NOTICE in a location viewable to users of the 
+ *       redistributed or derivative work.
+ *    2. Any pre-existing intellectual property disclaimers, notices, or terms 
+ *       and conditions. If none exist, the W3C Software Short Notice should be 
+ *       included (hypertext is preferred, text is permitted) within the body of 
+ *       any redistributed or derivative code.
+ *    3. Notice of any changes or modifications to the files, including the date 
+ *       changes were made. (We recommend you provide URIs to the location from which 
+ *       the code is derived.)
+ * 
+ * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE 
+ * NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
+ * WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE 
+ * USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, 
+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+ * 
+ * COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR 
+ * CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+ * 
+ * The name and trademarks of copyright holders may NOT be used in advertising or 
+ * publicity pertaining to the software without specific, written prior permission. 
+ * Title to copyright in this software and any associated documentation will at all 
+ * times remain with copyright holders.   
+-->
+
+<!--
+ * Modifications for Apache Tuscany:
+ * - This file combines the ipo.xsd and address.xsd information 
+ *   from the XML Schema Primer (http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) 
+ *   and extends the structures with UK postcode structures.
 -->
 <schema targetNamespace="http://www.example.com/IPO"
 	xmlns="http://www.w3.org/2001/XMLSchema"

Modified: incubator/tuscany/branches/sca-java-1.1/modules/databinding-axiom/src/test/resources/ipo.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/databinding-axiom/src/test/resources/ipo.xsd?rev=615588&r1=615587&r2=615588&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/modules/databinding-axiom/src/test/resources/ipo.xsd (original)
+++ incubator/tuscany/branches/sca-java-1.1/modules/databinding-axiom/src/test/resources/ipo.xsd Sun Jan 27 04:35:30 2008
@@ -1,22 +1,48 @@
 <!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * W3C(c) SOFTWARE NOTICE AND LICENSE
+ * http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ * 
+ * This work (and included software, documentation such as READMEs, or other 
+ * related items) is being provided by the copyright holders under the following 
+ * license. By obtaining, using and/or copying this work, you (the licensee) agree 
+ * that you have read, understood, and will comply with the following terms and conditions.
+ * 
+ * Permission to copy, modify, and distribute this software and its documentation, 
+ * with or without modification, for any purpose and without fee or royalty is 
+ * hereby granted, provided that you include the following on ALL copies of the 
+ * software and documentation or portions thereof, including modifications:
+ * 
+ *    1. The full text of this NOTICE in a location viewable to users of the 
+ *       redistributed or derivative work.
+ *    2. Any pre-existing intellectual property disclaimers, notices, or terms 
+ *       and conditions. If none exist, the W3C Software Short Notice should be 
+ *       included (hypertext is preferred, text is permitted) within the body of 
+ *       any redistributed or derivative code.
+ *    3. Notice of any changes or modifications to the files, including the date 
+ *       changes were made. (We recommend you provide URIs to the location from which 
+ *       the code is derived.)
+ * 
+ * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE 
+ * NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
+ * WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE 
+ * USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, 
+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+ * 
+ * COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR 
+ * CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+ * 
+ * The name and trademarks of copyright holders may NOT be used in advertising or 
+ * publicity pertaining to the software without specific, written prior permission. 
+ * Title to copyright in this software and any associated documentation will at all 
+ * times remain with copyright holders.   
 -->
 
+<!--
+ * Modifications for Apache Tuscany:
+ * - This file combines the ipo.xsd and address.xsd information 
+ *   from the XML Schema Primer (http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) 
+ *   and extends the structures with UK postcode structures.
+-->
 <schema targetNamespace="http://www.example.com/IPO"
 	xmlns="http://www.w3.org/2001/XMLSchema"
 	xmlns:ipo="http://www.example.com/IPO">

Modified: incubator/tuscany/branches/sca-java-1.1/modules/databinding-jaxb/src/test/resources/ipo.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/databinding-jaxb/src/test/resources/ipo.xsd?rev=615588&r1=615587&r2=615588&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/modules/databinding-jaxb/src/test/resources/ipo.xsd (original)
+++ incubator/tuscany/branches/sca-java-1.1/modules/databinding-jaxb/src/test/resources/ipo.xsd Sun Jan 27 04:35:30 2008
@@ -1,20 +1,47 @@
 <!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * W3C(c) SOFTWARE NOTICE AND LICENSE
+ * http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ * 
+ * This work (and included software, documentation such as READMEs, or other 
+ * related items) is being provided by the copyright holders under the following 
+ * license. By obtaining, using and/or copying this work, you (the licensee) agree 
+ * that you have read, understood, and will comply with the following terms and conditions.
+ * 
+ * Permission to copy, modify, and distribute this software and its documentation, 
+ * with or without modification, for any purpose and without fee or royalty is 
+ * hereby granted, provided that you include the following on ALL copies of the 
+ * software and documentation or portions thereof, including modifications:
+ * 
+ *    1. The full text of this NOTICE in a location viewable to users of the 
+ *       redistributed or derivative work.
+ *    2. Any pre-existing intellectual property disclaimers, notices, or terms 
+ *       and conditions. If none exist, the W3C Software Short Notice should be 
+ *       included (hypertext is preferred, text is permitted) within the body of 
+ *       any redistributed or derivative code.
+ *    3. Notice of any changes or modifications to the files, including the date 
+ *       changes were made. (We recommend you provide URIs to the location from which 
+ *       the code is derived.)
+ * 
+ * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE 
+ * NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
+ * WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE 
+ * USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, 
+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+ * 
+ * COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR 
+ * CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+ * 
+ * The name and trademarks of copyright holders may NOT be used in advertising or 
+ * publicity pertaining to the software without specific, written prior permission. 
+ * Title to copyright in this software and any associated documentation will at all 
+ * times remain with copyright holders.   
+-->
+
+<!--
+ * Modifications for Apache Tuscany:
+ * - This file combines the ipo.xsd and address.xsd information 
+ *   from the XML Schema Primer (http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) 
+ *   and extends the structures with UK postcode structures.
 -->
 <schema targetNamespace="http://www.example.com/IPO"
 	xmlns="http://www.w3.org/2001/XMLSchema"

Modified: incubator/tuscany/branches/sca-java-1.1/modules/databinding-json/src/test/resources/ipo.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/databinding-json/src/test/resources/ipo.xsd?rev=615588&r1=615587&r2=615588&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/modules/databinding-json/src/test/resources/ipo.xsd (original)
+++ incubator/tuscany/branches/sca-java-1.1/modules/databinding-json/src/test/resources/ipo.xsd Sun Jan 27 04:35:30 2008
@@ -1,20 +1,47 @@
 <!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
+ * W3C(c) SOFTWARE NOTICE AND LICENSE
+ * http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ * 
+ * This work (and included software, documentation such as READMEs, or other 
+ * related items) is being provided by the copyright holders under the following 
+ * license. By obtaining, using and/or copying this work, you (the licensee) agree 
+ * that you have read, understood, and will comply with the following terms and conditions.
+ * 
+ * Permission to copy, modify, and distribute this software and its documentation, 
+ * with or without modification, for any purpose and without fee or royalty is 
+ * hereby granted, provided that you include the following on ALL copies of the 
+ * software and documentation or portions thereof, including modifications:
+ * 
+ *    1. The full text of this NOTICE in a location viewable to users of the 
+ *       redistributed or derivative work.
+ *    2. Any pre-existing intellectual property disclaimers, notices, or terms 
+ *       and conditions. If none exist, the W3C Software Short Notice should be 
+ *       included (hypertext is preferred, text is permitted) within the body of 
+ *       any redistributed or derivative code.
+ *    3. Notice of any changes or modifications to the files, including the date 
+ *       changes were made. (We recommend you provide URIs to the location from which 
+ *       the code is derived.)
+ * 
+ * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE 
+ * NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
+ * WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE 
+ * USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, 
+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+ * 
+ * COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR 
+ * CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+ * 
+ * The name and trademarks of copyright holders may NOT be used in advertising or 
+ * publicity pertaining to the software without specific, written prior permission. 
+ * Title to copyright in this software and any associated documentation will at all 
+ * times remain with copyright holders.   
+-->
+
+<!--
+ * Modifications for Apache Tuscany:
+ * - This file combines the ipo.xsd and address.xsd information 
+ *   from the XML Schema Primer (http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) 
+ *   and extends the structures with UK postcode structures.
 -->
 <schema targetNamespace="http://www.example.com/IPO"
 	xmlns="http://www.w3.org/2001/XMLSchema"

Modified: incubator/tuscany/branches/sca-java-1.1/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd?rev=615588&r1=615587&r2=615588&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd (original)
+++ incubator/tuscany/branches/sca-java-1.1/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd Sun Jan 27 04:35:30 2008
@@ -1,20 +1,47 @@
 <!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * W3C(c) SOFTWARE NOTICE AND LICENSE
+ * http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ * 
+ * This work (and included software, documentation such as READMEs, or other 
+ * related items) is being provided by the copyright holders under the following 
+ * license. By obtaining, using and/or copying this work, you (the licensee) agree 
+ * that you have read, understood, and will comply with the following terms and conditions.
+ * 
+ * Permission to copy, modify, and distribute this software and its documentation, 
+ * with or without modification, for any purpose and without fee or royalty is 
+ * hereby granted, provided that you include the following on ALL copies of the 
+ * software and documentation or portions thereof, including modifications:
+ * 
+ *    1. The full text of this NOTICE in a location viewable to users of the 
+ *       redistributed or derivative work.
+ *    2. Any pre-existing intellectual property disclaimers, notices, or terms 
+ *       and conditions. If none exist, the W3C Software Short Notice should be 
+ *       included (hypertext is preferred, text is permitted) within the body of 
+ *       any redistributed or derivative code.
+ *    3. Notice of any changes or modifications to the files, including the date 
+ *       changes were made. (We recommend you provide URIs to the location from which 
+ *       the code is derived.)
+ * 
+ * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE 
+ * NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
+ * WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE 
+ * USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, 
+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+ * 
+ * COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR 
+ * CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+ * 
+ * The name and trademarks of copyright holders may NOT be used in advertising or 
+ * publicity pertaining to the software without specific, written prior permission. 
+ * Title to copyright in this software and any associated documentation will at all 
+ * times remain with copyright holders.   
+-->
+
+<!--
+ * Modifications for Apache Tuscany:
+ * - This file combines the ipo.xsd and address.xsd information 
+ *   from the XML Schema Primer (http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) 
+ *   and extends the structures with UK postcode structures.
 -->
 <schema targetNamespace="http://www.example.com/IPO"
 	xmlns="http://www.w3.org/2001/XMLSchema"

Modified: incubator/tuscany/branches/sca-java-1.1/modules/databinding-sdo/src/test/resources/ipo.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/databinding-sdo/src/test/resources/ipo.xsd?rev=615588&r1=615587&r2=615588&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/modules/databinding-sdo/src/test/resources/ipo.xsd (original)
+++ incubator/tuscany/branches/sca-java-1.1/modules/databinding-sdo/src/test/resources/ipo.xsd Sun Jan 27 04:35:30 2008
@@ -1,20 +1,47 @@
 <!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * W3C(c) SOFTWARE NOTICE AND LICENSE
+ * http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ * 
+ * This work (and included software, documentation such as READMEs, or other 
+ * related items) is being provided by the copyright holders under the following 
+ * license. By obtaining, using and/or copying this work, you (the licensee) agree 
+ * that you have read, understood, and will comply with the following terms and conditions.
+ * 
+ * Permission to copy, modify, and distribute this software and its documentation, 
+ * with or without modification, for any purpose and without fee or royalty is 
+ * hereby granted, provided that you include the following on ALL copies of the 
+ * software and documentation or portions thereof, including modifications:
+ * 
+ *    1. The full text of this NOTICE in a location viewable to users of the 
+ *       redistributed or derivative work.
+ *    2. Any pre-existing intellectual property disclaimers, notices, or terms 
+ *       and conditions. If none exist, the W3C Software Short Notice should be 
+ *       included (hypertext is preferred, text is permitted) within the body of 
+ *       any redistributed or derivative code.
+ *    3. Notice of any changes or modifications to the files, including the date 
+ *       changes were made. (We recommend you provide URIs to the location from which 
+ *       the code is derived.)
+ * 
+ * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE 
+ * NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
+ * WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE 
+ * USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, 
+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+ * 
+ * COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR 
+ * CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+ * 
+ * The name and trademarks of copyright holders may NOT be used in advertising or 
+ * publicity pertaining to the software without specific, written prior permission. 
+ * Title to copyright in this software and any associated documentation will at all 
+ * times remain with copyright holders.   
+-->
+
+<!--
+ * Modifications for Apache Tuscany:
+ * - This file combines the ipo.xsd and address.xsd information 
+ *   from the XML Schema Primer (http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) 
+ *   and extends the structures with UK postcode structures.
 -->
 <schema targetNamespace="http://www.example.com/IPO"
 	xmlns="http://www.w3.org/2001/XMLSchema"

Modified: incubator/tuscany/branches/sca-java-1.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsd?rev=615588&r1=615587&r2=615588&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsd (original)
+++ incubator/tuscany/branches/sca-java-1.1/modules/databinding-xmlbeans/src/test/resources/ipo.xsd Sun Jan 27 04:35:30 2008
@@ -1,20 +1,47 @@
 <!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
+ * W3C(c) SOFTWARE NOTICE AND LICENSE
+ * http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ * 
+ * This work (and included software, documentation such as READMEs, or other 
+ * related items) is being provided by the copyright holders under the following 
+ * license. By obtaining, using and/or copying this work, you (the licensee) agree 
+ * that you have read, understood, and will comply with the following terms and conditions.
+ * 
+ * Permission to copy, modify, and distribute this software and its documentation, 
+ * with or without modification, for any purpose and without fee or royalty is 
+ * hereby granted, provided that you include the following on ALL copies of the 
+ * software and documentation or portions thereof, including modifications:
+ * 
+ *    1. The full text of this NOTICE in a location viewable to users of the 
+ *       redistributed or derivative work.
+ *    2. Any pre-existing intellectual property disclaimers, notices, or terms 
+ *       and conditions. If none exist, the W3C Software Short Notice should be 
+ *       included (hypertext is preferred, text is permitted) within the body of 
+ *       any redistributed or derivative code.
+ *    3. Notice of any changes or modifications to the files, including the date 
+ *       changes were made. (We recommend you provide URIs to the location from which 
+ *       the code is derived.)
+ * 
+ * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE 
+ * NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
+ * WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE 
+ * USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, 
+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+ * 
+ * COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR 
+ * CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+ * 
+ * The name and trademarks of copyright holders may NOT be used in advertising or 
+ * publicity pertaining to the software without specific, written prior permission. 
+ * Title to copyright in this software and any associated documentation will at all 
+ * times remain with copyright holders.   
+-->
+
+<!--
+ * Modifications for Apache Tuscany:
+ * - This file combines the ipo.xsd and address.xsd information 
+ *   from the XML Schema Primer (http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) 
+ *   and extends the structures with UK postcode structures.
 -->
 <schema targetNamespace="http://www.example.com/IPO"
 	xmlns="http://www.w3.org/2001/XMLSchema"

Modified: incubator/tuscany/branches/sca-java-1.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd?rev=615588&r1=615587&r2=615588&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd (original)
+++ incubator/tuscany/branches/sca-java-1.1/modules/databinding/src/test/resources/org/apache/tuscany/sca/databinding/impl/ipo.xsd Sun Jan 27 04:35:30 2008
@@ -1,20 +1,47 @@
 <!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * W3C(c) SOFTWARE NOTICE AND LICENSE
+ * http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ * 
+ * This work (and included software, documentation such as READMEs, or other 
+ * related items) is being provided by the copyright holders under the following 
+ * license. By obtaining, using and/or copying this work, you (the licensee) agree 
+ * that you have read, understood, and will comply with the following terms and conditions.
+ * 
+ * Permission to copy, modify, and distribute this software and its documentation, 
+ * with or without modification, for any purpose and without fee or royalty is 
+ * hereby granted, provided that you include the following on ALL copies of the 
+ * software and documentation or portions thereof, including modifications:
+ * 
+ *    1. The full text of this NOTICE in a location viewable to users of the 
+ *       redistributed or derivative work.
+ *    2. Any pre-existing intellectual property disclaimers, notices, or terms 
+ *       and conditions. If none exist, the W3C Software Short Notice should be 
+ *       included (hypertext is preferred, text is permitted) within the body of 
+ *       any redistributed or derivative code.
+ *    3. Notice of any changes or modifications to the files, including the date 
+ *       changes were made. (We recommend you provide URIs to the location from which 
+ *       the code is derived.)
+ * 
+ * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE 
+ * NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
+ * WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE 
+ * USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, 
+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+ * 
+ * COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR 
+ * CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+ * 
+ * The name and trademarks of copyright holders may NOT be used in advertising or 
+ * publicity pertaining to the software without specific, written prior permission. 
+ * Title to copyright in this software and any associated documentation will at all 
+ * times remain with copyright holders.   
+-->
+
+<!--
+ * Modifications for Apache Tuscany:
+ * - This file combines the ipo.xsd and address.xsd information 
+ *   from the XML Schema Primer (http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) 
+ *   and extends the structures with UK postcode structures.
 -->
 <schema targetNamespace="http://www.example.com/IPO"
 	xmlns="http://www.w3.org/2001/XMLSchema"

Modified: incubator/tuscany/branches/sca-java-1.1/modules/domain-impl/NOTICE
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/domain-impl/NOTICE?rev=615588&r1=615587&r2=615588&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/modules/domain-impl/NOTICE (original)
+++ incubator/tuscany/branches/sca-java-1.1/modules/domain-impl/NOTICE Sun Jan 27 04:35:30 2008
@@ -4,3 +4,9 @@
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
+This product includes software under the Apache License Version 2.0
+with the following copyright:
+
+Copyright (c) 2003-2004 Jan-Klaas Kollhof
+Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
+

Modified: incubator/tuscany/branches/sca-java-1.1/modules/implementation-widget/NOTICE
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/implementation-widget/NOTICE?rev=615588&r1=615587&r2=615588&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/modules/implementation-widget/NOTICE (original)
+++ incubator/tuscany/branches/sca-java-1.1/modules/implementation-widget/NOTICE Sun Jan 27 04:35:30 2008
@@ -4,3 +4,9 @@
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
+This product includes software under the Apache License Version 2.0
+with the following copyright:
+
+Copyright (c) 2003-2004 Jan-Klaas Kollhof
+Copyright (c) 2005 Michael Clark, Metaparadigm Pte Ltd
+

Modified: incubator/tuscany/branches/sca-java-1.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd?rev=615588&r1=615587&r2=615588&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd (original)
+++ incubator/tuscany/branches/sca-java-1.1/modules/interface-wsdl-xml/src/test/resources/org/apache/tuscany/sca/interfacedef/wsdl/xml/ipo.xsd Sun Jan 27 04:35:30 2008
@@ -1,20 +1,47 @@
 <!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
+ * W3C(c) SOFTWARE NOTICE AND LICENSE
+ * http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
+ * 
+ * This work (and included software, documentation such as READMEs, or other 
+ * related items) is being provided by the copyright holders under the following 
+ * license. By obtaining, using and/or copying this work, you (the licensee) agree 
+ * that you have read, understood, and will comply with the following terms and conditions.
+ * 
+ * Permission to copy, modify, and distribute this software and its documentation, 
+ * with or without modification, for any purpose and without fee or royalty is 
+ * hereby granted, provided that you include the following on ALL copies of the 
+ * software and documentation or portions thereof, including modifications:
+ * 
+ *    1. The full text of this NOTICE in a location viewable to users of the 
+ *       redistributed or derivative work.
+ *    2. Any pre-existing intellectual property disclaimers, notices, or terms 
+ *       and conditions. If none exist, the W3C Software Short Notice should be 
+ *       included (hypertext is preferred, text is permitted) within the body of 
+ *       any redistributed or derivative code.
+ *    3. Notice of any changes or modifications to the files, including the date 
+ *       changes were made. (We recommend you provide URIs to the location from which 
+ *       the code is derived.)
+ * 
+ * THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE 
+ * NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, 
+ * WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE 
+ * USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, 
+ * COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
+ * 
+ * COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR 
+ * CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
+ * 
+ * The name and trademarks of copyright holders may NOT be used in advertising or 
+ * publicity pertaining to the software without specific, written prior permission. 
+ * Title to copyright in this software and any associated documentation will at all 
+ * times remain with copyright holders.   
+-->
+
+<!--
+ * Modifications for Apache Tuscany:
+ * - This file combines the ipo.xsd and address.xsd information 
+ *   from the XML Schema Primer (http://www.w3.org/TR/2004/PER-xmlschema-0-20040318/) 
+ *   and extends the structures with UK postcode structures.
 -->
 <schema targetNamespace="http://www.example.com/IPO"
 	xmlns="http://www.w3.org/2001/XMLSchema"



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org