From 33a37cce841e6c48ab044cd153aa7ed7cfffc6cc Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Wed, 14 Jan 2015 12:41:54 +0100
Subject: Apply some minor fixes.

- Add some FIXMEs.
- Fix moa-id-auth web.xml and switch to Servlet 3.0.
- Fix moa-id-auth logging (replace commons-logging with commons-logging-slf4j bridge, use log4j native binding).
- Adjust logging of periodical tasks (no more logging at info level).
---
 id/server/auth/pom.xml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'id/server/auth/pom.xml')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index dd75ee6aa..7db6ce648 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -112,11 +112,25 @@
 					<artifactId>axis-wsdl4j</artifactId>
 					<groupId>axis</groupId>
 				</exclusion>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>MOA.id.server</groupId>
 			<artifactId>moa-id-lib</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>ch.qos.logback</groupId>
+					<artifactId>logback-classic</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
         <dependency>
             <groupId>eu.stork</groupId>
@@ -173,6 +187,13 @@
 			<!-- should be provided by the container or jre -->
 			<scope>provided</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<version>1.7.10</version>
+		</dependency>
+
 	</dependencies>
 
 </project>
-- 
cgit v1.2.3


From e6e2bbf9a6e4df5e714ab10babae013317bf8422 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Fri, 16 Jan 2015 15:11:48 +0100
Subject: Add dti-process-engine support.

---
 id/server/auth/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'id/server/auth/pom.xml')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 7db6ce648..529737820 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -188,6 +188,16 @@
 			<scope>provided</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
-- 
cgit v1.2.3


From 4b6fd327b29ff84f61914f33b6361fa31441c92e Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Wed, 4 Feb 2015 11:31:43 +0100
Subject: Create separate module STORK (MOAID-67)

- Add new maven module moa-id-modules and sub module moa-id-module-stork.
- Move stork relates processes and task to module moa-id-module-stork.
- Move module registration to modules package.
---
 id/server/auth/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'id/server/auth/pom.xml')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index 529737820..df45568dc 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -137,6 +137,10 @@
             <artifactId>oasis-dss-api</artifactId>
             <version>1.0.0-RELEASE</version>
         </dependency>
+		<dependency>
+			<groupId>MOA.id.server.modules</groupId>
+			<artifactId>moa-id-module-stork</artifactId>
+		</dependency>
 
         <!-- transitive dependencies we don't want to include into the war -->
 		<dependency>
-- 
cgit v1.2.3


From 74a42b6128f6f8d21a65dddb9405cd52ebbc0520 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Wed, 4 Feb 2015 15:37:10 +0100
Subject: Create exemplary AuthServlet module (MOAID-68)

- Create new module moa-id-module-monitoring.
- Move MonitoringServlet, DatabaseTestModule, IdentityLinkTestModule, TestManager and TestModuleInterface to new module.
- Update pom.xml, adding new module dependency.
- Update web.xml, disabling static servlet registration.
- Add @WebServlet servlet registration for MonitoringServlet.
---
 id/server/auth/pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'id/server/auth/pom.xml')

diff --git a/id/server/auth/pom.xml b/id/server/auth/pom.xml
index df45568dc..cf394b7ad 100644
--- a/id/server/auth/pom.xml
+++ b/id/server/auth/pom.xml
@@ -137,10 +137,18 @@
             <artifactId>oasis-dss-api</artifactId>
             <version>1.0.0-RELEASE</version>
         </dependency>
+        
+        <!-- Adding stork module dependency automatically adds stork capabilities. -->
 		<dependency>
 			<groupId>MOA.id.server.modules</groupId>
 			<artifactId>moa-id-module-stork</artifactId>
 		</dependency>
+		
+		<!-- Adding monitoring module dependency automatically adds monitoring capabilities. -->
+		<dependency>
+			<groupId>MOA.id.server.modules</groupId>
+			<artifactId>moa-id-module-monitoring</artifactId>
+		</dependency>
 
         <!-- transitive dependencies we don't want to include into the war -->
 		<dependency>
-- 
cgit v1.2.3