Re-set some beans.xml settings

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

@@ -95,9 +95,11 @@
 
 	<!-- Beans for verb=GetRecord -->
 
-	<!-- <bean id="AbstractRecord" abstract="true" class="info.textgrid.middleware.RecordDelivererAbstract"> 
-		<constructor-arg index="0" value="${textgrid}" /> <constructor-arg index="1" 
-		value="${dariah}" /> </bean> -->
+	<bean id="AbstractRecord" abstract="true"
+		class="info.textgrid.middleware.RecordDelivererAbstract">
+		<constructor-arg index="0" value="${textgrid}" />
+		<constructor-arg index="1" value="${dariah}" />
+	</bean>
 
 	<!-- TODO prototype everywhere or NOT prototype? That is here the question! -->
 	<bean scope="prototype" id="RecordDC"
@@ -137,7 +139,7 @@
 		<property name="types" value="${typeList}" />
 	</bean>
 
-	<bean scope="prototype" id="RecordIDIOM"
+	<bean id="RecordIDIOM"
 		class="info.textgrid.middleware.RecordDelivererIDIOM">
 		<constructor-arg index="0" value="${textgrid}" />
 		<constructor-arg index="1" value="${dariah}" />
@@ -190,7 +192,7 @@
 		/> <property name="handle" value="${oar.handle}" /> <property name="sizeField" 
 		value="${oar.sizeField}" /> </bean> -->
 
-	<bean scope="prototype" id="RecordDATACITE"
+	<bean id="RecordDATACITE"
 		class="info.textgrid.middleware.RecordDelivererDATACITE">
 		<constructor-arg index="0" value="${textgrid}" />
 		<constructor-arg index="1" value="${dariah}" />
@@ -259,11 +261,13 @@
 
 	<!-- Beans for verb=ListRecords -->
 
-	<!-- <bean id="AbstractRecordList" abstract="true" class="info.textgrid.middleware.RecordListDelivererAbstract"> 
-		<constructor-arg index="0" value="${textgrid}" /> <constructor-arg index="1" 
-		value="${dariah}" /> </bean> -->
+	<bean id="AbstractRecordList" abstract="true"
+		class="info.textgrid.middleware.RecordListDelivererAbstract">
+		<constructor-arg index="0" value="${textgrid}" />
+		<constructor-arg index="1" value="${dariah}" />
+	</bean>
 
-	<bean scope="prototype" id="RecordListDC"
+	<bean id="RecordListDC"
 		class="info.textgrid.middleware.RecordListDelivererDC">
 		<constructor-arg index="0" value="${textgrid}" />
 		<constructor-arg index="1" value="${dariah}" />
@@ -316,36 +320,34 @@
 	<!-- <bean id="OpenAireRecordList" class="info.textgrid.middleware.OpenAireRecordList"> 
 		<constructor-arg index="0" value="${textgrid}" /> <constructor-arg index="1" 
 		value="${dariah}" /> </bean> -->
-	<bean scope="prototype" id="RecordListDATACITE"
+
+	<bean id="RecordListDATACITE"
 		class="info.textgrid.middleware.RecordListDelivererDATACITE">
 		<constructor-arg index="0" value="${textgrid}" />
 		<constructor-arg index="1" value="${dariah}" />
-
-		<property name="fields" value="${fields}" />
-		<property name="workFields" value="${workFields}" />
-
-		<property name="dateOfObjectCreation"
-			value="${dateOfObjectCreation}" />
-		<property name="relationToFurtherMetadataObject"
-			value="${relationToFurtherMetadataObject}" />
-		<property name="repositoryObjectURIPrefix"
-			value="${repositoryObjectURIPrefix}" />
-		<property name="modifiedField" value="${modifiedField}" />
-		<property name="identifierField" value="${identifierField}" />
-		<property name="rangeField" value="${rangeField}" />
-		<property name="formatField" value="${formatField}" />
-		<property name="formatToFilter" value="${formatToFilter}" />
-		<property name="searchResponseSize"
-			value="${searchResponseSize}" />
 	</bean>
 
+	<!-- <bean id="RecordListDATACITE" class="info.textgrid.middleware.RecordListDelivererDATACITE"> 
+		<constructor-arg index="0" value="${textgrid}" /> <constructor-arg index="1" 
+		value="${dariah}" /> <property name="fields" value="${fields}" /> <property 
+		name="workFields" value="${workFields}" /> <property name="dateOfObjectCreation" 
+		value="${dateOfObjectCreation}" /> <property name="relationToFurtherMetadataObject" 
+		value="${relationToFurtherMetadataObject}" /> <property name="repositoryObjectURIPrefix" 
+		value="${repositoryObjectURIPrefix}" /> <property name="modifiedField" value="${modifiedField}" 
+		/> <property name="identifierField" value="${identifierField}" /> <property 
+		name="rangeField" value="${rangeField}" /> <property name="formatField" value="${formatField}" 
+		/> <property name="formatToFilter" value="${formatToFilter}" /> <property 
+		name="searchResponseSize" value="${searchResponseSize}" /> </bean> -->
+
 	<!-- Beans for verb=ListIdentifiers -->
 
-	<!-- <bean id="AbstractIdentifierList" abstract="true" class="info.textgrid.middleware.IdentifierListDelivererAbstract"> 
-		<constructor-arg index="0" value="${textgrid}" /> <constructor-arg index="1" 
-		value="${dariah}" /> </bean> -->
+	<bean id="AbstractIdentifierList" abstract="true"
+		class="info.textgrid.middleware.IdentifierListDelivererAbstract">
+		<constructor-arg index="0" value="${textgrid}" />
+		<constructor-arg index="1" value="${dariah}" />
+	</bean>
 
-	<bean scope="prototype" id="ListIdentifierDC"
+	<bean id="ListIdentifierDC"
 		class="info.textgrid.middleware.IdentifierListDelivererDC">
 		<constructor-arg index="0" value="${textgrid}" />
 		<constructor-arg index="1" value="${dariah}" />
@@ -363,7 +365,7 @@
 		<property name="identifierField" value="${identifierField}" />
 	</bean>
 
-	<bean scope="prototype" id="ListIdentifierIDIOM"
+	<bean id="ListIdentifierIDIOM"
 		class="info.textgrid.middleware.IdentifierListDelivererIDIOM">
 		<constructor-arg index="0" value="${textgrid}" />
 		<constructor-arg index="1" value="${dariah}" />
@@ -385,7 +387,7 @@
 		<constructor-arg index="0" value="${textgrid}" /> <constructor-arg index="1" 
 		value="${dariah}" /> </bean> -->
 
-	<bean scope="prototype" id="ListIdentifierDATACITE"
+	<bean id="ListIdentifierDATACITE"
 		class="info.textgrid.middleware.IdentifierListDelivererDATACITE">
 		<constructor-arg index="0" value="${textgrid}" />
 		<constructor-arg index="1" value="${dariah}" />