Author: edwardsmj
Date: Mon Apr 27 11:34:54 2009
New Revision: 768931
URL: http://svn.apache.org/viewvc?rev=768931&view=rev
Log:
Added contribution-java XSD and corrected sca-contribution XSD to add a
minOccurs=0 to <deployable/> declaration.
Added:
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd01.xsd
Modified:
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd
Modified:
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd?rev=768931&r1=768930&r2=768931&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd
(original)
+++ tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-1.1-cd03.xsd
Mon Apr 27 11:34:54 2009
@@ -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>
Modified:
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd?rev=768931&r1=768930&r2=768931&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd
(original)
+++
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-1.1-cd03.xsd
Mon Apr 27 11:34:54 2009
@@ -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>
Added:
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd01.xsd
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd01.xsd?rev=768931&view=auto
==============================================================================
---
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd01.xsd
(added)
+++
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-contribution-java-1.1-cd01.xsd
Mon Apr 27 11:34:54 2009
@@ -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>
