Increased version to 1.3.20_SNAPSHOT.

Slightly corrected beans.xml for puppet usage.

oaipmh-core/pom.xml

@@ -4,11 +4,11 @@
 	<parent>
 		<artifactId>oaipmh</artifactId>
 		<groupId>info.textgrid.middleware</groupId>
-		<version>1.3.19-SNAPSHOT</version>
+		<version>1.3.20-SNAPSHOT</version>
 	</parent>
 	<groupId>info.textgrid.middleware</groupId>
 	<artifactId>oaipmh-core</artifactId>
-	<version>1.3.19-SNAPSHOT</version>
+	<version>1.3.20-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>TextGrid :: TG-OAI-PMH :: Core</name>
 	<url>http://maven.apache.org</url>

oaipmh-webapp/pom.xml

@@ -4,12 +4,12 @@
 	<parent>
 		<artifactId>oaipmh</artifactId>
 		<groupId>info.textgrid.middleware</groupId>
-		<version>1.3.19-SNAPSHOT</version>
+		<version>1.3.20-SNAPSHOT</version>
 	</parent>
 	<groupId>info.textgrid.middleware</groupId>
 	<artifactId>oaipmh-webapp</artifactId>
 	<packaging>war</packaging>
-	<version>1.3.19-SNAPSHOT</version>
+	<version>1.3.20-SNAPSHOT</version>
 	<name>TextGrid :: OAI-PMH :: Webapp</name>
 	<url>http://maven.apache.org</url>
 	<profiles>

oaipmh-webapp/src/main/webapp/WEB-INF/beans.xml

@@ -12,7 +12,7 @@
 	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>
+	<description>Configuration for the TextGrid/DARIAH OAI-PMH Interface</description>
 
 	<import resource="classpath:META-INF/cxf/cxf.xml" />
 	<import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
@@ -22,8 +22,8 @@
 		<property name="locations">
 			<list>
 				<!--value>/WEB-INF/oaipmh.properties</value -->
-				<value>file:/etc/dariah/oaipmh/oaipmh.properties</value>
-				<value>file:/etc/textgrid/oaipmh/oaipmh.properties</value>
+				<value>file:/etc/dariah/dhoaipmh/oaipmh.properties</value>
+				<value>file:/etc/textgrid/tgoaipmh/oaipmh.properties</value>
 			</list>
 		</property>
 		<property name="ignoreResourceNotFound" value="true" />
@@ -164,13 +164,13 @@
 
 	<bean id="SetDeliverer" class="info.textgrid.middleware.SetDeliverer">
 		<constructor-arg ref="ElasticSearchClient" />
-		<property name="formatField" value="${formatField}"/>
-		<property name="formatToFilter" value="${formatToFilter}"/>
-		<property name="identifierField" value="${identifierField}"/>
-		<property name="repositoryObjectURIPrefix" value="${repositoryObjectURIPrefix}"/>
-		<property name="specField" value="${specField}"/>
-		<property name="specFieldPrefix" value="${specFieldPrefix}"/>
-		
+		<property name="formatField" value="${formatField}" />
+		<property name="formatToFilter" value="${formatToFilter}" />
+		<property name="identifierField" value="${identifierField}" />
+		<property name="repositoryObjectURIPrefix" value="${repositoryObjectURIPrefix}" />
+		<property name="specField" value="${specField}" />
+		<property name="specFieldPrefix" value="${specFieldPrefix}" />
+
 	</bean>
 
 	<bean id="MetadataFormatList" class="info.textgrid.middleware.MetadataFormatListDeliverer">
@@ -195,8 +195,8 @@
 		<constructor-arg ref="MetadataFormatList" />
 		<constructor-arg ref="SetDeliverer" />
 		<constructor-arg ref="ListIdentifier" />
-		<property name="textGrid" value="${textgrid}" />	
-		<property name="dariah" value="${dariah}" />		
+		<property name="textGrid" value="${textgrid}" />
+		<property name="dariah" value="${dariah}" />
 	</bean>
 
 	<jaxrs:server id="root" address="/root"

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>info.textgrid.middleware</groupId>
   <artifactId>oaipmh</artifactId>
-  <version>1.3.19-SNAPSHOT</version>
+  <version>1.3.20-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>TextGrid :: TG-OAI-PMH :: Parent</name>
   <properties>