changed cues namespace to http://www.clarin.eu/cmd/cues/1 as per spec…

…ification (refs #14)
clarin-eric · Dec 3, 2020 · 68e743e · 68e743e
1 parent 3209789
commit 68e743e
Show file tree

Hide file tree

Showing 14 changed files with 21 additions and 20 deletions.
diff --git a/src/main/resources/toolkit/downgrade/cmd-component-1_2-to-1_1.xsl b/src/main/resources/toolkit/downgrade/cmd-component-1_2-to-1_1.xsl
@@ -2,7 +2,8 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:cue="http://www.clarin.eu/cmdi/cues/1"
+    xmlns:cue="http://www.clarin.eu/cmd/cues/1"
+    xmlns:cue_old="http://www.clarin.eu/cmdi/cues/1"
     exclude-result-prefixes="xs"
     version="2.0">
 
@@ -123,13 +124,13 @@
     </xsl:template>
 
     <!-- remove cue namespace for DisplayPriority -->
-    <xsl:template match="@cue:DisplayPriority" priority="2">
+    <xsl:template match="@cue:DisplayPriority|@cue_old:DisplayPriority" priority="2">
         <xsl:attribute name="DisplayPriority">
             <xsl:value-of select="."/>
         </xsl:attribute>
     </xsl:template>
 
     <!-- remove other cue attributes -->
-    <xsl:template match="@cue:*" priority="1"/>
+    <xsl:template match="@cue:*|@cue_old:*" priority="1"/>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
diff --git a/src/main/resources/toolkit/upgrade/cmd-component-1_1-to-1_2.xsl b/src/main/resources/toolkit/upgrade/cmd-component-1_1-to-1_2.xsl
@@ -2,7 +2,7 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    xmlns:cue="http://www.clarin.eu/cmdi/cues/1"
+    xmlns:cue="http://www.clarin.eu/cmd/cues/1"
     exclude-result-prefixes="xs"
     version="2.0">
 

diff --git a/src/main/resources/toolkit/xsd/cmd-component.xsd b/src/main/resources/toolkit/xsd/cmd-component.xsd
@@ -306,7 +306,7 @@
                 <xs:documentation>Is the attribute required or not?</xs:documentation>
             </xs:annotation>
         </xs:attribute>
-        <xs:anyAttribute namespace="http://www.clarin.eu/cmdi/cues/1" processContents="lax"/>
+        <xs:anyAttribute namespace="http://www.clarin.eu/cmd/cues/1" processContents="lax"/>
     </xs:attributeGroup>
 
     <xs:attributeGroup name="element_attributes">
@@ -340,7 +340,7 @@
                 <xs:documentation>Indicates that this element can have values in multiple languages (and thus is repeatable). This will result in the possibility of using the xml:lang attribute in the metadata instances that are created.</xs:documentation>
             </xs:annotation>
         </xs:attribute>
-        <xs:anyAttribute namespace="http://www.clarin.eu/cmdi/cues/1" processContents="lax"/>
+        <xs:anyAttribute namespace="http://www.clarin.eu/cmd/cues/1" processContents="lax"/>
     </xs:attributeGroup>
 
     <xs:attributeGroup name="component_attributes">
@@ -374,7 +374,7 @@
         <xs:attribute name="CardinalityMin" type="cardinality_type" use="optional" default="1"/>
         <xs:attribute name="CardinalityMax" type="cardinality_type" use="optional" default="1"/>
         <xs:attribute ref="xml:base" use="optional"/>
-        <xs:anyAttribute namespace="http://www.clarin.eu/cmdi/cues/1" processContents="lax"/>
+        <xs:anyAttribute namespace="http://www.clarin.eu/cmd/cues/1" processContents="lax"/>
     </xs:attributeGroup>
 
 
@@ -506,7 +506,7 @@
                         <xs:documentation>End-user guidance about the value of this controlled vocabulary item.</xs:documentation>
                     </xs:annotation>
                 </xs:attribute>
-                <xs:anyAttribute namespace="http://www.clarin.eu/cmdi/cues/1" processContents="lax"/>
+                <xs:anyAttribute namespace="http://www.clarin.eu/cmd/cues/1" processContents="lax"/>
             </xs:extension>
         </xs:simpleContent>
     </xs:complexType>

diff --git a/src/main/resources/toolkit/xslt/comp2schema.xsl b/src/main/resources/toolkit/xslt/comp2schema.xsl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:cmd="http://www.clarin.eu/cmd/1" xmlns:cue="http://www.clarin.eu/cmdi/cues/1">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:cmd="http://www.clarin.eu/cmd/1" xmlns:cue="http://www.clarin.eu/cmd/cues/1">
 
     <xsl:param name="cmd-toolkit" select="'https://infra.clarin.eu/CMDI/1.x'"/>
     <xsl:param name="cmd-envelop" select="concat($cmd-toolkit,'/xsd/cmd-envelop.xsd')"/>

diff --git a/src/test/resources/toolkit/Adelheid/profiles/clarin.eu:cr1:p_1311927752306_1_2.xml b/src/test/resources/toolkit/Adelheid/profiles/clarin.eu:cr1:p_1311927752306_1_2.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ComponentSpec CMDVersion="1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cue="http://www.clarin.eu/cmdi/cues/1" isProfile="true" xsi:noNamespaceSchemaLocation="../../../../../main/resources/toolkit/xsd/cmd-component.xsd">
+<ComponentSpec CMDVersion="1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cue="http://www.clarin.eu/cmd/cues/1" isProfile="true" xsi:noNamespaceSchemaLocation="../../../../../main/resources/toolkit/xsd/cmd-component.xsd">
     <Header>
         <ID>clarin.eu:cr1:p_1311927752306</ID>
         <Name>ToolService</Name>

diff --git a/src/test/resources/toolkit/CLAVAS/profiles/TestCLAVAS.xml b/src/test/resources/toolkit/CLAVAS/profiles/TestCLAVAS.xml
@@ -8,7 +8,7 @@
     </Header>
     <Component name="TestCLAVAS" CardinalityMin="1" CardinalityMax="1">
         <Component name="ISO639" ComponentRef="clarin.eu:cr1:c_1493735943958">
-            <Element name="iso-639-3-code" ConceptLink="http://hdl.handle.net/11459/CCR_C-2482_08eded24-4086-7e3f-88e5-e0807fb01e17" CardinalityMin="1" CardinalityMax="1" cue:DisplayPriority="1" xmlns:cue="http://www.clarin.eu/cmdi/cues/1">
+            <Element name="iso-639-3-code" ConceptLink="http://hdl.handle.net/11459/CCR_C-2482_08eded24-4086-7e3f-88e5-e0807fb01e17" CardinalityMin="1" CardinalityMax="1" cue:DisplayPriority="1" xmlns:cue="http://www.clarin.eu/cmd/cues/1">
                 <ValueScheme>
                     <Vocabulary URI="http://hdl.handle.net/11459/CLAVAS_810f8d2a-6723-3ba6-2e57-41d6d3844816" ValueProperty="notation">
                         <enumeration>

diff --git a/src/test/resources/toolkit/CMD/profiles/components-invalid.xml b/src/test/resources/toolkit/CMD/profiles/components-invalid.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ComponentSpec CMDVersion="1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:cue="http://www.clarin.eu/cmdi/cues/1" isProfile="true"
+    xmlns:cue="http://www.clarin.eu/cmd/cues/1" isProfile="true"
     xsi:noNamespaceSchemaLocation="../../../../../main/resources/toolkit/xsd/cmd-component.xsd">
     <Header>
         <ID>clarin.eu:cr1:p_1311927752306</ID>

diff --git a/src/test/resources/toolkit/OLAC/profiles/OLAC-DcmiTerms.cmdi12.xml b/src/test/resources/toolkit/OLAC/profiles/OLAC-DcmiTerms.cmdi12.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ComponentSpec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cue="http://www.clarin.eu/cmdi/cues/1" CMDVersion="1.2" CMDOriginalVersion="1.1" isProfile="true" xsi:noNamespaceSchemaLocation="https://infra.clarin.eu/CMDI/1.x/xsd/cmd-component.xsd">
+<ComponentSpec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cue="http://www.clarin.eu/cmd/cues/1" CMDVersion="1.2" CMDOriginalVersion="1.1" isProfile="true" xsi:noNamespaceSchemaLocation="https://infra.clarin.eu/CMDI/1.x/xsd/cmd-component.xsd">
     <Header>
         <ID>clarin.eu:cr1:p_1288172614026</ID>
         <Name>OLAC-DcmiTerms</Name>

diff --git a/src/test/resources/toolkit/attributes/profiles/mand_attrs_profile.xml b/src/test/resources/toolkit/attributes/profiles/mand_attrs_profile.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ComponentSpec CMDVersion="1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:cue="http://www.clarin.eu/cmdi/cues/1" isProfile="true"
+    xmlns:cue="http://www.clarin.eu/cmd/cues/1" isProfile="true"
     xsi:noNamespaceSchemaLocation="../../../../../main/resources/toolkit/xsd/cmd-component.xsd">
     <Header>
         <ID>clarin.eu:cr1:p_1311927752306</ID>

diff --git a/src/test/resources/toolkit/downgrade/profiles/test.xml b/src/test/resources/toolkit/downgrade/profiles/test.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ComponentSpec CMDVersion="1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:cue="http://www.clarin.eu/cmdi/cues/1" isProfile="true"
+    xmlns:cue="http://www.clarin.eu/cmd/cues/1" isProfile="true"
     xsi:noNamespaceSchemaLocation="../../../../../main/resources/toolkit/xsd/cmd-component.xsd">
     <Header>
         <ID>clarin.eu:cr1:p_12345</ID>

diff --git a/src/test/resources/toolkit/empty/profiles/empty-error.xml b/src/test/resources/toolkit/empty/profiles/empty-error.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ComponentSpec CMDVersion="1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:cue="http://www.clarin.eu/cmdi/cues/1" isProfile="true"
+    xmlns:cue="http://www.clarin.eu/cmd/cues/1" isProfile="true"
     xsi:noNamespaceSchemaLocation="../../../../../main/resources/toolkit/xsd/cmd-component.xsd">
     <Header>
         <ID>clarin.eu:cr1:p_1311927752306</ID>

diff --git a/src/test/resources/toolkit/empty/profiles/empty-warning.xml b/src/test/resources/toolkit/empty/profiles/empty-warning.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ComponentSpec CMDVersion="1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:cue="http://www.clarin.eu/cmdi/cues/1" isProfile="true"
+    xmlns:cue="http://www.clarin.eu/cmd/cues/1" isProfile="true"
     xsi:noNamespaceSchemaLocation="../../../../../main/resources/toolkit/xsd/cmd-component.xsd">
     <Header>
         <ID>clarin.eu:cr1:p_1311927752306</ID>

diff --git a/src/test/resources/toolkit/successor/profiles/successor-invalid.xml b/src/test/resources/toolkit/successor/profiles/successor-invalid.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ComponentSpec CMDVersion="1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:cue="http://www.clarin.eu/cmdi/cues/1" isProfile="true"
+    xmlns:cue="http://www.clarin.eu/cmd/cues/1" isProfile="true"
     xsi:noNamespaceSchemaLocation="../../../../../main/resources/toolkit/xsd/cmd-component.xsd">
     <Header>
         <ID>clarin.eu:cr1:p_1311927752306</ID>

diff --git a/src/test/resources/toolkit/successor/profiles/successor-valid.xml b/src/test/resources/toolkit/successor/profiles/successor-valid.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ComponentSpec CMDVersion="1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:cue="http://www.clarin.eu/cmdi/cues/1" isProfile="true"
+    xmlns:cue="http://www.clarin.eu/cmd/cues/1" isProfile="true"
     xsi:noNamespaceSchemaLocation="../../../../../main/resources/toolkit/xsd/cmd-component.xsd">
     <Header>
         <ID>clarin.eu:cr1:p_1311927752306</ID>