Merge branch 'eIDAS_node_implementation_remote' into moapid-3.2-opb-redis

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractController.java
	id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/session/AssertionStore.java

1 files changed, 98 insertions, 139 deletions

diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml
index 49557d83e..bddc25f71 100644
--- a/id/moa-spss-container/pom.xml
+++ b/id/moa-spss-container/pom.xml
@@ -8,165 +8,155 @@
   <groupId>MOA.id</groupId>
   <artifactId>moa-spss-container</artifactId>
   <version>${moa-id-version}</version>
-  <packaging>pom</packaging>
   <name>MOA-SPSS-Container-for-MOA-ID</name>
   <description>This module holds MOA-SPSS and all required library</description>
   
   <properties>
-		<repositoryPath>${basedir}/../../repository</repositoryPath>
+		<repositoryPath>${basedir}/../../../repository</repositoryPath>
 	</properties>
   
-      <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <repositories>
-                <repository>
-                    <id>local</id>
-                    <name>local</name>
-                    <url>file:${basedir}/../../repository</url>
-                </repository>
-                <repository>
-                    <id>egiz-commons</id>
-                    <url>https://demo.egiz.gv.at/int-repo/</url>
-                    <releases>
-                        <enabled>true</enabled>
-                    </releases>
-                </repository>
-            </repositories>
-        </profile>
-    </profiles>
+  <repositories>
+  	<repository>
+    	<id>MOA</id>
+      	<name>MOA Dependencies</name>
+      	<releases>
+      		<enabled>true</enabled>
+      		<checksumPolicy>ignore</checksumPolicy>
+      	</releases>
+        <layout>default</layout>
+        <url>file://${repositoryPath}</url>
+     </repository>
+  </repositories>
+  
+  <build>
+  	<plugins>
+  		<plugin>
+  			<groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+        	<includes>
+          	<include>${basedir}/../../../repository/MOA/spss/ext_libs/*.jar</include>
+           </includes>
+         </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>
+			<artifactId>moa-sig-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>
+					<artifactId>*</artifactId>
 					<groupId>axis</groupId>
 				</exclusion>
 			</exclusions>
 		</dependency>
-		
+	
+				
+<!-- 		MOA-SPSS 3.x --> 
 		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_ixsil</artifactId>
-		</dependency>
+			<groupId>MOA.spss</groupId>
+			<artifactId>common</artifactId>
+		</dependency>	
 		<dependency>
 			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_X509TrustManager</artifactId>
-		</dependency>
-		
-<!-- 		<dependency>
-			<groupId>axis</groupId>
-			<artifactId>axis</artifactId>
-		</dependency> -->
-
-<!-- 		<dependency>
-			<groupId>axis</groupId>
-			<artifactId>axis</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.axis</groupId>
-			<artifactId>axis-jaxrpc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.axis</groupId>
-			<artifactId>axis-saaj</artifactId>
-		</dependency> -->
+			<artifactId>iaik_cms</artifactId>
+			<version>5.1</version>
+		</dependency>			
 		<dependency>
-			<groupId>commons-discovery</groupId>
-			<artifactId>commons-discovery</artifactId>
-		</dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_cpades</artifactId>
+			<version>2.2b3_tmp</version>
+		</dependency>				
 		<dependency>
-			<groupId>commons-logging</groupId>
-			<artifactId>commons-logging</artifactId>
-		</dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_eccelerate</artifactId>
+			<version>3.1_eval</version>
+		</dependency>		
 		<dependency>
-			<groupId>javax.activation</groupId>
-			<artifactId>activation</artifactId>
-		</dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_eccelerate_addon</artifactId>
+			<version>3.01_eval</version>
+		</dependency>					
 		<dependency>
-			<groupId>javax.mail</groupId>
-			<artifactId>mail</artifactId>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_eccelerate_cms</artifactId>
+			<version>3.01</version>
 		</dependency>
 		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-		</dependency>
-		
-<!-- 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-		</dependency> -->
-<!-- 		   <dependency>
-					<groupId>org.apache.logging.log4j</groupId>
-					<artifactId>log4j-core</artifactId>
-				</dependency> -->
-		
+    	<groupId>iaik.prod</groupId>
+      <artifactId>iaik_jce_full</artifactId>
+      <scope>provided</scope>
+    </dependency>
 		<dependency>
-			<groupId>org.postgresql</groupId>
-			<artifactId>postgresql</artifactId>
+			<groupId>iaik.prod</groupId>
+		  	<artifactId>iaik_jsse</artifactId>
+  			<version>4.4</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
+    	<groupId>iaik.prod</groupId>
+      <artifactId>iaik_moa</artifactId>
+      <version>2.00</version>
+    </dependency>
 		<dependency>
-			<groupId>xalan-bin-dist</groupId>
-			<artifactId>xalan</artifactId>
-			<!-- <scope>provided</scope> -->
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_pki_module</artifactId>
+			<version>1.1_moa</version>
 		</dependency>
 		<dependency>
-			<groupId>xerces</groupId>
-			<artifactId>xercesImpl</artifactId>
-			<!-- <scope>provided</scope> -->
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_sva</artifactId>
+			<version>1.0_moa</version>
 		</dependency>
 		<dependency>
-			<groupId>xalan-bin-dist</groupId>
-			<artifactId>xml-apis</artifactId>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_tsl</artifactId>
+			<version>1.1_moa</version>
 		</dependency>
 		<dependency>
-			<groupId>xalan-bin-dist</groupId>
-			<artifactId>serializer</artifactId>
-			<!-- <scope>provided</scope> -->
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_tsp</artifactId>
+			<version>2.31_eval</version>
 		</dependency>
 		<dependency>
 			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_moa</artifactId>
-		</dependency>
+			<artifactId>iaik_util</artifactId>
+			<version>0.23</version>
+		</dependency>		
 		<dependency>
 			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_ixsil</artifactId>
+			<artifactId>iaik_xades</artifactId>
+			<version>20160408_eval</version>
 		</dependency>
 		<dependency>
 			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_jce_full</artifactId>
-			<scope>compile</scope>
+			<artifactId>iaik_xsect</artifactId>
+			<version>2.10_20160408_eval</version>
+		</dependency>		
+
+		
+				
+
+		<dependency>
+			<groupId>javax.mail</groupId>
+			<artifactId>mail</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_ecc</artifactId>
-			<scope>compile</scope>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_cms</artifactId>
-			<scope>runtime</scope>
+			<groupId>org.postgresql</groupId>
+			<artifactId>postgresql</artifactId>
 		</dependency>
+
 		<dependency>
 			<groupId>iaik.prod</groupId>
 			<artifactId>iaik_Pkcs11Provider</artifactId>
@@ -228,38 +218,7 @@
             <!-- should be provided by the container or jre -->
             <scope>provided</scope>
         </dependency>
-        <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</groupId>
-			<artifactId>iaik_tsl</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>iaik_pki_module</artifactId>
-					<groupId>iaik</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>iaik_ecc_signed</artifactId>
-					<groupId>iaik</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>iaik_jce_eval_signed</artifactId>
-					<groupId>iaik</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		
+	
   </dependencies>
   
 </project>
\ No newline at end of file