From 0a8953cd883a95a24d34d101f851d44b097ee50a Mon Sep 17 00:00:00 2001
From: EKT <kstamatis@ekt.gr>
Date: Sat, 22 Sep 2012 08:23:53 +0300
Subject: [PATCH 1/2] Fix issue with service manager and BTE

---
 dspace/config/spring/bte/bte.xml | 177 -------------------------------
 1 file changed, 177 deletions(-)
 delete mode 100644 dspace/config/spring/bte/bte.xml

diff --git a/dspace/config/spring/bte/bte.xml b/dspace/config/spring/bte/bte.xml
deleted file mode 100644
index dc714f83f5..0000000000
--- a/dspace/config/spring/bte/bte.xml
+++ /dev/null
@@ -1,177 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- TEST-SPRING.XML -->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans
-	   http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-	<bean id="org.dspace.app.itemimport.DataLoaderService" class="org.dspace.app.itemimport.DataLoaderService">
-		<property name="dataLoaders">
-			<map>
-				<entry>
-					<key><value>bibtex</value></key>
-					<ref bean="gr.ekt.transformationengine.dataloaders.dspace.BibTexDataLoader"/>
-				</entry>
-				<entry>
-					<key><value>csv</value></key>
-					<ref bean="gr.ekt.transformationengine.dataloaders.dspace.CSVDataLoader"/>
-				</entry>
-				<entry>
-					<key><value>tsv</value></key>
-					<ref bean="gr.ekt.transformationengine.dataloaders.dspace.TSVDataLoader"/>
-				</entry>
-				<entry>
-					<key><value>endnote</value></key>
-					<ref bean="gr.ekt.transformationengine.dataloaders.dspace.EndnoteDataLoader"/>
-				</entry>
-				<entry>
-					<key><value>ris</value></key>
-					<ref bean="gr.ekt.transformationengine.dataloaders.dspace.RISDataLoader"/>
-				</entry>
-			</map>
-		</property>
-	</bean>
-
-	<bean id="gr.ekt.transformationengine.core.TransformationEngine" class="gr.ekt.transformationengine.core.TransformationEngine">
-		<property name="workflow" ref="conjunctionTransformationWorkflow"/>
-		<property name="outputGenerator" ref="outputGenerator" />
-	</bean>
-
-	<bean id="gr.ekt.transformationengine.dataloaders.dspace.BibTexDataLoader"
-		class="gr.ekt.transformationengine.dataloaders.dspace.BibTexDataLoader"/>
-
-	<bean id="gr.ekt.transformationengine.dataloaders.dspace.CSVDataLoader" 
-		class="gr.ekt.transformationengine.dataloaders.dspace.CSVDataLoader"/>
-	
-	<bean id="gr.ekt.transformationengine.dataloaders.dspace.EndnoteDataLoader"
-		class="gr.ekt.transformationengine.dataloaders.dspace.EndnoteDataLoader"/>
-
-	<bean id="gr.ekt.transformationengine.dataloaders.dspace.RISDataLoader" 
-		class="gr.ekt.transformationengine.dataloaders.dspace.RISDataLoader"/>
-
-	<bean id="gr.ekt.transformationengine.dataloaders.dspace.TSVDataLoader" 
-		class="gr.ekt.transformationengine.dataloaders.dspace.TSVDataLoader"/>
-
-
-	<bean id="conjunctionTransformationWorkflow"
-		class="gr.ekt.transformationengine.core.ConjunctionTransformationWorkflow">
-		<property name="steps">
-			<list>
-			</list>
-		</property>
-	</bean>
-
-	<bean id="dcMap" class="java.util.HashMap">
-		<constructor-arg>
-			<map>
-				<entry>
-					<key>
-						<value>Title</value>
-					</key>
-					<ref bean="titleDSpaceMetadata" />
-				</entry>
-				<entry>
-					<key>
-						<value>Type</value>
-					</key>
-					<ref bean="typeDSpaceMetadata" />
-				</entry>
-				<entry>
-					<key>
-						<value>Author</value>
-					</key>
-					<ref bean="authorDSpaceMetadata" />
-				</entry>
-				<entry>
-					<key>
-						<value>Journal</value>
-					</key>
-					<ref bean="sourceDSpaceMetadata" />
-				</entry>
-				<entry>
-					<key>
-						<value>Year</value>
-					</key>
-					<ref bean="dateDSpaceMetadata" />
-				</entry>
-				<entry>
-					<key>
-						<value>ISSN</value>
-					</key>
-					<ref bean="issnDSpaceMetadata" />
-				</entry>
-			</map>
-		</constructor-arg>
-	</bean>
-
-	<bean id="ektMap" class="java.util.HashMap">
-		<constructor-arg>
-			<map>
-				<entry>
-					<key>
-						<value>Title</value>
-					</key>
-					<ref bean="titleDSpaceMetadata" />
-				</entry>
-				<entry>
-					<key>
-						<value>Type</value>
-					</key>
-					<ref bean="typeDSpaceMetadata" />
-				</entry>
-			</map>
-		</constructor-arg>
-	</bean>
-
-	<bean id="outputGenerator"
-		class="gr.ekt.transformationengine.outputGenerators.DSpaceOutputGenerator">
-		<property name="mappings">
-			<map>
-				<entry>
-					<key>
-						<value>dc</value>
-					</key>
-					<ref bean="dcMap" />
-				</entry>
-				<entry>
-					<key>
-						<value>ekt</value>
-					</key>
-					<ref bean="ektMap" />
-				</entry>
-			</map>
-		</property>
-	</bean>
-	<bean id="titleDSpaceMetadata" class="gr.ekt.transformationengine.dspace.DSpaceMetadata">
-		<property name="schema" value="dc" />
-		<property name="element" value="title" />
-	</bean>
-	<bean id="typeDSpaceMetadata" class="gr.ekt.transformationengine.dspace.DSpaceMetadata">
-		<property name="schema" value="dc" />
-		<property name="element" value="type" />
-	</bean>
-	<bean id="authorDSpaceMetadata" class="gr.ekt.transformationengine.dspace.DSpaceMetadata">
-		<property name="schema" value="dc" />
-		<property name="element" value="contributor" />
-		<property name="qualifier" value="author" />
-	</bean>
-	<bean id="abstractDSpaceMetadata" class="gr.ekt.transformationengine.dspace.DSpaceMetadata">
-		<property name="schema" value="dc" />
-		<property name="element" value="description" />
-		<property name="qualifier" value="abstract" />
-	</bean>
-	<bean id="sourceDSpaceMetadata" class="gr.ekt.transformationengine.dspace.DSpaceMetadata">
-		<property name="schema" value="dc" />
-		<property name="element" value="source" />
-	</bean>
-	<bean id="dateDSpaceMetadata" class="gr.ekt.transformationengine.dspace.DSpaceMetadata">
-		<property name="schema" value="dc" />
-		<property name="element" value="date" />
-	</bean>
-	<bean id="issnDSpaceMetadata" class="gr.ekt.transformationengine.dspace.DSpaceMetadata">
-		<property name="schema" value="dc" />
-		<property name="element" value="identifier" />
-	</bean>
-</beans> 
\ No newline at end of file

From d4823f12ba3815cce75d5c01b652ec882891b990 Mon Sep 17 00:00:00 2001
From: EKT <kstamatis@ekt.gr>
Date: Sat, 22 Sep 2012 08:27:46 +0300
Subject: [PATCH 2/2] Fix issue with Service Manager and BTE

---
 dspace/config/dspace.cfg         |   7 --
 dspace/config/spring/api/bte.xml | 177 +++++++++++++++++++++++++++++++
 2 files changed, 177 insertions(+), 7 deletions(-)
 create mode 100644 dspace/config/spring/api/bte.xml

diff --git a/dspace/config/dspace.cfg b/dspace/config/dspace.cfg
index 59968b92de..7924248cfe 100644
--- a/dspace/config/dspace.cfg
+++ b/dspace/config/dspace.cfg
@@ -1404,13 +1404,6 @@ google-metadata.config = ${dspace.dir}/config/crosswalks/google-metadata.propert
 google-metadata.enable = true
 
 
-#### DSpace services configuration ####
-#
-# Declare the Spirng xml resources for the SpringServiceManager 
-# (currently, only bibliotransformation-engine xml file)
-#
-service.manager.spring.configs=spring/bte/bte.xml
-
 
 #---------------------------------------------------------------#
 #--------------JSPUI SPECIFIC CONFIGURATIONS--------------------#
diff --git a/dspace/config/spring/api/bte.xml b/dspace/config/spring/api/bte.xml
new file mode 100644
index 0000000000..dc714f83f5
--- /dev/null
+++ b/dspace/config/spring/api/bte.xml
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- TEST-SPRING.XML -->
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+	   http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+	<bean id="org.dspace.app.itemimport.DataLoaderService" class="org.dspace.app.itemimport.DataLoaderService">
+		<property name="dataLoaders">
+			<map>
+				<entry>
+					<key><value>bibtex</value></key>
+					<ref bean="gr.ekt.transformationengine.dataloaders.dspace.BibTexDataLoader"/>
+				</entry>
+				<entry>
+					<key><value>csv</value></key>
+					<ref bean="gr.ekt.transformationengine.dataloaders.dspace.CSVDataLoader"/>
+				</entry>
+				<entry>
+					<key><value>tsv</value></key>
+					<ref bean="gr.ekt.transformationengine.dataloaders.dspace.TSVDataLoader"/>
+				</entry>
+				<entry>
+					<key><value>endnote</value></key>
+					<ref bean="gr.ekt.transformationengine.dataloaders.dspace.EndnoteDataLoader"/>
+				</entry>
+				<entry>
+					<key><value>ris</value></key>
+					<ref bean="gr.ekt.transformationengine.dataloaders.dspace.RISDataLoader"/>
+				</entry>
+			</map>
+		</property>
+	</bean>
+
+	<bean id="gr.ekt.transformationengine.core.TransformationEngine" class="gr.ekt.transformationengine.core.TransformationEngine">
+		<property name="workflow" ref="conjunctionTransformationWorkflow"/>
+		<property name="outputGenerator" ref="outputGenerator" />
+	</bean>
+
+	<bean id="gr.ekt.transformationengine.dataloaders.dspace.BibTexDataLoader"
+		class="gr.ekt.transformationengine.dataloaders.dspace.BibTexDataLoader"/>
+
+	<bean id="gr.ekt.transformationengine.dataloaders.dspace.CSVDataLoader" 
+		class="gr.ekt.transformationengine.dataloaders.dspace.CSVDataLoader"/>
+	
+	<bean id="gr.ekt.transformationengine.dataloaders.dspace.EndnoteDataLoader"
+		class="gr.ekt.transformationengine.dataloaders.dspace.EndnoteDataLoader"/>
+
+	<bean id="gr.ekt.transformationengine.dataloaders.dspace.RISDataLoader" 
+		class="gr.ekt.transformationengine.dataloaders.dspace.RISDataLoader"/>
+
+	<bean id="gr.ekt.transformationengine.dataloaders.dspace.TSVDataLoader" 
+		class="gr.ekt.transformationengine.dataloaders.dspace.TSVDataLoader"/>
+
+
+	<bean id="conjunctionTransformationWorkflow"
+		class="gr.ekt.transformationengine.core.ConjunctionTransformationWorkflow">
+		<property name="steps">
+			<list>
+			</list>
+		</property>
+	</bean>
+
+	<bean id="dcMap" class="java.util.HashMap">
+		<constructor-arg>
+			<map>
+				<entry>
+					<key>
+						<value>Title</value>
+					</key>
+					<ref bean="titleDSpaceMetadata" />
+				</entry>
+				<entry>
+					<key>
+						<value>Type</value>
+					</key>
+					<ref bean="typeDSpaceMetadata" />
+				</entry>
+				<entry>
+					<key>
+						<value>Author</value>
+					</key>
+					<ref bean="authorDSpaceMetadata" />
+				</entry>
+				<entry>
+					<key>
+						<value>Journal</value>
+					</key>
+					<ref bean="sourceDSpaceMetadata" />
+				</entry>
+				<entry>
+					<key>
+						<value>Year</value>
+					</key>
+					<ref bean="dateDSpaceMetadata" />
+				</entry>
+				<entry>
+					<key>
+						<value>ISSN</value>
+					</key>
+					<ref bean="issnDSpaceMetadata" />
+				</entry>
+			</map>
+		</constructor-arg>
+	</bean>
+
+	<bean id="ektMap" class="java.util.HashMap">
+		<constructor-arg>
+			<map>
+				<entry>
+					<key>
+						<value>Title</value>
+					</key>
+					<ref bean="titleDSpaceMetadata" />
+				</entry>
+				<entry>
+					<key>
+						<value>Type</value>
+					</key>
+					<ref bean="typeDSpaceMetadata" />
+				</entry>
+			</map>
+		</constructor-arg>
+	</bean>
+
+	<bean id="outputGenerator"
+		class="gr.ekt.transformationengine.outputGenerators.DSpaceOutputGenerator">
+		<property name="mappings">
+			<map>
+				<entry>
+					<key>
+						<value>dc</value>
+					</key>
+					<ref bean="dcMap" />
+				</entry>
+				<entry>
+					<key>
+						<value>ekt</value>
+					</key>
+					<ref bean="ektMap" />
+				</entry>
+			</map>
+		</property>
+	</bean>
+	<bean id="titleDSpaceMetadata" class="gr.ekt.transformationengine.dspace.DSpaceMetadata">
+		<property name="schema" value="dc" />
+		<property name="element" value="title" />
+	</bean>
+	<bean id="typeDSpaceMetadata" class="gr.ekt.transformationengine.dspace.DSpaceMetadata">
+		<property name="schema" value="dc" />
+		<property name="element" value="type" />
+	</bean>
+	<bean id="authorDSpaceMetadata" class="gr.ekt.transformationengine.dspace.DSpaceMetadata">
+		<property name="schema" value="dc" />
+		<property name="element" value="contributor" />
+		<property name="qualifier" value="author" />
+	</bean>
+	<bean id="abstractDSpaceMetadata" class="gr.ekt.transformationengine.dspace.DSpaceMetadata">
+		<property name="schema" value="dc" />
+		<property name="element" value="description" />
+		<property name="qualifier" value="abstract" />
+	</bean>
+	<bean id="sourceDSpaceMetadata" class="gr.ekt.transformationengine.dspace.DSpaceMetadata">
+		<property name="schema" value="dc" />
+		<property name="element" value="source" />
+	</bean>
+	<bean id="dateDSpaceMetadata" class="gr.ekt.transformationengine.dspace.DSpaceMetadata">
+		<property name="schema" value="dc" />
+		<property name="element" value="date" />
+	</bean>
+	<bean id="issnDSpaceMetadata" class="gr.ekt.transformationengine.dspace.DSpaceMetadata">
+		<property name="schema" value="dc" />
+		<property name="element" value="identifier" />
+	</bean>
+</beans> 
\ No newline at end of file