Add dynamic servlet registration for STORK processes.

- Add STORKWebApplicationInitializer.java
- Adjust web.xml
- Move STORK.authmodule.beans.xml to src/main/resources/...

2 files changed, 37 insertions, 14 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml
deleted file mode 100644
index 2e924bdd0..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORK.authmodule.beans.xml
+++ /dev/null
@@ -1,14 +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"

-	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 />

-

-	<bean id="storkAuthModule" class="at.gv.egovernment.moa.id.auth.modules.stork.STORKAuthModuleImpl">

-		<property name="priority" value="0" />

-	</bean>

-

-</beans>

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKWebApplicationInitializer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKWebApplicationInitializer.java
new file mode 100644
index 000000000..7478a57c3
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/stork/STORKWebApplicationInitializer.java
@@ -0,0 +1,37 @@
+package at.gv.egovernment.moa.id.auth.modules.stork;

+

+import javax.servlet.ServletContext;

+import javax.servlet.ServletException;

+import javax.servlet.ServletRegistration;

+

+import org.springframework.web.WebApplicationInitializer;

+

+import at.gv.egovernment.moa.id.auth.servlet.ProcessEngineSignalServlet;

+

+/**

+ * Spring automatically discovers {@link WebApplicationInitializer} implementations at startup.<br/>

+ * This STORK webapp initializer adds the required servlet mappings:

+ * <ul>

+ * <li>{@code /PEPSConnector}</li>

+ * <li>{@code /PEPSConnectorWithLocalSigning}</li>

+ * </ul>

+ * for the {@linkplain ProcessEngineSignalServlet process engine servlet} (named {@code ProcessEngineSignal}) that wakes

+ * up a process in order to execute asynchronous tasks. Therefore the servlet mappings mentioned above do not need to be

+ * declared in {@code web.xml}.

+ * 

+ * @author tknall

+ * @see ProcessEngineSignalServlet

+ */

+public class STORKWebApplicationInitializer implements WebApplicationInitializer {

+

+	@Override

+	public void onStartup(ServletContext servletContext) throws ServletException {

+		ServletRegistration servletRegistration = servletContext.getServletRegistration("ProcessEngineSignal");

+		if (servletRegistration == null) {

+			throw new IllegalStateException("Servlet 'ProcessEngineSignal' expected to be registered.");

+		}

+		servletRegistration.addMapping("/PEPSConnectorWithLocalSigning");

+		servletRegistration.addMapping("/PEPSConnector");

+	}

+

+}