From 72ba2e4f3570f228b073f3a3e75553fd603e760d Mon Sep 17 00:00:00 2001
From: Maximilian Brodhun <brodhun@sub.uni-goettingen.de>
Date: Fri, 15 Mar 2019 10:33:46 +0100
Subject: [PATCH] adapted beans.xml in oaipmh-webapp to new classes for DC and
MetsMods
---
.../src/main/webapp/WEB-INF/beans.xml | 42 +++++++------------
1 file changed, 14 insertions(+), 28 deletions(-)
diff --git a/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml b/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
index 42360981..22b95fcc 100644
--- a/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
+++ b/oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml
@@ -20,8 +20,7 @@
<import resource="classpath:META-INF/cxf/cxf.xml" />
<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
- <bean id="propertyPlaceholderConfigurer"
- class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <bean id="propertyPlaceholderConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="locations">
<list>
<value>file:/etc/dhrep/oaipmh/oaipmh.properties</value>
@@ -31,28 +30,21 @@
<property name="ignoreUnresolvablePlaceholders" value="true" />
</bean>
- <bean id="ElasticSearchClient"
- class="info.textgrid.middleware.OAI_ESClient">
- <constructor-arg index="0"
- value="${elasticSearch.url}" />
- <constructor-arg index="1"
- value="${elasticSearch.port}" />
- <constructor-arg index="2"
- value="${elasticSearch.clusterName}" />
+ <bean id="ElasticSearchClient" class="info.textgrid.middleware.OAI_ESClient">
+ <constructor-arg index="0" value="${elasticSearch.url}" />
+ <constructor-arg index="1" value="${elasticSearch.port}" />
+ <constructor-arg index="2" value="${elasticSearch.clusterName}" />
<property name="esIndex" value="${elasticSearch.index}" />
<property name="esType" value="${elasticSearch.type}" />
</bean>
<!--bean id="drc" class="info.textgrid.middleware.oaipmh.${DeletedRecordInfo}" -->
- <bean id="RepIdentification"
- class="info.textgrid.middleware.RepIdentification">
+ <bean id="RepIdentification" class="info.textgrid.middleware.RepIdentification">
<constructor-arg index="0" value="${RepositoryName}" />
<constructor-arg index="1" value="${BaseUrl}" />
- <constructor-arg index="2"
- value="${DeletedRecordInfo}" />
- <constructor-arg index="3"
- value="${EarliestDateStamp}" />
+ <constructor-arg index="2" value="${DeletedRecordInfo}" />
+ <constructor-arg index="3" value="${EarliestDateStamp}" />
<constructor-arg index="4" value="${Granularity}" />
<constructor-arg index="5" value="${ProtocolVersion}" />
<constructor-arg index="6" value="${AdminMail}" />
@@ -162,30 +154,26 @@
<constructor-arg index="1" value="${dariah}" />
</bean>
- <bean id="SetDeliverer"
- class="info.textgrid.middleware.SetDeliverer">
+ <bean id="SetDeliverer" class="info.textgrid.middleware.SetDeliverer">
<constructor-arg ref="ElasticSearchClient" />
<constructor-arg index="1" value="${textgrid}" />
<constructor-arg index="2" value="${dariah}" />
<property name="formatField" value="${formatField}" />
<property name="formatToFilter" value="${formatToFilter}" />
<property name="identifierField" value="${identifierField}" />
- <property name="repositoryObjectURIPrefix"
- value="${repositoryObjectURIPrefix}" />
+ <property name="repositoryObjectURIPrefix" value="${repositoryObjectURIPrefix}" />
<property name="specField" value="${specField}" />
<property name="specFieldPrefix" value="${specFieldPrefix}" />
</bean>
- <bean id="MetadataFormatList"
- class="info.textgrid.middleware.MetadataFormatListDeliverer">
+ <bean id="MetadataFormatList" class="info.textgrid.middleware.MetadataFormatListDeliverer">
<constructor-arg ref="ElasticSearchClient" />
</bean>
<!-- REST Interface -->
<bean id="rest" class="info.textgrid.middleware.Rest" />
- <bean id="cors-filter"
- class="org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter">
+ <bean id="cors-filter" class="org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter">
<property name="allowOrigins">
<util:list />
</property>
@@ -206,8 +194,7 @@
<property name="dariah" value="${dariah}" />
</bean>
- <jaxrs:server id="root" address="/root"
- publishedEndpointUrl="${RS_ENDPOINT}">
+ <jaxrs:server id="root" address="/root" publishedEndpointUrl="${RS_ENDPOINT}">
<jaxrs:serviceBeans>
<ref bean="rest" />
</jaxrs:serviceBeans>
@@ -216,8 +203,7 @@
</jaxrs:providers>
</jaxrs:server>
- <jaxrs:server id="queryEndpoint" address="/oai"
- publishedEndpointUrl="${RS_ENDPOINT}">
+ <jaxrs:server id="queryEndpoint" address="/oai" publishedEndpointUrl="${RS_ENDPOINT}">
<jaxrs:serviceBeans>
<ref bean="oai" />
</jaxrs:serviceBeans>
--
GitLab