From 5f79a0ff46c28fabe9597e1d0b14d5e94171ffa1 Mon Sep 17 00:00:00 2001
From: Maximilian Brodhun <brodhun@sub.uni-goettingen.de>
Date: Mon, 11 Mar 2019 13:45:35 +0100
Subject: [PATCH] newest jena and common
---
oaipmh-core/pom.xml | 36 ++++++++++++-------
.../middleware/IdentifierListDeliverer.java | 3 --
.../middleware/RecordDelivererIDIOM.java | 2 ++
.../textgrid/middleware/SetDeliverer.java | 15 +-------
.../info/textgrid/middleware/OaiPmhTest.java | 6 ++--
pom.xml | 2 +-
6 files changed, 30 insertions(+), 34 deletions(-)
diff --git a/oaipmh-core/pom.xml b/oaipmh-core/pom.xml
index 5f807385..48195d85 100644
--- a/oaipmh-core/pom.xml
+++ b/oaipmh-core/pom.xml
@@ -18,33 +18,36 @@
<artifactId>crud-common</artifactId>
<version>${tgcrud.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-cors</artifactId>
<version>${cxf.version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
<version>${cxf.version}</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
<version>${cxf.version}</version>
- </dependency>
- <dependency>
+ </dependency-->
+ <!--dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
- </dependency>
- <!-- dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId>
- <version>${cxf.version}</version> </dependency -->
- <dependency>
+ </dependency-->
+ <!--dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-transports-http</artifactId>
+ <version>${cxf.version}</version>
+ </dependency-->
+ <!--dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId>
<version>1.0</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -93,9 +96,16 @@
<artifactId>metsModsMapping</artifactId>
<version>1.0-SNAPSHOT</version>
</dependency>
- <!-- <dependency> <groupId>org.apache.jena</groupId> <artifactId>jena-core</artifactId>
- <version>3.4.0</version> </dependency> <dependency> <groupId>org.apache.jena</groupId>
- <artifactId>jena-arq</artifactId> <version>3.6.0</version> </dependency -->
+ <!--dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-core</artifactId>
+ <version>3.4.0</version>
+ </dependency-->
+ <!-- dependency>
+ <groupId>org.apache.jena</groupId>
+ <artifactId>jena-arq</artifactId>
+ <version>3.6.0</version>
+ </dependency-->
</dependencies>
<build>
diff --git a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDeliverer.java b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDeliverer.java
index 3bc18591..3716ee85 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/IdentifierListDeliverer.java
@@ -8,7 +8,6 @@ import info.textgrid.middleware.oaipmh.RequestType;
import info.textgrid.middleware.oaipmh.ResumptionTokenType;
import info.textgrid.namespaces.middleware.tgcrud.common.TextGridMimetypes;
-import java.math.BigInteger;
import java.text.ParseException;
import java.util.Hashtable;
import java.util.Map;
@@ -16,9 +15,7 @@ import java.util.Map;
import javax.xml.datatype.DatatypeConfigurationException;
import org.apache.commons.logging.LogFactory;
-import org.elasticsearch.action.search.SearchRequestBuilder;
import org.elasticsearch.action.search.SearchResponse;
-import org.elasticsearch.action.search.SearchScrollRequestBuilder;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
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 76a3413d..cd00bf37 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/RecordDelivererIDIOM.java
@@ -2,6 +2,8 @@ package info.textgrid.middleware;
import org.apache.commons.logging.LogFactory;
+import org.classicmayan.tools.ClassicMayanMetsMods;
+
import info.textgrid.middleware.oaipmh.GetRecordType;
import info.textgrid.middleware.oaipmh.HeaderType;
import info.textgrid.middleware.oaipmh.MetadataType;
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 d9549991..94752cd7 100644
--- a/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
+++ b/oaipmh-core/src/main/java/info/textgrid/middleware/SetDeliverer.java
@@ -3,7 +3,7 @@ package info.textgrid.middleware;
import info.textgrid.middleware.oaipmh.ListSetsType;
import info.textgrid.middleware.oaipmh.SetType;
import info.textgrid.namespaces.middleware.tgcrud.common.TextGridMimetypes;
-import info.textgrid.utils.sesameclient.SesameClient;
+
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.util.Hashtable;
@@ -27,7 +27,6 @@ public class SetDeliverer {
private static Map<String, String> setSet = new Hashtable<String, String>();
private OAI_ESClient oaiEsClient;
- private SesameClient sparqlClient;
private Set<String> identifier = new LinkedHashSet<String>();
private String formatField;
private String formatToFilter;
@@ -255,17 +254,5 @@ public class SetDeliverer {
this.dariah = dariah;
}
- /**
- * @return
- */
- public SesameClient getSparqlClient() {
- return this.sparqlClient;
- }
- /**
- * @param sparqlClient
- */
- public void setSparqlClient(SesameClient sparqlClient) {
- this.sparqlClient = sparqlClient;
- }
}
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 f1244b9d..945e9721 100644
--- a/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
+++ b/oaipmh-core/src/test/java/info/textgrid/middleware/OaiPmhTest.java
@@ -223,10 +223,10 @@ public class OaiPmhTest {
* @throws ParseException
*/
@Test
- @Ignore
+ //@Ignore
public void testGetRequestGetRecordIDIOM() throws ParseException {
- record.setContributor(TGConstants.CONTRIBUTOR_LIST);
+ /*record.setContributor(TGConstants.CONTRIBUTOR_LIST);
record.setCoverage(TGConstants.COVERAGE_LIST);
record.setCreator(TGConstants.CREATOR_LIST);
record.setDates(TGConstants.DATE_LIST);
@@ -248,7 +248,7 @@ public class OaiPmhTest {
record.setDateOfObjectCreation(TGConstants.CREATED);
record.setRelationToFurtherMetadataObject(TGConstants.EDITION_ISEDITIONOF);
record.setRepositoryObjectURIPrefix(TGConstants.ITEM_IDENTIFIER_PREFIX);
- record.setIdentifierField("textgridUri");
+ record.setIdentifierField("textgridUri");*/
System.out.println("Test for the verb \"GetRecord\" with succesfull response");
JAXBElement<OAIPMHType> p =
diff --git a/pom.xml b/pom.xml
index 7795795d..04fdb964 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<name>DARIAHDE :: OAI-PMH DataProvider</name>
<properties>
<tgcrud.version>7.24.0-DH</tgcrud.version>
- <tghttpclients.version>3.0.0</tghttpclients.version>
+ <tghttpclients.version>3.3.1-SNAPSHOT</tghttpclients.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cxf.version>3.2.3</cxf.version>
<spring.version>4.0.2.RELEASE</spring.version>
--
GitLab