aboutsummaryrefslogtreecommitdiff
path: root/id/server/auth/src/main/webapp/WEB-INF
diff options
context:
space:
mode:
Diffstat (limited to 'id/server/auth/src/main/webapp/WEB-INF')
-rw-r--r--id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml9
-rw-r--r--id/server/auth/src/main/webapp/WEB-INF/web.xml30
2 files changed, 14 insertions, 25 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 c7b4e6419..1fe3b4254 100644
--- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml
@@ -2,9 +2,7 @@
<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:task="http://www.springframework.org/schema/task"
- xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.1.xsd
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ 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">
<context:annotation-config />
@@ -16,5 +14,10 @@
</bean>
<bean id="authenticationManager" class="at.gv.egovernment.moa.id.moduls.AuthenticationManager" factory-method="getInstance" />
+
<bean id="moduleRegistration" class="at.gv.egovernment.moa.id.moduls.moduleregistration.ModuleRegistration" factory-method="getInstance" />
+
+ <!-- import auth modules -->
+ <import resource="classpath*:**/*.authmodule.beans.xml" />
+
</beans>
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..41c46bd22 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>
@@ -160,11 +138,19 @@
</servlet>
<servlet-mapping>
<servlet-name>ProcessEngineSignal</servlet-name>
+ <!-- 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) -->
<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 -->
+ <!--
+ <url-pattern>/PEPSConnectorWithLocalSigning</url-pattern>
+ <url-pattern>/PEPSConnector</url-pattern>
+ -->
</servlet-mapping>
<session-config>