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/moa-spss-container/.gitignore |   1 +
 id/moa-spss-container/pom.xml    | 235 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 236 insertions(+)
 create mode 100644 id/moa-spss-container/.gitignore
 create mode 100644 id/moa-spss-container/pom.xml

(limited to 'id/moa-spss-container')

diff --git a/id/moa-spss-container/.gitignore b/id/moa-spss-container/.gitignore
new file mode 100644
index 000000000..b83d22266
--- /dev/null
+++ b/id/moa-spss-container/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml
new file mode 100644
index 000000000..7f13593a8
--- /dev/null
+++ b/id/moa-spss-container/pom.xml
@@ -0,0 +1,235 @@
+<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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>MOA</groupId>
+    <artifactId>id</artifactId>
+    <version>3.x</version>
+  </parent>
+  <groupId>MOA.id</groupId>
+  <artifactId>moa-spss-container</artifactId>
+  <version>${moa-id-version}</version>
+  <name>MOA-SPSS-Container-for-MOA-ID</name>
+  <description>This module holds MOA-SPSS and all required library</description>
+  
+  <properties>
+		<repositoryPath>${basedir}/../../../repository</repositoryPath>
+	</properties>
+  
+  <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>iaik.prod</groupId>
+			<artifactId>iaik_ixsil</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>
+		<dependency>
+			<groupId>commons-discovery</groupId>
+			<artifactId>commons-discovery</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.activation</groupId>
+			<artifactId>activation</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.mail</groupId>
+			<artifactId>mail</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.postgresql</groupId>
+			<artifactId>postgresql</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>xalan-bin-dist</groupId>
+			<artifactId>xalan</artifactId>
+			<!-- <scope>provided</scope> -->
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<!-- <scope>provided</scope> -->
+		</dependency>
+		<dependency>
+			<groupId>xalan-bin-dist</groupId>
+			<artifactId>xml-apis</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>xalan-bin-dist</groupId>
+			<artifactId>serializer</artifactId>
+			<!-- <scope>provided</scope> -->
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_moa</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_ixsil</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_jce_full</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_ecc</artifactId>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_cms</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_Pkcs11Provider</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_Pkcs11Wrapper</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>iaik.prod</groupId>
+			<artifactId>iaik_Pkcs11Wrapper</artifactId>
+			<classifier>win32</classifier>
+			<type>dll</type>
+			<scope>runtime</scope>
+			<optional>true</optional>
+		</dependency>
+		
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-impl</artifactId>
+			<version>2.2.11</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>com.sun.xml.bind</groupId>
+			<artifactId>jaxb-core</artifactId>
+			<version>2.2.11</version>
+		</dependency>
+		
+        <dependency>
+            <groupId>xalan-bin-dist</groupId>
+            <artifactId>xalan</artifactId>
+            <!-- should be provided by the container or jre -->
+            <scope>provided</scope>
+            <exclusions>
+            	<exclusion>
+            		<artifactId>serializer</artifactId>
+            		<groupId>xalan</groupId>
+            	</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>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
-- 
cgit v1.2.3


From fd1f836eda8a6a7c4683dd6e0b1ba38e39a87148 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 17 Mar 2016 08:32:13 +0100
Subject: add missing eIDAS dependencies

---
 id/moa-spss-container/pom.xml | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'id/moa-spss-container')

diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml
index 7f13593a8..c0fcca040 100644
--- a/id/moa-spss-container/pom.xml
+++ b/id/moa-spss-container/pom.xml
@@ -12,9 +12,32 @@
   <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>
+  
   <dependencies>
   	        <!-- we need Axis 1.1 here, 1.0 is included in SPSS -->
 		<dependency>
-- 
cgit v1.2.3


From 23cded37cfe100bf51480c08827166666e464c6c Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 18 Mar 2016 11:35:31 +0100
Subject: update slf4j

---
 id/moa-spss-container/pom.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'id/moa-spss-container')

diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml
index c0fcca040..1f7cb673f 100644
--- a/id/moa-spss-container/pom.xml
+++ b/id/moa-spss-container/pom.xml
@@ -105,10 +105,16 @@
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 		</dependency>
-		<dependency>
+		
+<!-- 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
-		</dependency>
+		</dependency> -->
+<!-- 		   <dependency>
+					<groupId>org.apache.logging.log4j</groupId>
+					<artifactId>log4j-core</artifactId>
+				</dependency> -->
+		
 		<dependency>
 			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
-- 
cgit v1.2.3


From 54a26c8e353069abacefe5232f8270bec6b3cc60 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 21 Mar 2016 15:49:24 +0100
Subject: update libs

---
 id/moa-spss-container/pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'id/moa-spss-container')

diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml
index 1f7cb673f..fb08989b4 100644
--- a/id/moa-spss-container/pom.xml
+++ b/id/moa-spss-container/pom.xml
@@ -68,12 +68,12 @@
 			<artifactId>iaik_X509TrustManager</artifactId>
 		</dependency>
 		
-		<dependency>
+<!-- 		<dependency>
 			<groupId>axis</groupId>
 			<artifactId>axis</artifactId>
-		</dependency>
+		</dependency> -->
 
-		<dependency>
+<!-- 		<dependency>
 			<groupId>axis</groupId>
 			<artifactId>axis</artifactId>
 		</dependency>
@@ -84,7 +84,7 @@
 		<dependency>
 			<groupId>org.apache.axis</groupId>
 			<artifactId>axis-saaj</artifactId>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>commons-discovery</groupId>
 			<artifactId>commons-discovery</artifactId>
-- 
cgit v1.2.3


From f5970e6aa4f621e870db8a9337fb00598cd85703 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 22 Mar 2016 08:49:49 +0100
Subject: update third party libs

---
 id/moa-spss-container/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'id/moa-spss-container')

diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml
index fb08989b4..32bea1974 100644
--- a/id/moa-spss-container/pom.xml
+++ b/id/moa-spss-container/pom.xml
@@ -121,7 +121,7 @@
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
+			<artifactId>javax.servlet-api</artifactId>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-- 
cgit v1.2.3


From b819b1f8cd82383fd2b2ed63dc71f6ac23fa9731 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 24 Mar 2016 13:25:04 +0100
Subject: fix problem in moa-id-configuration with duplicate entries and delete
 operation

---
 id/moa-spss-container/pom.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'id/moa-spss-container')

diff --git a/id/moa-spss-container/pom.xml b/id/moa-spss-container/pom.xml
index 32bea1974..49557d83e 100644
--- a/id/moa-spss-container/pom.xml
+++ b/id/moa-spss-container/pom.xml
@@ -8,6 +8,7 @@
   <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>
   
-- 
cgit v1.2.3