From 42a9819e0544087e70012cfc7176c8f1f7a89dcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ant=C3=B3nio=20Lindo?= Date: Fri, 17 May 2024 09:37:57 +0100 Subject: [PATCH] wip --- .../src/main/resources/schema/XMLSchema.dtd | 112 +- .../src/main/resources/schema/XMLSchema.xsd | 2652 ++++++++-------- .../AVID.HEX.2000.1/Indices/fileIndex.xml | 2 +- .../AVID.TST.4000.1/Indices/fileIndex.xml | 4 +- .../Schemas/standard/XMLSchema.xsd | 2720 ++++++++--------- dbptk-model/pom.xml | 15 +- dbptk-modules/dbptk-module-siard/pom.xml | 20 +- .../SIARD1MetadataExportStrategy.java | 2 +- .../SIARDDKMetadataExportStrategy.java | 8 +- pom.xml | 18 +- 10 files changed, 2829 insertions(+), 2724 deletions(-) diff --git a/dbptk-bindings/dbptk-bindings-siarddk/src/main/resources/schema/XMLSchema.dtd b/dbptk-bindings/dbptk-bindings-siarddk/src/main/resources/schema/XMLSchema.dtd index adf2c738b..ebbda6ec8 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/resources/schema/XMLSchema.dtd +++ b/dbptk-bindings/dbptk-bindings-siarddk/src/main/resources/schema/XMLSchema.dtd @@ -1,58 +1,58 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dbptk-bindings/dbptk-bindings-siarddk/src/main/resources/schema/XMLSchema.xsd b/dbptk-bindings/dbptk-bindings-siarddk/src/main/resources/schema/XMLSchema.xsd index d972ac52a..fb7c6859f 100644 --- a/dbptk-bindings/dbptk-bindings-siarddk/src/main/resources/schema/XMLSchema.xsd +++ b/dbptk-bindings/dbptk-bindings-siarddk/src/main/resources/schema/XMLSchema.xsd @@ -4,17 +4,77 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ]> - Part 1 version: Id: structures.xsd,v 1.2 2004/01/15 11:34:25 ht Exp - Part 2 version: Id: datatypes.xsd,v 1.3 2004/01/23 18:11:13 ht Exp + Part 1 version: Id: structures.xsd,v 1.2 2004/01/15 11:34:25 ht Exp + Part 2 version: Id: datatypes.xsd,v 1.3 2004/01/23 18:11:13 ht Exp - + The schema corresponding to this document is normative, with respect to the syntactic constraints it expresses in the XML Schema language. The documentation (within <documentation> elements) @@ -23,58 +83,58 @@ - + The simpleType element and all of its members are defined - towards the end of this schema document + towards the end of this schema document - - - Get access to the xml: attribute groups for xml:lang - as declared on 'schema' and 'documentation' below - - + + + Get access to the xml: attribute groups for xml:lang + as declared on 'schema' and 'documentation' below + + - - - This type is extended by almost all schema types - to allow attributes from other namespaces to be - added to user schemas. - - - - - - - + + + This type is extended by almost all schema types + to allow attributes from other namespaces to be + added to user schemas. + + + + + + + - - - This type is extended by all types which allow annotation - other than <schema> itself - - - - - - - - - - + + + This type is extended by all types which allow annotation + other than <schema> itself + + + + + + + + + + - This group is for the - elements which occur freely at the top level of schemas. - All of their types are based on the "annotated" type by extension. + This group is for the + elements which occur freely at the top level of schemas. + All of their types are based on the "annotated" type by extension. @@ -87,8 +147,8 @@ - This group is for the - elements which can self-redefine (see <redefine> below). + This group is for the + elements which can self-redefine (see <redefine> below). @@ -101,7 +161,7 @@ - A utility type, not for public use + A utility type, not for public use @@ -112,7 +172,7 @@ - A utility type, not for public use + A utility type, not for public use @@ -123,9 +183,9 @@ - A utility type, not for public use + A utility type, not for public use - #all or (possibly empty) subset of {extension, restriction} + #all or (possibly empty) subset of {extension, restriction} @@ -142,7 +202,7 @@ - A utility type, not for public use + A utility type, not for public use @@ -152,12 +212,12 @@ - + - A utility type, not for public use + A utility type, not for public use - #all or (possibly empty) subset of {extension, restriction, list, union} + #all or (possibly empty) subset of {extension, restriction, list, union} @@ -173,7 +233,7 @@ - + @@ -268,8 +328,8 @@ - - 'complexType' uses this + + 'complexType' uses this @@ -359,21 +419,21 @@ - - - - - - This branch is short for - <complexContent> - <restriction base="xs:anyType"> - ... - </restriction> - </complexContent> - - - - + + + + + + This branch is short for + <complexContent> + <restriction base="xs:anyType"> + ... + </restriction> + </complexContent> + + + + @@ -384,15 +444,15 @@ - Will be restricted to required or forbidden + Will be restricted to required or forbidden - Not allowed if simpleContent child is chosen. - May be overriden by setting on complexContent child. - + Not allowed if simpleContent child is chosen. + May be overriden by setting on complexContent child. + @@ -453,7 +513,7 @@ This choice is added simply to - make this a valid restriction per the REC + make this a valid restriction per the REC @@ -490,9 +550,9 @@ - Overrides any setting on complexType parent. + Overrides any setting on complexType parent. - + @@ -506,7 +566,7 @@ This choice is added simply to - make this a valid restriction per the REC + make this a valid restriction per the REC @@ -523,7 +583,7 @@ - No typeDefParticle group reference + No typeDefParticle group reference @@ -556,42 +616,42 @@ - - - + + + A utility type, not for public use - + #all or (possibly empty) subset of {substitution, extension, restriction} - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - The element element can be used either - at the top level to define an element-type binding globally, - or within a content model to either reference a globally-defined - element or type or declare an element-type binding locally. - The ref form is not allowed at the top level. + The element element can be used either + at the top level to define an element-type binding globally, + or within a content model to either reference a globally-defined + element or type or declare an element-type binding locally. + The ref form is not allowed at the top level. @@ -667,8 +727,8 @@ - group type for explicit groups, named top-level groups and - group references + group type for explicit groups, named top-level groups and + group references @@ -742,7 +802,7 @@ - group type for the three kinds of group + group type for the three kinds of group @@ -773,16 +833,16 @@ - - - - This choice with min/max is here to - avoid a pblm with the Elt:All/Choice/Seq - Particle derivation constraint - - - - + + + + This choice with min/max is here to + avoid a pblm with the Elt:All/Choice/Seq + Particle derivation constraint + + + + @@ -821,33 +881,33 @@ - - - - Only elements allowed inside - - - - - - - - - - - - - - - - - - - - - - - + + + + Only elements allowed inside + + + + + + + + + + + + + + + + + + + + + + + @@ -903,35 +963,35 @@ - - + + simple type for the value of the 'namespace' attr of 'any' and 'anyAttribute' - - - + + + Value is - ##any - - any non-conflicting WFXML/attribute at all + ##any - - any non-conflicting WFXML/attribute at all - ##other - - any non-conflicting WFXML/attribute from - namespace other than targetNS + ##other - - any non-conflicting WFXML/attribute from + namespace other than targetNS - ##local - - any unqualified non-conflicting WFXML/attribute + ##local - - any unqualified non-conflicting WFXML/attribute - one or - - any non-conflicting WFXML/attribute from - more URI the listed namespaces - references - (space separated) + one or - - any non-conflicting WFXML/attribute from + more URI the listed namespaces + references + (space separated) - ##targetNamespace or ##local may appear in the above list, to - refer to the targetNamespace of the enclosing - schema or an absent targetNamespace respectively - + ##targetNamespace or ##local may appear in the above list, to + refer to the targetNamespace of the enclosing + schema or an absent targetNamespace respectively + - A utility type, not for public use + A utility type, not for public use @@ -1055,25 +1115,25 @@ - - + + A subset of XPath expressions for use -in selectors + in selectors A utility type, not for public -use + use The following pattern is intended to allow XPath - expressions per the following EBNF: + expressions per the following EBNF: Selector ::= Path ( '|' Path )* Path ::= ('.//')? Step ( '/' Step )* Step ::= '.' | NameTest NameTest ::= QName | '*' | NCName ':' '*' - child:: is also allowed + child:: is also allowed @@ -1081,9 +1141,9 @@ use - - - + + + @@ -1091,21 +1151,21 @@ use - - + + A subset of XPath expressions for use -in fields + in fields A utility type, not for public -use + use The following pattern is intended to allow XPath - expressions per the same EBNF as for selector, - with the following change: + expressions per the same EBNF as for selector, + with the following change: Path ::= ('.//')? ( Step '/' )* ( Step | '@' NameTest ) @@ -1114,9 +1174,9 @@ use - - - + + + @@ -1134,7 +1194,7 @@ use The three kinds of identity constraints, all with - type of or derived from 'keybase'. + type of or derived from 'keybase'. @@ -1185,55 +1245,55 @@ use - A utility type, not for public use + A utility type, not for public use - A public identifier, per ISO 8879 + A public identifier, per ISO 8879 - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -1247,8 +1307,8 @@ use - Not the real urType, but as close an approximation as we can - get in the XML representation + Not the real urType, but as close an approximation as we can + get in the XML representation @@ -1256,863 +1316,863 @@ use - - - First the built-in primitive datatypes. These definitions are for - information only, the real built-in definitions are magic. - + + + First the built-in primitive datatypes. These definitions are for + information only, the real built-in definitions are magic. + - - For each built-in datatype in this schema (both primitive and - derived) can be uniquely addressed via a URI constructed - as follows: - 1) the base URI is the URI of the XML Schema namespace - 2) the fragment identifier is the name of the datatype + + For each built-in datatype in this schema (both primitive and + derived) can be uniquely addressed via a URI constructed + as follows: + 1) the base URI is the URI of the XML Schema namespace + 2) the fragment identifier is the name of the datatype - For example, to address the int datatype, the URI is: + For example, to address the int datatype, the URI is: - http://www.w3.org/2001/XMLSchema#int + http://www.w3.org/2001/XMLSchema#int - Additionally, each facet definition element can be uniquely - addressed via a URI constructed as follows: - 1) the base URI is the URI of the XML Schema namespace - 2) the fragment identifier is the name of the facet + Additionally, each facet definition element can be uniquely + addressed via a URI constructed as follows: + 1) the base URI is the URI of the XML Schema namespace + 2) the fragment identifier is the name of the facet - For example, to address the maxInclusive facet, the URI is: + For example, to address the maxInclusive facet, the URI is: - http://www.w3.org/2001/XMLSchema#maxInclusive + http://www.w3.org/2001/XMLSchema#maxInclusive - Additionally, each facet usage in a built-in datatype definition - can be uniquely addressed via a URI constructed as follows: - 1) the base URI is the URI of the XML Schema namespace - 2) the fragment identifier is the name of the datatype, followed - by a period (".") followed by the name of the facet + Additionally, each facet usage in a built-in datatype definition + can be uniquely addressed via a URI constructed as follows: + 1) the base URI is the URI of the XML Schema namespace + 2) the fragment identifier is the name of the datatype, followed + by a period (".") followed by the name of the facet - For example, to address the usage of the maxInclusive facet in - the definition of int, the URI is: + For example, to address the usage of the maxInclusive facet in + the definition of int, the URI is: - http://www.w3.org/2001/XMLSchema#int.maxInclusive + http://www.w3.org/2001/XMLSchema#int.maxInclusive - - + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - NOTATION cannot be used directly in a schema; rather a type - must be derived from it by specifying at least one enumeration - facet whose value is the name of a NOTATION declared in the - schema. - - - - - - + + + + + + + + + + + + + + + + + + + + + - - Now the derived primitive types - + + + + + + + + + + + + + + + NOTATION cannot be used directly in a schema; rather a type + must be derived from it by specifying at least one enumeration + facet whose value is the name of a NOTATION declared in the + schema. + + + + + - - - - - - - - + + + Now the derived primitive types + + - - - - - - - - + + + + + + + + - - - - - - - - - pattern specifies the content of section 2.12 of XML 1.0e2 - and RFC 3066 (Revised version of RFC 1766). - - - - - + + + + + + + + - + + + + + + - - - - - - - - - - - - - + + pattern specifies the content of section 2.12 of XML 1.0e2 + and RFC 3066 (Revised version of RFC 1766). + - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - pattern matches production 7 from the XML spec - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + - - - - - - - - - - - - - + + pattern matches production 7 from the XML spec + - - - - - - - + + + - - - - - - - - - pattern matches production 5 from the XML spec - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + - + + pattern matches production 5 from the XML spec + - - - - - pattern matches production 4 from the Namespaces in XML spec - - - - - + + + - + + + + + + - + + pattern matches production 4 from the Namespaces in XML spec + - - + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + - A utility type, not for public use + A utility type, not for public use @@ -2125,19 +2185,19 @@ use - - - + + + - #all or (possibly empty) subset of {restriction, union, list} + #all or (possibly empty) subset of {restriction, union, list} - A utility type, not for public use + A utility type, not for public use @@ -2159,173 +2219,173 @@ use - - - - - - - - - Can be restricted to required or forbidden - - - - - - + + + + + + + + + Can be restricted to required or forbidden + + + + + + - - - - - - - - - - - Required at the top level - - - - - - - + + + + + + + + + + + Required at the top level + + + + + + + - - - - - - - - - - - Forbidden when nested - - - - - - - - + + + + + + + + + + + Forbidden when nested + + + + + + + + - - - - - + + + + + + + + + + We should use a substitution group for facets, but + that's ruled out because it would allow users to + add their own, which we're not ready for yet. + + + + + + + + + + + + + + + + + - + + + + + + + + + - - We should use a substitution group for facets, but - that's ruled out because it would allow users to - add their own, which we're not ready for yet. + + base attribute and simpleType child are mutually + exclusive, but one or other is required - - - - - - - - - - - - - - - + + + + + + + + - - - - - - + + + + + itemType attribute and simpleType child are mutually + exclusive, but one or other is required + + + + + + + + + + + + - - - - - base attribute and simpleType child are mutually - exclusive, but one or other is required - - - - - - - - - - - - - - - - itemType attribute and simpleType child are mutually - exclusive, but one or other is required - - - - - - - - - - - - - - - - - - memberTypes attribute must be non-empty or there must be - at least one simpleType child - - - - - - - - - - - - - - - - - - - - - - - - + + + + + memberTypes attribute must be non-empty or there must be + at least one simpleType child + + + + + + + + + + + + + + + + + + + + + + + + @@ -2339,136 +2399,136 @@ use - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/dbptk-core/src/test/resources/siarddk/AVID.HEX.2000.1/Indices/fileIndex.xml b/dbptk-core/src/test/resources/siarddk/AVID.HEX.2000.1/Indices/fileIndex.xml index 150564ada..eeecd6209 100644 --- a/dbptk-core/src/test/resources/siarddk/AVID.HEX.2000.1/Indices/fileIndex.xml +++ b/dbptk-core/src/test/resources/siarddk/AVID.HEX.2000.1/Indices/fileIndex.xml @@ -8,7 +8,7 @@ AVID.HEX.2000.1\Schemas\standard XMLSchema.xsd - 94ED1A93CE3147D01BCB2FC1126255ED + 296FA50F21D7AA4F1A646B0906D21C6C AVID.HEX.2000.1\Schemas\standard diff --git a/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Indices/fileIndex.xml b/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Indices/fileIndex.xml index 6cbc7ccfd..f9fc40f9d 100644 --- a/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Indices/fileIndex.xml +++ b/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Indices/fileIndex.xml @@ -8,7 +8,7 @@ AVID.TST.4000.1\Schemas\standard XMLSchema.xsd - 94ED1A93CE3147D01BCB2FC1126255ED + 296FA50F21D7AA4F1A646B0906D21C6C AVID.TST.4000.1\Schemas\standard @@ -23,7 +23,7 @@ AVID.TST.4000.1\Schemas\standard fileIndex.xsd - BC828D70D073029CE8C5FDBC6651C4F3 + D41D8CD98F00B204E9800998ECF8427E AVID.TST.4000.1\Schemas\standard diff --git a/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Schemas/standard/XMLSchema.xsd b/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Schemas/standard/XMLSchema.xsd index 2e9a2729e..fb7c6859f 100644 --- a/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Schemas/standard/XMLSchema.xsd +++ b/dbptk-core/src/test/resources/siarddk/AVID.TST.4000.1/Schemas/standard/XMLSchema.xsd @@ -6,34 +6,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -44,10 +44,10 @@ - + @@ -68,13 +68,13 @@ - Part 1 version: Id: structures.xsd,v 1.2 2004/01/15 11:34:25 ht Exp - Part 2 version: Id: datatypes.xsd,v 1.3 2004/01/23 18:11:13 ht Exp + Part 1 version: Id: structures.xsd,v 1.2 2004/01/15 11:34:25 ht Exp + Part 2 version: Id: datatypes.xsd,v 1.3 2004/01/23 18:11:13 ht Exp - + The schema corresponding to this document is normative, with respect to the syntactic constraints it expresses in the XML Schema language. The documentation (within <documentation> elements) @@ -83,58 +83,58 @@ - + The simpleType element and all of its members are defined - towards the end of this schema document + towards the end of this schema document - - - Get access to the xml: attribute groups for xml:lang - as declared on 'schema' and 'documentation' below - - + + + Get access to the xml: attribute groups for xml:lang + as declared on 'schema' and 'documentation' below + + - - - This type is extended by almost all schema types - to allow attributes from other namespaces to be - added to user schemas. - - - - - - - + + + This type is extended by almost all schema types + to allow attributes from other namespaces to be + added to user schemas. + + + + + + + - - - This type is extended by all types which allow annotation - other than <schema> itself - - - - - - - - - - + + + This type is extended by all types which allow annotation + other than <schema> itself + + + + + + + + + + - This group is for the - elements which occur freely at the top level of schemas. - All of their types are based on the "annotated" type by extension. + This group is for the + elements which occur freely at the top level of schemas. + All of their types are based on the "annotated" type by extension. @@ -143,12 +143,12 @@ - + - This group is for the - elements which can self-redefine (see <redefine> below). + This group is for the + elements which can self-redefine (see <redefine> below). @@ -161,7 +161,7 @@ - A utility type, not for public use + A utility type, not for public use @@ -172,7 +172,7 @@ - A utility type, not for public use + A utility type, not for public use @@ -183,12 +183,12 @@ - A utility type, not for public use + A utility type, not for public use - #all or (possibly empty) subset of {extension, restriction} + #all or (possibly empty) subset of {extension, restriction} - + @@ -202,7 +202,7 @@ - A utility type, not for public use + A utility type, not for public use @@ -212,15 +212,15 @@ - + - A utility type, not for public use + A utility type, not for public use - #all or (possibly empty) subset of {extension, restriction, list, union} + #all or (possibly empty) subset of {extension, restriction, list, union} - + @@ -233,7 +233,7 @@ - + @@ -276,17 +276,17 @@ - + - + - + @@ -328,8 +328,8 @@ - - 'complexType' uses this + + 'complexType' uses this @@ -337,8 +337,8 @@ - - + + @@ -349,7 +349,7 @@ - + @@ -360,7 +360,7 @@ - + @@ -384,7 +384,7 @@ - + @@ -419,21 +419,21 @@ - - - - - - This branch is short for - <complexContent> - <restriction base="xs:anyType"> - ... - </restriction> - </complexContent> - - - - + + + + + + This branch is short for + <complexContent> + <restriction base="xs:anyType"> + ... + </restriction> + </complexContent> + + + + @@ -444,15 +444,15 @@ - Will be restricted to required or forbidden + Will be restricted to required or forbidden - Not allowed if simpleContent child is chosen. - May be overriden by setting on complexContent child. - + Not allowed if simpleContent child is chosen. + May be overriden by setting on complexContent child. + @@ -460,7 +460,7 @@ - + @@ -473,7 +473,7 @@ - + @@ -489,7 +489,7 @@ - + @@ -502,7 +502,7 @@ - + @@ -513,7 +513,7 @@ This choice is added simply to - make this a valid restriction per the REC + make this a valid restriction per the REC @@ -521,7 +521,7 @@ - + @@ -533,7 +533,7 @@ - + @@ -546,13 +546,13 @@ - + - Overrides any setting on complexType parent. + Overrides any setting on complexType parent. - + @@ -566,7 +566,7 @@ This choice is added simply to - make this a valid restriction per the REC + make this a valid restriction per the REC @@ -583,7 +583,7 @@ - No typeDefParticle group reference + No typeDefParticle group reference @@ -608,7 +608,7 @@ - + @@ -616,42 +616,42 @@ - - - + + + A utility type, not for public use - + #all or (possibly empty) subset of {substitution, extension, restriction} - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - The element element can be used either - at the top level to define an element-type binding globally, - or within a content model to either reference a globally-defined - element or type or declare an element-type binding locally. - The ref form is not allowed at the top level. + The element element can be used either + at the top level to define an element-type binding globally, + or within a content model to either reference a globally-defined + element or type or declare an element-type binding locally. + The ref form is not allowed at the top level. @@ -677,7 +677,7 @@ - + @@ -698,7 +698,7 @@ - + @@ -727,8 +727,8 @@ - group type for explicit groups, named top-level groups and - group references + group type for explicit groups, named top-level groups and + group references @@ -738,7 +738,7 @@ - + @@ -802,7 +802,7 @@ - group type for the three kinds of group + group type for the three kinds of group @@ -816,7 +816,7 @@ - + @@ -830,22 +830,22 @@ - + - - - - This choice with min/max is here to - avoid a pblm with the Elt:All/Choice/Seq - Particle derivation constraint - - - - + + + + This choice with min/max is here to + avoid a pblm with the Elt:All/Choice/Seq + Particle derivation constraint + + + + - - + + restricted max/min @@ -881,33 +881,33 @@ - - - - Only elements allowed inside - - - - - - - - - - - - - - - - - - - - - - - + + + + Only elements allowed inside + + + + + + + + + + + + + + + + + + + + + + + @@ -963,35 +963,35 @@ - - + + simple type for the value of the 'namespace' attr of 'any' and 'anyAttribute' - - - + + + Value is - ##any - - any non-conflicting WFXML/attribute at all + ##any - - any non-conflicting WFXML/attribute at all - ##other - - any non-conflicting WFXML/attribute from - namespace other than targetNS + ##other - - any non-conflicting WFXML/attribute from + namespace other than targetNS - ##local - - any unqualified non-conflicting WFXML/attribute + ##local - - any unqualified non-conflicting WFXML/attribute - one or - - any non-conflicting WFXML/attribute from - more URI the listed namespaces - references - (space separated) + one or - - any non-conflicting WFXML/attribute from + more URI the listed namespaces + references + (space separated) - ##targetNamespace or ##local may appear in the above list, to - refer to the targetNamespace of the enclosing - schema or an absent targetNamespace respectively - + ##targetNamespace or ##local may appear in the above list, to + refer to the targetNamespace of the enclosing + schema or an absent targetNamespace respectively + - A utility type, not for public use + A utility type, not for public use @@ -1031,7 +1031,7 @@ - + @@ -1115,25 +1115,25 @@ - - + + A subset of XPath expressions for use -in selectors + in selectors A utility type, not for public -use + use The following pattern is intended to allow XPath - expressions per the following EBNF: - Selector ::= Path ( '|' Path )* - Path ::= ('.//')? Step ( '/' Step )* - Step ::= '.' | NameTest - NameTest ::= QName | '*' | NCName ':' '*' - child:: is also allowed + expressions per the following EBNF: + Selector ::= Path ( '|' Path )* + Path ::= ('.//')? Step ( '/' Step )* + Step ::= '.' | NameTest + NameTest ::= QName | '*' | NCName ':' '*' + child:: is also allowed @@ -1141,9 +1141,9 @@ use - - - + + + @@ -1151,22 +1151,22 @@ use - - + + A subset of XPath expressions for use -in fields + in fields A utility type, not for public -use + use The following pattern is intended to allow XPath - expressions per the same EBNF as for selector, - with the following change: - Path ::= ('.//')? ( Step '/' )* ( Step | '@' NameTest ) + expressions per the same EBNF as for selector, + with the following change: + Path ::= ('.//')? ( Step '/' )* ( Step | '@' NameTest ) @@ -1174,9 +1174,9 @@ use - - - + + + @@ -1194,7 +1194,7 @@ use The three kinds of identity constraints, all with - type of or derived from 'keybase'. + type of or derived from 'keybase'. @@ -1245,55 +1245,55 @@ use - A utility type, not for public use + A utility type, not for public use - A public identifier, per ISO 8879 + A public identifier, per ISO 8879 - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -1303,12 +1303,12 @@ use - + - Not the real urType, but as close an approximation as we can - get in the XML representation + Not the real urType, but as close an approximation as we can + get in the XML representation @@ -1316,863 +1316,863 @@ use - - - First the built-in primitive datatypes. These definitions are for - information only, the real built-in definitions are magic. - + + + First the built-in primitive datatypes. These definitions are for + information only, the real built-in definitions are magic. + - - For each built-in datatype in this schema (both primitive and - derived) can be uniquely addressed via a URI constructed - as follows: - 1) the base URI is the URI of the XML Schema namespace - 2) the fragment identifier is the name of the datatype + + For each built-in datatype in this schema (both primitive and + derived) can be uniquely addressed via a URI constructed + as follows: + 1) the base URI is the URI of the XML Schema namespace + 2) the fragment identifier is the name of the datatype - For example, to address the int datatype, the URI is: + For example, to address the int datatype, the URI is: - http://www.w3.org/2001/XMLSchema#int + http://www.w3.org/2001/XMLSchema#int - Additionally, each facet definition element can be uniquely - addressed via a URI constructed as follows: - 1) the base URI is the URI of the XML Schema namespace - 2) the fragment identifier is the name of the facet + Additionally, each facet definition element can be uniquely + addressed via a URI constructed as follows: + 1) the base URI is the URI of the XML Schema namespace + 2) the fragment identifier is the name of the facet - For example, to address the maxInclusive facet, the URI is: + For example, to address the maxInclusive facet, the URI is: - http://www.w3.org/2001/XMLSchema#maxInclusive + http://www.w3.org/2001/XMLSchema#maxInclusive - Additionally, each facet usage in a built-in datatype definition - can be uniquely addressed via a URI constructed as follows: - 1) the base URI is the URI of the XML Schema namespace - 2) the fragment identifier is the name of the datatype, followed - by a period (".") followed by the name of the facet + Additionally, each facet usage in a built-in datatype definition + can be uniquely addressed via a URI constructed as follows: + 1) the base URI is the URI of the XML Schema namespace + 2) the fragment identifier is the name of the datatype, followed + by a period (".") followed by the name of the facet - For example, to address the usage of the maxInclusive facet in - the definition of int, the URI is: + For example, to address the usage of the maxInclusive facet in + the definition of int, the URI is: - http://www.w3.org/2001/XMLSchema#int.maxInclusive + http://www.w3.org/2001/XMLSchema#int.maxInclusive - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - NOTATION cannot be used directly in a schema; rather a type - must be derived from it by specifying at least one enumeration - facet whose value is the name of a NOTATION declared in the - schema. - - - - - - + + + + + + + + + + + + + + + + + + + + + - - Now the derived primitive types - + + + + + + + + + + + + + + + NOTATION cannot be used directly in a schema; rather a type + must be derived from it by specifying at least one enumeration + facet whose value is the name of a NOTATION declared in the + schema. + + + + + - - - - - - - - + + + Now the derived primitive types + + - - - - - - - - + + + + + + + + - - - - - - - - - pattern specifies the content of section 2.12 of XML 1.0e2 - and RFC 3066 (Revised version of RFC 1766). - - - - - + + + + + + + + - + + + + + + - - - - - - - - - - - - - + + pattern specifies the content of section 2.12 of XML 1.0e2 + and RFC 3066 (Revised version of RFC 1766). + - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - pattern matches production 7 from the XML spec - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + - - - - - - - - - - - - - + + pattern matches production 7 from the XML spec + - - - - - - - + + + - - - - - - - - - pattern matches production 5 from the XML spec - - - - - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + - + + pattern matches production 5 from the XML spec + - - - - - pattern matches production 4 from the Namespaces in XML spec - - - - - + + + - + + + + + + - + + pattern matches production 4 from the Namespaces in XML spec + - - + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - + + + + + + - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + + - - - - - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + - A utility type, not for public use + A utility type, not for public use @@ -2185,19 +2185,19 @@ use - - - + + + - #all or (possibly empty) subset of {restriction, union, list} + #all or (possibly empty) subset of {restriction, union, list} - A utility type, not for public use + A utility type, not for public use @@ -2219,173 +2219,173 @@ use - - - - - - - - - Can be restricted to required or forbidden - - - - - - + + + + + + + + + Can be restricted to required or forbidden + + + + + + - - - - - - - - - - - Required at the top level - - - - - - - + + + + + + + + + + + Required at the top level + + + + + + + - - - - - - - - - - - Forbidden when nested - - - - - - - - + + + + + + + + + + + Forbidden when nested + + + + + + + + - - - - - + + + + + + + + + + We should use a substitution group for facets, but + that's ruled out because it would allow users to + add their own, which we're not ready for yet. + + + + + + + + + + + + + + + + + + + + + + + + - + + - - We should use a substitution group for facets, but - that's ruled out because it would allow users to - add their own, which we're not ready for yet. + + base attribute and simpleType child are mutually + exclusive, but one or other is required - - - - - - - - - - - - - - - + + + + + + + + - - - - - - + + + + + itemType attribute and simpleType child are mutually + exclusive, but one or other is required + + + + + + + + + + + + - - - - - base attribute and simpleType child are mutually - exclusive, but one or other is required - - - - - - - - - - - - - - - - itemType attribute and simpleType child are mutually - exclusive, but one or other is required - - - - - - - - - - - - - - - - - - memberTypes attribute must be non-empty or there must be - at least one simpleType child - - - - - - - - - - - - - - - - - - - - - - - - + + + + + memberTypes attribute must be non-empty or there must be + at least one simpleType child + + + + + + + + + + + + + + + + + + + + + + + + @@ -2399,136 +2399,136 @@ use - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/dbptk-model/pom.xml b/dbptk-model/pom.xml index 30799b365..d759e51bd 100644 --- a/dbptk-model/pom.xml +++ b/dbptk-model/pom.xml @@ -73,7 +73,13 @@ com.sun.xml.bind jaxb-impl - 2.3.7 + 4.0.5 + runtime + + + org.glassfish.jaxb + jaxb-runtime + 4.0.5 com.google.guava @@ -107,4 +113,11 @@ + + + maven_central + Maven Central + https://repo.maven.apache.org/maven2/ + + \ No newline at end of file diff --git a/dbptk-modules/dbptk-module-siard/pom.xml b/dbptk-modules/dbptk-module-siard/pom.xml index c861e6905..c6d8787b2 100644 --- a/dbptk-modules/dbptk-module-siard/pom.xml +++ b/dbptk-modules/dbptk-module-siard/pom.xml @@ -75,10 +75,26 @@ mapdb 3.1.0 + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 + + + com.sun.xml.bind + jaxb-impl + 4.0.5 + runtime + + + org.glassfish.jaxb + jaxb-runtime + 4.0.5 + com.databasepreservation - dbptk-bindings-siard2-2 - 2.2.0 + dbptk-bindings-siard2-1 + 1.5.1 compile diff --git a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARD1MetadataExportStrategy.java b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARD1MetadataExportStrategy.java index db21fcf60..a3e0e9df6 100644 --- a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARD1MetadataExportStrategy.java +++ b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARD1MetadataExportStrategy.java @@ -88,7 +88,7 @@ import com.databasepreservation.modules.siard.out.write.WriteStrategy; import com.databasepreservation.utils.JodaUtils; import com.databasepreservation.utils.XMLUtils; - +import jakarta.xml.bind.JAXBContext; /** * @author Bruno Ferreira */ diff --git a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARDDKMetadataExportStrategy.java b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARDDKMetadataExportStrategy.java index 087760964..426422fd6 100644 --- a/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARDDKMetadataExportStrategy.java +++ b/dbptk-modules/dbptk-module-siard/src/main/java/com/databasepreservation/modules/siard/out/metadata/SIARDDKMetadataExportStrategy.java @@ -182,9 +182,11 @@ private void writeSchemaFile(SIARDArchiveContainer container, String indexFile, OutputStream outputStream = fileIndexFileStrategy.getWriter(container, path, writeStrategy); try { - IOUtils.copy(inputStream, outputStream); - inputStream.close(); - outputStream.close(); + if (inputStream != null) { + IOUtils.copy(inputStream, outputStream); + inputStream.close(); + outputStream.close(); + } fileIndexFileStrategy.addFile(path); diff --git a/pom.xml b/pom.xml index 8ddd5145b..1bd7e7148 100644 --- a/pom.xml +++ b/pom.xml @@ -381,8 +381,22 @@ commons-cli 1.3.1 - - + + jakarta.xml.bind + jakarta.xml.bind-api + 4.0.2 + + + com.sun.xml.bind + jaxb-impl + 4.0.5 + runtime + + + org.glassfish.jaxb + jaxb-runtime + 4.0.5 + org.hamcrest