diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml
index 39a36995029b72b28604d3bf3fadfaf73ab062d0..b9d2db8e7299590577a0dae5ae6db98d25575b2b 100644
--- a/oaipmh-core/pom.xml
+++ b/oaipmh-core/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>oaipmh</artifactId>
<groupId>info.textgrid.middleware</groupId>
- <version>4.0.17-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-core</artifactId>
diff --git a/oaipmh-core/src/main/resources/bindings.xjb b/oaipmh-core/src/main/resources/bindings.xjb
index 4d1a426b65b80c36f69349980626c0439d7b80b0..670996db80efdf6d83f2502463ca16445c1f5e91 100644
--- a/oaipmh-core/src/main/resources/bindings.xjb
+++ b/oaipmh-core/src/main/resources/bindings.xjb
@@ -28,8 +28,6 @@
<namespace:prefix
namespaceURI="http://namespace.openaire.eu/oaf" name="open_aire" />
</jxb:bindings>
-
-
</jxb:bindings>
<jxb:bindings schemaLocation="openaire.xsd">
@@ -39,12 +37,8 @@
</jxb:schemaBindings>
</jxb:bindings>
-
-
-
- <!-- MIT DIESEM HIER EINKOMMENTIERT, benennt er die Klassen um, scheint
+ <!-- MIT DIESEM HIER EINKOMMENTIERT, benennt er die Klassen um, scheint
sie aber irgendwo NOCHMAL zu definieren?? -->
-
<jxb:bindings schemaLocation="oaf-common-1.0.xsd" multiple="true" node="/xs:schema">
<jxb:schemaBindings>
<jxb:package name="info.textgrid.middleware.oaipmh.oaf.common" />
@@ -60,12 +54,7 @@
</jxb:bindings>
<jxb:bindings node="//xs:attribute[@name='schemename']" multiple="true" >
<jxb:property name="OAFSchemenameProperty" />
- </jxb:bindings>
+ </jxb:bindings>
</jxb:bindings>
-
-
-
-
-
</jxb:bindings>
diff --git a/oaipmh-core/src/main/resources/include/simpledc20021212.xsd b/oaipmh-core/src/main/resources/include/simpledc20021212.xsd
new file mode 100644
index 0000000000000000000000000000000000000000..bea04f8ec5e127dd6e62f09b2ae26f479527e239
--- /dev/null
+++ b/oaipmh-core/src/main/resources/include/simpledc20021212.xsd
@@ -0,0 +1,78 @@
+<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="http://www.w3.org/XML/1998/namespace"
+ schemaLocation="http://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>
+
+
diff --git a/oaipmh-core/src/main/resources/oai_dc.xsd b/oaipmh-core/src/main/resources/oai_dc.xsd
index da2b49c8bb402faffb9700b4262c9b3f84b98e7b..078fe6f84ec881283372fcba11cc8ce46390d7a8 100644
--- a/oaipmh-core/src/main/resources/oai_dc.xsd
+++ b/oaipmh-core/src/main/resources/oai_dc.xsd
@@ -1,27 +1,25 @@
<schema targetNamespace="http://www.openarchives.org/OAI/2.0/oai_dc/"
- xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns="http://www.w3.org/2001/XMLSchema"
elementFormDefault="qualified" attributeFormDefault="unqualified">
-
+
<annotation>
- <documentation>
+ <documentation>
XML Schema 2002-03-18 by Pete Johnston.
Adjusted for usage in the OAI-PMH.
Schema imports the Dublin Core elements from the DCMI schema for unqualified Dublin Core.
2002-12-19 updated to use simpledc20021212.xsd (instead of simpledc20020312.xsd)
</documentation>
</annotation>
-
- <!--import namespace="http://purl.org/dc/elements/1.1/"
- schemaLocation="file:///home/max/Dokumente/simpledc20021212.xsd"/-->
- <import namespace="http://purl.org/dc/elements/1.1/"
- schemaLocation="https://dublincore.org/schemas/xmls/simpledc20021212.xsd"/>
+ <!-- Do we need this to be external for a reason? If not, just leave it so, that we can build independent of the remote server! -->
+ <import namespace="http://purl.org/dc/elements/1.1/" schemaLocation="./include/simpledc20021212.xsd"/>
+ <!--import namespace="http://purl.org/dc/elements/1.1/"
+ schemaLocation="https://dublincore.org/schemas/xmls/simpledc20021212.xsd"/-->
-
<element name="dc" type="oai_dc:oai_dcType"/>
-
+
<complexType name="oai_dcType">
<choice minOccurs="0" maxOccurs="unbounded">
<element ref="dc:title"/>
@@ -41,5 +39,5 @@
<element ref="dc:rights"/>
</choice>
</complexType>
-
+
</schema>
diff --git a/oaipmh-webapp/pom.xml b/oaipmh-webapp/pom.xml
index e3fefccc0911c667d4031a35f70c4b62d6982785..c6d5ad42ef9b19d093a4b675e8e0ec673584b9fd 100644
--- a/oaipmh-webapp/pom.xml
+++ b/oaipmh-webapp/pom.xml
@@ -5,7 +5,7 @@
<parent>
<artifactId>oaipmh</artifactId>
<groupId>info.textgrid.middleware</groupId>
- <version>4.0.17-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-webapp</artifactId>
diff --git a/pom.xml b/pom.xml
index cdbd9b87932b452e213a989fff3dfe3b95a29c1f..5fd9cab3aa678d08cd600e6378a7b59c0d9908cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,34 +4,34 @@
<modelVersion>4.0.0</modelVersion>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh</artifactId>
- <version>4.0.17-SNAPSHOT</version>
+ <version>4.1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>DARIAHDE :: OAI-PMH DataProvider</name>
<properties>
- <common.version>4.0.1</common.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cxf.version>3.3.11</cxf.version>
+ <jdk.version>1.8</jdk.version>
+ <antlr-maven-plugin.version>3.2</antlr-maven-plugin.version>
+ <antlr-runtime.version>3.2</antlr-runtime.version>
+ <common.version>4.2.0-SNAPSHOT</common.version>
+ <cxf.version>3.3.12</cxf.version>
+ <elasticsearch.version>6.5.4</elasticsearch.version>
+ <jaxb2-maven-plugin.version>2.5.0</jaxb2-maven-plugin.version>
+ <jetty-maven-plugin.version>9.4.12.v20180830</jetty-maven-plugin.version>
+ <junit.version>4.13.1</junit.version>
+ <maven-antrun-plugin.version>1.3</maven-antrun-plugin.version>
+ <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
+ <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
+ <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
<mets-mods-mapping.version>1.1.25</mets-mods-mapping.version>
+ <properties-maven-plugin.version>1.0-alpha-2</properties-maven-plugin.version>
+ <slf4j.version>1.7.5</slf4j.version>
<spring.version>4.0.2.RELEASE</spring.version>
- <elasticsearch.version>6.5.4</elasticsearch.version>
- <antlr-runtime.version>3.2</antlr-runtime.version>
- <antlr-maven-plugin.version>3.2</antlr-maven-plugin.version>
- <slf4j.version>1.7.5</slf4j.version>
- <junit.version>4.11</junit.version>
- <jdk.version>1.8</jdk.version>
- <maven-antrun-plugin.version>1.3</maven-antrun-plugin.version>
- <jaxb2-maven-plugin.version>2.5.0</jaxb2-maven-plugin.version>
- <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
- <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
- <jetty-maven-plugin.version>9.4.12.v20180830</jetty-maven-plugin.version>
- <maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version>
- <properties-maven-plugin.version>1.0-alpha-2</properties-maven-plugin.version>
</properties>
- <url>https://projects.gwdg.de/projects/oai-pmh</url>
+ <url>https://gitlab.gwdg.de/dariah-de/dariah-de-oai-pmh-services</url>
<scm>
- <connection>scm:git@git.projects.gwdg.de:oai-pmh.git</connection>
- <developerConnection>scm:git@git.projects.gwdg.de:oai-pmh.git</developerConnection>
- <url>https://projects.gwdg.de/projects/oai-pmh</url>
+ <connection>scm:git@gitlab.gwdg.de:dariah-de/dariah-de-oai-pmh-services.git</connection>
+ <developerConnection>scm:git@gitlab.gwdg.de:dariah-de/dariah-de-oai-pmh-services.git</developerConnection>
+ <url>https://gitlab.gwdg.de/dariah-de/dariah-de-oai-pmh-services/-/issues</url>
</scm>
<issueManagement>
<system>GWDG Project Management Service</system>
@@ -78,28 +78,25 @@
<artifactId>maven-deploy-plugin</artifactId>
<version>${maven-deploy-plugin.version}</version>
</plugin>
-
-
- <!--plugin >
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>chronos-jmeter-maven-plugin</artifactId>
- <version>1.1.0</version>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>3.0.15</version>
- </dependency>
- </dependencies>
- <executions>
- <execution>
- <goals>
- <goal>jmeter</goal>
- </goals>
- </execution>
- </executions>
- </plugin-->
-
+ <!--plugin >
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>chronos-jmeter-maven-plugin</artifactId>
+ <version>1.1.0</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>3.0.15</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <goals>
+ <goal>jmeter</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin-->
</plugins>
</build>
<modules>