diff options
Diffstat (limited to '')
4 files changed, 46 insertions, 24 deletions
diff --git a/cpp/sca/runtime/xsd/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/cpp/sca/runtime/xsd/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema deleted file mode 100644 index 5007705d41..0000000000 --- a/cpp/sca/runtime/xsd/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema +++ /dev/null @@ -1,18 +0,0 @@ -# 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. -# -tuscany-sca-1.1.xsd
\ No newline at end of file diff --git a/cpp/sca/runtime/xsd/sca-core-1.1-cd04.xsd b/cpp/sca/runtime/xsd/sca-core-1.1-cd04.xsd index 74cfe9a739..654d568bab 100644 --- a/cpp/sca/runtime/xsd/sca-core-1.1-cd04.xsd +++ b/cpp/sca/runtime/xsd/sca-core-1.1-cd04.xsd @@ -33,10 +33,7 @@ <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" @@ -290,8 +287,7 @@ <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="0"/> <choice minOccurs="0" maxOccurs="unbounded"> <element name="service" type="sca:ComponentService"/> <element name="reference" type="sca:ComponentReference"/> diff --git a/cpp/sca/runtime/xsd/tuscany-sca-1.1-implementation-widget.xsd b/cpp/sca/runtime/xsd/tuscany-sca-1.1-implementation-widget.xsd new file mode 100644 index 0000000000..8e65b402d7 --- /dev/null +++ b/cpp/sca/runtime/xsd/tuscany-sca-1.1-implementation-widget.xsd @@ -0,0 +1,43 @@ +<?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/200903" + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" + elementFormDefault="qualified"> + + <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200903" schemaLocation="sca-1.1-cd04.xsd"/> + + <element name="implementation.widget" type="t:WidgetImplementation" substitutionGroup="sca:implementation"/> + + <complexType name="WidgetImplementation"> + <complexContent> + <extension base="sca:Implementation"> + <sequence> + <any namespace="##targetNamespace" processContents="lax" + minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="location" type="anyURI" use="required"/> + <anyAttribute namespace="##any" processContents="lax"/> + </extension> + </complexContent> + </complexType> + +</schema> diff --git a/cpp/sca/runtime/xsd/tuscany-sca-1.1.xsd b/cpp/sca/runtime/xsd/tuscany-sca-1.1.xsd index 7a8f45954f..fb0a0cf9d5 100644 --- a/cpp/sca/runtime/xsd/tuscany-sca-1.1.xsd +++ b/cpp/sca/runtime/xsd/tuscany-sca-1.1.xsd @@ -31,4 +31,5 @@ <include schemaLocation="tuscany-sca-1.1-binding-rmi.xsd"/> <include schemaLocation="tuscany-sca-1.1-implementation-osgi.xsd"/> -</schema>
\ No newline at end of file + <include schemaLocation="tuscany-sca-1.1-implementation-widget.xsd"/> +</schema> |