Author: slaws
Date: Mon Nov 3 07:37:23 2008
New Revision: 710084
URL: http://svn.apache.org/viewvc?rev=710084&view=rev
Log:
Add import/export.resource to the contributions schema. However it seems that
our contribution schema is in the wrong place and the extension elements are in
the wrong namespace. I'll open JIRA.
Modified:
tuscany/java/sca/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
tuscany/java/sca/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
Modified:
tuscany/java/sca/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml?rev=710084&r1=710083&r2=710084&view=diff
==============================================================================
---
tuscany/java/sca/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
(original)
+++
tuscany/java/sca/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
Mon Nov 3 07:37:23 2008
@@ -18,7 +18,6 @@
* under the License.
-->
<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0";
- targetNamespace="http://calc";
xmlns:calc="http://calc";>
<deployable composite="calc:Calculator"/>
<import.resource xmlns="http://www.osoa.org/xmlns/sca/1.0"/>
Modified:
tuscany/java/sca/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java?rev=710084&r1=710083&r2=710084&view=diff
==============================================================================
---
tuscany/java/sca/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
(original)
+++
tuscany/java/sca/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
Mon Nov 3 07:37:23 2008
@@ -52,7 +52,7 @@
public void testCalculator() {
Monitor monitor = customDomain.getMonitorInstance();
- Problem problem =
((DefaultLoggingMonitorImpl)monitor).getProblems().get(0);
+ Problem problem =
((DefaultLoggingMonitorImpl)monitor).getProblems().get(2);
assertNotNull(problem);
assertEquals("AttributeURIMissing", problem.getMessageId());
Modified:
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
URL:
http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-contributions.xsd?rev=710084&r1=710083&r2=710084&view=diff
==============================================================================
---
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
(original)
+++
tuscany/java/sca/modules/assembly-xsd/src/main/resources/sca-contributions.xsd
Mon Nov 3 07:37:23 2008
@@ -11,8 +11,8 @@
<complexType name="ContributionType">
<sequence>
<element name="deployable" type="sca:DeployableType"
minOccurs="1" maxOccurs="unbounded"/>
- <element name="import" type="sca:ImportType" minOccurs="0"
maxOccurs="unbounded"/>
- <element name="export" type="sca:ExportType" minOccurs="0"
maxOccurs="unbounded"/>
+ <element ref="sca:import" minOccurs="0" maxOccurs="unbounded"/>
+ <element ref="sca:export" minOccurs="0" maxOccurs="unbounded"/>
<any namespace="##other" processContents="lax" minOccurs="0"
maxOccurs="unbounded"/>
</sequence>
<anyAttribute namespace="##other" processContents="lax"/>
@@ -26,6 +26,7 @@
<anyAttribute namespace="##other" processContents="lax"/>
</complexType>
+ <element name="import" type="sca:ImportType"/>
<complexType name="ImportType">
<sequence>
<any namespace="##other" processContents="lax" minOccurs="0"
maxOccurs="unbounded"/>
@@ -35,11 +36,30 @@
<anyAttribute namespace="##other" processContents="lax"/>
</complexType>
+ <element name="export" type="sca:ExportType"/>
<complexType name="ExportType">
<sequence>
<any namespace="##other" processContents="lax" minOccurs="0"
maxOccurs="unbounded"/>
</sequence>
<attribute name="namespace" type="string" use="required"/>
<anyAttribute namespace="##other" processContents="lax"/>
- </complexType>
+ </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>
</schema>
\ No newline at end of file
