From d60ceb70869148deb9f85751c63460fa245a8c7f Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 9 Mar 2016 12:14:18 +0100
Subject: split moa-id-auth in a final- and an edjucation- version

---
 id/server/auth-final/pom.xml | 250 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 250 insertions(+)
 create mode 100644 id/server/auth-final/pom.xml

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

diff --git a/id/server/auth-final/pom.xml b/id/server/auth-final/pom.xml
new file mode 100644
index 000000000..b6b153ec3
--- /dev/null
+++ b/id/server/auth-final/pom.xml
@@ -0,0 +1,250 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<parent>
+		<groupId>MOA.id</groupId>
+		<artifactId>moa-id</artifactId>
+		<version>3.x</version>
+	</parent>
+	
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>MOA.id.server</groupId>
+	<artifactId>moa-id-auth-final</artifactId>
+	<version>${moa-id-version-final}</version>
+	<packaging>war</packaging>
+	<name>MOA ID-Auth-Final</name>
+	<description>Final release-version of MOA-ID-Auth without education and development functionality</description>
+	
+	<properties>
+		<repositoryPath>${basedir}/../../../repository</repositoryPath>
+	</properties>
+	
+	<repositories>
+		<repository>
+			<id>shibboleth.internet2.edu</id>
+			<name>Internet2</name>
+			<url>https://build.shibboleth.net/nexus/content/groups/public/</url>
+		</repository>
+	</repositories>
+	
+	<build>
+		<!--sourceDirectory>${basedir}/../idserverlib/src/main/java</sourceDirectory-->
+		<!--testSourceDirectory>${basedir}/../idserverlib/src/test/java</testSourceDirectory-->
+		<plugins>
+		
+			<plugin>
+      	<groupId>org.codehaus.mojo</groupId>
+      	<artifactId>versions-maven-plugin</artifactId>
+      	<version>2.1</version>
+    	</plugin>
+		
+		
+<!-- 		        	<plugin>
+            		<groupId>org.codehaus.mojo</groupId>
+            		<artifactId>properties-maven-plugin</artifactId>
+            		<version>1.0-alpha-2</version>
+            		<executions>
+                		<execution>
+                    		<phase>initialize</phase>
+                    		<goals>
+                        		<goal>read-project-properties</goal>
+                    		</goals>
+                    		<configuration>
+    	                   		<files>
+		                            <file>${basedir}/../../../moa-id.properties</file>
+      		                  </files>
+          		          </configuration>
+              		  </execution>
+            		</executions>
+        		</plugin> -->
+				<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.1.1</version>
+				<!-- <version>2.0.2</version>-->
+				<configuration>
+					<archive>
+						<manifest>
+							<addDefaultSpecificationEntries>false</addDefaultSpecificationEntries>
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+						</manifest>
+						<addMavenDescriptor>false</addMavenDescriptor>
+					</archive>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	
+	<dependencies>
+
+
+        <!-- we need Axis 1.1 here, 1.0 is included in SPSS -->
+		<dependency>
+			<groupId>MOA.spss.server</groupId>
+			<artifactId>moa-spss-lib</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>iaik_pki_module</artifactId>
+					<groupId>iaik</groupId>
+				</exclusion>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+				<exclusion>
+					<artifactId>axis-wsdl4j</artifactId>
+					<groupId>axis</groupId>
+				</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>
+				<exclusion>
+					<artifactId>axis</artifactId>
+					<groupId>axis</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		
+		<dependency>
+			<groupId>MOA.id.server</groupId>
+			<artifactId>moa-id-spring-initializer</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>MOA.id.server</groupId>
+  		<artifactId>moa-id-frontend-resources</artifactId>
+		</dependency>
+		
+		
+		<!-- Adding eIDAS module dependency automatically adds eIDAS protocol capabilities. -->
+		<!--dependency>
+			<groupId>MOA.id.server.modules</groupId>
+			<artifactId>moa-id-module-eIDAS</artifactId>
+		</dependency-->
+		
+		
+		<!-- Adding monitoring module dependency automatically adds monitoring capabilities. -->
+		<dependency>
+			<groupId>MOA.id.server.modules</groupId>
+			<artifactId>moa-id-module-monitoring</artifactId>
+		</dependency>
+
+
+		<dependency>
+			<groupId>MOA.id.server.modules</groupId>
+			<artifactId>moa-id-module-saml1</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>MOA.id.server.modules</groupId>
+			<artifactId>moa-id-module-openID</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>MOA.id.server.modules</groupId>
+    	<artifactId>moa-id-module-elga_mandate_service</artifactId>
+		</dependency>
+
+<!-- 		<dependency>
+			<groupId>MOA.id.server.modules</groupId>
+			<artifactId>moa-id-module-pvp2</artifactId>
+		</dependency> -->
+
+ 		<dependency>
+			<groupId>MOA.id.server.modules</groupId>
+			<artifactId>moa-id-modul-citizencard_authentication</artifactId>
+		</dependency>
+
+			<!--dependency>
+				<groupId>MOA.id.server.modules</groupId>
+				<artifactId>moa-id-modules-federated_authentication</artifactId>
+			</dependency--> 
+
+		<!--dependency>
+			<groupId>MOA.id.server.modules</groupId>
+			<artifactId>moa-id-module-ssoTransfer</artifactId>
+			<version>${moa-id-version}</version>
+		</dependency-->
+				
+        <!-- transitive dependencies we don't want to include into the war -->
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_jce_full</artifactId>
+			<!-- should be in the ext directory of the jre -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_ecc</artifactId>
+			<!-- should be in the ext directory of the jre -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_Pkcs11Provider</artifactId>
+			<!-- should be in the ext directory of the jre -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_Pkcs11Wrapper</artifactId>
+			<!-- should be in the ext directory of the jre -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>xalan-bin-dist</groupId>
+			<artifactId>xalan</artifactId>
+			<!-- should be provided by the container or jre -->
+			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>xalan</groupId>
+					<artifactId>serializer</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<!-- should be provided by the container or jre -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>xalan-bin-dist</groupId>
+			<artifactId>xml-apis</artifactId>
+			<!-- should be provided by the container or jre -->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>xalan-bin-dist</groupId>
+			<artifactId>serializer</artifactId>
+			<!-- should be provided by the container or jre -->
+			<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>
+		</dependency>
+
+	</dependencies>
+
+</project>
-- 
cgit v1.2.3


From 989f5cfa9c9c6f60ce6e161983be8434ca87a698 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 9 Mar 2016 16:01:38 +0100
Subject: remove MOA-SPSS from buildpath and add MOA-SPSS container-modul

---
 id/server/auth-final/pom.xml | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

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

diff --git a/id/server/auth-final/pom.xml b/id/server/auth-final/pom.xml
index b6b153ec3..a0f20ba1f 100644
--- a/id/server/auth-final/pom.xml
+++ b/id/server/auth-final/pom.xml
@@ -74,27 +74,25 @@
 	</build>
 	
 	<dependencies>
-
-
-        <!-- we need Axis 1.1 here, 1.0 is included in SPSS -->
 		<dependency>
-			<groupId>MOA.spss.server</groupId>
-			<artifactId>moa-spss-lib</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>iaik_pki_module</artifactId>
-					<groupId>iaik</groupId>
-				</exclusion>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-				<exclusion>
-					<artifactId>axis-wsdl4j</artifactId>
-					<groupId>axis</groupId>
-				</exclusion>
-			</exclusions>
+			<groupId>MOA.id</groupId>
+  		<artifactId>moa-spss-container</artifactId>
+  		<exclusions>
+					<exclusion>
+						<artifactId>iaik_pki_module</artifactId>
+						<groupId>iaik</groupId>
+					</exclusion>
+					<exclusion>
+						<groupId>commons-logging</groupId>
+						<artifactId>commons-logging</artifactId>
+					</exclusion>
+					<exclusion>
+						<artifactId>axis-wsdl4j</artifactId>
+						<groupId>axis</groupId>
+					</exclusion>
+				</exclusions>
 		</dependency>
+				
 		<dependency>
 			<groupId>MOA.id.server</groupId>
 			<artifactId>moa-id-lib</artifactId>
-- 
cgit v1.2.3


From 0fe2bed17c674587a60e63fac211a0354ab4ef03 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 10 Mar 2016 16:07:58 +0100
Subject: remove axis 1 implementation completely

---
 id/server/auth-final/pom.xml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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

diff --git a/id/server/auth-final/pom.xml b/id/server/auth-final/pom.xml
index a0f20ba1f..776ec00d3 100644
--- a/id/server/auth-final/pom.xml
+++ b/id/server/auth-final/pom.xml
@@ -90,7 +90,19 @@
 						<artifactId>axis-wsdl4j</artifactId>
 						<groupId>axis</groupId>
 					</exclusion>
-				</exclusions>
+					<exclusion>
+						<artifactId>axis</artifactId>
+						<groupId>axis</groupId>
+					</exclusion>
+					<exclusion>
+						<artifactId>axis-jaxrpc</artifactId>
+						<groupId>org.apache.axis</groupId>
+					</exclusion>
+					<exclusion>
+						<artifactId>axis-saaj</artifactId>
+						<groupId>org.apache.axis</groupId>
+					</exclusion>
+  		</exclusions>
 		</dependency>
 				
 		<dependency>
-- 
cgit v1.2.3


From ab67fbdf5d661a33b67436c70db0dcb8b840cf57 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 31 Mar 2016 08:03:28 +0200
Subject: if database cleanUP process found some unhandled exception, write
 error messages to technical log

---
 id/server/auth-final/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/id/server/auth-final/pom.xml b/id/server/auth-final/pom.xml
index 776ec00d3..61eba7f22 100644
--- a/id/server/auth-final/pom.xml
+++ b/id/server/auth-final/pom.xml
@@ -165,7 +165,7 @@
 
 <!-- 		<dependency>
 			<groupId>MOA.id.server.modules</groupId>
-			<artifactId>moa-id-module-pvp2</artifactId>
+			<artifactId>moa-id-module-eIDAS</artifactId>
 		</dependency> -->
 
  		<dependency>
-- 
cgit v1.2.3


From e5e4f2b8cc2652e47d31ace6ee35e7aeab7d814a Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 7 Apr 2016 10:45:13 +0200
Subject: small default-config and handbook updates for final version 3.1.0

---
 id/server/auth-final/pom.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

diff --git a/id/server/auth-final/pom.xml b/id/server/auth-final/pom.xml
index 61eba7f22..2fb196255 100644
--- a/id/server/auth-final/pom.xml
+++ b/id/server/auth-final/pom.xml
@@ -77,6 +77,7 @@
 		<dependency>
 			<groupId>MOA.id</groupId>
   		<artifactId>moa-spss-container</artifactId>
+  		<type>pom</type>
   		<exclusions>
 					<exclusion>
 						<artifactId>iaik_pki_module</artifactId>
@@ -158,10 +159,10 @@
 			<artifactId>moa-id-module-openID</artifactId>
 		</dependency>
 
-		<dependency>
+<!-- 		<dependency>
 			<groupId>MOA.id.server.modules</groupId>
     	<artifactId>moa-id-module-elga_mandate_service</artifactId>
-		</dependency>
+		</dependency> -->
 
 <!-- 		<dependency>
 			<groupId>MOA.id.server.modules</groupId>
-- 
cgit v1.2.3