tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r950343 - in /tuscany/sca-cpp/trunk: kernel/ modules/python/ modules/scdl/ modules/scheme/ xsd/ xsd/external/
Date Wed, 02 Jun 2010 02:56:27 GMT
Author: jsdelfino
Date: Wed Jun  2 02:56:25 2010
New Revision: 950343

URL: http://svn.apache.org/viewvc?rev=950343&view=rev
Log:
Upgrade SCDL schemas to cd05 level. Remove unused and unsupported schemas. Add SCDL schema validation test case.

Added:
    tuscany/sca-cpp/trunk/modules/scdl/validate-test   (contents, props changed)
      - copied, changed from r949816, tuscany/sca-cpp/trunk/modules/scdl/Makefile.am
    tuscany/sca-cpp/trunk/xsd/external/wsdl20-instance.xsd
      - copied, changed from r949816, tuscany/sca-cpp/trunk/xsd/external/wsdli.xsd
    tuscany/sca-cpp/trunk/xsd/sca-1.1-cd05.xsd
    tuscany/sca-cpp/trunk/xsd/sca-binding-sca-1.1-cd05.xsd
      - copied, changed from r949816, tuscany/sca-cpp/trunk/xsd/sca-binding-sca-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-core-1.1-cd05.xsd
      - copied, changed from r949816, tuscany/sca-cpp/trunk/xsd/sca-core-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-definitions-1.1-cd05.xsd
      - copied, changed from r949816, tuscany/sca-cpp/trunk/xsd/sca-definitions-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-implementation-composite-1.1-cd05.xsd
      - copied, changed from r949816, tuscany/sca-cpp/trunk/xsd/sca-implementation-composite-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-implementation-java-1.1-cd02.xsd
      - copied, changed from r949816, tuscany/sca-cpp/trunk/xsd/sca-implementation-java-1.1-cd03.xsd
    tuscany/sca-cpp/trunk/xsd/sca-interface-wsdl-1.1-cd05.xsd
      - copied, changed from r949816, tuscany/sca-cpp/trunk/xsd/sca-interface-wsdl-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-policy-1.1-cd03.xsd
      - copied, changed from r949816, tuscany/sca-cpp/trunk/xsd/sca-policy-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-atom.xsd
      - copied, changed from r949816, tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rmi.xsd
    tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rest.xsd
    tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rss.xsd
      - copied, changed from r949816, tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-dwr.xsd
    tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-python.xsd
      - copied, changed from r949816, tuscany/sca-cpp/trunk/modules/python/tuscany-sca-1.1-implementation-python.xsd
    tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-scheme.xsd
      - copied, changed from r949816, tuscany/sca-cpp/trunk/modules/scheme/tuscany-sca-1.1-implementation-scheme.xsd
Removed:
    tuscany/sca-cpp/trunk/modules/python/tuscany-sca-1.1-implementation-python.xsd
    tuscany/sca-cpp/trunk/modules/scheme/tuscany-sca-1.1-implementation-scheme.xsd
    tuscany/sca-cpp/trunk/xsd/external/wsdli.xsd
    tuscany/sca-cpp/trunk/xsd/sca-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-binding-ejb-1.1-cd01.xsd
    tuscany/sca-cpp/trunk/xsd/sca-binding-jca-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-binding-jms-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-binding-sca-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-binding-ws-callback-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-contribution-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-contribution-c-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-contribution-cpp-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-contribution-java-1.1-cd02.xsd
    tuscany/sca-cpp/trunk/xsd/sca-core-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-definitions-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-implementation-bpel-1.1-cd03.xsd
    tuscany/sca-cpp/trunk/xsd/sca-implementation-c-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-implementation-composite-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-implementation-java-1.1-cd03.xsd
    tuscany/sca-cpp/trunk/xsd/sca-implementation-spring-1.1-cd01.xsd
    tuscany/sca-cpp/trunk/xsd/sca-interface-c-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-interface-wsdl-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-jee-1.1-wd03.xsd
    tuscany/sca-cpp/trunk/xsd/sca-policy-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-dwr.xsd
    tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rmi.xsd
    tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-osgi.xsd
    tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-widget.xsd
Modified:
    tuscany/sca-cpp/trunk/kernel/xsd-test.cpp
    tuscany/sca-cpp/trunk/modules/python/Makefile.am
    tuscany/sca-cpp/trunk/modules/scdl/Makefile.am
    tuscany/sca-cpp/trunk/modules/scheme/Makefile.am
    tuscany/sca-cpp/trunk/xsd/external/oasis-200401-wss-wssecurity-secext-1.0.xsd
    tuscany/sca-cpp/trunk/xsd/external/ws-policy.xsd
    tuscany/sca-cpp/trunk/xsd/external/xmldsig-core-schema.xsd
    tuscany/sca-cpp/trunk/xsd/sca-binding-ws-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-implementation-cpp-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-interface-cpp-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/sca-interface-java-1.1-cd04.xsd
    tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-http.xsd
    tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd
    tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1.xsd

Modified: tuscany/sca-cpp/trunk/kernel/xsd-test.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/kernel/xsd-test.cpp?rev=950343&r1=950342&r2=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/kernel/xsd-test.cpp (original)
+++ tuscany/sca-cpp/trunk/kernel/xsd-test.cpp Wed Jun  2 02:56:25 2010
@@ -35,12 +35,12 @@ bool printNode(xmlTextReaderPtr reader) 
     if(name == NULL)
         name = (xmlChar *)"<unknown>";
     const xmlChar* value = xmlTextReaderConstValue(reader);
-    cout << xmlTextReaderDepth(reader) << " " << xmlTextReaderNodeType(reader) << " " << name << " "
+    cerr << xmlTextReaderDepth(reader) << " " << xmlTextReaderNodeType(reader) << " " << name << " "
             << xmlTextReaderIsEmptyElement(reader) << " " << xmlTextReaderHasValue(reader);
     if(value == NULL)
-        cout << endl;
+        cerr << endl;
     else
-        cout << value << endl;
+        cerr << value << endl;
     return true;
 }
 
@@ -54,13 +54,13 @@ int xmlClose(void *context) {
 }
 
 bool readFile(const char*xsdfilename, const char *filename) {
-    cout << "Loading schemas...\n";
+    cout << "Loading schema " << xsdfilename << endl;
     const xmlDocPtr xsddoc = xmlReadFile(xsdfilename, NULL, XML_PARSE_NONET);
     const xmlSchemaParserCtxtPtr xsdctx = xmlSchemaNewDocParserCtxt(xsddoc);
     const xmlSchemaPtr xsd = xmlSchemaParse(xsdctx);
     const xmlSchemaValidCtxtPtr validctx = xmlSchemaNewValidCtxt(xsd);
 
-    cout << "Reading file...\n";
+    cout << "Reading file " << filename << endl;
     FILE* file = fopen(filename, "r");
     if (file != NULL) {
         const xmlTextReaderPtr reader = xmlReaderForIO(xmlRead, xmlClose, file, filename, NULL, XML_PARSE_NONET);

Modified: tuscany/sca-cpp/trunk/modules/python/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/python/Makefile.am?rev=950343&r1=950342&r2=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/python/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/python/Makefile.am Wed Jun  2 02:56:25 2010
@@ -24,9 +24,6 @@ INCLUDES = -I${PYTHON_INCLUDE}
 dist_mod_SCRIPTS = python-conf
 moddir = $(prefix)/modules/python
 
-nobase_dist_xsd_DATA = *.xsd
-xsddir = $(prefix)/xsd
-
 prefix_DATA = python.prefix
 prefixdir = $(prefix)/modules/python
 python.prefix: $(top_builddir)/config.status

Modified: tuscany/sca-cpp/trunk/modules/scdl/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/scdl/Makefile.am?rev=950343&r1=950342&r2=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/scdl/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/scdl/Makefile.am Wed Jun  2 02:56:25 2010
@@ -21,4 +21,4 @@ scdl_test_LDFLAGS = -lxml2
 EXTRA_DIST = test.composite
 
 noinst_PROGRAMS = scdl-test
-TESTS = scdl-test
+TESTS = scdl-test validate-test

Copied: tuscany/sca-cpp/trunk/modules/scdl/validate-test (from r949816, tuscany/sca-cpp/trunk/modules/scdl/Makefile.am)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/scdl/validate-test?p2=tuscany/sca-cpp/trunk/modules/scdl/validate-test&p1=tuscany/sca-cpp/trunk/modules/scdl/Makefile.am&r1=949816&r2=950343&rev=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/scdl/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/scdl/validate-test Wed Jun  2 02:56:25 2010
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 #  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
@@ -15,10 +17,7 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-scdl_test_SOURCES = scdl-test.cpp
-scdl_test_LDFLAGS = -lxml2
-
-EXTRA_DIST = test.composite
-
-noinst_PROGRAMS = scdl-test
-TESTS = scdl-test
+# Validate test composite
+../../kernel/xsd-test ../../xsd/tuscany-sca-1.1.xsd test.composite 2>/dev/null
+rc=$?
+return $rc

Propchange: tuscany/sca-cpp/trunk/modules/scdl/validate-test
------------------------------------------------------------------------------
    svn:executable = *

Modified: tuscany/sca-cpp/trunk/modules/scheme/Makefile.am
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/scheme/Makefile.am?rev=950343&r1=950342&r2=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/scheme/Makefile.am (original)
+++ tuscany/sca-cpp/trunk/modules/scheme/Makefile.am Wed Jun  2 02:56:25 2010
@@ -15,9 +15,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-xsddir=$(prefix)/xsd
-nobase_dist_xsd_DATA = *.xsd
-
 eval_test_SOURCES = eval-test.cpp
 
 eval_shell_SOURCES = eval-shell.cpp

Modified: tuscany/sca-cpp/trunk/xsd/external/oasis-200401-wss-wssecurity-secext-1.0.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/external/oasis-200401-wss-wssecurity-secext-1.0.xsd?rev=950343&r1=950342&r2=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/external/oasis-200401-wss-wssecurity-secext-1.0.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/external/oasis-200401-wss-wssecurity-secext-1.0.xsd Wed Jun  2 02:56:25 2010
@@ -8,9 +8,9 @@ The limited permissions granted above ar
 This document and the information contained herein is provided on an “AS IS” basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
 -->
 <xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" elementFormDefault="qualified" attributeFormDefault="unqualified" blockDefault="#all" version="0.2">
-	<xsd:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
-	<xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-	<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
+	<xsd:import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" schemaLocation="oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
+	<xsd:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="xml.xsd"/>
+	<xsd:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
 	<xsd:complexType name="AttributedString">
 		<xsd:annotation>
 			<xsd:documentation>This type represents an element with arbitrary attributes.</xsd:documentation>

Modified: tuscany/sca-cpp/trunk/xsd/external/ws-policy.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/external/ws-policy.xsd?rev=950343&r1=950342&r2=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/external/ws-policy.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/external/ws-policy.xsd Wed Jun  2 02:56:25 2010
@@ -27,15 +27,15 @@
 
   <xs:import
       namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
-      schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" />
+      schemaLocation="oasis-200401-wss-wssecurity-secext-1.0.xsd" />
 
   <xs:import
       namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
-      schemaLocation="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" />
+      schemaLocation="oasis-200401-wss-wssecurity-utility-1.0.xsd" />
 
   <xs:import
       namespace="http://www.w3.org/XML/1998/namespace"
-      schemaLocation="http://www.w3.org/2001/xml.xsd" />
+      schemaLocation="xml.xsd" />
 
     <!-- Constructs from the Web Services Policy 1.5 Framework -->
 

Copied: tuscany/sca-cpp/trunk/xsd/external/wsdl20-instance.xsd (from r949816, tuscany/sca-cpp/trunk/xsd/external/wsdli.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/external/wsdl20-instance.xsd?p2=tuscany/sca-cpp/trunk/xsd/external/wsdl20-instance.xsd&p1=tuscany/sca-cpp/trunk/xsd/external/wsdli.xsd&r1=949816&r2=950343&rev=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/external/wsdli.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/external/wsdl20-instance.xsd Wed Jun  2 02:56:25 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd">
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd">
 <!--
    W3C XML Schema defined in the Web Services Description (WSDL)
     Version 2.0 specification

Modified: tuscany/sca-cpp/trunk/xsd/external/xmldsig-core-schema.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/external/xmldsig-core-schema.xsd?rev=950343&r1=950342&r2=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/external/xmldsig-core-schema.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/external/xmldsig-core-schema.xsd Wed Jun  2 02:56:25 2010
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE schema
-  PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
+  PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "XMLSchema.dtd"
  [
    <!ATTLIST schema 
      xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#">
@@ -11,7 +11,7 @@
 
 <!-- Schema for XML Signatures
     http://www.w3.org/2000/09/xmldsig#
-    $Revision: 796166 $ on $Date: 2009-07-21 00:03:47 -0700 (Tue, 21 Jul 2009) $ by $Author: reagle $
+    $Revision$ on $Date$ by $Author: reagle $
 
     Copyright 2001 The Internet Society and W3C (Massachusetts Institute
     of Technology, Institut National de Recherche en Informatique et en

Added: tuscany/sca-cpp/trunk/xsd/sca-1.1-cd05.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/sca-1.1-cd05.xsd?rev=950343&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/sca-1.1-cd05.xsd (added)
+++ tuscany/sca-cpp/trunk/xsd/sca-1.1-cd05.xsd Wed Jun  2 02:56:25 2010
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2010. All Rights Reserved. 
+     OASIS trademark, IPR and other policies apply.  -->
+<schema xmlns="http://www.w3.org/2001/XMLSchema" 
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
+   xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912">
+   
+   <include schemaLocation="sca-core-1.1-cd05.xsd"/>
+
+   <include schemaLocation="sca-interface-java-1.1-cd04.xsd"/>
+   <include schemaLocation="sca-interface-wsdl-1.1-cd05.xsd"/>
+   <include schemaLocation="sca-interface-cpp-1.1-cd04.xsd"/>
+
+   <include schemaLocation="sca-implementation-java-1.1-cd02.xsd"/>
+   <include schemaLocation="sca-implementation-composite-1.1-cd05.xsd"/>
+   <include schemaLocation="sca-implementation-cpp-1.1-cd04.xsd"/>
+
+   <include schemaLocation="sca-binding-ws-1.1-cd04.xsd"/>
+   <include schemaLocation="sca-binding-sca-1.1-cd05.xsd"/>
+
+   <include schemaLocation="sca-definitions-1.1-cd05.xsd"/>
+   <include schemaLocation="sca-policy-1.1-cd03.xsd"/>
+
+</schema>

Copied: tuscany/sca-cpp/trunk/xsd/sca-binding-sca-1.1-cd05.xsd (from r949816, tuscany/sca-cpp/trunk/xsd/sca-binding-sca-1.1-cd04.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/sca-binding-sca-1.1-cd05.xsd?p2=tuscany/sca-cpp/trunk/xsd/sca-binding-sca-1.1-cd05.xsd&p1=tuscany/sca-cpp/trunk/xsd/sca-binding-sca-1.1-cd04.xsd&r1=949816&r2=950343&rev=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/sca-binding-sca-1.1-cd04.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/sca-binding-sca-1.1-cd05.xsd Wed Jun  2 02:56:25 2010
@@ -6,7 +6,7 @@
         xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
         elementFormDefault="qualified">
 
-   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
+   <include schemaLocation="sca-core-1.1-cd05.xsd"/>
 
    <!-- SCA Binding -->
    <element name="binding.sca" type="sca:SCABinding" 

Modified: tuscany/sca-cpp/trunk/xsd/sca-binding-ws-1.1-cd04.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/sca-binding-ws-1.1-cd04.xsd?rev=950343&r1=950342&r2=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/sca-binding-ws-1.1-cd04.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/sca-binding-ws-1.1-cd04.xsd Wed Jun  2 02:56:25 2010
@@ -9,11 +9,11 @@
     elementFormDefault="qualified">
 
     <import namespace="http://www.w3.org/ns/wsdl-instance"
-            schemaLocation="http://www.w3.org/2007/05/wsdl/wsdl20-instance.xsd"/>
+            schemaLocation="external/wsdl20-instance.xsd"/>
     <import namespace="http://www.w3.org/2005/08/addressing"
-            schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd"/>
+            schemaLocation="external/ws-addr.xsd"/>
 
-    <include schemaLocation="sca-core-1.1-cd04.xsd"/>
+    <include schemaLocation="sca-core-1.1-cd05.xsd"/>
 
     <element name="binding.ws" type="sca:WebServiceBinding"
              substitutionGroup="sca:binding"/>
@@ -22,10 +22,10 @@
         <complexContent>
             <extension base="sca:Binding">
                 <sequence>
-                    <element name="endpointReference" type="wsa:EndpointReferenceType"
+                    <element ref="wsa:EndpointReference"
                              minOccurs="0" maxOccurs="unbounded"/>
-                    <any namespace="##other" processContents="lax"
-                         minOccurs="0" maxOccurs="unbounded"/>
+                    <!-- any namespace="##other" processContents="lax"
+                         minOccurs="0" maxOccurs="unbounded"/-->
                 </sequence>
                 <attribute name="wsdlElement" type="anyURI" use="optional"/>
                 <attribute ref="wsdli:wsdlLocation" use="optional"/>

Copied: tuscany/sca-cpp/trunk/xsd/sca-core-1.1-cd05.xsd (from r949816, tuscany/sca-cpp/trunk/xsd/sca-core-1.1-cd04.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/sca-core-1.1-cd05.xsd?p2=tuscany/sca-cpp/trunk/xsd/sca-core-1.1-cd05.xsd&p1=tuscany/sca-cpp/trunk/xsd/sca-core-1.1-cd04.xsd&r1=949816&r2=950343&rev=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/sca-core-1.1-cd04.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/sca-core-1.1-cd05.xsd Wed Jun  2 02:56:25 2010
@@ -6,8 +6,9 @@
    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    elementFormDefault="qualified">
 
+   <include schemaLocation="sca-policy-1.1-cd03.xsd"/>	
    <import namespace="http://www.w3.org/XML/1998/namespace" 
-           schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+           schemaLocation="external/xml.xsd"/>
 
    <!-- Common extension base for SCA definitions -->
    <complexType name="CommonExtensionBase">
@@ -33,20 +34,16 @@
       <complexContent>
          <extension base="sca:CommonExtensionBase">
             <sequence>
-               <!-- Comment out the sca:implementation to workaround http://www.mail-archive.com/dev@tuscany.apache.org/msg08924.html. -->
-               <!-- 
                <element ref="sca:implementation" minOccurs="0"/>
-                -->
                <choice minOccurs="0" maxOccurs="unbounded">
                   <element name="service" type="sca:ComponentService"/>
                   <element name="reference" 
                      type="sca:ComponentTypeReference"/>
                   <element name="property" type="sca:Property"/>
                </choice>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
+               <!-- any namespace="##other" processContents="lax" minOccurs="0" 
+                    maxOccurs="unbounded"/ -->
             </sequence>
-            <attribute name="constrainingType" type="QName" use="optional"/>
          </extension>
       </complexContent>
    </complexType>
@@ -60,6 +57,8 @@
                <element ref="sca:include" minOccurs="0" 
                         maxOccurs="unbounded"/>
                <choice minOccurs="0" maxOccurs="unbounded">
+                  <element ref="sca:requires"/>
+                  <element ref="sca:policySetAttachment"/>
                   <element name="service" type="sca:Service"/>
                   <element name="property" type="sca:Property"/>
                   <element name="component" type="sca:Component"/>
@@ -75,7 +74,6 @@
                        default="false"/>
             <attribute name="autowire" type="boolean" use="optional" 
                        default="false"/>
-            <attribute name="constrainingType" type="QName" use="optional"/>
             <attribute name="requires" type="sca:listOfQNames" 
                        use="optional"/>
             <attribute name="policySets" type="sca:listOfQNames" 
@@ -93,8 +91,11 @@
                <element ref="sca:binding" minOccurs="0" 
                         maxOccurs="unbounded" />
                <element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded" />
+               <element ref="sca:requires" minOccurs="0" 
+                        maxOccurs="unbounded"/>
+               <element ref="sca:policySetAttachment" minOccurs="0" 
+                        maxOccurs="unbounded"/>
+               <element ref="sca:extensions" minOccurs="0" maxOccurs="1" />
             </sequence>
             <attribute name="name" type="NCName" use="required" />
             <attribute name="requires" type="sca:listOfQNames" 
@@ -119,6 +120,10 @@
    <complexType name="Interface" abstract="true">
       <complexContent>
          <extension base="sca:CommonExtensionBase">
+            <choice minOccurs="0" maxOccurs="unbounded">
+               <element ref="sca:requires"/>
+               <element ref="sca:policySetAttachment"/>
+            </choice>
             <attribute name="remotable" type="boolean" use="optional"/>
 	        <attribute name="requires" type="sca:listOfQNames" 
                use="optional"/>
@@ -132,13 +137,12 @@
    <complexType name="Reference">
       <complexContent>
          <extension base="sca:Contract">
-            <attribute name="autowire" type="boolean" use="optional"/>
             <attribute name="target" type="sca:listOfAnyURIs" 
                        use="optional"/>
             <attribute name="wiredByImpl" type="boolean" use="optional" 
                        default="false"/>
             <attribute name="multiplicity" type="sca:Multiplicity" 
-                       use="optional" default="1..1"/>
+                       use="required"/>
             <attribute name="promote" type="sca:listOfAnyURIs" 
                        use="required"/>
          </extension>
@@ -155,58 +159,29 @@
              i.e. no element-based extension point under "sca:property" -->
       </sequence>
       <!-- mixed="true" to handle simple type -->
-      <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-      <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
+      <attribute name="name" type="NCName" use="required"/>
+      <attribute name="type" type="QName" use="optional"/>
+      <attribute name="element" type="QName" use="optional"/>
+      <attribute name="many" type="boolean" use="optional" default="false"/>
+      <attribute name="value" type="anySimpleType" use="optional"/>
+      <anyAttribute namespace="##other" processContents="lax"/>
    </complexType>
    
    <complexType name="Property" mixed="true">
       <complexContent mixed="true">
          <extension base="sca:SCAPropertyBase">
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="type" type="QName" use="optional"/>
-            <attribute name="element" type="QName" use="optional"/>
-            <attribute name="many" type="boolean" use="optional" 
-                       default="false"/>
             <attribute name="mustSupply" type="boolean" use="optional" 
                        default="false"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
          </extension>
-         <!-- extension defines the place to hold default value -->
-         <!-- an extension point ; attribute-based only -->
-      </complexContent>
-   </complexType>
-   
-   <!-- ConstrainingProperty is equivalent to the Property type but removes 
-        the capability to contain a value -->
-   <complexType name="ConstrainingProperty" mixed="true">
-      <complexContent mixed="true">
-         <restriction base="sca:Property">
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="type" type="QName" use="optional"/>
-            <attribute name="element" type="QName" use="optional"/>
-            <attribute name="many" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="mustSupply" type="boolean" use="optional" 
-                       default="false"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
-         </restriction>
       </complexContent>
    </complexType>
    
    <complexType name="PropertyValue" mixed="true">
       <complexContent mixed="true">
          <extension base="sca:SCAPropertyBase">
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="type" type="QName" use="optional"/>
-            <attribute name="element" type="QName" use="optional"/>
-            <attribute name="many" type="boolean" use="optional" 
-                       default="false"/>
             <attribute name="source" type="string" use="optional"/>
             <attribute name="file" type="anyURI" use="optional"/>
-            <attribute name="value" type="string" use="optional"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
          </extension>
-         <!-- an extension point ; attribute-based only -->
       </complexContent>
    </complexType>
 
@@ -219,6 +194,10 @@
                <element ref="sca:wireFormat" minOccurs="0" maxOccurs="1" />
                <element ref="sca:operationSelector" minOccurs="0" 
                         maxOccurs="1" />
+               <element ref="sca:requires" minOccurs="0" 
+                        maxOccurs="unbounded"/>
+               <element ref="sca:policySetAttachment" minOccurs="0" 
+                        maxOccurs="unbounded"/>
             </sequence>
             <attribute name="uri" type="anyURI" use="optional"/>
             <attribute name="name" type="NCName" use="optional"/>
@@ -236,8 +215,8 @@
       <complexContent>
          <extension base="sca:CommonExtensionBase">
             <sequence>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
+               <!-- any namespace="##other" processContents="lax" minOccurs="0" 
+                    maxOccurs="unbounded"/-->
             </sequence>
             <attribute name="type" type="QName" use="required"/>
             <attribute name="alwaysProvides" type="sca:listOfQNames" 
@@ -259,7 +238,8 @@
    </complexType>
 
    <!-- OperationSelector Type -->
-   <element name="operationSelector" type="sca:OperationSelectorType" abstract="true"/>
+   <element name="operationSelector" type="sca:OperationSelectorType"
+      abstract="true"/>
    <complexType name="OperationSelectorType" abstract="true">
       <sequence>
          <any namespace="##other" processContents="lax" minOccurs="0" 
@@ -275,7 +255,9 @@
          <extension base="sca:CommonExtensionBase">
             <choice minOccurs="0" maxOccurs="unbounded">
                <element ref="sca:binding"/>
-               <any namespace="##other" processContents="lax"/>
+               <element ref="sca:requires"/>
+               <element ref="sca:policySetAttachment"/>
+               <!-- any namespace="##other" processContents="lax"/ -->
             </choice>
             <attribute name="requires" type="sca:listOfQNames" 
                        use="optional"/>
@@ -290,19 +272,20 @@
       <complexContent>
          <extension base="sca:CommonExtensionBase">
             <sequence>
-               <!-- Set minOccurs="1" instead of "0" to workaround http://www.mail-archive.com/dev@tuscany.apache.org/msg08924.html. -->
-               <element ref="sca:implementation" minOccurs="1"/>
+               <element ref="sca:implementation" minOccurs="1" 
+                  maxOccurs="1"/>
                <choice minOccurs="0" maxOccurs="unbounded">
                   <element name="service" type="sca:ComponentService"/>
                   <element name="reference" type="sca:ComponentReference"/>
                   <element name="property" type="sca:PropertyValue"/>
+                  <element ref="sca:requires"/>
+                  <element ref="sca:policySetAttachment"/>
                </choice>
                <any namespace="##other" processContents="lax" minOccurs="0" 
                     maxOccurs="unbounded"/>
             </sequence>
             <attribute name="name" type="NCName" use="required"/>
             <attribute name="autowire" type="boolean" use="optional"/>
-            <attribute name="constrainingType" type="QName" use="optional"/>
             <attribute name="requires" type="sca:listOfQNames" 
                        use="optional"/>
             <attribute name="policySets" type="sca:listOfQNames" 
@@ -319,22 +302,6 @@
       </complexContent>
    </complexType>
    
-   <!-- Constraining Service -->
-   <complexType name="ConstrainingService">
-      <complexContent>
-         <restriction base="sca:ComponentService">
-            <sequence>
-               <element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-               <element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded" />
-            </sequence>
-            <attribute name="name" type="NCName" use="required" />
-         </restriction>
-      </complexContent>
-   </complexType>
-   
-
    <!-- Component Reference -->
    <complexType name="ComponentReference">
       <complexContent>
@@ -352,26 +319,6 @@
       </complexContent>
    </complexType>
    
-   <!-- Constraining Reference -->
-   <complexType name="ConstrainingReference">
-      <complexContent>
-         <restriction base="sca:ComponentReference">
-            <sequence>
-               <element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-               <element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded" />
-            </sequence>
-            <attribute name="name" type="NCName" use="required" />
-            <attribute name="autowire" type="boolean" use="optional"/>
-            <attribute name="wiredByImpl" type="boolean" use="optional" 
-                       default="false"/>
-            <attribute name="multiplicity" type="sca:Multiplicity" 
-                       use="optional" default="1..1"/>
-         </restriction>
-      </complexContent>
-   </complexType>   
-   
    <!-- Component Type Reference -->
    <complexType name="ComponentTypeReference">
       <complexContent>
@@ -383,8 +330,11 @@
                <element ref="sca:binding" minOccurs="0" 
                         maxOccurs="unbounded"/>
                <element ref="sca:callback" minOccurs="0"/>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
+               <element ref="sca:requires" minOccurs="0" 
+                        maxOccurs="unbounded"/>
+               <element ref="sca:policySetAttachment" minOccurs="0"  
+                        maxOccurs="unbounded"/>              
+               <element ref="sca:extensions" minOccurs="0" maxOccurs="1" />
             </sequence>
             <attribute name="name" type="NCName" use="required"/>
             <attribute name="autowire" type="boolean" use="optional"/>
@@ -407,6 +357,10 @@
    <complexType name="Implementation" abstract="true">
       <complexContent>
          <extension base="sca:CommonExtensionBase">
+	        <choice minOccurs="0" maxOccurs="unbounded">
+	           <element ref="sca:requires"/>
+	           <element ref="sca:policySetAttachment"/>
+	        </choice>     
             <attribute name="requires" type="sca:listOfQNames" 
                        use="optional"/>
             <attribute name="policySets" type="sca:listOfQNames" 
@@ -458,27 +412,16 @@
          </extension>
       </complexContent>
    </complexType>
-
-   <!-- Constraining Type -->
-   <element name="constrainingType" type="sca:ConstrainingType"/>
-   <complexType name="ConstrainingType">
-      <complexContent>
-         <extension base="sca:CommonExtensionBase">
-            <sequence>
-               <choice minOccurs="0" maxOccurs="unbounded">
-                  <element name="service" type="sca:ConstrainingService"/>
-                  <element name="reference" 
-                           type="sca:ConstrainingReference"/>
-                  <element name="property" type="sca:ConstrainingProperty"/>
-               </choice>
-               <any namespace="##other" processContents="lax" minOccurs="0" 
-                    maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="targetNamespace" type="anyURI"/>
-         </extension>
-      </complexContent>
-   </complexType>
+   
+   <!-- Extensions element -->
+   <element name="extensions">
+      <complexType>
+         <sequence>
+            <any namespace="##other" processContents="lax" 
+               minOccurs="1" maxOccurs="unbounded"/>
+         </sequence>
+      </complexType>
+   </element>
 
    <!-- Intents within WSDL documents -->
    <attribute name="requires" type="sca:listOfQNames"/>
@@ -492,7 +435,8 @@
    <element name="value" type="sca:ValueType"/> 
    <complexType name="ValueType" mixed="true">
       <sequence> 
-         <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs='unbounded'/> 
+         <any namespace="##any" processContents="lax" minOccurs="0"
+            maxOccurs='unbounded'/> 
       </sequence> 
       <!-- mixed="true" to handle simple type --> 
       <anyAttribute namespace="##any" processContents="lax"/> 
@@ -524,11 +468,11 @@
       <list itemType="anyURI"/>
    </simpleType>
 	
-	<simpleType name="CreateResource">
-		<restriction base="string">
-			<enumeration value="always" />
-			<enumeration value="never" />
-			<enumeration value="ifnotexist" />
-		</restriction>
-	</simpleType>
+   <simpleType name="CreateResource">
+      <restriction base="string">
+         <enumeration value="always" />
+         <enumeration value="never" />
+         <enumeration value="ifnotexist" />
+      </restriction>
+   </simpleType>
 </schema>

Copied: tuscany/sca-cpp/trunk/xsd/sca-definitions-1.1-cd05.xsd (from r949816, tuscany/sca-cpp/trunk/xsd/sca-definitions-1.1-cd04.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/sca-definitions-1.1-cd05.xsd?p2=tuscany/sca-cpp/trunk/xsd/sca-definitions-1.1-cd05.xsd&p1=tuscany/sca-cpp/trunk/xsd/sca-definitions-1.1-cd04.xsd&r1=949816&r2=950343&rev=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/sca-definitions-1.1-cd04.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/sca-definitions-1.1-cd05.xsd Wed Jun  2 02:56:25 2010
@@ -6,8 +6,8 @@
    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    elementFormDefault="qualified">
    
-   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
-   <include schemaLocation="sca-policy-1.1-cd04.xsd"/>
+   <include schemaLocation="sca-core-1.1-cd05.xsd"/>
+   <include schemaLocation="sca-policy-1.1-cd03.xsd"/>
    
    <!-- Definitions -->
    <element name="definitions" type="sca:tDefinitions"/>
@@ -17,7 +17,6 @@
             <choice minOccurs="0" maxOccurs="unbounded">
                <element ref="sca:intent"/>
                <element ref="sca:policySet"/>
-               <element ref="sca:binding"/>
                <element ref="sca:bindingType"/>
                <element ref="sca:implementationType"/>
                <any namespace="##other" processContents="lax" 

Copied: tuscany/sca-cpp/trunk/xsd/sca-implementation-composite-1.1-cd05.xsd (from r949816, tuscany/sca-cpp/trunk/xsd/sca-implementation-composite-1.1-cd04.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/sca-implementation-composite-1.1-cd05.xsd?p2=tuscany/sca-cpp/trunk/xsd/sca-implementation-composite-1.1-cd05.xsd&p1=tuscany/sca-cpp/trunk/xsd/sca-implementation-composite-1.1-cd04.xsd&r1=949816&r2=950343&rev=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/sca-implementation-composite-1.1-cd04.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/sca-implementation-composite-1.1-cd05.xsd Wed Jun  2 02:56:25 2010
@@ -6,7 +6,7 @@
    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    elementFormDefault="qualified">
 
-   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
+   <include schemaLocation="sca-core-1.1-cd05.xsd"/>
 
    <!-- Composite Implementation -->
    <element name="implementation.composite" type="sca:SCAImplementation" 

Modified: tuscany/sca-cpp/trunk/xsd/sca-implementation-cpp-1.1-cd04.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/sca-implementation-cpp-1.1-cd04.xsd?rev=950343&r1=950342&r2=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/sca-implementation-cpp-1.1-cd04.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/sca-implementation-cpp-1.1-cd04.xsd Wed Jun  2 02:56:25 2010
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved.
+<!-- Copyright(C) OASIS(R) 2006,2010. All Rights Reserved.
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
 	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	elementFormDefault="qualified">
 
-	<include schemaLocation="sca-core-1.1-cd04.xsd" />
+	<include schemaLocation="sca-core-1.1-cd05.xsd" />
 
 	<element name="implementation.cpp" type="sca:CPPImplementation"
 		substitutionGroup="sca:implementation" />
@@ -32,7 +32,6 @@
 					use="optional" />
 				<attribute name="allowsPassByReference" type="boolean"
 					use="optional" />
-				<anyAttribute namespace="##other" processContents="lax" />
 			</extension>
 		</complexContent>
 	</complexType>
@@ -45,7 +44,17 @@
 	</simpleType>
 
 	<complexType name="CPPImplementationFunction">
+		<sequence>
+			<choice minOccurs="0" maxOccurs="unbounded">
+				<element ref="sca:requires"/>
+				<element ref="sca:policySetAttachment"/>
+			</choice>
+			<any namespace="##other" processContents="lax" minOccurs="0"
+				maxOccurs="unbounded" />
+		</sequence>
 		<attribute name="name" type="NCName" use="required" />
+		<attribute name="requires" type="sca:listOfQNames" use="optional" />
+		<attribute name="policySets" type="sca:listOfQNames" use="optional" />
 		<attribute name="allowsPassByReference" type="boolean"
 			use="optional" />
 		<anyAttribute namespace="##other" processContents="lax" />

Copied: tuscany/sca-cpp/trunk/xsd/sca-implementation-java-1.1-cd02.xsd (from r949816, tuscany/sca-cpp/trunk/xsd/sca-implementation-java-1.1-cd03.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/sca-implementation-java-1.1-cd02.xsd?p2=tuscany/sca-cpp/trunk/xsd/sca-implementation-java-1.1-cd02.xsd&p1=tuscany/sca-cpp/trunk/xsd/sca-implementation-java-1.1-cd03.xsd&r1=949816&r2=950343&rev=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/sca-implementation-java-1.1-cd03.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/sca-implementation-java-1.1-cd02.xsd Wed Jun  2 02:56:25 2010
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
+<!-- Copyright(C) OASIS(R) 2005,2010. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    elementFormDefault="qualified">
    
-   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
+   <include schemaLocation="sca-core-1.1-cd05.xsd"/>
 
    <!-- Java Implementation -->
    <element name="implementation.java" type="sca:JavaImplementation" 
@@ -19,9 +19,8 @@
                     maxOccurs="unbounded"/>
             </sequence>
             <attribute name="class" type="NCName" use="required"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
          </extension>
       </complexContent>
    </complexType>
 
-</schema>
+</schema>
\ No newline at end of file

Modified: tuscany/sca-cpp/trunk/xsd/sca-interface-cpp-1.1-cd04.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/sca-interface-cpp-1.1-cd04.xsd?rev=950343&r1=950342&r2=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/sca-interface-cpp-1.1-cd04.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/sca-interface-cpp-1.1-cd04.xsd Wed Jun  2 02:56:25 2010
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2006,2009. All Rights Reserved.
-     OASIS trademark, IPR and other policies apply.  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+	<!--
+		Copyright(C) OASIS(R) 2006,2010. All Rights Reserved. OASIS trademark,
+		IPR and other policies apply.
+	-->
+<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
 	elementFormDefault="qualified">
 
-	<include schemaLocation="sca-core-1.1-cd04.xsd" />
+	<include schemaLocation="sca-core-1.1-cd05.xsd" />
 
 	<element name="interface.cpp" type="sca:CPPInterface"
 		substitutionGroup="sca:interface" />
@@ -15,29 +16,35 @@
 		<complexContent>
 			<extension base="sca:Interface">
 				<sequence>
-					<element name="function" type="sca:CPPFunction"
-						minOccurs="0" maxOccurs="unbounded" />
-					<element name="callbackFunction"
-						type="sca:CPPFunction" minOccurs="0" maxOccurs="unbounded" />
-					<any namespace="##other" processContents="lax"
+					<element name="function" type="sca:CPPFunction" minOccurs="0"
+						maxOccurs="unbounded" />
+					<element name="callbackFunction" type="sca:CPPFunction"
 						minOccurs="0" maxOccurs="unbounded" />
+					<any namespace="##other" processContents="lax" minOccurs="0"
+						maxOccurs="unbounded" />
 				</sequence>
 				<attribute name="header" type="string" use="required" />
 				<attribute name="class" type="Name" use="required" />
-				<attribute name="callbackHeader" type="string"
-					use="optional" />
-				<attribute name="callbackClass" type="Name"
-					use="optional" />
-				<anyAttribute namespace="##other" processContents="lax" />
+				<attribute name="callbackHeader" type="string" use="optional" />
+				<attribute name="callbackClass" type="Name" use="optional" />
 			</extension>
 		</complexContent>
 	</complexType>
 
 	<complexType name="CPPFunction">
+		<sequence>
+			<choice minOccurs="0" maxOccurs="unbounded">
+				<element ref="sca:requires"/>
+				<element ref="sca:policySetAttachment"/>
+			</choice>
+			<any namespace="##other" processContents="lax" minOccurs="0"
+				maxOccurs="unbounded" />
+		</sequence>
 		<attribute name="name" type="NCName" use="required" />
-		<attribute name="requires" type="sca:listOfQNames"
-			use="optional" />
+		<attribute name="requires" type="sca:listOfQNames" use="optional" />
+		<attribute name="policySets" type="sca:listOfQNames" use="optional" />
 		<attribute name="oneWay" type="boolean" use="optional" />
+		<attribute name="exclude" type="boolean" use="optional" />
 		<anyAttribute namespace="##other" processContents="lax" />
 	</complexType>
 

Modified: tuscany/sca-cpp/trunk/xsd/sca-interface-java-1.1-cd04.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/sca-interface-java-1.1-cd04.xsd?rev=950343&r1=950342&r2=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/sca-interface-java-1.1-cd04.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/sca-interface-java-1.1-cd04.xsd Wed Jun  2 02:56:25 2010
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
+<!-- Copyright(C) OASIS(R) 2005,2010. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema" 
    targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    elementFormDefault="qualified">
    
-   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
+   <include schemaLocation="sca-core-1.1-cd05.xsd"/>
    
    <!-- Java Interface -->
    <element name="interface.java" type="sca:JavaInterface" 
@@ -21,7 +21,6 @@
             <attribute name="interface" type="NCName" use="required"/>
             <attribute name="callbackInterface" type="NCName" 
                        use="optional"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
          </extension>
       </complexContent>
    </complexType>

Copied: tuscany/sca-cpp/trunk/xsd/sca-interface-wsdl-1.1-cd05.xsd (from r949816, tuscany/sca-cpp/trunk/xsd/sca-interface-wsdl-1.1-cd04.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/sca-interface-wsdl-1.1-cd05.xsd?p2=tuscany/sca-cpp/trunk/xsd/sca-interface-wsdl-1.1-cd05.xsd&p1=tuscany/sca-cpp/trunk/xsd/sca-interface-wsdl-1.1-cd04.xsd&r1=949816&r2=950343&rev=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/sca-interface-wsdl-1.1-cd04.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/sca-interface-wsdl-1.1-cd05.xsd Wed Jun  2 02:56:25 2010
@@ -6,7 +6,7 @@
    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" 
    elementFormDefault="qualified">
    
-   <include schemaLocation="sca-core-1.1-cd04.xsd"/>
+   <include schemaLocation="sca-core-1.1-cd05.xsd"/>
    
    <!-- WSDL Interface -->
    <element name="interface.wsdl" type="sca:WSDLPortType" 
@@ -21,7 +21,6 @@
             <attribute name="interface" type="anyURI" use="required"/>
             <attribute name="callbackInterface" type="anyURI" 
                        use="optional"/>
-            <anyAttribute namespace="##other" processContents="lax"/>
          </extension>
       </complexContent>
    </complexType>

Copied: tuscany/sca-cpp/trunk/xsd/sca-policy-1.1-cd03.xsd (from r949816, tuscany/sca-cpp/trunk/xsd/sca-policy-1.1-cd04.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/sca-policy-1.1-cd03.xsd?p2=tuscany/sca-cpp/trunk/xsd/sca-policy-1.1-cd03.xsd&p1=tuscany/sca-cpp/trunk/xsd/sca-policy-1.1-cd04.xsd&r1=949816&r2=950343&rev=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/sca-policy-1.1-cd04.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/sca-policy-1.1-cd03.xsd Wed Jun  2 02:56:25 2010
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright(C) OASIS(R) 2005,2009. All Rights Reserved. 
+<!-- Copyright(C) OASIS(R) 2005,2010. All Rights Reserved. 
      OASIS trademark, IPR and other policies apply.  -->
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
 	targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200912"
@@ -7,9 +7,9 @@
 	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
 	elementFormDefault="qualified">
 
-	<include schemaLocation="sca-core-1.1-cd04.xsd"/>	
+	<include schemaLocation="sca-core-1.1-cd05.xsd"/>	
 	<import namespace="http://www.w3.org/ns/ws-policy"
-		schemaLocation="http://www.w3.org/2007/02/ws-policy.xsd"/>
+		schemaLocation="external/ws-policy.xsd"/>
 
 	<element name="intent" type="sca:Intent"/>
 	<complexType name="Intent">
@@ -40,12 +40,24 @@
 		<sequence>
 			<element name="description" type="string" minOccurs="0" 
 			   maxOccurs="1" />
+			<any namespace="##other" processContents="lax" minOccurs="0"
+			   maxOccurs="unbounded"/> 
 		</sequence>
   		<attribute name="name" type="NCName" use="required"/>
   		<attribute name="default" type="boolean" use="optional" 
   		   default="false"/>
 	</complexType>
 
+	<element name="requires"> 
+		<complexType>
+			<sequence minOccurs="0" maxOccurs="unbounded">
+				<any namespace="##other" processContents="lax"/>
+			</sequence>		
+			<attribute name="intents" type="sca:listOfQNames" use="required"/>
+			<anyAttribute namespace="##other" processContents="lax"/>
+		</complexType>
+	</element>
+
 	<element name="policySet" type="sca:PolicySet"/>
 	<complexType name="PolicySet">
 		<choice minOccurs="0" maxOccurs="unbounded">
@@ -61,12 +73,15 @@
 		<anyAttribute namespace="##other" processContents="lax"/>
 	</complexType>
 
-	<element name="policySetAttachment" 
-	   type="sca:PolicySetAttachment"/>
-	<complexType name="PolicySetAttachment">
-		<attribute name="name" type="QName" use="required"/>
-		<anyAttribute namespace="##other" processContents="lax"/>
-	</complexType>
+	<element name="policySetAttachment">
+		<complexType>
+			<sequence minOccurs="0" maxOccurs="unbounded">
+				<any namespace="##other" processContents="lax"/>
+			</sequence>
+			<attribute name="name" type="QName" use="required"/>
+			<anyAttribute namespace="##other" processContents="lax"/>
+		</complexType>
+	</element>
 
 	<complexType name="PolicySetReference">
 		<attribute name="name" type="QName" use="required"/>
@@ -101,4 +116,4 @@
 		</restriction>
 	</simpleType>
 
-</schema>
\ No newline at end of file
+</schema>

Copied: tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-atom.xsd (from r949816, tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rmi.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-atom.xsd?p2=tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-atom.xsd&p1=tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rmi.xsd&r1=949816&r2=950343&rev=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rmi.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-atom.xsd Wed Jun  2 02:56:25 2010
@@ -23,18 +23,21 @@
     xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
     elementFormDefault="qualified">
 
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
 
-    <element name="binding.rmi" type="t:RMIBinding"/>
+    <element name="binding.atom" type="t:AtomBinding" substitutionGroup="sca:binding"/>
     
-    <complexType name="RMIBinding">
+    <complexType name="AtomBinding">
         <complexContent>
             <extension base="sca:Binding">
-                <sequence>
+                <!-- sequence>
                     <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
                          maxOccurs="unbounded"/>
-                </sequence>
+                </sequence -->
+                <attribute name="title" type="string" use="optional"/>
+                <attribute name="description" type="string" use="optional"/>
+                <!-- anyAttribute namespace="##any" processContents="lax"/ -->
             </extension>
         </complexContent>
     </complexType>
-</schema>
+</schema>
\ No newline at end of file

Modified: tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-http.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-http.xsd?rev=950343&r1=950342&r2=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-http.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-http.xsd Wed Jun  2 02:56:25 2010
@@ -23,18 +23,18 @@
     xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
     elementFormDefault="qualified">
 
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
 
-    <element name="binding.http" type="t:HTTPBinding"/>
+    <element name="binding.http" type="t:HTTPBinding" substitutionGroup="sca:binding"/>
     
     <complexType name="HTTPBinding">
         <complexContent>
             <extension base="sca:Binding">
                 <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
+                    <!-- any namespace="##targetNamespace" processContents="lax" minOccurs="0"
+                         maxOccurs="unbounded"/ -->
                 </sequence>
-                <anyAttribute namespace="##any" processContents="lax"/>
+                <!-- anyAttribute namespace="##any" processContents="lax"/-->
             </extension>
         </complexContent>
     </complexType>

Modified: tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd?rev=950343&r1=950342&r2=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-jsonrpc.xsd Wed Jun  2 02:56:25 2010
@@ -23,18 +23,18 @@
     xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
     elementFormDefault="qualified">
 
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
 
-    <element name="binding.jsonrpc" type="t:JSONRPCBinding"/>
+    <element name="binding.jsonrpc" type="t:JSONRPCBinding" substitutionGroup="sca:binding"/>
     
     <complexType name="JSONRPCBinding">
         <complexContent>
             <extension base="sca:Binding">
                 <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
+                    <!-- any namespace="##targetNamespace" processContents="lax" minOccurs="0"
+                         maxOccurs="unbounded"/ -->
                 </sequence>
-                <anyAttribute namespace="##any" processContents="lax"/>
+                <!-- anyAttribute namespace="##any" processContents="lax"/ -->
             </extension>
         </complexContent>
     </complexType>

Added: tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rest.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rest.xsd?rev=950343&view=auto
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rest.xsd (added)
+++ tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rest.xsd Wed Jun  2 02:56:25 2010
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.    
+-->
+<schema xmlns="http://www.w3.org/2001/XMLSchema" 
+    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
+    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
+    elementFormDefault="qualified">
+
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
+
+    <element name="binding.rest" type="t:RESTBinding" substitutionGroup="sca:binding"/>
+
+    
+    <complexType name="RESTBinding">
+        <complexContent>
+            <extension base="sca:Binding">
+                <sequence>
+                	<element ref="t:http-headers" minOccurs="0" maxOccurs="1"/>
+                    <!-- any namespace="##targetNamespace" processContents="lax" minOccurs="0"
+                         maxOccurs="unbounded"/ -->
+                </sequence>
+                <!-- anyAttribute namespace="##any" processContents="lax"/-->
+            </extension>
+        </complexContent>
+    </complexType>
+
+    <complexType name="HTTPHeadersType">
+        <sequence>
+        	<element ref="t:header" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+    </complexType>
+    
+    <element name="http-headers" type="t:HTTPHeadersType"/>
+    
+    <complexType name="HTTPHeaderType">
+        <attribute name="name" type="string" use="required" />
+        <attribute name="value" type="string" use="required" />
+    </complexType>
+
+	<element name="header" type="t:HTTPHeaderType" />
+    
+    <!--  wire formats -->
+    <complexType name="WireFormatJSONType">
+      <complexContent>
+         <extension base="sca:WireFormatType"/>
+      </complexContent>
+   </complexType>
+   
+   <element name="wireFormat.json" type="t:WireFormatJSONType" 
+            substitutionGroup="sca:wireFormat"/>
+            
+   <complexType name="WireFormatXMLType">
+      <complexContent>
+         <extension base="sca:WireFormatType"/>
+      </complexContent>
+   </complexType>
+   
+   <element name="wireFormat.xml" type="t:WireFormatXMLType" 
+            substitutionGroup="sca:wireFormat"/>            
+            
+   <!--  operation selectors -->      
+   <complexType name="OperationSelectorJAXRSType">
+      <complexContent>
+         <extension base="sca:OperationSelectorType"/>
+      </complexContent>
+   </complexType>    
+   <element name="operationSelector.jaxrs" 
+            type="t:OperationSelectorJAXRSType"
+            substitutionGroup="sca:operationSelector"/>              
+
+   <complexType name="OperationSelectorRPCType">
+      <complexContent>
+         <extension base="sca:OperationSelectorType"/>
+      </complexContent>
+   </complexType>    
+   <element name="operationSelector.rpc" 
+            type="t:OperationSelectorRPCType"
+            substitutionGroup="sca:operationSelector"/>              
+
+</schema>

Copied: tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rss.xsd (from r949816, tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-dwr.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rss.xsd?p2=tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rss.xsd&p1=tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-dwr.xsd&r1=949816&r2=950343&rev=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-dwr.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-binding-rss.xsd Wed Jun  2 02:56:25 2010
@@ -23,19 +23,21 @@
     xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
     elementFormDefault="qualified">
 
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
 
-    <element name="binding.dwr" type="t:DWRBinding"/>
+    <element name="binding.rss" type="t:RSSBinding" substitutionGroup="sca:binding"/>
     
-    <complexType name="DWRBinding">
+    <complexType name="RSSBinding">
         <complexContent>
             <extension base="sca:Binding">
-                <sequence>
+                <!--sequence>
                     <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
                          maxOccurs="unbounded"/>
-                </sequence>
-                <anyAttribute namespace="##any" processContents="lax"/>
+                </sequence -->
+                <attribute name="title" type="string" use="optional"/>
+                <attribute name="description" type="string" use="optional"/>
+                <!--anyAttribute namespace="##any" processContents="lax"/-->
             </extension>
         </complexContent>
     </complexType>
-</schema>
+</schema>
\ No newline at end of file

Copied: tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-python.xsd (from r949816, tuscany/sca-cpp/trunk/modules/python/tuscany-sca-1.1-implementation-python.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-python.xsd?p2=tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-python.xsd&p1=tuscany/sca-cpp/trunk/modules/python/tuscany-sca-1.1-implementation-python.xsd&r1=949816&r2=950343&rev=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/python/tuscany-sca-1.1-implementation-python.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-python.xsd Wed Jun  2 02:56:25 2010
@@ -23,7 +23,7 @@
     xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
     elementFormDefault="qualified">
 
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
 
     <element name="implementation.python" type="t:PythonImplementation" substitutionGroup="sca:implementation"/>
     	

Copied: tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-scheme.xsd (from r949816, tuscany/sca-cpp/trunk/modules/scheme/tuscany-sca-1.1-implementation-scheme.xsd)
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-scheme.xsd?p2=tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-scheme.xsd&p1=tuscany/sca-cpp/trunk/modules/scheme/tuscany-sca-1.1-implementation-scheme.xsd&r1=949816&r2=950343&rev=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/scheme/tuscany-sca-1.1-implementation-scheme.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1-implementation-scheme.xsd Wed Jun  2 02:56:25 2010
@@ -23,7 +23,7 @@
     xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"
     elementFormDefault="qualified">
 
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
 
     <element name="implementation.scheme" type="t:SchemeImplementation" substitutionGroup="sca:implementation"/>
     	

Modified: tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1.xsd
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1.xsd?rev=950343&r1=950342&r2=950343&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1.xsd (original)
+++ tuscany/sca-cpp/trunk/xsd/tuscany-sca-1.1.xsd Wed Jun  2 02:56:25 2010
@@ -20,16 +20,15 @@
 <schema xmlns="http://www.w3.org/2001/XMLSchema"
     targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1">
 
-<!--
-    <import namespace="http://www.w3.org/ns/wsdl-instance" schemaLocation="wsdli.xsd"/>
--->
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd04.xsd"/>
+    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" schemaLocation="sca-1.1-cd05.xsd"/>
 
-    <include schemaLocation="tuscany-sca-1.1-binding-dwr.xsd"/>
+
+    <include schemaLocation="tuscany-sca-1.1-binding-atom.xsd"/>    
     <include schemaLocation="tuscany-sca-1.1-binding-http.xsd"/>
     <include schemaLocation="tuscany-sca-1.1-binding-jsonrpc.xsd"/>
-    <include schemaLocation="tuscany-sca-1.1-binding-rmi.xsd"/>
+    <include schemaLocation="tuscany-sca-1.1-binding-rest.xsd"/>
+    <include schemaLocation="tuscany-sca-1.1-binding-rss.xsd"/>
 
-    <include schemaLocation="tuscany-sca-1.1-implementation-osgi.xsd"/>
-    <include schemaLocation="tuscany-sca-1.1-implementation-widget.xsd"/>
-</schema>
\ No newline at end of file
+    <include schemaLocation="tuscany-sca-1.1-implementation-python.xsd"/>
+    <include schemaLocation="tuscany-sca-1.1-implementation-scheme.xsd"/>
+</schema>



Mime
View raw message