Changeset 6255

Timestamp:

06/01/15 10:18:22 (9 years ago)

Author:

Menzo Windhouwer

Message:

Now follow the default Maven layout, so we can easily leverage standard testing facilities.

First test based on Adelheid 1.1 profile and record tests:

• upgrade of a profile conforms to 1.2 cmd-component.xsd
• upgrade of a record conforms to the 1.2 profile XSD

Additional records collected at the CLARIN Centre Meeting May 2015 are also added, but still need to be worked into tests.

Location:

metadata/trunk/toolkit

Files:

• src (added)
• src/main (added)
• src/main/java (added)
• src/main/java/eu (added)
• src/main/java/eu/clarin (added)
• src/main/java/eu/clarin/cmdi (added)
• src/main/java/eu/clarin/cmdi/toolkit (added)
• src/main/java/eu/clarin/cmdi/toolkit/CMDToolkit.java (added)
• src/main/resources (added)
• src/main/resources/toolkit (added)
• src/main/resources/toolkit/upgrade (added)
• src/main/resources/toolkit/upgrade/cmd-component-1_1-to-1_2.xsl (copied) (copied from metadata/trunk/toolkit/upgrade/cmd-component-1_1-to-1_2.xsl) (1 diff)
• src/main/resources/toolkit/upgrade/cmd-record-1_1-to-1_2.xsl (copied) (copied from metadata/trunk/toolkit/upgrade/cmd-record-1_1-to-1_2.xsl) (1 diff)
• src/main/resources/toolkit/xsd (added)
• src/main/resources/toolkit/xsd/cmd-component.xsd (copied) (copied from metadata/trunk/toolkit/xsd/cmd-component.xsd)
• src/main/resources/toolkit/xsd/cmd-envelop.xsd (copied) (copied from metadata/trunk/toolkit/xsd/cmd-envelop.xsd)
• src/main/resources/toolkit/xslt (added)
• src/main/resources/toolkit/xslt/comp2schema.xsl (copied) (copied from metadata/trunk/toolkit/xslt/comp2schema.xsl) (1 diff)
• src/test (added)
• src/test/java (added)
• src/test/java/eu (added)
• src/test/java/eu/clarin (added)
• src/test/java/eu/clarin/cmd (added)
• src/test/java/eu/clarin/cmd/toolkit (added)
• src/test/java/eu/clarin/cmd/toolkit/CMDToolkitTestSuite.java (added)
• src/test/java/eu/clarin/cmd/toolkit/TestCMDToolkit.java (added)
• src/test/resources (added)
• src/test/resources/toolkit (added)
• src/test/resources/toolkit/Adelheid (added)
• src/test/resources/toolkit/Adelheid/profiles (added)
• src/test/resources/toolkit/Adelheid/profiles/clarin.eu:cr1:p_1311927752306.xml (added)
• src/test/resources/toolkit/Adelheid/records (added)
• src/test/resources/toolkit/Adelheid/records/Adelheid.cmdi (added)
• src/test/resources/toolkit/TEI (added)
• src/test/resources/toolkit/TEI/records (added)
• src/test/resources/toolkit/TEI/records/sundhed_dsn.teiHeader.ref.xml (added)
• src/test/resources/toolkit/Utrecht (added)
• src/test/resources/toolkit/Utrecht/profiles (added)
• src/test/resources/toolkit/Utrecht/profiles/clarin.eu:cr1:p_1311927752306.xml (added)
• src/test/resources/toolkit/successor (added)
• src/test/resources/toolkit/successor/profiles (added)
• src/test/resources/toolkit/successor/profiles/successor-invalid.xml (added)
• src/test/resources/toolkit/successor/profiles/successor-valid.xml (added)
• test (deleted)
• upgrade (deleted)
• xsd (deleted)
• xslt (deleted)

metadata/trunk/toolkit/src/main/resources/toolkit/upgrade/cmd-component-1_1-to-1_2.xsl

@@ -6 +6 @@
     exclude-result-prefixes="xs"
     version="2.0">
-    
-    <xsl:param name="cmd-component-xsd" select="'../../xsd/cmd-component.xsd'"/>
+
+    <xsl:param name="cmd-toolkit" select="'../../../../../main/resources/toolkit'"/>    
+    <xsl:param name="cmd-component-xsd" select="concat($cmd-toolkit,'/xsd/cmd-component.xsd')"/>
     <xsl:param name="cmd-component-status" select="'production'"/>
     

metadata/trunk/toolkit/src/main/resources/toolkit/upgrade/cmd-record-1_1-to-1_2.xsl

@@ -8 +8 @@
     version="2.0">
     
-    <xsl:param name="cmd-envelop-xsd" select="'../../xsd/cmd-envelop.xsd'"/>
+    <xsl:param name="cmd-toolkit" select="'../../../../../main/resources/toolkit'"/>
+    <xsl:param name="cmd-envelop-xsd" select="concat($cmd-toolkit,'/xsd/cmd-envelop.xsd')"/>
     <xsl:param name="cmd-uri" select="'http://www.clarin.eu/cmd/1'"/>
     <xsl:param name="cr-uri" select="'..'"/>

metadata/trunk/toolkit/src/main/resources/toolkit/xslt/comp2schema.xsl

@@ -8 +8 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dcr="http://www.isocat.org/ns/dcr" xmlns:ann="http://www.clarin.eu" xmlns:cmd="http://www.clarin.eu/cmd/1" xmlns:cue="http://www.clarin.eu/cmdi/cues/display/1.0">
 
-    <xsl:param name="cmd-envelop" select="'../../xsd/cmd-envelop.xsd'"/>
+    <xsl:param name="cmd-toolkit" select="'../../../../../main/resources/toolkit'"/>
+    <xsl:param name="cmd-envelop" select="concat($cmd-toolkit,'/xsd/cmd-envelop.xsd')"/>
 
     <xsl:variable name="CMDVersion" select="'1.2'"/>