Changeset 6901 for metadata/trunk/toolkit/src/main/resources/toolkit

Timestamp:

01/12/16 14:41:23 (9 years ago)

Author:

Mitchell Seaton

Message:

M pom.xml

• updated repository url

M src/main/resources/toolkit/xsd/cmd-component.xsd

• Removed Schematron rule for Attribute name values not longer required due to 1.2 namespaces changes

M src/test/java/eu/clarin/cmd/toolkit/TestCMDToolkit.java

• Added unit test for CMDI profile schema containing 'ref' named Attributes

File:

• metadata/trunk/toolkit/src/main/resources/toolkit/xsd/cmd-component.xsd (modified) (7 diffs)

metadata/trunk/toolkit/src/main/resources/toolkit/xsd/cmd-component.xsd

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-    $Revision$ 
-    $Date$ 
+<!--
+    $Revision$
+    $Date$
 -->
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:sch="http://purl.oclc.org/dsdl/schematron"
     xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning" vc:minVersion="1.0" vc:maxVersion="1.1">
-    
+
     <xs:import namespace="http://www.w3.org/XML/1998/namespace"
         schemaLocation="http://www.w3.org/2005/08/xml.xsd"/>
@@ -92 +92 @@
             <!-- from small (attribute) to big (component) -->
             <xs:element name="AttributeList" type="AttributeList_type" minOccurs="0" maxOccurs="1"/>
-            <xs:element name="Element" type="Element_type" minOccurs="0" maxOccurs="unbounded"/> 
+            <xs:element name="Element" type="Element_type" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="Component" type="Component_type" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
@@ -117 +117 @@
         </xs:simpleContent>
     </xs:complexType>
-    
+
     <xs:complexType name="Element_type">
         <xs:annotation>
@@ -205 +205 @@
                 <xs:annotation>
                     <xs:appinfo>
-                        <sch:pattern id="a_res">
-                            <sch:title>Check reserved attribute names</sch:title>
-                            <sch:rule context="Attribute">
-                                <sch:assert test="not(@name=('ref','ComponentId'))">Attribute name shouldn't be 'ref' or 'ComponentId', as these are used internally by CMD!</sch:assert>
-                            </sch:rule>
-                        </sch:pattern>
                         <sch:pattern id="a_sibs">
                             <sch:title>Check attribute siblings</sch:title>
@@ -273 +267 @@
         <xs:anyAttribute namespace="http://www.clarin.eu/cmdi/cues/1" processContents="lax"/>
     </xs:attributeGroup>
-    
+
     <xs:attributeGroup name="element_attributes">
         <xs:attribute name="name" type="xs:Name" use="required">
@@ -361 +355 @@
                         8    unbounded number    NOK
                         9    unbounded unbounded OK
-                        
+
                         UNK can be either a missing attribute or an empty value, both can be detected with normalize-space(@...)=''
-                        
+
                         default CardinalityMin is 1 (based on the XSD minOccurs default value)
                         default CardinalityMax is 1 (based on the XSD maxOccurs default value)
-                        
+
                         If a basic XSLT 2.0 engine, like Saxon HE, is used for Schematron validation we can't cast to xs:nonNegativeInteger.
                         So we cast to xs:integer. The XSD validator should have already validated that the values are valid cardinality_types.
@@ -455 +449 @@
                     </sch:rule>
                 </sch:pattern>
-            </xs:appinfo>            
+            </xs:appinfo>
         </xs:annotation>
         <xs:simpleContent>