diff options
Diffstat (limited to 'id/server/auth/src/main/webapp/WEB-INF')
| -rw-r--r-- | id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml | 14 | ||||
| -rw-r--r-- | id/server/auth/src/main/webapp/WEB-INF/web.xml | 30 |
2 files changed, 14 insertions, 30 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 a251064f6..2c699f24d 100644 --- a/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml +++ b/id/server/auth/src/main/webapp/WEB-INF/applicationContext.xml @@ -11,16 +11,9 @@ <bean id="processEngine" class="at.gv.egovernment.moa.id.process.ProcessEngineImpl">
<property name="transitionConditionExpressionEvaluator">
- <bean class="at.gv.egovernment.moa.id.process.spring.SpringExpressionEvaluator" />
+ <bean class="com.datentechnik.process_engine.spring.SpringExpressionEvaluator" />
</property>
<property name="processInstanceMaxIdleTimeSeconds" value="600" />
- <!--
- <property name="processDefinitions">
- <bean class="com.datentechnik.process_engine.spring.ProcessDefinitionsFactoryBean">
- <property name="resources" value="classpath:resources/processes/*.process.xml" />
- </bean>
- </property>
- -->
</bean>
<task:scheduler id="taskScheduler" pool-size="1" />
@@ -29,5 +22,10 @@ </task:scheduled-tasks>
<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> |