aboutsummaryrefslogtreecommitdiff
path: root/id/server/auth/src
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-02-10 16:25:06 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-02-10 16:25:06 +0100
commitd0e4e457b349e7d4ffc7b9eb146d79c8100f9781 (patch)
treeb6e502abcc1a4716f6486782f1983799c9c0704d /id/server/auth/src
parent8b29eb9a19c4dcf6e30e34e41b8c6db61a21adb6 (diff)
downloadmoa-id-spss-d0e4e457b349e7d4ffc7b9eb146d79c8100f9781.tar.gz
moa-id-spss-d0e4e457b349e7d4ffc7b9eb146d79c8100f9781.tar.bz2
moa-id-spss-d0e4e457b349e7d4ffc7b9eb146d79c8100f9781.zip
switch to Spring based application initializer
Diffstat (limited to 'id/server/auth/src')
-rw-r--r--id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml16
-rw-r--r--id/server/auth/src/main/webapp/WEB-INF/web.xml36
2 files changed, 32 insertions, 20 deletions
diff --git a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
index a3f834457..18a75740a 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -2,11 +2,23 @@
<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"
- 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">
+ 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 />
+
<bean id="processEngine" class="at.gv.egovernment.moa.id.process.ProcessEngineImpl">
<property name="transitionConditionExpressionEvaluator">
<bean class="at.gv.egovernment.moa.id.process.springweb.SpringWebExpressionEvaluator" />
diff --git a/id/server/auth/src/main/webapp/WEB-INF/web.xml b/id/server/auth/src/main/webapp/WEB-INF/web.xml
index 5afc0dee7..4b129f374 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -5,10 +5,10 @@
<display-name>MOA ID Auth</display-name>
<description>MOA ID Authentication Service</description>
- <!-- bootstrap loader for spring framework -->
- <listener>
+ <!-- bootstrap loader for spring framework -->
+<!-- <listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
- </listener>
+ </listener> -->
<filter>
<filter-name>characterEncodingFilter</filter-name>
@@ -27,8 +27,8 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
- <!-- exposes request and response to the current thread -->
- <filter>
+ <!-- exposes request and response to the current thread -->
+<!-- <filter>
<filter-name>requestContextFilter</filter-name>
<filter-class>org.springframework.web.filter.RequestContextFilter</filter-class>
</filter>
@@ -67,8 +67,8 @@
<url-pattern>/RedirectServlet</url-pattern>
</servlet-mapping>
- <!-- automatically registered by module 'moa-id-module-monitoring' using @WebServlet annotation -->
- <!--
+ automatically registered by module 'moa-id-module-monitoring' using @WebServlet annotation
+
<servlet>
<display-name>MonitoringServlet</display-name>
<servlet-name>MonitoringServlet</servlet-name>
@@ -78,7 +78,7 @@
<servlet-name>MonitoringServlet</servlet-name>
<url-pattern>/MonitoringServlet</url-pattern>
</servlet-mapping>
- -->
+
<servlet>
<display-name>SSOSendAssertionServlet</display-name>
@@ -110,7 +110,7 @@
<servlet-mapping>
<servlet-name>IDPSLO</servlet-name>
<url-pattern>/idpSingleLogout</url-pattern>
- </servlet-mapping>
+ </servlet-mapping> -->
<servlet>
<display-name>Apache-Axis Servlet</display-name>
@@ -122,7 +122,7 @@
<url-pattern>/services/*</url-pattern>
</servlet-mapping>
- <servlet>
+<!-- <servlet>
<display-name>Dispatcher Servlet</display-name>
<servlet-name>DispatcherServlet</servlet-name>
<servlet-class>at.gv.egovernment.moa.id.entrypoints.DispatcherServlet</servlet-class>
@@ -140,28 +140,28 @@
<servlet-class>at.gv.egovernment.moa.id.auth.servlet.ProcessEngineSignalServlet</servlet-class>
</servlet>
<servlet-mapping>
- <!-- do not change this servlet-name -->
+ do not change this servlet-name
<servlet-name>ProcessEngineSignal</servlet-name>
- <!-- Use this url-pattern in order to signal the next (asynchronous) task. -->
+ Use this url-pattern in order to signal the next (asynchronous) task.
<url-pattern>/signalProcess</url-pattern>
- <!-- legacy url patterns for asynchronous tasks (internal default module/processes) -->
+ legacy url patterns for asynchronous tasks (internal default module/processes)
<url-pattern>/GetMISSessionID</url-pattern>
<url-pattern>/GetForeignID</url-pattern>
<url-pattern>/VerifyAuthBlock</url-pattern>
<url-pattern>/VerifyCertificate</url-pattern>
<url-pattern>/VerifyIdentityLink</url-pattern>
- <!--
+
STORK servlet mappings; automatically registered by the stork module;
refer to at.gv.egovernment.moa.id.auth.modules.stork.STORKWebApplicationInitializer
- -->
- <!--
+
+
<url-pattern>/PEPSConnectorWithLocalSigning</url-pattern>
<url-pattern>/PEPSConnector</url-pattern>
- -->
- </servlet-mapping>
+
+ </servlet-mapping> -->
<session-config>
<session-timeout>5</session-timeout>