From 9cdf812d997087bb85a8e8240ee8035dad3edfd0 Mon Sep 17 00:00:00 2001
From: "Stefan E. Funk" <funk@sub.uni-goettingen.de>
Date: Wed, 16 Oct 2019 12:43:44 +0200
Subject: [PATCH] Package names adapted as they were before. maybe it is
working again now?
---
oaipmh-core/pom.xml | 5 +
.../textgrid/middleware/DARIAHConstants.java | 119 ++++----
.../middleware/DublinCoreBuilder.java | 25 +-
.../textgrid/middleware/ErrorHandler.java | 4 +-
.../IdentifierListDelivererAbstract.java | 4 +-
.../middleware/IdentifierListDelivererDC.java | 8 +-
.../IdentifierListDelivererIDIOM.java | 4 +-
.../IdentifierListDelivererInterface.java | 2 +-
.../MetadataFormatListDeliverer.java | 6 +-
.../info/textgrid/middleware/OAIPMHImpl.java | 36 +--
.../textgrid/middleware/OAIPMHProducer.java | 2 +-
.../textgrid/middleware/OAIPMHUtillities.java | 22 +-
.../textgrid/middleware/OAI_ESClient.java | 258 +++++++++---------
.../textgrid/middleware/OaiPmhClient.java | 2 +-
.../middleware/RecordDelivererAbstract.java | 2 +-
.../middleware/RecordDelivererDC.java | 6 +-
.../middleware/RecordDelivererIDIOM.java | 8 +-
.../middleware/RecordDelivererInterface.java | 2 +-
.../RecordListDelivererAbstract.java | 2 +-
.../middleware/RecordListDelivererDC.java | 10 +-
.../middleware/RecordListDelivererIDIOM.java | 10 +-
.../RecordListDelivererInterface.java | 4 +-
.../middleware/RepIdentification.java | 66 +++--
.../textgrid/middleware/SetDeliverer.java | 6 +-
.../textgrid/middleware/OaiPmhDARIAHTest.java | 6 +-
.../info/textgrid/middleware/OaiPmhTest.java | 6 +-
oaipmh-webapp/.gitignore | 1 +
.../src/main/webapp/WEB-INF/beans.xml | 2 +-
28 files changed, 331 insertions(+), 297 deletions(-)
diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml
index 602ccc13..4f5230a7 100644
--- a/oaipmh-core/pom.xml
+++ b/oaipmh-core/pom.xml
@@ -165,10 +165,15 @@
</execution>
</executions>
<configuration>
+ <generatePackage>info.textgrid.middleware.oaipmh</generatePackage>
<schemaDirectory>src/main/xsd</schemaDirectory>
<schemaIncludes>
<include>*.xsd</include>
</schemaIncludes>
+ <bindingDirectory>src/main/xsd</bindingDirectory>
+ <bindingIncludes>
+ <include>**/*.xjb</include>
+ </bindingIncludes>
</configuration>
</plugin>
</plugins>
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 f3a0ae2b..35fd6de9 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/DARIAHConstants.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/DARIAHConstants.java
@@ -11,72 +11,77 @@ import java.util.List;
public final class DARIAHConstants {
- private DARIAHConstants() {
- // not called
- }
+ private DARIAHConstants() {
+ // not called
+ }
- public static final String ITEM_IDENTIFIER_PREFIX = "hdl:";
- public static final String COLLECTIONREGISTRY_PREFIX = "dariah:collection:";
- public static final String COLLECTION_MIMETYPE = "text/vnd.dariah.dhrep.collection+turtle";
- public static final List<String> TEXTGRID_REP_ADMIN_CONTACT = Arrays.asList("support@de.dariah.eu");
+ public static final String ITEM_IDENTIFIER_PREFIX = "hdl:";
+ public static final String COLLECTIONREGISTRY_PREFIX = "dariah:collection:";
+ public static final String COLLECTION_MIMETYPE = "text/vnd.dariah.dhrep.collection+turtle";
+ public static final List<String> TEXTGRID_REP_ADMIN_CONTACT =
+ Arrays.asList("support@de.dariah.eu");
- /*
- * Rep Identification String Constants
- */
+ /*
+ * Rep Identification String Constants
+ */
- public static final String DARIAH_REP_BASEURL = "repository.de.dariah.eu";
- public static final String METADATA_DC_PREFIX = "rdf:RDF/rdf:Description";
+ public static final String DARIAH_REP_BASEURL = "repository.de.dariah.eu";
+ public static final String METADATA_DC_PREFIX = "rdf:RDF/rdf:Description";
- /*
- * Error String Constants
- */
+ /*
+ * 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)
- */
+ /*
+ * TextGrid Metadata Fields for OAI-PMH Request (Mapping to DC)
+ */
- public static final String CREATED = "descriptiveMetadata.dc:date";
- public static final String FORMAT = "descriptiveMetadata.dc:format";
- public static final String IDENTIFIER = "administrativeMetadata.dcterms:identifier";
- public static final String DATA_CONTRIBUTOR = "descriptiveMetadata.dc:contributor";
+ public static final String CREATED = "descriptiveMetadata.dc:date";
+ public static final String FORMAT = "descriptiveMetadata.dc:format";
+ public static final String IDENTIFIER = "administrativeMetadata.dcterms:identifier";
+ public static final String DATA_CONTRIBUTOR = "descriptiveMetadata.dc:contributor";
- public static final String[] DARIAHFields = {
- "descriptiveMetadata.dc:contributor", "descriptiveMetadata.dc:coverage",
- "administrativeMetadata.dcterms:created", "administrativeMetadata.dcterms:modified",
- "descriptiveMetadata.dc:description", "descriptiveMetadata.dc:format",
- "descriptiveMetadata.dc:identifier", "descriptiveMetadata.dc:language",
- "descriptiveMetadata.dc:publisher", "descriptiveMetadata.dc:relation",
- "descriptiveMetadata.dc:rights", "descriptiveMetadata.:source", "descriptiveMetadata.dc:subject",
- "descriptiveMetadata.dc:title", "descriptiveMetadata.dc:type", "administrativeMetadata.dcterms:identifier" };
+ public static final String[] DARIAHFields = {
+ "descriptiveMetadata.dc:contributor", "descriptiveMetadata.dc:coverage",
+ "administrativeMetadata.dcterms:created", "administrativeMetadata.dcterms:modified",
+ "descriptiveMetadata.dc:description", "descriptiveMetadata.dc:format",
+ "descriptiveMetadata.dc:identifier", "descriptiveMetadata.dc:language",
+ "descriptiveMetadata.dc:publisher", "descriptiveMetadata.dc:relation",
+ "descriptiveMetadata.dc:rights", "descriptiveMetadata.:source",
+ "descriptiveMetadata.dc:subject",
+ "descriptiveMetadata.dc:title", "descriptiveMetadata.dc:type",
+ "administrativeMetadata.dcterms:identifier"};
- public static final String[] DARIAHCollectionFields = { "metadata.dc:title" };
+ 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 = { "descriptiveMetadata.dc:contributor" };
- public static final String[] COVERAGE_LIST = { "descriptiveMetadata.dc:coverage" };
- public static final String[] CREATOR_LIST = { "descriptiveMetadata.dc:cretor" };
- public static final String[] DATE_LIST = { "administrativeMetadata.dcterms:modified" };
- public static final String[] DESCRIPTION_LIST = { "descriptiveMetadata.dc:description" };
- public static final String[] FORMAT_LIST = { "descriptiveMetadata.dc:format" };
- public static final String[] IDENTIFIER_LIST = { "descriptiveMetadata.dc:identifier" };
- public static final String[] LANGUAGE_LIST = { "descriptiveMetadata.dc:language" };
- public static final String[] PUBLISHER_LIST = { "descriptiveMetadata.dc:publisher" };
- public static final String[] RELATIONS_LIST = { "descriptiveMetadata.dc:relation" };
- public static final String[] RIGHTS_LIST = { "descriptiveMetadata.dc:rights" };
- public static final String[] SOURCE_LIST = { "descriptiveMetadata.dc:source" };
- public static final String[] SUBJECT_LIST = { "descriptiveMetadata.dc:subject" };
- public static final String[] TITLE_LIST = { "descriptiveMetadata.dc:title" };
- public static final String[] TYPE_LIST = { "descriptiveMetadata.dc:type" };
- public static final String[] IDENTIFIER_LIST_FIELDS = { "administrativeMetadata.dcterms:identifier","administrativeMetadata.dcterms:modified", "descriptiveMetadata.dc:identifier", "descriptiveMetadata.dc:date", "descriptiveMetadata.dc:format" };
- public static final String RANGE_FIELD = "administrativeMetadata.dcterms:modified";
- public static final String MODIFIED_FIELD = "administrativeMetadata.dcterms:modified";
+ public static final String[] CONTRIBUTOR_LIST = {"descriptiveMetadata.dc:contributor"};
+ public static final String[] COVERAGE_LIST = {"descriptiveMetadata.dc:coverage"};
+ public static final String[] CREATOR_LIST = {"descriptiveMetadata.dc:cretor"};
+ public static final String[] DATE_LIST = {"administrativeMetadata.dcterms:modified"};
+ public static final String[] DESCRIPTION_LIST = {"descriptiveMetadata.dc:description"};
+ public static final String[] FORMAT_LIST = {"descriptiveMetadata.dc:format"};
+ public static final String[] IDENTIFIER_LIST = {"descriptiveMetadata.dc:identifier"};
+ public static final String[] LANGUAGE_LIST = {"descriptiveMetadata.dc:language"};
+ public static final String[] PUBLISHER_LIST = {"descriptiveMetadata.dc:publisher"};
+ public static final String[] RELATIONS_LIST = {"descriptiveMetadata.dc:relation"};
+ public static final String[] RIGHTS_LIST = {"descriptiveMetadata.dc:rights"};
+ public static final String[] SOURCE_LIST = {"descriptiveMetadata.dc:source"};
+ public static final String[] SUBJECT_LIST = {"descriptiveMetadata.dc:subject"};
+ public static final String[] TITLE_LIST = {"descriptiveMetadata.dc:title"};
+ public static final String[] TYPE_LIST = {"descriptiveMetadata.dc:type"};
+ public static final String[] IDENTIFIER_LIST_FIELDS =
+ {"administrativeMetadata.dcterms:identifier", "administrativeMetadata.dcterms:modified",
+ "descriptiveMetadata.dc:identifier", "descriptiveMetadata.dc:date",
+ "descriptiveMetadata.dc:format"};
+ public static final String RANGE_FIELD = "administrativeMetadata.dcterms:modified";
+ public static final String MODIFIED_FIELD = "administrativeMetadata.dcterms:modified";
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreBuilder.java b/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreBuilder.java
index 1a14eba3..93fc66d2 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreBuilder.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/DublinCoreBuilder.java
@@ -1,13 +1,12 @@
package info.textgrid.middleware;
import java.util.List;
+import javax.xml.bind.JAXB;
import javax.xml.bind.JAXBElement;
-import org.openarchives.oai._2.MetadataType;
-import org.openarchives.oai._2_0.oai_dc.OaiDcType;
-import org.purl.dc.elements._1.ElementType;
-// import org.openarchives.oai._2_0.oai_dc.ObjectFactory;
-// import org.openarchives.oai._2.ObjectFactory;
-import org.purl.dc.elements._1.ObjectFactory;
+import info.textgrid.middleware.oaipmh.ElementType;
+import info.textgrid.middleware.oaipmh.MetadataType;
+import info.textgrid.middleware.oaipmh.OaiDcType;
+import info.textgrid.middleware.oaipmh.ObjectFactory;
/**
* <p>
@@ -312,18 +311,10 @@ public final class DublinCoreBuilder {
* @return metadata element with the dublinCore values for a specific object
*/
public MetadataType getDC() {
+ this.metadata.setAny(this.oaiDcObj.createDc(this.tgMappedDC));
- System.out.println("KAKKI!");
-
- // this.metadata.setAny(this.oaiDcObj.createDc(this.tgMappedDC));
- org.openarchives.oai._2_0.oai_dc.ObjectFactory of =
- new org.openarchives.oai._2_0.oai_dc.ObjectFactory();
-
- System.out.println("URGLI!");
-
- this.metadata.setAny(of.createDc(this.tgMappedDC));
-
- System.out.println("ARGLI!");
+ System.out.println(" ##");
+ JAXB.marshal(this.metadata, System.out);
return this.metadata;
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/ErrorHandler.java b/oaipmh-core/src/main/java/info/textgrid/middleware/ErrorHandler.java
index caa007c4..0179698b 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/ErrorHandler.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/ErrorHandler.java
@@ -1,7 +1,7 @@
package info.textgrid.middleware;
-import org.openarchives.oai._2.OAIPMHerrorType;
-import org.openarchives.oai._2.OAIPMHerrorcodeType;
+import info.textgrid.middleware.oaipmh.OAIPMHerrorType;
+import info.textgrid.middleware.oaipmh.OAIPMHerrorcodeType;
/**
* Handling the errors for a incorrect request
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
index 32cc99f8..b94d7206 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererAbstract.java
@@ -2,8 +2,8 @@ package info.textgrid.middleware;
import java.util.ArrayList;
import java.util.List;
-import org.openarchives.oai._2.ListIdentifiersType;
-import org.openarchives.oai._2.RequestType;
+import info.textgrid.middleware.oaipmh.ListIdentifiersType;
+import info.textgrid.middleware.oaipmh.RequestType;
/**
*
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java
index f1097655..e740ef3f 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererDC.java
@@ -1,9 +1,5 @@
package info.textgrid.middleware;
-import org.openarchives.oai._2.HeaderType;
-import org.openarchives.oai._2.ListIdentifiersType;
-import org.openarchives.oai._2.ResumptionTokenType;
-import info.textgrid.namespaces.middleware.tgcrud.common.TextGridMimetypes;
import java.text.ParseException;
import java.util.Hashtable;
import java.util.Map;
@@ -14,6 +10,10 @@ import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.SearchHit;
+import info.textgrid.middleware.oaipmh.HeaderType;
+import info.textgrid.middleware.oaipmh.ListIdentifiersType;
+import info.textgrid.middleware.oaipmh.ResumptionTokenType;
+import info.textgrid.namespaces.middleware.tgcrud.common.TextGridMimetypes;
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
index d1e8aa42..d9b56b13 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererIDIOM.java
@@ -6,8 +6,8 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
import org.classicmayan.tools.Queries;
-import org.openarchives.oai._2.ListIdentifiersType;
-import org.openarchives.oai._2.ResumptionTokenType;
+import info.textgrid.middleware.oaipmh.ListIdentifiersType;
+import info.textgrid.middleware.oaipmh.ResumptionTokenType;
/**
*
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererInterface.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererInterface.java
index fd88f870..2e9b56f3 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererInterface.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDelivererInterface.java
@@ -1,7 +1,7 @@
package info.textgrid.middleware;
import java.text.ParseException;
-import org.openarchives.oai._2.ListIdentifiersType;
+import info.textgrid.middleware.oaipmh.ListIdentifiersType;
/**
*
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDeliverer.java
index e2aa6b59..e88f54a8 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/MetadataFormatListDeliverer.java
@@ -2,9 +2,9 @@ package info.textgrid.middleware;
import org.elasticsearch.action.get.GetRequestBuilder;
import org.elasticsearch.action.get.GetResponse;
-import org.openarchives.oai._2.ListMetadataFormatsType;
-import org.openarchives.oai._2.MetadataFormatType;
-import org.openarchives.oai._2.RequestType;
+import info.textgrid.middleware.oaipmh.ListMetadataFormatsType;
+import info.textgrid.middleware.oaipmh.MetadataFormatType;
+import info.textgrid.middleware.oaipmh.RequestType;
public class MetadataFormatListDeliverer {
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
index 843eb26c..7513c23b 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHImpl.java
@@ -7,16 +7,16 @@ import javax.xml.bind.JAXBElement;
import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.XMLGregorianCalendar;
import org.apache.commons.logging.LogFactory;
-import org.openarchives.oai._2.GetRecordType;
-import org.openarchives.oai._2.IdentifyType;
-import org.openarchives.oai._2.ListIdentifiersType;
-import org.openarchives.oai._2.ListMetadataFormatsType;
-import org.openarchives.oai._2.ListRecordsType;
-import org.openarchives.oai._2.ListSetsType;
-import org.openarchives.oai._2.OAIPMHtype;
-import org.openarchives.oai._2.ObjectFactory;
-import org.openarchives.oai._2.RequestType;
-import org.openarchives.oai._2.VerbType;
+import info.textgrid.middleware.oaipmh.GetRecordType;
+import info.textgrid.middleware.oaipmh.IdentifyType;
+import info.textgrid.middleware.oaipmh.ListIdentifiersType;
+import info.textgrid.middleware.oaipmh.ListMetadataFormatsType;
+import info.textgrid.middleware.oaipmh.ListRecordsType;
+import info.textgrid.middleware.oaipmh.ListSetsType;
+import info.textgrid.middleware.oaipmh.OAIPMHtype;
+import info.textgrid.middleware.oaipmh.ObjectFactory;
+import info.textgrid.middleware.oaipmh.RequestType;
+import info.textgrid.middleware.oaipmh.VerbType;
/**
* <p>
@@ -80,9 +80,9 @@ public class OAIPMHImpl implements OAIPMHProducer {
/*
* (non-Javadoc)
- *
- * @see org.openarchives.oai._2Producer#getRequest(java.lang.String, java.lang.String,
- * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+ *
+ * @see info.textgrid.middleware.OAIPMHProducer#postRequest(String, String, String, String,
+ * String, String, String)
*/
public JAXBElement<OAIPMHtype> postRequest(String verb, String identifier, String metadataPrefix,
String set, String from, String until, String resumptionToken) {
@@ -92,8 +92,8 @@ public class OAIPMHImpl implements OAIPMHProducer {
/*
* (non-Javadoc)
*
- * @see org.openarchives.oai._2Producer#getRequest(java.lang.String, java.lang.String,
- * java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String)
+ * @see info.textgrid.middleware.OAIPMHProducer#getRequest(String, String, String, String, String,
+ * String, String)
*/
public JAXBElement<OAIPMHtype> getRequest(String verb, String identifier, String metadataPrefix,
String set, String from, String until, String resumptionToken) {
@@ -109,8 +109,10 @@ public class OAIPMHImpl implements OAIPMHProducer {
}
/**
- * checks the Identify request of correctness and response including errors in case of an
- * incorrect request
+ * <p>
+ * Checks the Identify request of correctness and response including errors in case of an
+ * incorrect request.
+ * </p>
*
* @param obf
* @param oai
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHProducer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHProducer.java
index df1caea1..c5a83a8d 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHProducer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHProducer.java
@@ -1,6 +1,6 @@
package info.textgrid.middleware;
-import org.openarchives.oai._2.OAIPMHtype;
+import info.textgrid.middleware.oaipmh.OAIPMHtype;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtillities.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtillities.java
index ca2f6c1c..3fb61833 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtillities.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAIPMHUtillities.java
@@ -1,8 +1,5 @@
package info.textgrid.middleware;
-import org.openarchives.oai._2.ListMetadataFormatsType;
-import org.openarchives.oai._2.MetadataFormatType;
-import org.openarchives.oai._2.ResumptionTokenType;
import java.math.BigInteger;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -14,6 +11,9 @@ import javax.xml.datatype.DatatypeConfigurationException;
import javax.xml.datatype.DatatypeFactory;
import javax.xml.datatype.XMLGregorianCalendar;
import org.apache.commons.logging.LogFactory;
+import info.textgrid.middleware.oaipmh.ListMetadataFormatsType;
+import info.textgrid.middleware.oaipmh.MetadataFormatType;
+import info.textgrid.middleware.oaipmh.ResumptionTokenType;
/**
* <p>
@@ -50,7 +50,9 @@ public class OAIPMHUtillities {
}
/**
- * producing the list of all metadata formats
+ * <p>
+ * Producing the list of all metadata formats.
+ * </p>
*
* @return tgRepMetadaFormats
*/
@@ -64,7 +66,9 @@ public class OAIPMHUtillities {
}
/**
- * calculating the current date and give it back as XMLGregorianCalendar
+ * <p>
+ * Calculating the current date and give it back as XMLGregorianCalendar.
+ * </p>
*
* @return now
* @throws DatatypeConfigurationException
@@ -80,8 +84,10 @@ public class OAIPMHUtillities {
}
/**
+ * <p>
* Converting a given string representing a date value into the date format required for OAIPMH
- * and give it back as XMLGregorianCalendar
+ * and give it back as XMLGregorianCalendar.
+ * </p>
*
* @param originalDateTimeString
* @return xmlCal
@@ -102,8 +108,10 @@ public class OAIPMHUtillities {
}
/**
+ * <p>
* Converting a given string representing a date value into the date format required for OAIPMH
- * and give it back as string
+ * and give it back as string.
+ * </p>
*
* @param originalDateTimeString
* @return dateOutputAsString
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OAI_ESClient.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OAI_ESClient.java
index a9b902f0..26ee2fbb 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OAI_ESClient.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OAI_ESClient.java
@@ -18,133 +18,135 @@ import org.elasticsearch.common.transport.InetSocketTransportAddress;
*/
public class OAI_ESClient {
- private Log log = LogFactory.getLog(OAI_ESClient.class);
- private static String url;
- private static int port;
- private static String esCluster;
- private static String esIndex;
- private static String esType;
- public static Client oaiESClient;
-
- /**
- * Constructor for the connection to an ElasticSearch index
- * @param url address for the ELasticSearch connection
- * @param port for the ElasticSearch connection
- * @param clusterName indicating the name of the cluster where the index exists
- */
- @SuppressWarnings("resource")
- public OAI_ESClient(String url, String thePort, String clusterName){
-
- int port = Integer.parseInt(thePort);
-
- this.log.info("ElasticSearch connection settings:");
- this.log.info("url = " + url);
- this.log.info("port = " + port);
- this.log.info("cluster name = " + clusterName);
-
- OAI_ESClient.setUrl(url);
- OAI_ESClient.setPort(port);
-
- Settings oaiESClusterSettings = ImmutableSettings.settingsBuilder().put("cluster.name", clusterName).build();
-
- oaiESClient = new TransportClient(oaiESClusterSettings)
- .addTransportAddress(new InetSocketTransportAddress(url, port));
- }
-
- /**
- *
- * @return esIndex
- */
- public static String getEsIndex() {
- return esIndex;
- }
-
- /**
- *
- * @param esIndex
- */
- public static void setEsIndex(String esIndex) {
- OAI_ESClient.esIndex = esIndex;
- }
-
- /**
- *
- * @return esType
- */
- public static String getEsType() {
- return esType;
- }
-
- /**
- *
- * @param esType
- */
- public static void setEsType(String esType) {
- OAI_ESClient.esType = esType;
- }
-
- /**
- *
- * @return oaiESClient
- */
- public static Client getOaiESClient() {
- return oaiESClient;
- }
-
- /**
- *
- * @return esCluster
- */
- public static String getClusterName() {
- return esCluster;
- }
-
- /**
- *
- * @param esCluster
- */
- public static void setClusterName(String esCluster) {
- OAI_ESClient.esCluster = esCluster;
- }
-
- /**
- *
- * @return url
- */
- public static String getUrl() {
- return url;
- }
-
- /**
- *
- * @param url
- */
- public static void setUrl(String url) {
- OAI_ESClient.url = url;
- }
-
- /**
- *
- * @return port
- */
- public static int getPort() {
- return port;
- }
-
- /**
- *
- * @param port
- */
- public static void setPort(int port) {
- OAI_ESClient.port=port;
- }
-
- /**
- *
- * @param oaiClient
- */
- public static void setOaiESClient(Client theOaiClient){
- OAI_ESClient.oaiESClient = theOaiClient;
- }
+ private Log log = LogFactory.getLog(OAI_ESClient.class);
+ private static String url;
+ private static int port;
+ private static String esCluster;
+ private static String esIndex;
+ private static String esType;
+ public static Client oaiESClient;
+
+ /**
+ * Constructor for the connection to an ElasticSearch index
+ *
+ * @param url address for the ELasticSearch connection
+ * @param port for the ElasticSearch connection
+ * @param clusterName indicating the name of the cluster where the index exists
+ */
+ @SuppressWarnings("resource")
+ public OAI_ESClient(String url, String thePort, String clusterName) {
+
+ int port = Integer.parseInt(thePort);
+
+ this.log.info("ElasticSearch connection settings:");
+ this.log.info("url = " + url);
+ this.log.info("port = " + port);
+ this.log.info("cluster name = " + clusterName);
+
+ OAI_ESClient.setUrl(url);
+ OAI_ESClient.setPort(port);
+
+ Settings oaiESClusterSettings =
+ ImmutableSettings.settingsBuilder().put("cluster.name", clusterName).build();
+
+ oaiESClient = new TransportClient(oaiESClusterSettings)
+ .addTransportAddress(new InetSocketTransportAddress(url, port));
+ }
+
+ /**
+ *
+ * @return esIndex
+ */
+ public static String getEsIndex() {
+ return esIndex;
+ }
+
+ /**
+ *
+ * @param esIndex
+ */
+ public static void setEsIndex(String esIndex) {
+ OAI_ESClient.esIndex = esIndex;
+ }
+
+ /**
+ *
+ * @return esType
+ */
+ public static String getEsType() {
+ return esType;
+ }
+
+ /**
+ *
+ * @param esType
+ */
+ public static void setEsType(String esType) {
+ OAI_ESClient.esType = esType;
+ }
+
+ /**
+ *
+ * @return oaiESClient
+ */
+ public static Client getOaiESClient() {
+ return oaiESClient;
+ }
+
+ /**
+ *
+ * @return esCluster
+ */
+ public static String getClusterName() {
+ return esCluster;
+ }
+
+ /**
+ *
+ * @param esCluster
+ */
+ public static void setClusterName(String esCluster) {
+ OAI_ESClient.esCluster = esCluster;
+ }
+
+ /**
+ *
+ * @return url
+ */
+ public static String getUrl() {
+ return url;
+ }
+
+ /**
+ *
+ * @param url
+ */
+ public static void setUrl(String url) {
+ OAI_ESClient.url = url;
+ }
+
+ /**
+ *
+ * @return port
+ */
+ public static int getPort() {
+ return port;
+ }
+
+ /**
+ *
+ * @param port
+ */
+ public static void setPort(int port) {
+ OAI_ESClient.port = port;
+ }
+
+ /**
+ *
+ * @param oaiClient
+ */
+ public static void setOaiESClient(Client theOaiClient) {
+ OAI_ESClient.oaiESClient = theOaiClient;
+ }
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/OaiPmhClient.java b/oaipmh-core/src/main/java/info/textgrid/middleware/OaiPmhClient.java
index 5e9bf744..f59d6af8 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/OaiPmhClient.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/OaiPmhClient.java
@@ -1,6 +1,6 @@
package info.textgrid.middleware;
-import org.openarchives.oai._2.OAIPMHtype;
+import info.textgrid.middleware.oaipmh.OAIPMHtype;
import java.text.ParseException;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererAbstract.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererAbstract.java
index ad8e73c9..c5af2071 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererAbstract.java
@@ -2,7 +2,7 @@ package info.textgrid.middleware;
import java.util.ArrayList;
import java.util.List;
-import org.openarchives.oai._2.RequestType;
+import info.textgrid.middleware.oaipmh.RequestType;
/**
* FIXME
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java
index 539e00a0..eccb54aa 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererDC.java
@@ -5,9 +5,9 @@ import javax.xml.datatype.DatatypeConfigurationException;
import org.apache.commons.logging.LogFactory;
import org.elasticsearch.action.get.GetRequestBuilder;
import org.elasticsearch.action.get.GetResponse;
-import org.openarchives.oai._2.GetRecordType;
-import org.openarchives.oai._2.HeaderType;
-import org.openarchives.oai._2.RecordType;
+import info.textgrid.middleware.oaipmh.GetRecordType;
+import info.textgrid.middleware.oaipmh.HeaderType;
+import info.textgrid.middleware.oaipmh.RecordType;
/**
* FIXME
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
index eae3bba5..7a3939fb 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
@@ -10,10 +10,10 @@ import org.apache.commons.logging.LogFactory;
import org.classicmayan.tools.ClassicMayanMetsMods;
import org.elasticsearch.action.get.GetRequestBuilder;
import org.elasticsearch.action.get.GetResponse;
-import org.openarchives.oai._2.GetRecordType;
-import org.openarchives.oai._2.HeaderType;
-import org.openarchives.oai._2.MetadataType;
-import org.openarchives.oai._2.RecordType;
+import info.textgrid.middleware.oaipmh.GetRecordType;
+import info.textgrid.middleware.oaipmh.HeaderType;
+import info.textgrid.middleware.oaipmh.MetadataType;
+import info.textgrid.middleware.oaipmh.RecordType;
/**
*
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererInterface.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererInterface.java
index e5723941..133a9022 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererInterface.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererInterface.java
@@ -1,6 +1,6 @@
package info.textgrid.middleware;
-import org.openarchives.oai._2.GetRecordType;
+import info.textgrid.middleware.oaipmh.GetRecordType;
/**
* @author Maximilian Brodhun, SUB Göttingen
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
index c6807249..a62afe19 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererAbstract.java
@@ -2,7 +2,7 @@ package info.textgrid.middleware;
import java.util.ArrayList;
import java.util.List;
-import org.openarchives.oai._2.RequestType;
+import info.textgrid.middleware.oaipmh.RequestType;
/**
*
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
index b38b0177..7b434cae 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererDC.java
@@ -15,11 +15,11 @@ import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.SearchHit;
-import org.openarchives.oai._2.HeaderType;
-import org.openarchives.oai._2.ListRecordsType;
-import org.openarchives.oai._2.MetadataType;
-import org.openarchives.oai._2.RecordType;
-import org.openarchives.oai._2.ResumptionTokenType;
+import info.textgrid.middleware.oaipmh.HeaderType;
+import info.textgrid.middleware.oaipmh.ListRecordsType;
+import info.textgrid.middleware.oaipmh.MetadataType;
+import info.textgrid.middleware.oaipmh.RecordType;
+import info.textgrid.middleware.oaipmh.ResumptionTokenType;
/**
*
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
index 20df76f2..4eacaf08 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererIDIOM.java
@@ -6,11 +6,11 @@ import java.util.Map;
import java.util.UUID;
import org.apache.commons.logging.LogFactory;
import org.classicmayan.tools.Queries;
-import org.openarchives.oai._2.HeaderType;
-import org.openarchives.oai._2.ListRecordsType;
-import org.openarchives.oai._2.MetadataType;
-import org.openarchives.oai._2.RecordType;
-import org.openarchives.oai._2.ResumptionTokenType;
+import info.textgrid.middleware.oaipmh.HeaderType;
+import info.textgrid.middleware.oaipmh.ListRecordsType;
+import info.textgrid.middleware.oaipmh.MetadataType;
+import info.textgrid.middleware.oaipmh.RecordType;
+import info.textgrid.middleware.oaipmh.ResumptionTokenType;
/**
*
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererInterface.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererInterface.java
index b655ccf1..1dd1f583 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererInterface.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordListDelivererInterface.java
@@ -1,7 +1,7 @@
package info.textgrid.middleware;
-import org.openarchives.oai._2.HeaderType;
-import org.openarchives.oai._2.ListRecordsType;
+import info.textgrid.middleware.oaipmh.HeaderType;
+import info.textgrid.middleware.oaipmh.ListRecordsType;
/**
*
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/RepIdentification.java b/oaipmh-core/src/main/java/info/textgrid/middleware/RepIdentification.java
index b1e4fb98..8594579a 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RepIdentification.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RepIdentification.java
@@ -1,16 +1,17 @@
package info.textgrid.middleware;
-import org.openarchives.oai._2.DeletedRecordType;
-import org.openarchives.oai._2.GranularityType;
-import org.openarchives.oai._2.RequestType;
+import info.textgrid.middleware.oaipmh.DeletedRecordType;
+import info.textgrid.middleware.oaipmh.GranularityType;
+import info.textgrid.middleware.oaipmh.RequestType;
/**
- * Handling the "Identify" request from an OAIPMH client
+ * <p>
+ * Handling the "Identify" request from an OAIPMH client.
+ * </p>
*
* @author Maximilian Brodhun, SUB
* @version 1.0
* @since 11.02.2014
- *
*/
public class RepIdentification {
@@ -23,14 +24,18 @@ public class RepIdentification {
private String ProtocolVersion;
private String AdminMailAdress;
-
- public RepIdentification(String RepositoryName,
- String BaseUrl,
- DeletedRecordType DeletedRecordInfo,
- String EarliestDatestamp,
- GranularityType Granularity,
- String ProtocolVersion,
- String AdminMail) {
+ /**
+ * @param RepositoryName
+ * @param BaseUrl
+ * @param DeletedRecordInfo
+ * @param EarliestDatestamp
+ * @param Granularity
+ * @param ProtocolVersion
+ * @param AdminMail
+ */
+ public RepIdentification(String RepositoryName, String BaseUrl,
+ DeletedRecordType DeletedRecordInfo, String EarliestDatestamp, GranularityType Granularity,
+ String ProtocolVersion, String AdminMail) {
setRepositoryName(RepositoryName);
setBaseUrl(BaseUrl);
@@ -41,45 +46,49 @@ public class RepIdentification {
setAdminMailAddress(AdminMail);
}
-
/**
- *
* @return TGConstants.TG_REP_NAME;
*/
public String getRepositoryName() {
return this.RepositoryName;
}
+ /**
+ * @param RepositoryName
+ */
public void setRepositoryName(String RepositoryName) {
this.RepositoryName = RepositoryName;
}
/**
- *
* @return TGConstants.TG_REP_BASEURL
*/
public String getBaseUrl() {
return this.BaseUrl;
}
+ /**
+ * @param BaseUrl
+ */
public void setBaseUrl(String BaseUrl) {
this.BaseUrl = BaseUrl;
}
/**
- *
* @return tgDeletetObjects
*/
public DeletedRecordType getDeletedRecordStatus() {
return this.tgDeletetObjects;
}
+ /**
+ * @param tgDeletetObjects
+ */
public void setDeletedRecordStatus(DeletedRecordType tgDeletetObjects) {
this.tgDeletetObjects = tgDeletetObjects;
}
/**
- *
* @return "2011-06-11T2:32:40Z"
*/
public String getEarliestDatestamp() {
@@ -87,24 +96,28 @@ public class RepIdentification {
return this.EarliestDatestamp;
}
+ /**
+ * @param earliestDatestamp
+ */
public void setEarliestDatestamp(String earliestDatestamp) {
this.EarliestDatestamp = earliestDatestamp;
}
/**
- *
* @return tgRepGranulartiry
*/
public GranularityType getGranularity() {
return this.tgRepGranulartiry;
}
+ /**
+ * @param tgRepGranulartiry
+ */
public void setGranularity(GranularityType tgRepGranulartiry) {
this.tgRepGranulartiry = tgRepGranulartiry;
}
/**
- *
* @return TGConstants.TG_REP_OAIPMH_PROTOCOL_VERSION;
*/
public String getProtocolVersion() {
@@ -112,12 +125,14 @@ public class RepIdentification {
return this.ProtocolVersion;
}
+ /**
+ * @param protocolVersion
+ */
public void setProtocolVersion(String protocolVersion) {
this.ProtocolVersion = protocolVersion;
}
/**
- *
* @return TGConstants.TEXTGRID_REP_ADMIN_CONTACT.get(0)
*/
public String getAdminMaiAddresss() {
@@ -125,17 +140,21 @@ public class RepIdentification {
return this.AdminMailAdress;
}
+ /**
+ * @param adminMailAddress
+ */
public void setAdminMailAddress(String adminMailAddress) {
this.AdminMailAdress = adminMailAddress;
}
/**
- * checking the request if all necessary values are set or not allowed values are not set
+ * <p>
+ * Checking the request if all necessary values are set or not allowed values are not set.
+ * </p>
*
* @param request the initially request from the OAIPMG client
* @return a boolean indicating the correctness of the request
*/
-
public boolean requestChecker(RequestType request) {
boolean noArguments;
@@ -152,6 +171,7 @@ public class RepIdentification {
} else {
noArguments = true;
}
+
return noArguments;
}
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
index 063f734a..5a89c741 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
@@ -1,6 +1,5 @@
package info.textgrid.middleware;
-import info.textgrid.namespaces.middleware.tgcrud.common.TextGridMimetypes;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.Hashtable;
@@ -15,8 +14,9 @@ import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.search.SearchHit;
-import org.openarchives.oai._2.ListSetsType;
-import org.openarchives.oai._2.SetType;
+import info.textgrid.middleware.oaipmh.ListSetsType;
+import info.textgrid.middleware.oaipmh.SetType;
+import info.textgrid.namespaces.middleware.tgcrud.common.TextGridMimetypes;
/**
*
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDARIAHTest.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDARIAHTest.java
index 1fc93b7d..3ff0821e 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDARIAHTest.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhDARIAHTest.java
@@ -6,9 +6,9 @@ import javax.xml.bind.JAXBElement;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import org.openarchives.oai._2.DeletedRecordType;
-import org.openarchives.oai._2.GranularityType;
-import org.openarchives.oai._2.OAIPMHtype;
+import info.textgrid.middleware.oaipmh.DeletedRecordType;
+import info.textgrid.middleware.oaipmh.GranularityType;
+import info.textgrid.middleware.oaipmh.OAIPMHtype;
import info.textgrid.namespaces.middleware.tgcrud.common.TextGridMimetypes;
/**
diff --git a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
index d25ab6a5..802660c4 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
@@ -9,9 +9,9 @@ import javax.xml.datatype.XMLGregorianCalendar;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
-import org.openarchives.oai._2.DeletedRecordType;
-import org.openarchives.oai._2.GranularityType;
-import org.openarchives.oai._2.OAIPMHtype;
+import info.textgrid.middleware.oaipmh.DeletedRecordType;
+import info.textgrid.middleware.oaipmh.GranularityType;
+import info.textgrid.middleware.oaipmh.OAIPMHtype;
import info.textgrid.namespaces.middleware.tgcrud.common.TextGridMimetypes;
/**
diff --git a/oaipmh-webapp/.gitignore b/oaipmh-webapp/.gitignore
index 10d81e8c..d814cc02 100644
--- a/oaipmh-webapp/.gitignore
+++ b/oaipmh-webapp/.gitignore
@@ -2,3 +2,4 @@
/.project
/.settings/
/target/
+/bin/
diff --git a/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml b/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
index 58fc35df..f6ecb033 100644
--- a/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
+++ b/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
@@ -22,7 +22,7 @@
<bean id="propertyPlaceholderConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="locations">
<list>
- <value>file:/etc/dhrep/oaipmh/oaipmh.properties</value>
+ <value>file:/etc/dhrep/oaipmh/oaipmh.dariah.properties</value>
</list>
</property>
<property name="ignoreResourceNotFound" value="true" />
--
GitLab