diff options
Diffstat (limited to '')
3 files changed, 87 insertions, 46 deletions
diff --git a/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/sca-contributions.xsd b/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/sca-contributions.xsd index e445acef6e..f4f1037eb1 100644 --- a/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/sca-contributions.xsd +++ b/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/sca-contributions.xsd @@ -3,23 +3,31 @@ <schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.osoa.org/xmlns/sca/1.0" xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" elementFormDefault="qualified"> <include schemaLocation="sca-core.xsd"/> + <import namespace="http://tuscany.apache.org/xmlns/sca/1.0" schemaLocation="tuscany-sca-contributions.xsd"/> <element name="contribution" type="sca:ContributionType"/> <complexType name="ContributionType"> <sequence> - <element name="deployable" type="sca:DeployableType" minOccurs="0" maxOccurs="unbounded"/> - <element ref="sca:import" minOccurs="0" maxOccurs="unbounded"/> - <element ref="sca:export" minOccurs="0" maxOccurs="unbounded"/> + <element name="deployable" type="sca:DeployableType" minOccurs="0" maxOccurs="unbounded"/> + <choice minOccurs="0" maxOccurs="unbounded"> + <element name="import" type="sca:ImportType"/> + <element name="export" type="sca:ExportType"/> + <element name="import.java" type="t:ImportJavaType"/> + <element name="export.java" type="t:ExportJavaType"/> + <element name="import.resource" type="t:ImportResourceType"/> + <element name="export.resource" type="t:ExportResourceType"/> + </choice> <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> </sequence> <anyAttribute namespace="##other" processContents="lax"/> </complexType> <complexType name="DeployableType"> - <sequence> + <sequence> <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> </sequence> <attribute name="composite" type="QName" use="required"/> @@ -28,56 +36,20 @@ <element name="import" type="sca:ImportType"/> <complexType name="ImportType"> - <sequence> + <sequence> <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> </sequence> <attribute name="namespace" type="string" use="required"/> - <attribute name="location" type="anyURI" use="required"/> + <attribute name="location" type="anyURI" use="optional"/> <anyAttribute namespace="##other" processContents="lax"/> </complexType> <element name="export" type="sca:ExportType"/> <complexType name="ExportType"> - <sequence> + <sequence> <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/> </sequence> <attribute name="namespace" type="string" use="required"/> <anyAttribute namespace="##other" processContents="lax"/> - </complexType> - - <element name="import.resource" type="sca:ImportResourceType" substitutionGroup="sca:import"/> - <complexType name="ImportResourceType"> - <complexContent> - <extension base="sca:ImportType"> - <attribute name="uri" type="anyURI" use="optional"/> - </extension> - </complexContent> - </complexType> - - <element name="export.resource" type="sca:ExportResourceType" substitutionGroup="sca:export"/> - <complexType name="ExportResourceType"> - <complexContent> - <extension base="sca:ExportType"> - <attribute name="uri" type="anyURI" use="optional"/> - </extension> - </complexContent> - </complexType> - - <element name="import.java" type="sca:ImportJavaType" substitutionGroup="sca:import"/> - <complexType name="ImportJavaType"> - <complexContent> - <extension base="sca:ImportType"> - <attribute name="package" type="string" use="optional"/> - </extension> - </complexContent> - </complexType> - - <element name="export.java" type="sca:ExportJavaType" substitutionGroup="sca:export"/> - <complexType name="ExportJavaType"> - <complexContent> - <extension base="sca:ExportType"> - <attribute name="package" type="string" use="optional"/> - </extension> - </complexContent> - </complexType> -</schema>
\ No newline at end of file + </complexType> +</schema> diff --git a/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-contributions.xsd b/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-contributions.xsd new file mode 100644 index 0000000000..d8ee19af03 --- /dev/null +++ b/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca-contributions.xsd @@ -0,0 +1,67 @@ +<?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.0"
+ xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
+ elementFormDefault="qualified">
+
+ <element name="import.resource" type="t:ImportResourceType"/>
+ <complexType name="ImportResourceType">
+ <sequence>
+ <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="namespace" type="string" use="optional"/>
+ <attribute name="location" type="anyURI" use="optional"/>
+ <attribute name="uri" type="anyURI" use="required"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
+ </complexType>
+
+ <element name="export.resource" type="t:ExportResourceType"/>
+ <complexType name="ExportResourceType">
+ <sequence>
+ <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="namespace" type="string" use="optional"/>
+ <attribute name="uri" type="anyURI" use="required"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
+ </complexType>
+
+ <element name="import.java" type="t:ImportJavaType"/>
+ <complexType name="ImportJavaType">
+ <sequence>
+ <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="namespace" type="string" use="optional"/>
+ <attribute name="location" type="anyURI" use="optional"/>
+ <attribute name="package" type="string" use="required"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
+ </complexType>
+
+ <element name="export.java" type="t:ExportJavaType"/>
+ <complexType name="ExportJavaType">
+ <sequence>
+ <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ <attribute name="namespace" type="string" use="optional"/>
+ <attribute name="package" type="string" use="required"/>
+ <anyAttribute namespace="##other" processContents="lax"/>
+ </complexType>
+</schema>
diff --git a/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd b/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd index 8bf3766eab..d6bac98a78 100644 --- a/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd +++ b/branches/sca-java-1.x/modules/assembly-xsd/src/main/resources/tuscany-sca.xsd @@ -46,4 +46,6 @@ <include schemaLocation="tuscany-sca-implementation-widget.xsd"/> <include schemaLocation="tuscany-sca-implementation-xquery.xsd"/> -</schema>
\ No newline at end of file + <include schemaLocation="tuscany-sca-contributions.xsd"/> + +</schema> |