diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml
index 3c1496db96251ef948a2712a3a4acf9354e1ed33..1eaad533fe55aaee06906fa364068a1036ac4f8d 100644
--- a/oaipmh-core/pom.xml
+++ b/oaipmh-core/pom.xml
@@ -171,9 +171,33 @@
</executions>
</plugin>
<plugin>
+<!-- We use this plugin to ensure that our usage of the
+maven-jaxb2-plugin is JDK 8 compatible in absence of a fix
+for https://java.net/jira/browse/MAVEN_JAXB2_PLUGIN-80. -->
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>properties-maven-plugin</artifactId>
+ <version>1.0-alpha-2</version>
+ <executions>
+ <execution>
+ <id>set-additional-system-properties</id>
+ <goals>
+ <goal>set-system-properties</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <properties>
+ <property>
+ <name>javax.xml.accessExternalSchema</name>
+ <value>file,http</value>
+ </property>
+ </properties>
+ </configuration>
+</plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>jaxb2-maven-plugin</artifactId>
- <version>1.5</version>
+ <version>2.4</version>
<executions>
<execution>
<id>oaipmhDCSchema-xjc</id>
@@ -185,11 +209,7 @@
<packageName>info.textgrid.middleware.oaidc</packageName>
<schemaDirectory>src/main/xsd</schemaDirectory>
<schemaIncludes>
- <include>simpledc20020312.xsd</include>
- <include>xml.xsd</include>
<include>oai_dc.xsd</include>
- <include>XMLSchema.dtd</include>
- <include>datatypes.dtd</include>
</schemaIncludes>
<generateDirectory>${project.build.directory}/generated-sources/xjc1</generateDirectory>
<staleFile>${project.build.directory}/jaxb2/.oaiDCSchemaXjcStaleFlag</staleFile>
diff --git a/oaipmh-core/src/main/xsd/XMLSchema.dtd b/oaipmh-core/src/main/xsd/XMLSchema.dtd
deleted file mode 100644
index bbc0aa688b9e83b178a2c56af7a928d1aa375473..0000000000000000000000000000000000000000
--- a/oaipmh-core/src/main/xsd/XMLSchema.dtd
+++ /dev/null
@@ -1,403 +0,0 @@
-
-<!-- DTD for XML Schemas: Part 1: Structures
- Public Identifier: "-//W3C//DTD XMLSCHEMA 200102//EN"
- Official Location: http://www.w3.org/2001/XMLSchema.dtd -->
-<!-- $Id: XMLSchema.dtd,v 1.31 2001/10/24 15:50:16 ht Exp $ -->
-<!-- Note this DTD is NOT normative, or even definitive. --> <!--d-->
-<!-- prose copy in the structures REC is the definitive version --> <!--d-->
-<!-- (which shouldn't differ from this one except for this --> <!--d-->
-<!-- comment and entity expansions, but just in case) --> <!--d-->
-<!-- With the exception of cases with multiple namespace
- prefixes for the XML Schema namespace, any XML document which is
- not valid per this DTD given redefinitions in its internal subset of the
- 'p' and 's' parameter entities below appropriate to its namespace
- declaration of the XML Schema namespace is almost certainly not
- a valid schema. -->
-
-<!-- The simpleType element and its constituent parts
- are defined in XML Schema: Part 2: Datatypes -->
-<!ENTITY % xs-datatypes PUBLIC 'datatypes' 'datatypes.dtd' >
-
-<!ENTITY % p 'xs:'> <!-- can be overriden in the internal subset of a
- schema document to establish a different
- namespace prefix -->
-<!ENTITY % s ':xs'> <!-- if %p is defined (e.g. as foo:) then you must
- also define %s as the suffix for the appropriate
- namespace declaration (e.g. :foo) -->
-<!ENTITY % nds 'xmlns%s;'>
-
-<!-- Define all the element names, with optional prefix -->
-<!ENTITY % schema "%p;schema">
-<!ENTITY % complexType "%p;complexType">
-<!ENTITY % complexContent "%p;complexContent">
-<!ENTITY % simpleContent "%p;simpleContent">
-<!ENTITY % extension "%p;extension">
-<!ENTITY % element "%p;element">
-<!ENTITY % unique "%p;unique">
-<!ENTITY % key "%p;key">
-<!ENTITY % keyref "%p;keyref">
-<!ENTITY % selector "%p;selector">
-<!ENTITY % field "%p;field">
-<!ENTITY % group "%p;group">
-<!ENTITY % all "%p;all">
-<!ENTITY % choice "%p;choice">
-<!ENTITY % sequence "%p;sequence">
-<!ENTITY % any "%p;any">
-<!ENTITY % anyAttribute "%p;anyAttribute">
-<!ENTITY % attribute "%p;attribute">
-<!ENTITY % attributeGroup "%p;attributeGroup">
-<!ENTITY % include "%p;include">
-<!ENTITY % import "%p;import">
-<!ENTITY % redefine "%p;redefine">
-<!ENTITY % notation "%p;notation">
-
-<!-- annotation elements -->
-<!ENTITY % annotation "%p;annotation">
-<!ENTITY % appinfo "%p;appinfo">
-<!ENTITY % documentation "%p;documentation">
-
-<!-- Customisation entities for the ATTLIST of each element type.
- Define one of these if your schema takes advantage of the
- anyAttribute='##other' in the schema for schemas -->
-
-<!ENTITY % schemaAttrs ''>
-<!ENTITY % complexTypeAttrs ''>
-<!ENTITY % complexContentAttrs ''>
-<!ENTITY % simpleContentAttrs ''>
-<!ENTITY % extensionAttrs ''>
-<!ENTITY % elementAttrs ''>
-<!ENTITY % groupAttrs ''>
-<!ENTITY % allAttrs ''>
-<!ENTITY % choiceAttrs ''>
-<!ENTITY % sequenceAttrs ''>
-<!ENTITY % anyAttrs ''>
-<!ENTITY % anyAttributeAttrs ''>
-<!ENTITY % attributeAttrs ''>
-<!ENTITY % attributeGroupAttrs ''>
-<!ENTITY % uniqueAttrs ''>
-<!ENTITY % keyAttrs ''>
-<!ENTITY % keyrefAttrs ''>
-<!ENTITY % selectorAttrs ''>
-<!ENTITY % fieldAttrs ''>
-<!ENTITY % includeAttrs ''>
-<!ENTITY % importAttrs ''>
-<!ENTITY % redefineAttrs ''>
-<!ENTITY % notationAttrs ''>
-<!ENTITY % annotationAttrs ''>
-<!ENTITY % appinfoAttrs ''>
-<!ENTITY % documentationAttrs ''>
-
-<!ENTITY % complexDerivationSet "CDATA">
- <!-- #all or space-separated list drawn from derivationChoice -->
-<!ENTITY % blockSet "CDATA">
- <!-- #all or space-separated list drawn from
- derivationChoice + 'substitution' -->
-
-<!ENTITY % mgs '%all; | %choice; | %sequence;'>
-<!ENTITY % cs '%choice; | %sequence;'>
-<!ENTITY % formValues '(qualified|unqualified)'>
-
-
-<!ENTITY % attrDecls '((%attribute;| %attributeGroup;)*,(%anyAttribute;)?)'>
-
-<!ENTITY % particleAndAttrs '((%mgs; | %group;)?, %attrDecls;)'>
-
-<!-- This is used in part2 -->
-<!ENTITY % restriction1 '((%mgs; | %group;)?)'>
-
-%xs-datatypes;
-
-<!-- the duplication below is to produce an unambiguous content model
- which allows annotation everywhere -->
-<!ELEMENT %schema; ((%include; | %import; | %redefine; | %annotation;)*,
- ((%simpleType; | %complexType;
- | %element; | %attribute;
- | %attributeGroup; | %group;
- | %notation; ),
- (%annotation;)*)* )>
-<!ATTLIST %schema;
- targetNamespace %URIref; #IMPLIED
- version CDATA #IMPLIED
- %nds; %URIref; #FIXED 'http://www.w3.org/2001/XMLSchema'
- xmlns CDATA #IMPLIED
- finalDefault %complexDerivationSet; ''
- blockDefault %blockSet; ''
- id ID #IMPLIED
- elementFormDefault %formValues; 'unqualified'
- attributeFormDefault %formValues; 'unqualified'
- xml:lang CDATA #IMPLIED
- %schemaAttrs;>
-<!-- Note the xmlns declaration is NOT in the Schema for Schemas,
- because at the Infoset level where schemas operate,
- xmlns(:prefix) is NOT an attribute! -->
-<!-- The declaration of xmlns is a convenience for schema authors -->
-
-<!-- The id attribute here and below is for use in external references
- from non-schemas using simple fragment identifiers.
- It is NOT used for schema-to-schema reference, internal or
- external. -->
-
-<!-- a type is a named content type specification which allows attribute
- declarations-->
-<!-- -->
-
-<!ELEMENT %complexType; ((%annotation;)?,
- (%simpleContent;|%complexContent;|
- %particleAndAttrs;))>
-
-<!ATTLIST %complexType;
- name %NCName; #IMPLIED
- id ID #IMPLIED
- abstract %boolean; #IMPLIED
- final %complexDerivationSet; #IMPLIED
- block %complexDerivationSet; #IMPLIED
- mixed (true|false) 'false'
- %complexTypeAttrs;>
-
-<!-- particleAndAttrs is shorthand for a root type -->
-<!-- mixed is disallowed if simpleContent, overriden if complexContent
- has one too. -->
-
-<!-- If anyAttribute appears in one or more referenced attributeGroups
- and/or explicitly, the intersection of the permissions is used -->
-
-<!ELEMENT %complexContent; ((%annotation;)?, (%restriction;|%extension;))>
-<!ATTLIST %complexContent;
- mixed (true|false) #IMPLIED
- id ID #IMPLIED
- %complexContentAttrs;>
-
-<!-- restriction should use the branch defined above, not the simple
- one from part2; extension should use the full model -->
-
-<!ELEMENT %simpleContent; ((%annotation;)?, (%restriction;|%extension;))>
-<!ATTLIST %simpleContent;
- id ID #IMPLIED
- %simpleContentAttrs;>
-
-<!-- restriction should use the simple branch from part2, not the
- one defined above; extension should have no particle -->
-
-<!ELEMENT %extension; ((%annotation;)?, (%particleAndAttrs;))>
-<!ATTLIST %extension;
- base %QName; #REQUIRED
- id ID #IMPLIED
- %extensionAttrs;>
-
-<!-- an element is declared by either:
- a name and a type (either nested or referenced via the type attribute)
- or a ref to an existing element declaration -->
-
-<!ELEMENT %element; ((%annotation;)?, (%complexType;| %simpleType;)?,
- (%unique; | %key; | %keyref;)*)>
-<!-- simpleType or complexType only if no type|ref attribute -->
-<!-- ref not allowed at top level -->
-<!ATTLIST %element;
- name %NCName; #IMPLIED
- id ID #IMPLIED
- ref %QName; #IMPLIED
- type %QName; #IMPLIED
- minOccurs %nonNegativeInteger; #IMPLIED
- maxOccurs CDATA #IMPLIED
- nillable %boolean; #IMPLIED
- substitutionGroup %QName; #IMPLIED
- abstract %boolean; #IMPLIED
- final %complexDerivationSet; #IMPLIED
- block %blockSet; #IMPLIED
- default CDATA #IMPLIED
- fixed CDATA #IMPLIED
- form %formValues; #IMPLIED
- %elementAttrs;>
-<!-- type and ref are mutually exclusive.
- name and ref are mutually exclusive, one is required -->
-<!-- In the absence of type AND ref, type defaults to type of
- substitutionGroup, if any, else the ur-type, i.e. unconstrained -->
-<!-- default and fixed are mutually exclusive -->
-
-<!ELEMENT %group; ((%annotation;)?,(%mgs;)?)>
-<!ATTLIST %group;
- name %NCName; #IMPLIED
- ref %QName; #IMPLIED
- minOccurs %nonNegativeInteger; #IMPLIED
- maxOccurs CDATA #IMPLIED
- id ID #IMPLIED
- %groupAttrs;>
-
-<!ELEMENT %all; ((%annotation;)?, (%element;)*)>
-<!ATTLIST %all;
- minOccurs (1) #IMPLIED
- maxOccurs (1) #IMPLIED
- id ID #IMPLIED
- %allAttrs;>
-
-<!ELEMENT %choice; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)>
-<!ATTLIST %choice;
- minOccurs %nonNegativeInteger; #IMPLIED
- maxOccurs CDATA #IMPLIED
- id ID #IMPLIED
- %choiceAttrs;>
-
-<!ELEMENT %sequence; ((%annotation;)?, (%element;| %group;| %cs; | %any;)*)>
-<!ATTLIST %sequence;
- minOccurs %nonNegativeInteger; #IMPLIED
- maxOccurs CDATA #IMPLIED
- id ID #IMPLIED
- %sequenceAttrs;>
-
-<!-- an anonymous grouping in a model, or
- a top-level named group definition, or a reference to same -->
-
-<!-- Note that if order is 'all', group is not allowed inside.
- If order is 'all' THIS group must be alone (or referenced alone) at
- the top level of a content model -->
-<!-- If order is 'all', minOccurs==maxOccurs==1 on element/any inside -->
-<!-- Should allow minOccurs=0 inside order='all' . . . -->
-
-<!ELEMENT %any; (%annotation;)?>
-<!ATTLIST %any;
- namespace CDATA '##any'
- processContents (skip|lax|strict) 'strict'
- minOccurs %nonNegativeInteger; '1'
- maxOccurs CDATA '1'
- id ID #IMPLIED
- %anyAttrs;>
-
-<!-- namespace is interpreted as follows:
- ##any - - any non-conflicting WFXML at all
-
- ##other - - any non-conflicting WFXML from namespace other
- than targetNamespace
-
- ##local - - any unqualified non-conflicting WFXML/attribute
- one or - - any non-conflicting WFXML from
- more URI the listed namespaces
- references
-
- ##targetNamespace ##local may appear in the above list,
- with the obvious meaning -->
-
-<!ELEMENT %anyAttribute; (%annotation;)?>
-<!ATTLIST %anyAttribute;
- namespace CDATA '##any'
- processContents (skip|lax|strict) 'strict'
- id ID #IMPLIED
- %anyAttributeAttrs;>
-<!-- namespace is interpreted as for 'any' above -->
-
-<!-- simpleType only if no type|ref attribute -->
-<!-- ref not allowed at top level, name iff at top level -->
-<!ELEMENT %attribute; ((%annotation;)?, (%simpleType;)?)>
-<!ATTLIST %attribute;
- name %NCName; #IMPLIED
- id ID #IMPLIED
- ref %QName; #IMPLIED
- type %QName; #IMPLIED
- use (prohibited|optional|required) #IMPLIED
- default CDATA #IMPLIED
- fixed CDATA #IMPLIED
- form %formValues; #IMPLIED
- %attributeAttrs;>
-<!-- type and ref are mutually exclusive.
- name and ref are mutually exclusive, one is required -->
-<!-- default for use is optional when nested, none otherwise -->
-<!-- default and fixed are mutually exclusive -->
-<!-- type attr and simpleType content are mutually exclusive -->
-
-<!-- an attributeGroup is a named collection of attribute decls, or a
- reference thereto -->
-<!ELEMENT %attributeGroup; ((%annotation;)?,
- (%attribute; | %attributeGroup;)*,
- (%anyAttribute;)?) >
-<!ATTLIST %attributeGroup;
- name %NCName; #IMPLIED
- id ID #IMPLIED
- ref %QName; #IMPLIED
- %attributeGroupAttrs;>
-
-<!-- ref iff no content, no name. ref iff not top level -->
-
-<!-- better reference mechanisms -->
-<!ELEMENT %unique; ((%annotation;)?, %selector;, (%field;)+)>
-<!ATTLIST %unique;
- name %NCName; #REQUIRED
- id ID #IMPLIED
- %uniqueAttrs;>
-
-<!ELEMENT %key; ((%annotation;)?, %selector;, (%field;)+)>
-<!ATTLIST %key;
- name %NCName; #REQUIRED
- id ID #IMPLIED
- %keyAttrs;>
-
-<!ELEMENT %keyref; ((%annotation;)?, %selector;, (%field;)+)>
-<!ATTLIST %keyref;
- name %NCName; #REQUIRED
- refer %QName; #REQUIRED
- id ID #IMPLIED
- %keyrefAttrs;>
-
-<!ELEMENT %selector; ((%annotation;)?)>
-<!ATTLIST %selector;
- xpath %XPathExpr; #REQUIRED
- id ID #IMPLIED
- %selectorAttrs;>
-<!ELEMENT %field; ((%annotation;)?)>
-<!ATTLIST %field;
- xpath %XPathExpr; #REQUIRED
- id ID #IMPLIED
- %fieldAttrs;>
-
-<!-- Schema combination mechanisms -->
-<!ELEMENT %include; (%annotation;)?>
-<!ATTLIST %include;
- schemaLocation %URIref; #REQUIRED
- id ID #IMPLIED
- %includeAttrs;>
-
-<!ELEMENT %import; (%annotation;)?>
-<!ATTLIST %import;
- namespace %URIref; #IMPLIED
- schemaLocation %URIref; #IMPLIED
- id ID #IMPLIED
- %importAttrs;>
-
-<!ELEMENT %redefine; (%annotation; | %simpleType; | %complexType; |
- %attributeGroup; | %group;)*>
-<!ATTLIST %redefine;
- schemaLocation %URIref; #REQUIRED
- id ID #IMPLIED
- %redefineAttrs;>
-
-<!ELEMENT %notation; (%annotation;)?>
-<!ATTLIST %notation;
- name %NCName; #REQUIRED
- id ID #IMPLIED
- public CDATA #REQUIRED
- system %URIref; #IMPLIED
- %notationAttrs;>
-
-<!-- Annotation is either application information or documentation -->
-<!-- By having these here they are available for datatypes as well
- as all the structures elements -->
-
-<!ELEMENT %annotation; (%appinfo; | %documentation;)*>
-<!ATTLIST %annotation; %annotationAttrs;>
-
-<!-- User must define annotation elements in internal subset for this
- to work -->
-<!ELEMENT %appinfo; ANY> <!-- too restrictive -->
-<!ATTLIST %appinfo;
- source %URIref; #IMPLIED
- id ID #IMPLIED
- %appinfoAttrs;>
-<!ELEMENT %documentation; ANY> <!-- too restrictive -->
-<!ATTLIST %documentation;
- source %URIref; #IMPLIED
- id ID #IMPLIED
- xml:lang CDATA #IMPLIED
- %documentationAttrs;>
-
-<!NOTATION XMLSchemaStructures PUBLIC
- 'structures' 'http://www.w3.org/2001/XMLSchema.xsd' >
-<!NOTATION XML PUBLIC
- 'REC-xml-1998-0210' 'http://www.w3.org/TR/1998/REC-xml-19980210' >
diff --git a/oaipmh-core/src/main/xsd/datatypes.dtd b/oaipmh-core/src/main/xsd/datatypes.dtd
deleted file mode 100644
index f4ad4c6f4bd24f12f3a879012d43bf892671e89b..0000000000000000000000000000000000000000
--- a/oaipmh-core/src/main/xsd/datatypes.dtd
+++ /dev/null
@@ -1,204 +0,0 @@
-
-<!--
- DTD for XML Schemas: Part 2: Datatypes
- $Id: datatypes.dtd,v 1.23 2001/03/16 17:36:30 ht Exp $
- Note this DTD is NOT normative, or even definitive. - - the
- prose copy in the datatypes REC is the definitive version
- (which shouldn't differ from this one except for this comment
- and entity expansions, but just in case)
- -->
-
-<!--
- This DTD cannot be used on its own, it is intended
- only for incorporation in XMLSchema.dtd, q.v.
- -->
-
-<!-- Define all the element names, with optional prefix -->
-<!ENTITY % simpleType "%p;simpleType">
-<!ENTITY % restriction "%p;restriction">
-<!ENTITY % list "%p;list">
-<!ENTITY % union "%p;union">
-<!ENTITY % maxExclusive "%p;maxExclusive">
-<!ENTITY % minExclusive "%p;minExclusive">
-<!ENTITY % maxInclusive "%p;maxInclusive">
-<!ENTITY % minInclusive "%p;minInclusive">
-<!ENTITY % totalDigits "%p;totalDigits">
-<!ENTITY % fractionDigits "%p;fractionDigits">
-<!ENTITY % length "%p;length">
-<!ENTITY % minLength "%p;minLength">
-<!ENTITY % maxLength "%p;maxLength">
-<!ENTITY % enumeration "%p;enumeration">
-<!ENTITY % whiteSpace "%p;whiteSpace">
-<!ENTITY % pattern "%p;pattern">
-
-<!--
- Customisation entities for the ATTLIST of each element
- type. Define one of these if your schema takes advantage
- of the anyAttribute='##other' in the schema for schemas
- -->
-
-<!ENTITY % simpleTypeAttrs "">
-<!ENTITY % restrictionAttrs "">
-<!ENTITY % listAttrs "">
-<!ENTITY % unionAttrs "">
-<!ENTITY % maxExclusiveAttrs "">
-<!ENTITY % minExclusiveAttrs "">
-<!ENTITY % maxInclusiveAttrs "">
-<!ENTITY % minInclusiveAttrs "">
-<!ENTITY % totalDigitsAttrs "">
-<!ENTITY % fractionDigitsAttrs "">
-<!ENTITY % lengthAttrs "">
-<!ENTITY % minLengthAttrs "">
-<!ENTITY % maxLengthAttrs "">
-<!ENTITY % enumerationAttrs "">
-<!ENTITY % whiteSpaceAttrs "">
-<!ENTITY % patternAttrs "">
-
-<!-- Define some entities for informative use as attribute
- types -->
-<!ENTITY % URIref "CDATA">
-<!ENTITY % XPathExpr "CDATA">
-<!ENTITY % QName "NMTOKEN">
-<!ENTITY % QNames "NMTOKENS">
-<!ENTITY % NCName "NMTOKEN">
-<!ENTITY % nonNegativeInteger "NMTOKEN">
-<!ENTITY % boolean "(true|false)">
-<!ENTITY % simpleDerivationSet "CDATA">
-<!--
- #all or space-separated list drawn from derivationChoice
- -->
-
-<!--
- Note that the use of 'facet' below is less restrictive
- than is really intended: There should in fact be no
- more than one of each of minInclusive, minExclusive,
- maxInclusive, maxExclusive, totalDigits, fractionDigits,
- length, maxLength, minLength within datatype,
- and the min- and max- variants of Inclusive and Exclusive
- are mutually exclusive. On the other hand, pattern and
- enumeration may repeat.
- -->
-<!ENTITY % minBound "(%minInclusive; | %minExclusive;)">
-<!ENTITY % maxBound "(%maxInclusive; | %maxExclusive;)">
-<!ENTITY % bounds "%minBound; | %maxBound;">
-<!ENTITY % numeric "%totalDigits; | %fractionDigits;">
-<!ENTITY % ordered "%bounds; | %numeric;">
-<!ENTITY % unordered
- "%pattern; | %enumeration; | %whiteSpace; | %length; |
- %maxLength; | %minLength;">
-<!ENTITY % facet "%ordered; | %unordered;">
-<!ENTITY % facetAttr
- "value CDATA #REQUIRED
- id ID #IMPLIED">
-<!ENTITY % fixedAttr "fixed %boolean; #IMPLIED">
-<!ENTITY % facetModel "(%annotation;)?">
-<!ELEMENT %simpleType;
- ((%annotation;)?, (%restriction; | %list; | %union;))>
-<!ATTLIST %simpleType;
- name %NCName; #IMPLIED
- final %simpleDerivationSet; #IMPLIED
- id ID #IMPLIED
- %simpleTypeAttrs;>
-<!-- name is required at top level -->
-<!ELEMENT %restriction; ((%annotation;)?,
- (%restriction1; |
- ((%simpleType;)?,(%facet;)*)),
- (%attrDecls;))>
-<!ATTLIST %restriction;
- base %QName; #IMPLIED
- id ID #IMPLIED
- %restrictionAttrs;>
-<!--
- base and simpleType child are mutually exclusive,
- one is required.
-
- restriction is shared between simpleType and
- simpleContent and complexContent (in XMLSchema.xsd).
- restriction1 is for the latter cases, when this
- is restricting a complex type, as is attrDecls.
- -->
-<!ELEMENT %list; ((%annotation;)?,(%simpleType;)?)>
-<!ATTLIST %list;
- itemType %QName; #IMPLIED
- id ID #IMPLIED
- %listAttrs;>
-<!--
- itemType and simpleType child are mutually exclusive,
- one is required
- -->
-<!ELEMENT %union; ((%annotation;)?,(%simpleType;)*)>
-<!ATTLIST %union;
- id ID #IMPLIED
- memberTypes %QNames; #IMPLIED
- %unionAttrs;>
-<!--
- At least one item in memberTypes or one simpleType
- child is required
- -->
-
-<!ELEMENT %maxExclusive; %facetModel;>
-<!ATTLIST %maxExclusive;
- %facetAttr;
- %fixedAttr;
- %maxExclusiveAttrs;>
-<!ELEMENT %minExclusive; %facetModel;>
-<!ATTLIST %minExclusive;
- %facetAttr;
- %fixedAttr;
- %minExclusiveAttrs;>
-
-<!ELEMENT %maxInclusive; %facetModel;>
-<!ATTLIST %maxInclusive;
- %facetAttr;
- %fixedAttr;
- %maxInclusiveAttrs;>
-<!ELEMENT %minInclusive; %facetModel;>
-<!ATTLIST %minInclusive;
- %facetAttr;
- %fixedAttr;
- %minInclusiveAttrs;>
-
-<!ELEMENT %totalDigits; %facetModel;>
-<!ATTLIST %totalDigits;
- %facetAttr;
- %fixedAttr;
- %totalDigitsAttrs;>
-<!ELEMENT %fractionDigits; %facetModel;>
-<!ATTLIST %fractionDigits;
- %facetAttr;
- %fixedAttr;
- %fractionDigitsAttrs;>
-
-<!ELEMENT %length; %facetModel;>
-<!ATTLIST %length;
- %facetAttr;
- %fixedAttr;
- %lengthAttrs;>
-<!ELEMENT %minLength; %facetModel;>
-<!ATTLIST %minLength;
- %facetAttr;
- %fixedAttr;
- %minLengthAttrs;>
-<!ELEMENT %maxLength; %facetModel;>
-<!ATTLIST %maxLength;
- %facetAttr;
- %fixedAttr;
- %maxLengthAttrs;>
-
-<!-- This one can be repeated -->
-<!ELEMENT %enumeration; %facetModel;>
-<!ATTLIST %enumeration;
- %facetAttr;
- %enumerationAttrs;>
-
-<!ELEMENT %whiteSpace; %facetModel;>
-<!ATTLIST %whiteSpace;
- %facetAttr;
- %fixedAttr;
- %whiteSpaceAttrs;>
-
-<!-- This one can be repeated -->
-<!ELEMENT %pattern; %facetModel;>
-<!ATTLIST %pattern;
- %facetAttr;
- %patternAttrs;>
diff --git a/oaipmh-core/src/main/xsd/simpledc20021212.xsd b/oaipmh-core/src/main/xsd/simpledc20021212.xsd
deleted file mode 100644
index f24b24294c71dafb051e15c1b2ba0a34b8fe8fc4..0000000000000000000000000000000000000000
--- a/oaipmh-core/src/main/xsd/simpledc20021212.xsd
+++ /dev/null
@@ -1,76 +0,0 @@
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns="http://purl.org/dc/elements/1.1/"
- targetNamespace="http://purl.org/dc/elements/1.1/"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified">
-
- <xs:annotation>
- <xs:documentation xml:lang="en">
- Simple DC XML Schema, 2002-10-09
- by Pete Johnston (p.johnston@ukoln.ac.uk),
- Carl Lagoze (lagoze@cs.cornell.edu), Andy Powell (a.powell@ukoln.ac.uk),
- Herbert Van de Sompel (hvdsomp@yahoo.com).
- This schema defines terms for Simple Dublin Core, i.e. the 15
- elements from the http://purl.org/dc/elements/1.1/ namespace, with
- no use of encoding schemes or element refinements.
- Default content type for all elements is xs:string with xml:lang
- attribute available.
-
- Supercedes version of 2002-03-12.
- Amended to remove namespace declaration for http://www.w3.org/XML/1998/namespace namespace,
- and to reference lang attribute via built-in xml: namespace prefix.
- xs:appinfo also removed.
- </xs:documentation>
- </xs:annotation>
-
- <xs:import namespace="https://www.w3.org/XML/1998/namespace"
- schemaLocation="https://www.w3.org/2001/03/xml.xsd">
- </xs:import>
-
- <xs:element name="title" type="elementType"/>
- <xs:element name="creator" type="elementType"/>
- <xs:element name="subject" type="elementType"/>
- <xs:element name="description" type="elementType"/>
- <xs:element name="publisher" type="elementType"/>
- <xs:element name="contributor" type="elementType"/>
- <xs:element name="date" type="elementType"/>
- <xs:element name="type" type="elementType"/>
- <xs:element name="format" type="elementType"/>
- <xs:element name="identifier" type="elementType"/>
- <xs:element name="source" type="elementType"/>
- <xs:element name="language" type="elementType"/>
- <xs:element name="relation" type="elementType"/>
- <xs:element name="coverage" type="elementType"/>
- <xs:element name="rights" type="elementType"/>
-
- <xs:group name="elementsGroup">
- <xs:sequence>
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="title"/>
- <xs:element ref="creator"/>
- <xs:element ref="subject"/>
- <xs:element ref="description"/>
- <xs:element ref="publisher"/>
- <xs:element ref="contributor"/>
- <xs:element ref="date"/>
- <xs:element ref="type"/>
- <xs:element ref="format"/>
- <xs:element ref="identifier"/>
- <xs:element ref="source"/>
- <xs:element ref="language"/>
- <xs:element ref="relation"/>
- <xs:element ref="coverage"/>
- <xs:element ref="rights"/>
- </xs:choice>
- </xs:sequence>
- </xs:group>
-
- <xs:complexType name="elementType">
- <xs:simpleContent>
- <xs:extension base="xs:string">
- <xs:attribute ref="xml:lang" use="optional"/>
- </xs:extension>
- </xs:simpleContent>
- </xs:complexType>
-
-</xs:schema>
\ No newline at end of file
diff --git a/oaipmh-core/src/main/xsd/xml.xsd b/oaipmh-core/src/main/xsd/xml.xsd
deleted file mode 100644
index 1568cee8157de4cf6663e9abf1bd4df7b0264768..0000000000000000000000000000000000000000
--- a/oaipmh-core/src/main/xsd/xml.xsd
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
-
- <xs:annotation>
- <xs:documentation>
- See http://www.w3.org/XML/1998/namespace.html and
- http://www.w3.org/TR/REC-xml for information about this namespace.
-
- This schema document describes the XML namespace, in a form
- suitable for import by other schema documents.
-
- Note that local names in this namespace are intended to be defined
- only by the World Wide Web Consortium or its subgroups. The
- following names are currently defined in this namespace and should
- not be used with conflicting semantics by any Working Group,
- specification, or document instance:
-
- base (as an attribute name): denotes an attribute whose value
- provides a URI to be used as the base for interpreting any
- relative URIs in the scope of the element on which it
- appears; its value is inherited. This name is reserved
- by virtue of its definition in the XML Base specification.
-
- lang (as an attribute name): denotes an attribute whose value
- is a language code for the natural language of the content of
- any element; its value is inherited. This name is reserved
- by virtue of its definition in the XML specification.
-
- space (as an attribute name): denotes an attribute whose
- value is a keyword indicating what whitespace processing
- discipline is intended for the content of the element; its
- value is inherited. This name is reserved by virtue of its
- definition in the XML specification.
-
- Father (in any context at all): denotes Jon Bosak, the chair of
- the original XML Working Group. This name is reserved by
- the following decision of the W3C XML Plenary and
- XML Coordination groups:
-
- In appreciation for his vision, leadership and dedication
- the W3C XML Plenary on this 10th day of February, 2000
- reserves for Jon Bosak in perpetuity the XML name
- xml:Father
- </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
- <xs:documentation>This schema defines attributes and an attribute group
- suitable for use by
- schemas wishing to allow xml:base, xml:lang or xml:space attributes
- on elements they define.
-
- To enable this, such a schema must import this schema
- for the XML namespace, e.g. as follows:
- <schema . . .>
- . . .
- <import namespace="http://www.w3.org/XML/1998/namespace"
- schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
-
- Subsequently, qualified reference to any of the attributes
- or the group defined below will have the desired effect, e.g.
-
- <type . . .>
- . . .
- <attributeGroup ref="xml:specialAttrs"/>
-
- will define a type which will schema-validate an instance
- element with any of those attributes</xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
- <xs:documentation>In keeping with the XML Schema WG's standard versioning
- policy, this schema document will persist at
- http://www.w3.org/2001/03/xml.xsd.
- At the date of issue it can also be found at
- http://www.w3.org/2001/xml.xsd.
- The schema document at that URI may however change in the future,
- in order to remain compatible with the latest version of XML Schema
- itself. In other words, if the XML Schema namespace changes, the version
- of this document at
- http://www.w3.org/2001/xml.xsd will change
- accordingly; the version at
- http://www.w3.org/2001/03/xml.xsd will not change.
- </xs:documentation>
- </xs:annotation>
-
- <xs:attribute name="lang" type="xs:language">
- <xs:annotation>
- <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
- codes as the enumerated possible values . . .</xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attribute name="space" default="preserve">
- <xs:simpleType>
- <xs:restriction base="xs:NCName">
- <xs:enumeration value="default"/>
- <xs:enumeration value="preserve"/>
- </xs:restriction>
- </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="base" type="xs:anyURI">
- <xs:annotation>
- <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
- information about this attribute.</xs:documentation>
- </xs:annotation>
- </xs:attribute>
-
- <xs:attributeGroup name="specialAttrs">
- <xs:attribute ref="xml:base"/>
- <xs:attribute ref="xml:lang"/>
- <xs:attribute ref="xml:space"/>
- </xs:attributeGroup>
-
-</xs:schema>