From 04a8a85a7092f460e30553394ae415ad9bed18ed Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 9 Mar 2016 11:35:56 +0100
Subject: move basic applicationContext.xml to SpringInitialization modul

---
 .../src/main/webapp/WEB-INF/applicationContext.xml | 31 ----------------------
 .../moa/id/auth/MOAIDAuthSpringInitializer.java    | 11 +++++---
 .../src/main/resources/applicationContext.xml      | 31 ++++++++++++++++++++++
 3 files changed, 39 insertions(+), 34 deletions(-)
 delete mode 100644 id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
 create mode 100644 id/server/moa-id-spring-initializer/src/main/resources/applicationContext.xml

diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
deleted file mode 100644
index f3b133585..000000000
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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:context="http://www.springframework.org/schema/context"
-	xmlns:mvc="http://www.springframework.org/schema/mvc"
-	xsi:schemaLocation="
-		http://www.springframework.org/schema/beans 
-		http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context 
-		http://www.springframework.org/schema/context/spring-context.xsd
-		http://www.springframework.org/schema/mvc
-		http://www.springframework.org/schema/mvc/spring-mvc.xsd
-		http://www.springframework.org/schema/tx
-		http://www.springframework.org/schema/tx/spring-tx.xsd
-	"
->
-
-	<context:annotation-config />
-	<mvc:annotation-driven />
-
-	<context:component-scan base-package="at.gv.egovernment.moa.id.auth.frontend" />
-
-	<!-- <mvc:default-servlet-handler/> -->
-	
-  <mvc:interceptors>
-  	<bean class="at.gv.egovernment.moa.id.auth.servlet.interceptor.WebFrontEndSecurityInterceptor" />
-  	<bean class="at.gv.egovernment.moa.id.auth.servlet.interceptor.UniqueSessionIdentifierInterceptor" />
-  </mvc:interceptors> 
-
-	
-</beans>
diff --git a/id/server/moa-id-spring-initializer/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthSpringInitializer.java b/id/server/moa-id-spring-initializer/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthSpringInitializer.java
index 75e076d84..cc5552e81 100644
--- a/id/server/moa-id-spring-initializer/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthSpringInitializer.java
+++ b/id/server/moa-id-spring-initializer/src/main/java/at/gv/egovernment/moa/id/auth/MOAIDAuthSpringInitializer.java
@@ -8,6 +8,7 @@ import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.web.WebApplicationInitializer;
 import org.springframework.web.context.ContextLoaderListener;
 import org.springframework.web.context.request.RequestContextListener;
@@ -36,7 +37,7 @@ public class MOAIDAuthSpringInitializer implements WebApplicationInitializer {
 	public MOAIDAuthSpringInitializer() {
 		this.rootServletContexts = null;
 		this.servletContexts = new String[] {
-				"/WEB-INF/applicationContext.xml",
+				"/applicationContext.xml",
 				
 		};
 		this.activeProfiles = null;
@@ -92,10 +93,14 @@ public class MOAIDAuthSpringInitializer implements WebApplicationInitializer {
 			Logger.debug("Loading servlet config in "+ rootContext);
 			if (servletContexts != null) {
 				for (String servletContextString : servletContexts) {
-					xmlReader.loadBeanDefinitions(new ServletContextResource(
-							servletContext, servletContextString));
+					xmlReader.loadBeanDefinitions(new ClassPathResource(
+							servletContextString, 
+							MOAIDAuthSpringInitializer.class));
 				}
 			}
+			
+			
+			
 			Logger.debug("Refreshing context "+ rootContext);
 			rootContext.refresh();
 
diff --git a/id/server/moa-id-spring-initializer/src/main/resources/applicationContext.xml b/id/server/moa-id-spring-initializer/src/main/resources/applicationContext.xml
new file mode 100644
index 000000000..42325314c
--- /dev/null
+++ b/id/server/moa-id-spring-initializer/src/main/resources/applicationContext.xml
@@ -0,0 +1,31 @@
+<?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:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="
+		http://www.springframework.org/schema/beans 
+		http://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/context 
+		http://www.springframework.org/schema/context/spring-context.xsd
+		http://www.springframework.org/schema/mvc
+		http://www.springframework.org/schema/mvc/spring-mvc.xsd
+		http://www.springframework.org/schema/tx
+		http://www.springframework.org/schema/tx/spring-tx.xsd
+	"
+>
+
+	<context:annotation-config />
+	<mvc:annotation-driven />
+
+	<context:component-scan base-package="at.gv.egovernment.moa.id.auth.frontend" />
+
+	<!-- <mvc:default-servlet-handler/> -->
+	
+  <mvc:interceptors>
+  	<bean class="at.gv.egovernment.moa.id.auth.servlet.interceptor.WebFrontEndSecurityInterceptor" />
+  	<bean class="at.gv.egovernment.moa.id.auth.servlet.interceptor.UniqueSessionIdentifierInterceptor" />
+  </mvc:interceptors> 
+
+	
+</beans>
-- 
cgit v1.2.3