diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml
index f1919c6eea0a4bfc7a1d5762d12b64b42286e9ce..824775b98f4a58be3aa2e6aa66a76f22bc35bf8d 100644
--- a/oaipmh-core/pom.xml
+++ b/oaipmh-core/pom.xml
@@ -4,11 +4,11 @@
<parent>
<artifactId>oaipmh</artifactId>
<groupId>info.textgrid.middleware</groupId>
- <version>1.3.12-SNAPSHOT</version>
+ <version>1.3.13-SNAPSHOT</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-core</artifactId>
- <version>1.3.12-SNAPSHOT</version>
+ <version>1.3.13-SNAPSHOT</version>
<packaging>jar</packaging>
<name>TextGrid :: TG-OAI-PMH :: Core</name>
<url>http://maven.apache.org</url>
@@ -23,16 +23,16 @@
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-security-cors</artifactId>
- <version>${cxf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-client</artifactId>
- <version>${cxf.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-security-cors</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-client</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
@@ -169,9 +169,10 @@
</goals>
<configuration>
<tasks>
- <!-- download wsdl task -->
- <get usetimestamp="true" src="${tgauth.wsdl}" dest="tgextra.wsdl"/>
- <!--get usetimestamp="true" src="https://develop.sub.uni-goettingen.de/repos/textgrid/trunk/middleware/tgauth/info.textgrid.middleware.tgauth.rbac/rbacSoap/wsdl-productive/tgextra.wsdl" dest="tgextra.wsdl"/-->
+ <!-- download wsdl task -->
+ <get usetimestamp="true" src="${tgauth.wsdl}" dest="tgextra.wsdl" />
+ <!--get usetimestamp="true" src="https://develop.sub.uni-goettingen.de/repos/textgrid/trunk/middleware/tgauth/info.textgrid.middleware.tgauth.rbac/rbacSoap/wsdl-productive/tgextra.wsdl"
+ dest="tgextra.wsdl"/ -->
</tasks>
</configuration>
</execution>
@@ -190,9 +191,9 @@
<wsdlOption>
<wsdl>tgextra.wsdl</wsdl>
<extraargs>
- <extraarg>-fe</extraarg>
- <extraarg>jaxws21</extraarg>
- </extraargs>
+ <extraarg>-fe</extraarg>
+ <extraarg>jaxws21</extraarg>
+ </extraargs>
</wsdlOption>
</wsdlOptions>
</configuration>
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/DARIAHConstants.java b/oaipmh-core/src/main/java/info/textgrid/middleware/DARIAHConstants.java
index 99d116bc1a30ac186b1cca39f91083bb4b9b8999..6b9515f1a1e61c6e6d55074b1f866166d55dc777 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/DARIAHConstants.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/DARIAHConstants.java
@@ -12,73 +12,77 @@ import java.util.List;
public final class DARIAHConstants {
- private DARIAHConstants()
- {
- //not called
+ private DARIAHConstants() {
+ // not called
}
-
- //public static boolean furtherElements = true;
-
- public static final String TG_ITEM_IDENTIFIER_PREFIX = "textgrid:";
- public static final List<String> TEXTGRID_REP_ADMIN_CONTACT = Arrays.asList("textgrid-support@gwdg.de");
-
+
+ // public static boolean furtherElements = true;
+
+ public static final String TG_ITEM_IDENTIFIER_PREFIX = "hdl:";
+ public static final List<String> TEXTGRID_REP_ADMIN_CONTACT = Arrays.asList("textgrid-support@gwdg.de");
+
/*
* Rep Identification String Constants
*/
-
- //public static final String TG_REP_NAME = "TextGrid Repository";
- public static final String TG_REP_BASEURL = "www.textgridrep.de";
- //public static final String TG_REP_OAIPMH_PROTOCOL_VERSION = "2.0";
- public static final String METADATA_DC_PREFIX = "oai_dc";
-
+
+ // public static final String TG_REP_NAME = "TextGrid Repository";
+ public static final String TG_REP_BASEURL = "repository.de.dariah.eu";
+ // public static final String TG_REP_OAIPMH_PROTOCOL_VERSION = "2.0";
+ public static final String METADATA_DC_PREFIX = "rdf:RDF/rdf:Description";
+
/*
* Error String Constants
*/
-
- public static final String OAI_BAD_ARGUMENT = "BadArgument";
- public static final String OAI_METADATA_FORMAT_ERROR = "FormatError";
- public static final String OAI_NO_RECORD_MATCH = "RecordMatchError";
- public static final String OAI_NO_SET_HIERARCHY = "SetHierarchyError";
-
+
+ public static final String OAI_BAD_ARGUMENT = "BadArgument";
+ public static final String OAI_METADATA_FORMAT_ERROR = "FormatError";
+ public static final String OAI_NO_RECORD_MATCH = "RecordMatchError";
+ public static final String OAI_NO_SET_HIERARCHY = "SetHierarchyError";
+
/*
* TextGrid Metadata Fields for OAI-PMH Request (Mapping to DC)
*/
-
- public static final String CREATED = "metadata.dc:date";
- public static final String FORMAT = "metadata.dc:format";
- public static final String IDENTIFIER = "metadata.dc:identifier";
- public static final String DATA_CONTRIBUTOR = "metadata.dc:contributor";
-
-
- public static final String[] DARIAHFields = {"metadata.dc:contributor", "metadata.dc:coverage", "metadata.dc:creator", "metadata.dc:date",
- "metadata.dc:description", "metadata.dc:format", "metadata.dc:identifier", "metadata.dc:language",
- "metadata.dc:publisher", "metadata.dc:relation", "metadata.dc:rights", "metadata.dc:source",
- "metadata.dc:subject", "metadata.dc:title", "metadata.dc:type"};
-
- public static final String[] DARIAHCollectionFields = {"metadata.dc:title"};
-
+
+ public static final String CREATED = "metadata.dc:date";
+ public static final String FORMAT = "metadata.dc:format";
+ public static final String IDENTIFIER = "metadata.dc:identifier";
+ public static final String DATA_CONTRIBUTOR = "metadata.dc:contributor";
+
+ public static final String[] DARIAHFields = {
+ "metadata.dc:contributor", "metadata.dc:coverage",
+ "metadata.dc:creator", "metadata.dc:date",
+ "metadata.dc:description", "metadata.dc:format",
+ "metadata.dc:identifier", "metadata.dc:language",
+ "metadata.dc:publisher", "metadata.dc:relation",
+ "metadata.dc:rights", "metadata.dc:source", "metadata.dc:subject",
+ "metadata.dc:title", "metadata.dc:type" };
+
+ public static final String[] DARIAHCollectionFields = { "metadata.dc:title" };
+
/*
- * String Arrays to define which TextGrid fields belongs to the regarding DC fields
+ * String Arrays to define which TextGrid fields belongs to the regarding DC
+ * fields
*/
- public static final String[] CONTRIBUTOR_LIST = {"metadata.dc:contributor"};
- public static final String[] COVERAGE_LIST = {"metadata.dc:coverage"};
- public static final String[] CREATOR_LIST = {"metadata.dc:cretor"};
- public static final String[] DATE_LIST = {"metadata.dc:date"};
- public static final String[] DESCRIPTION_LIST = {"metadata.dc:description"};
- public static final String[] FORMAT_LIST = {"metadata.dc:format"};
- public static final String[] IDENTIFIER_LIST = {"metadata.dc:identifier"};
- public static final String[] LANGUAGE_LIST = {"metadata.dc:language"};
- public static final String[] PUBLISHER_LIST = {"metadata.dc:publisher"};
- public static final String[] RELATIONS_LIST = {"metadata.dc:relation"};
- public static final String[] RIGHTS_LIST = {"metadata.dc:rights"};
- public static final String[] SOURCE_LIST = {"metadata.dc:source"};
-
- public static final String[] SUBJECT_LIST = {"metadata.dc:subject"};
- public static final String[] TITLE_LIST = {"metadata.dc:title"};
-
- public static final String[] TYPE_LIST = {"metadata.dc:type"};
-
- public static final String[] IDENTIFIER_LIST_FIELDS = {"metadata.dc:identifier", "metadata.dc:date", "metadata.dc:format"};
- public static final String RANGE_FIELD = "metadata.dc:date";
+ public static final String[] CONTRIBUTOR_LIST = { "metadata.dc:contributor" };
+ public static final String[] COVERAGE_LIST = { "metadata.dc:coverage" };
+ public static final String[] CREATOR_LIST = { "metadata.dc:cretor" };
+ public static final String[] DATE_LIST = { "metadata.dc:date" };
+ public static final String[] DESCRIPTION_LIST = { "metadata.dc:description" };
+ public static final String[] FORMAT_LIST = { "metadata.dc:format" };
+ public static final String[] IDENTIFIER_LIST = { "metadata.dc:identifier" };
+ public static final String[] LANGUAGE_LIST = { "metadata.dc:language" };
+ public static final String[] PUBLISHER_LIST = { "metadata.dc:publisher" };
+ public static final String[] RELATIONS_LIST = { "metadata.dc:relation" };
+ public static final String[] RIGHTS_LIST = { "metadata.dc:rights" };
+ public static final String[] SOURCE_LIST = { "metadata.dc:source" };
+
+ public static final String[] SUBJECT_LIST = { "metadata.dc:subject" };
+ public static final String[] TITLE_LIST = { "metadata.dc:title" };
+
+ public static final String[] TYPE_LIST = { "metadata.dc:type" };
+
+ public static final String[] IDENTIFIER_LIST_FIELDS = {
+ "metadata.dc:identifier", "metadata.dc:date", "metadata.dc:format" };
+ public static final String RANGE_FIELD = "metadata.dc:date";
}
diff --git a/oaipmh-webapp/pom.xml b/oaipmh-webapp/pom.xml
index 517e234fe9413118e19b93652042f492546d2b56..2d60a971b1aa57bf470d59068a9137bf9b1048b5 100644
--- a/oaipmh-webapp/pom.xml
+++ b/oaipmh-webapp/pom.xml
@@ -4,12 +4,12 @@
<parent>
<artifactId>oaipmh</artifactId>
<groupId>info.textgrid.middleware</groupId>
- <version>1.3.12-SNAPSHOT</version>
+ <version>1.3.13-SNAPSHOT</version>
</parent>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh-webapp</artifactId>
<packaging>war</packaging>
- <version>1.3.12-SNAPSHOT</version>
+ <version>1.3.13-SNAPSHOT</version>
<name>TextGrid :: OAI-PMH :: Webapp</name>
<url>http://maven.apache.org</url>
<profiles>
@@ -79,17 +79,17 @@
<target>${jdk.version}</target>
</configuration>
</plugin>
- <plugin>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>9.0.7.v20131107</version>
- <configuration>
- <scanIntervalSeconds>1</scanIntervalSeconds>
- <webAppConfig>
- <contextPath>tgsearch-public.war</contextPath>
- </webAppConfig>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>9.0.7.v20131107</version>
+ <configuration>
+ <scanIntervalSeconds>1</scanIntervalSeconds>
+ <webAppConfig>
+ <contextPath>tgsearch-public.war</contextPath>
+ </webAppConfig>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/pom.xml b/pom.xml
index 28852f562974c050febc9305a8c77f9fb9825887..44f5a52f627704de3d05f9d3d98acced0d0d53de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>info.textgrid.middleware</groupId>
<artifactId>oaipmh</artifactId>
- <version>1.3.12-SNAPSHOT</version>
+ <version>1.3.13-SNAPSHOT</version>
<packaging>pom</packaging>
<name>TextGrid :: TG-OAI-PMH :: Parent</name>
<properties>