aboutsummaryrefslogtreecommitdiff
path: root/id/server/auth/src/main
diff options
context:
space:
mode:
authorThomas Knall <t.knall@datentechnik-innovation.com>2015-01-29 11:45:17 +0100
committerThomas Knall <t.knall@datentechnik-innovation.com>2015-01-29 11:45:17 +0100
commita60b5f9a3c247056ab4b688d0e24c6d944b50b7e (patch)
tree79124ab5fdd4ee9515fa029d5814fb3dae46eead /id/server/auth/src/main
parent7ae32988fcf9e4407b4bcae7831772338da55a8f (diff)
parentc7e846c52979756aa3c178d65f6d618c6189bd81 (diff)
downloadmoa-id-spss-a60b5f9a3c247056ab4b688d0e24c6d944b50b7e.tar.gz
moa-id-spss-a60b5f9a3c247056ab4b688d0e24c6d944b50b7e.tar.bz2
moa-id-spss-a60b5f9a3c247056ab4b688d0e24c6d944b50b7e.zip
Merge branch 'MOAID-37'
Diffstat (limited to 'id/server/auth/src/main')
-rw-r--r--id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml2
-rw-r--r--id/server/auth/src/main/webapp/WEB-INF/web.xml24
2 files changed, 3 insertions, 23 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 a4a06d24a..563fd6ec7 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -11,7 +11,7 @@
<bean id="processEngine" class="com.datentechnik.process_engine.ProcessEngineImpl">
<property name="transitionConditionExpressionEvaluator">
- <bean class="com.datentechnik.process_engine.spring.SpringExpressionEvaluator" />
+ <bean class="com.datentechnik.process_engine.springweb.SpringWebExpressionEvaluator" />
</property>
<property name="processInstanceMaxIdleTimeSeconds" value="600" />
<property name="processDefinitions">
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 4548e05d9..2dbceb4e9 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/web.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/web.xml
@@ -120,28 +120,6 @@
</servlet-mapping>
<servlet>
- <description>Servlet receiving STORK SAML Response Messages from different C-PEPS</description>
- <display-name>PEPSConnectorServlet</display-name>
- <servlet-name>PEPSConnectorServlet</servlet-name>
- <servlet-class>at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>PEPSConnectorServlet</servlet-name>
- <url-pattern>/PEPSConnector</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <description>Servlet receiving STORK SAML Response Messages from different C-PEPS</description>
- <display-name>PEPSConnectorWithLocalSigningServlet</display-name>
- <servlet-name>PEPSConnectorWithLocalSigningServlet</servlet-name>
- <servlet-class>at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorWithLocalSigningServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>PEPSConnectorWithLocalSigningServlet</servlet-name>
- <url-pattern>/PEPSConnectorWithLocalSigning</url-pattern>
- </servlet-mapping>
-
- <servlet>
<display-name>Dispatcher Servlet</display-name>
<servlet-name>DispatcherServlet</servlet-name>
<servlet-class>at.gv.egovernment.moa.id.entrypoints.DispatcherServlet</servlet-class>
@@ -165,6 +143,8 @@
<url-pattern>/VerifyAuthBlock</url-pattern>
<url-pattern>/VerifyCertificate</url-pattern>
<url-pattern>/VerifyIdentityLink</url-pattern>
+ <url-pattern>/PEPSConnectorWithLocalSigning</url-pattern>
+ <url-pattern>/PEPSConnector</url-pattern>
</servlet-mapping>
<session-config>