Skip to content
Snippets Groups Projects
Commit 7fdc7cc0 authored by Stefan E. Funk's avatar Stefan E. Funk
Browse files

Renamed beans file to beans.xml. 

Added dariah config file location as last parameter.
More minor changes.
parent cc1ddb07
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
oaipmh-webapp/src/main/webapp/WEB-INF/beans.oaipmh.xml deleted 100644 → 0
+ 0
− 78
View file @ cc1ddb07
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxws="http://cxf.apache.org/jaxws"
xmlns:jaxrs="http://cxf.apache.org/jaxrs"
xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd
http://cxf.apache.org/jaxrs
http://cxf.apache.org/schemas/jaxrs.xsd
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util-3.1.xsd
">
<description>Configuration for the textgrid oai interface</description>
<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">
<property name="locations">
<list>
<value>file:/etc/textgrid/tgoaipmh/oaipmh.properties</value>
</list>
</property>
<property name="ignoreResourceNotFound" value="true"/>
<property name="ignoreUnresolvablePlaceholders">
<value>true</value>
</property>
</bean>
<bean id="ElasticSearchClient" class="info.textgrid.middleware.OAI_ESClient">
<constructor-arg index="0"><value>${elasticSearch.url}</value></constructor-arg>
<constructor-arg index="1"><value>${elasticSearch.port}</value></constructor-arg>
<constructor-arg index="2"><value>${elasticSearch.clusterName}</value></constructor-arg>
<property name="esIndex" value="${elasticSearch.index}"/>
<property name="esType" value="${elasticSearch.type}"/>
</bean>
<!-- REST Interface -->
<bean id="rest" class="info.textgrid.middleware.Rest"></bean>
<bean id="cors-filter" class="org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter">
<property name="allowOrigins">
<util:list/>
</property>
</bean>
<bean id="oai" class="info.textgrid.middleware.OAIPMHImpl">
<constructor-arg ref="ElasticSearchClient"/>
</bean>
<jaxrs:server id="root" address="/root">
<jaxrs:serviceBeans>
<ref bean="rest" />
</jaxrs:serviceBeans>
<jaxrs:providers>
<ref bean="cors-filter"/>
</jaxrs:providers>
</jaxrs:server>
<jaxrs:server id="queryEndpoint" address="/oai">
<jaxrs:serviceBeans>
<ref bean="oai" />
</jaxrs:serviceBeans>
<jaxrs:providers>
<ref bean="cors-filter"/>
</jaxrs:providers>
</jaxrs:server>
</beans>
\ No newline at end of file
oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml 0 → 100644
+ 82
− 0
View file @ 7fdc7cc0
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
xmlns:jaxrs="http://cxf.apache.org/jaxrs" xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd
http://cxf.apache.org/jaxrs
http://cxf.apache.org/schemas/jaxrs.xsd
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util-3.1.xsd
">
<description>Configuration for the TextGrid OAI-PMH interface
</description>
<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">
<property name="locations">
<list>
<value>/WEB-INF/oaipmh.properties</value>
<value>file:/etc/textgrid/oaipmh/oaipmh.properties</value>
<value>file:/etc/dariah/oaipmh/oaipmh.properties</value>
</list>
</property>
<property name="ignoreResourceNotFound" value="true" />
<property name="ignoreUnresolvablePlaceholders" value="true" />
</bean>
<bean id="ElasticSearchClient" class="info.textgrid.middleware.OAI_ESClient">
<constructor-arg index="0">
<value>${elasticSearch.url}</value>
</constructor-arg>
<constructor-arg index="1">
<value>${elasticSearch.port}</value>
</constructor-arg>
<constructor-arg index="2">
<value>${elasticSearch.clusterName}</value>
</constructor-arg>
<property name="esIndex" value="${elasticSearch.index}" />
<property name="esType" value="${elasticSearch.type}" />
</bean>
<!-- REST Interface -->
<bean id="rest" class="info.textgrid.middleware.Rest"></bean>
<bean id="cors-filter"
class="org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter">
<property name="allowOrigins">
<util:list />
</property>
</bean>
<bean id="oai" class="info.textgrid.middleware.OAIPMHImpl">
<constructor-arg ref="ElasticSearchClient" />
</bean>
<jaxrs:server id="root" address="/root">
<jaxrs:serviceBeans>
<ref bean="rest" />
</jaxrs:serviceBeans>
<jaxrs:providers>
<ref bean="cors-filter" />
</jaxrs:providers>
</jaxrs:server>
<jaxrs:server id="queryEndpoint" address="/oai">
<jaxrs:serviceBeans>
<ref bean="oai" />
</jaxrs:serviceBeans>
<jaxrs:providers>
<ref bean="cors-filter" />
</jaxrs:providers>
</jaxrs:server>
</beans>
oaipmh-webapp/src/main/webapp/WEB-INF/log4j.properties
+ 1
− 1
View file @ 7fdc7cc0
......@@ -2,7 +2,7 @@
# #%L
# TG-OAI-PMH Webapp
# %%
# Copyright (C) 2011 - 2012 TextGrid Consortium (http://www.textgrid.de), SUB Göttingen (http://www.sub.uni-goettingen.de)
# Copyright (C) 2011 - 2014 TextGrid Consortium (http://www.textgrid.de), SUB Gttingen (http://www.sub.uni-goettingen.de)
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as
......
oaipmh-webapp/src/main/webapp/WEB-INF/oaipmh.properties
+ 6
− 6
View file @ 7fdc7cc0
# elastic search config
elasticSearch.url = 10.160.254.106
elasticSearch.port = 9300
elasticSearch.clusterName = tg-search-es-ws4
elasticSearch.index = textgrid-public-ws4
elasticSearch.type = metadata
# elasticsearch config
elasticSearch.url = *
elasticSearch.port = *
elasticSearch.clusterName = *
elasticSearch.index = *
elasticSearch.type = *
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment