TUSCANY-2626 - Add the wsdlLocation attribute back into the binding.ws schema and add the W3C schema to support it.

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

7 files changed, 152 insertions, 2 deletions

diff --git a/java/sca/distribution/src/main/release/bin/LICENSE b/java/sca/distribution/src/main/release/bin/LICENSE
index cc6777527c..7ea8d871a2 100644
--- a/java/sca/distribution/src/main/release/bin/LICENSE
+++ b/java/sca/distribution/src/main/release/bin/LICENSE
@@ -2452,3 +2452,43 @@ OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR RELATING TO ANY USE OR
 DISTRIBUTION OF THE Service Components Architecture SPECIFICATION.
 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,
+
+================================================================================
+
+The tuscany-assembly-xsd jar includes files under the following license:
+
+W3CŪ 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.
+
diff --git a/java/sca/distribution/src/main/release/bin/NOTICE b/java/sca/distribution/src/main/release/bin/NOTICE
index 2682347ca8..05094cdf7c 100644
--- a/java/sca/distribution/src/main/release/bin/NOTICE
+++ b/java/sca/distribution/src/main/release/bin/NOTICE
@@ -113,3 +113,15 @@ This product also includes software under the Service Component Architecture spe
 (C) Copyright BEA Systems, Inc., Cape Clear Software, International Business Machines Corp, Interface21, IONA
 Technologies, Oracle, Primeton Technologies, Progress Software, Red Hat, Rogue Wave Software, SAP AG., Siemens
 AG., Software AG., Sun Microsystems, Inc., Sybase Inc., TIBCO Software Inc., 2005, 2008. All rights reserved.
+
+This product also includes software under the W3C(r) Software License
+(see the LICENSE file contained in this distribution), with the following
+copyright:
+
+Copyright (c) 2004 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(r) 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
diff --git a/java/sca/distribution/src/main/release/src/LICENSE b/java/sca/distribution/src/main/release/src/LICENSE
index 05bfe735c8..3200103252 100644
--- a/java/sca/distribution/src/main/release/src/LICENSE
+++ b/java/sca/distribution/src/main/release/src/LICENSE
@@ -357,7 +357,15 @@ 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:
+The module 
+
+tuscany-assembly-xsd 
+
+Includes file wsdli.xsd
+
+From http://www.w3.org/2004/08/wsdl-instance
+
+The ipo.xsd and wsdli.xsd files are included under the following license:
 
 W3C(c) SOFTWARE NOTICE AND LICENSE
 http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231
diff --git a/java/sca/modules/assembly-xsd/LICENSE b/java/sca/modules/assembly-xsd/LICENSE
index bfded7c6a9..ea18d5f03c 100644
--- a/java/sca/modules/assembly-xsd/LICENSE
+++ b/java/sca/modules/assembly-xsd/LICENSE
@@ -242,3 +242,40 @@ JavaDoc, Interface Definition Files and XSD Files will at all times remain with
 No other rights are granted by implication, estoppel or otherwise.
 
 ===============================================================================
+
+This module includes XSD files under the following W3C(r) Software License:
+
+W3CŪ 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.
diff --git a/java/sca/modules/assembly-xsd/NOTICE b/java/sca/modules/assembly-xsd/NOTICE
index 6dcfe88195..637bbaccf9 100644
--- a/java/sca/modules/assembly-xsd/NOTICE
+++ b/java/sca/modules/assembly-xsd/NOTICE
@@ -10,3 +10,14 @@ copyright:
 
 (c) Copyright SCA Collaboration 2006, 2007
 
+This product also includes software under the W3C(r) Software License
+(see the LICENSE file contained in this distribution), with the following
+copyright:
+
+Copyright (c) 2004 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(r) 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
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
index 3e92de193b..2dd44f8e06 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-binding-webservice.xsd
@@ -6,6 +6,11 @@
     xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
     xmlns:wsa="http://www.w3.org/2004/12/addressing"
     elementFormDefault="qualified">
+    
+    <import namespace="http://www.w3.org/2004/08/wsdl-instance"
+            schemaLocation="wsdli.xsd" />
+    <!-- import namespace="http://www.w3.org/2005/08/addressing" 
+            schemaLocation="ws-addr.xsd" /-->
 
     <include schemaLocation="sca-core.xsd"/>
 
@@ -15,11 +20,14 @@
         <complexContent>
             <extension base="sca:Binding">
                 <sequence>
+                    <!-- element ref="wsa:EndpointReference" minOccurs="0"
+                         maxOccurs="unbounded"/-->                  
                     <any namespace="##other" processContents="lax" minOccurs="0"
                          maxOccurs="unbounded"/>
                 </sequence>
 			 <attribute name="wsdlElement" type="anyURI" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
+             <attribute ref="wsdli:wsdlLocation" use="optional"/>
+             <anyAttribute namespace="##any" processContents="lax"/>
             </extension>
         </complexContent>
     </complexType>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/wsdli.xsd b/java/sca/modules/assembly-xsd/src/main/resources/wsdli.xsd
new file mode 100644
index 0000000000..321a6568bb
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/wsdli.xsd
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd">
+<!-- $Id: wsdl-instance.xsd,v 1.1 2004/08/03 16:02:04 hugo Exp $ -->
+<!-- 
+   W3C XML Schema defined in the Web Services Description (WSDL)
+    Version 2.0 specification
+     http://www.w3.org/TR/wsdl20
+
+   Copyright (c) 2004 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(r) 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
+-->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance" targetNamespace="http://www.w3.org/2004/08/wsdl-instance" elementFormDefault="qualified" finalDefault="" blockDefault="" attributeFormDefault="unqualified">
+
+  <xs:attribute name="wsdlLocation">
+    <xs:annotation>
+      <xs:documentation>
+      This attribute can be used to provide some hints on where
+      additional WSDL information for a given namespace can be
+      found in order to help with QName resolution
+      </xs:documentation>
+    </xs:annotation>
+    <xs:simpleType>
+      <xs:list itemType="xs:anyURI"/>
+    </xs:simpleType>
+  </xs:attribute>
+
+</xs:schema>