Added contribution-java XSD and corrected sca-contribution XSD to add a minOccurs=0 to <deployable/> declaration.

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

3 files changed, 120 insertions, 86 deletions

diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd
index 5247c1704c..edd3187ae1 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd
@@ -30,5 +30,6 @@
    <include schemaLocation="sca-contribution-1.1-cd03.xsd"/>
    <include schemaLocation="sca-contribution-cpp-1.1-cd02.xsd"/>
    <include schemaLocation="sca-contribution-c-1.1-cd02.xsd"/>
+   <include schemaLocation="sca-contribution-java-1.1-cd01.xsd"/>
    
 </schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd
index 17c2dd8285..8445749363 100644
--- a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd
@@ -1,86 +1,86 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!-- Copyright(C) OASIS(R) 2005,2009. 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/200903" 

-   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 

-   elementFormDefault="qualified">

-

-   <include schemaLocation="sca-core-1.1-cd03.xsd"/>

-

-   <!-- Contribution -->

-   <element name="contribution" type="sca:ContributionType"/>

-   <complexType name="ContributionType">

-      <complexContent>

-         <extension base="sca:CommonExtensionBase">

-            <sequence>

-               <element name="deployable" type="sca:DeployableType" 

-                        maxOccurs="unbounded"/>

-               <element ref="sca:importBase" minOccurs="0" 

-                        maxOccurs="unbounded"/>

-               <element ref="sca:exportBase" minOccurs="0" 

-                        maxOccurs="unbounded"/>

-               <any namespace="##other" processContents="lax" minOccurs="0" 

-                        maxOccurs="unbounded"/>

-            </sequence>

-         </extension>

-      </complexContent>

-   </complexType>

-

-   <!-- Deployable -->

-   <complexType name="DeployableType">

-      <complexContent>

-         <extension base="sca:CommonExtensionBase">

-            <sequence>

-               <any namespace="##other" processContents="lax" minOccurs="0" 

-                    maxOccurs="unbounded"/>

-            </sequence>

-            <attribute name="composite" type="QName" use="required"/>

-         </extension>

-      </complexContent>

-   </complexType>

-

-   <!-- Import -->

-   <element name="importBase" type="sca:Import" abstract="true" />

-   <complexType name="Import" abstract="true">

-      <complexContent>

-         <extension base="sca:CommonExtensionBase">

-            <sequence>

-               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-            </sequence>

-         </extension>

-      </complexContent>   

-   </complexType>

-   

-   <element name="import" type="sca:ImportType" substitutionGroup="sca:importBase"/>

-   <complexType name="ImportType">

-      <complexContent>

-         <extension base="sca:Import">

-            <attribute name="namespace" type="string" use="required"/>

-            <attribute name="location" type="anyURI" use="optional"/>

-         </extension>

-      </complexContent>

-   </complexType>

-

-   <!-- Export -->

-   <element name="exportBase" type="sca:Export" abstract="true" />

-   <complexType name="Export" abstract="true">

-      <complexContent>

-         <extension base="sca:CommonExtensionBase">

-            <sequence>

-               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>

-            </sequence>

-         </extension>

-      </complexContent>      

-   </complexType>

-   

-   <element name="export" type="sca:ExportType" substitutionGroup="sca:exportBase"/>

-   <complexType name="ExportType">

-      <complexContent>

-         <extension base="sca:Export">

-            <attribute name="namespace" type="string" use="required"/>

-         </extension>

-      </complexContent>

-   </complexType>

-

-</schema>

+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright(C) OASIS(R) 2005,2009. 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/200903" 
+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 
+   elementFormDefault="qualified">
+
+   <include schemaLocation="sca-core-1.1-cd03.xsd"/>
+
+   <!-- Contribution -->
+   <element name="contribution" type="sca:ContributionType"/>
+   <complexType name="ContributionType">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+            <sequence>
+               <element name="deployable" type="sca:DeployableType" 
+                        minOccurs="0" maxOccurs="unbounded"/>
+               <element ref="sca:importBase" minOccurs="0" 
+                        maxOccurs="unbounded"/>
+               <element ref="sca:exportBase" minOccurs="0" 
+                        maxOccurs="unbounded"/>
+               <any namespace="##other" processContents="lax" minOccurs="0" 
+                        maxOccurs="unbounded"/>
+            </sequence>
+         </extension>
+      </complexContent>
+   </complexType>
+
+   <!-- Deployable -->
+   <complexType name="DeployableType">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+            <sequence>
+               <any namespace="##other" processContents="lax" minOccurs="0" 
+                    maxOccurs="unbounded"/>
+            </sequence>
+            <attribute name="composite" type="QName" use="required"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+   <!-- Import -->
+   <element name="importBase" type="sca:Import" abstract="true" />
+   <complexType name="Import" abstract="true">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+            <sequence>
+               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+            </sequence>
+         </extension>
+      </complexContent>   
+   </complexType>
+   
+   <element name="import" type="sca:ImportType" substitutionGroup="sca:importBase"/>
+   <complexType name="ImportType">
+      <complexContent>
+         <extension base="sca:Import">
+            <attribute name="namespace" type="string" use="required"/>
+            <attribute name="location" type="anyURI" use="optional"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+   <!-- Export -->
+   <element name="exportBase" type="sca:Export" abstract="true" />
+   <complexType name="Export" abstract="true">
+      <complexContent>
+         <extension base="sca:CommonExtensionBase">
+            <sequence>
+               <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+            </sequence>
+         </extension>
+      </complexContent>      
+   </complexType>
+   
+   <element name="export" type="sca:ExportType" substitutionGroup="sca:exportBase"/>
+   <complexType name="ExportType">
+      <complexContent>
+         <extension base="sca:Export">
+            <attribute name="namespace" type="string" use="required"/>
+         </extension>
+      </complexContent>
+   </complexType>
+
+</schema>
diff --git a/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd01.xsd b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd01.xsd
new file mode 100644
index 0000000000..8923a4b9e2
--- /dev/null
+++ b/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd01.xsd
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!-- Copyright(C) OASIS(R) 2005,2009. 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/200903" 

+   targetNamespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" 

+   elementFormDefault="qualified">

+

+   <include schemaLocation="sca-contribution-1.1-cd03.xsd"/>

+

+   <!-- Import.java -->   

+   <element name="import.java" type="sca:JavaImportType"

+      substitutionGroup="sca:importBase" />

+   <complexType name="JavaImportType">

+      <complexContent>

+         <extension base="sca:Import">

+            <attribute name="package" type="NCName" use="required"/>

+            <attribute name="location" type="anyURI" use="optional"/>

+         </extension>

+      </complexContent>

+   </complexType>

+   

+   <!-- Export.java -->

+   <element name="export.java" type="sca:JavaExportType"

+      substitutionGroup="sca:exportBase" />

+   <complexType name="JavaExportType">

+      <complexContent>

+         <extension base="sca:Export">

+            <attribute name="package" type="NCName" use="required"/>

+         </extension>

+      </complexContent>

+   </complexType>

+

+</schema>