Commit 679c822d authored by Gradl, Tobias's avatar Gradl, Tobias
Browse files

1175: Fix minor issues of current 3.5 release

Task-Url: https://pm.winseda.de/issues/1175
parent e845e823
Pipeline #6680 failed with stages
in 3 minutes and 24 seconds
......@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>eu.dariah.de.minfba.search</groupId>
<artifactId>cosmotool</artifactId>
<version>2.0.1-SNAPSHOT</version>
<version>2.0.3-SNAPSHOT</version>
<packaging>war</packaging>
<name>DARIAH-DE CosmoTool</name>
<properties>
......@@ -12,7 +12,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<eu.dariah.de.minfba-search-commons.version>1.8.0</eu.dariah.de.minfba-search-commons.version>
<eu.dariah.de.minfba-search-commons.version>1.10.0-RELEASE</eu.dariah.de.minfba-search-commons.version>
<org.springframework-version>4.3.6.RELEASE</org.springframework-version>
<org.springsecurity-version>4.2.1.RELEASE</org.springsecurity-version>
......
......@@ -72,18 +72,20 @@
<property name="maxPoolSize" value="${crawling.max_threads:4}" />
<property name="offlineProcessingChains">
<map>
<entry key="OAI_PMH" value="indexCleaner,xmlFileProcessor" />
<entry key="XML" value="indexCleaner,fileUnpacker,fileUnarchiver,xmlChunker,xmlBatchFileProcessor" />
<entry key="CSV" value="indexCleaner,fileUnpacker,fileUnarchiver,csvBatchFileProcessor" />
<entry key="TEXT" value="indexCleaner,fileUnpacker,fileUnarchiver,textBatchFileProcessor" />
<entry key="OAI-PMH" value="indexCleaner,xmlBatchFileProcessor" />
<entry key="XML" value="fileUnpacker,fileUnarchiver,xmlChunker,indexCleaner,xmlBatchFileProcessor" />
<entry key="CSV" value="fileUnpacker,fileUnarchiver,indexCleaner,csvBatchFileProcessor" />
<entry key="TSV" value="fileUnpacker,fileUnarchiver,indexCleaner,tsvBatchFileProcessor" />
<entry key="TEXT" value="fileUnpacker,fileUnarchiver,indexCleaner,textBatchFileProcessor" />
</map>
</property>
<property name="onlineProcessingChains">
<map>
<entry key="OAI_PMH" value="indexCleaner,oaipmhCrawler,xmlFileProcessor" />
<entry key="XML" value="indexCleaner,fileDownloader,fileUnpacker,fileUnarchiver,xmlChunker,xmlBatchFileProcessor" />
<entry key="CSV" value="indexCleaner,fileDownloader,fileUnpacker,fileUnarchiver,csvBatchFileProcessor" />
<entry key="TEXT" value="indexCleaner,fileDownloader,fileUnpacker,fileUnarchiver,textBatchFileProcessor" />
<entry key="OAI-PMH" value="oaipmhCrawler,indexCleaner,xmlBatchFileProcessor" />
<entry key="XML" value="fileDownloader,fileUnpacker,fileUnarchiver,xmlChunker,indexCleaner,xmlBatchFileProcessor" />
<entry key="CSV" value="fileDownloader,fileUnpacker,fileUnarchiver,indexCleaner,csvBatchFileProcessor" />
<entry key="TSV" value="fileDownloader,fileUnpacker,fileUnarchiver,indexCleaner,tsvBatchFileProcessor" />
<entry key="TEXT" value="fileDownloader,fileUnpacker,fileUnarchiver,indexCleaner,textBatchFileProcessor" />
</map>
</property>
</bean>
......@@ -101,17 +103,22 @@
<bean id="xmlBatchFileProcessor" class="eu.dariah.de.search.crawling.crawler.FileProcessor" scope="prototype">
<property name="wrappedServiceType" value="de.unibamberg.minf.processing.service.xml.XmlStringProcessingService" />
<property name="wrappedServiceType" value="de.unibamberg.minf.processing.service.xml.XmlProcessingService" />
<property name="maxParallelThreads" value="6" />
</bean>
<bean id="textBatchFileProcessor" class="eu.dariah.de.search.crawling.crawler.FileProcessor" scope="prototype">
<property name="wrappedServiceType" value="de.unibamberg.minf.processing.service.text.TextStringProcessingService" />
<property name="wrappedServiceType" value="de.unibamberg.minf.processing.service.text.TextProcessingService" />
<property name="maxParallelThreads" value="6" />
</bean>
<bean id="csvBatchFileProcessor" class="eu.dariah.de.search.crawling.crawler.FileProcessor" scope="prototype">
<property name="wrappedServiceType" value="de.unibamberg.minf.processing.service.text.CsvStringProcessingService" />
<property name="wrappedServiceType" value="de.unibamberg.minf.processing.service.tabular.CsvProcessingService" />
<property name="maxParallelThreads" value="6" />
</bean>
<bean id="tsvBatchFileProcessor" class="eu.dariah.de.search.crawling.crawler.FileProcessor" scope="prototype">
<property name="wrappedServiceType" value="de.unibamberg.minf.processing.service.tabular.TsvProcessingService" />
<property name="maxParallelThreads" value="6" />
</bean>
......@@ -161,7 +168,7 @@
<property name="descriptionEngine">
<bean class="de.unibamberg.minf.gtf.DescriptionEngineImpl" scope="prototype">
<property name="grammarsRoot" value="${paths.grammars}" />
<property name="parseErrorDumpPath" value="/tmp/schereg_parse_errors" />
<property name="parseErrorDumpPath" value="${paths.gtf.parse_errors}" />
</bean>
</property>
<property name="transformationEngine">
......@@ -180,7 +187,8 @@
<bean class="de.unibamberg.minf.gtf.extensions.file.dispatcher.FileCommandsDispatcher">
<property name="commands">
<bean class="de.unibamberg.minf.gtf.extensions.file.commands.OnlineFileCommands">
<property name="baseDownloadDirectory" value="${gtf.extensions.file.baseDownloadDir:/tmp}" />
<property name="baseDownloadDirectory" value="${paths.downloads:/tmp}" />
<property name="disabled" value="${debugging.indexing.disable_downloads:#{false}}" />
</bean>
</property>
</bean>
......
......@@ -22,6 +22,7 @@
</bean>
</list>
</property>
<property name="maxTimeoutMs" value="300000" />
</bean>
<mongo:db-factory host="${mongo.host}" port="${mongo.port}" dbname="${mongo.database}" />
......@@ -52,7 +53,11 @@
<bean class="com.fasterxml.jackson.datatype.joda.JodaModule"></bean>
</list>
</property>
</bean>
</bean>
<bean id="jsonNodeHelper" class="de.unibamberg.minf.core.util.json.JsonNodeHelper">
<property name="objMapper" ref="objectMapper" />
</bean>
<bean id="restTemplate" class="org.springframework.web.client.RestTemplate">
<property name="messageConverters">
......@@ -96,11 +101,20 @@
<property name="thumbnailsHeight" value="${custom_search.pictures.thumbnails.max_height:150}" />
</bean>
<context:component-scan base-package="eu.dariah.de.minfba.cosmotool.service"/>
<bean id="cachedImageService" class="eu.dariah.de.search.data.service.CachedImageServiceImpl">
<property name="imagePath" value="${paths.downloads}" />
<property name="imagesSizeType" value="MAX_SHORTEST_SIDE" />
<property name="imagesWidth" value="${presentation.resource.images.display.box_width:500}" />
<property name="imagesHeight" value="${presentation.resource.images.display.box_height:500}" />
<property name="thumbnailsSizeType" value="MAX_SHORTEST_SIDE" />
<property name="thumbnailsWidth" value="${presentation.resource.images.thumbnails.box_width:135}" />
<property name="thumbnailsHeight" value="${presentation.resource.images.thumbnails.box_height:135}" />
</bean>
<context:component-scan base-package="eu.dariah.de.dariahsp.configuration" />
<context:component-scan base-package="eu.dariah.de.search.service"/>
<context:component-scan base-package="eu.dariah.de.search.data.service"/>
<context:component-scan base-package="eu.dariah.de.search.api"/>
<context:component-scan base-package="eu.dariah.de.search.dao" />
<context:component-scan base-package="eu.dariah.de.search.es.client" />
......
......@@ -38,9 +38,21 @@
</bean>
<mvc:annotation-driven />
<mvc:resources mapping="/resources/**" location="/resources/" cache-period="31556926"/>
<mvc:resources mapping="/images/**" location="file://${paths.pictures}/"/>
<mvc:resources mapping="/logs/**" location="file://${html_logs}/"/>
<mvc:resources mapping="/remoteFiles/**" location="file://${paths.gtf.parse_errors}/"/>
<mvc:resources mapping="/resources/**" location="/resources/">
<mvc:resource-chain resource-cache="false">
<mvc:resolvers>
<mvc:version-resolver>
<mvc:content-version-strategy patterns="/**"/>
</mvc:version-resolver>
</mvc:resolvers>
<mvc:transformers>
<bean class="org.springframework.web.servlet.resource.CssLinkResourceTransformer" />
</mvc:transformers>
</mvc:resource-chain>
</mvc:resources>
<bean id="initService" class="de.unibamberg.minf.core.web.init.LocaleAwareInitializationServiceImpl">
<property name="basename" value="classpath:i18n/messages" />
......@@ -98,9 +110,11 @@
<bean id="customSearchToMainInterceptor" class="eu.dariah.de.search.interceptors.CustomSearchToMainInterceptor" />
<!-- Not by annotation because it differs in derived projects -->
<bean id="homeController" class="eu.dariah.de.minfba.cosmotool.controller.HomeController" />
<bean id="imageController" class="de.unibamberg.minf.core.web.controller.ImageController" />
<context:component-scan base-package="eu.dariah.de.minfba.cosmotool.controller"/>
<context:component-scan base-package="eu.dariah.de.search.controller"/>
<context:component-scan base-package="eu.dariah.de.dariahsp.saml.web.controller" />
</beans>
Supports Markdown
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