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-edu/pom.xml                         |  37 ++--
 id/server/auth-final/pom.xml                       |  36 ++--
 id/server/idserverlib/pom.xml                      | 230 +++++----------------
 id/server/moa-id-commons/pom.xml                   |  23 +--
 .../pom.xml                                        |  23 ++-
 5 files changed, 106 insertions(+), 243 deletions(-)

(limited to 'id/server')

diff --git a/id/server/auth-edu/pom.xml b/id/server/auth-edu/pom.xml
index 3d7f0b94a..0812745b6 100644
--- a/id/server/auth-edu/pom.xml
+++ b/id/server/auth-edu/pom.xml
@@ -89,27 +89,26 @@
 	</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>
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>
diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 445de36ee..9975fee54 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -61,18 +61,25 @@
     <dependency>
     		<groupId>MOA.id.server</groupId>
     		<artifactId>moa-id-commons</artifactId>
-<!--     		<exclusions>
-    			<exclusion>
-    				<artifactId>hyperjaxb3-ejb-runtime</artifactId>
-    				<groupId>org.jvnet.hyperjaxb3</groupId>
-    			</exclusion>
-    		</exclusions> -->
+    </dependency>
+    
+    <dependency>
+    		<groupId>MOA.id.server</groupId>
+    		<artifactId>moa-id-commons</artifactId>
+    		<type>test-jar</type>
+				<scope>test</scope>
     </dependency>
 
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
             <version>${hibernate.version}</version>
+            <exclusions>
+            	<exclusion>
+            		<artifactId>xml-apis</artifactId>
+            		<groupId>xml-apis</groupId>
+            	</exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
@@ -84,60 +91,32 @@
             <artifactId>hibernate-entitymanager</artifactId>
             <version>${hibernate.version}</version>
         </dependency>
-
-    
-<!--         <dependency>
-            <groupId>eu.stork</groupId>
-            <artifactId>Commons</artifactId>
-            <version>1.4.0</version>
-        </dependency> -->
-<!--         <dependency>
-            <groupId>eu.stork</groupId>
-            <artifactId>SamlEngine</artifactId>
-            <version>1.5.1</version>
-        </dependency> -->
-
-
-<!-- 		<dependency>
-			<groupId>MOA</groupId>
-			<artifactId>moa-common</artifactId>
-			<type>jar</type>
-		</dependency>
-
-		<dependency>
-			<groupId>MOA</groupId>
-			<artifactId>moa-common</artifactId>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency> -->
-		<dependency>
-			<groupId>MOA.spss.server</groupId>
-			<artifactId>moa-spss-lib</artifactId>
-			<exclusions>
-				<exclusion>
-					<artifactId>iaik_pki_module</artifactId>
-					<groupId>iaik</groupId>
-				</exclusion>
-				<exclusion>
-					<groupId>javax.servlet</groupId>
-					<artifactId>servlet-api</artifactId>
-				</exclusion>
-				<exclusion>
-					<artifactId>axis-wsdl4j</artifactId>
-					<groupId>axis</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>jaxb-impl</artifactId>
-					<groupId>com.sun.xml.bind</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-		<dependency>
-			<groupId>axis</groupId>
-			<artifactId>axis</artifactId>
-		</dependency>
-		
-
+	
+			<dependency>
+				<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>jakarta-regexp</groupId>
+				<artifactId>jakarta-regexp</artifactId>
+				<version>1.4</version>
+			</dependency>
+  
 		   <dependency>
             <groupId>at.gv.util</groupId>
             <artifactId>egovutils</artifactId>
@@ -166,6 +145,10 @@
                 	<artifactId>jaxb-core</artifactId>
                 	<groupId>com.sun.xml.bind</groupId>
                 </exclusion>
+                <exclusion>
+                	<artifactId>xml-apis</artifactId>
+                	<groupId>xml-apis</groupId>
+                </exclusion>
             </exclusions>
         </dependency>
 				
@@ -183,6 +166,11 @@
         	<artifactId>cxf-rt-transports-http</artifactId>
     	</dependency>
 		
+		<dependency>
+			<groupId>xalan-bin-dist</groupId>
+			<artifactId>xml-apis</artifactId>
+		</dependency>
+		
 		
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
@@ -201,83 +189,6 @@
 			<groupId>javax.mail</groupId>
 			<artifactId>mail</artifactId>
 		</dependency>
-		<!--
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<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>
-            		<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>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <version>1.7.7</version>
-        </dependency> -->
-<!--         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.7.6</version>
-        </dependency> -->
-<!--         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <version>1.7.6</version>
-        </dependency> -->
-<!--          <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-            <version>1.7.6</version>
-        </dependency> -->
-<!--         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jul-to-slf4j</artifactId>
-            <version>1.7.6</version>
-        </dependency> -->
 
 		<dependency>
 			<groupId>org.easymock</groupId>
@@ -318,33 +229,7 @@
 		<dependency>
 			<groupId>httpsclient</groupId>
 			<artifactId>httpsclient</artifactId>
-		</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_X509TrustManager</artifactId>
-		</dependency>
-		<!-- <dependency> <groupId>iaik</groupId> <artifactId>moa</artifactId> 
-			<version>1.28</version> </dependency> -->
-<!-- 		<dependency>
-			<groupId>edu.internet2.middleware</groupId>
-			<artifactId>shibboleth-common</artifactId>
-			<version>1.4.0</version>
-			<exclusions>
-				<exclusion>
-					<artifactId>logback-classic</artifactId>
-					<groupId>ch.qos.logback</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency> -->
-		
+		</dependency>		
 	<dependency>
   		<groupId>org.opensaml</groupId>
   		<artifactId>opensaml</artifactId>
@@ -390,23 +275,6 @@
 		</exclusions>
 	</dependency>  		
 
-<!-- 	<dependency>
-			<groupId>regexp</groupId>
-			<artifactId>regexp</artifactId>
-		</dependency> -->
-		
-		<!-- <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> 
-			</dependency> -->
-		<!-- <dependency> <groupId>at.gv.egovernment.moa.id</groupId> <artifactId>mandate-validate</artifactId> 
-			<version>1.1</version> </dependency> -->
-        <!--
-        <dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>2.6</version>
-		</dependency>
-        -->
-
 		<!-- the core, which includes Streaming API, shared low-level abstractions (but NOT data-binding) -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 90b391b42..bbaba6a50 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -249,11 +249,11 @@
     </dependencies>
 
     <build>
-    	<plugins>
-        <defaultGoal>install</defaultGoal>                      
-            <plugin>
+    	<plugins>                 
+             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>2.0.2</version>
                 <configuration>
                     <source>1.7</source>
                     <target>1.7</target>
@@ -263,9 +263,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
-                    <skipIfEmpty>true</skipIfEmpty>
-                    <skip>true</skip>
-                    <skipTests>true</skipTests>
                     <archive>
                         <addMavenDescriptor>false</addMavenDescriptor>
                     </archive>
@@ -279,18 +276,8 @@
                 </executions>
             </plugin>
 
-            <plugin>
-                <inherited>true</inherited>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-
 <!-- CLI for 2.x to 3.x migragtion -->
-  <plugin>
+<!--   <plugin>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-jar-plugin</artifactId>
     <version>2.4</version>
@@ -303,7 +290,7 @@
         </manifest>
       </archive>
     </configuration>
-  </plugin>
+  </plugin> -->
   <plugin>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-dependency-plugin</artifactId>
diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml b/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml
index 11e0c764c..f2403a62e 100644
--- a/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml
+++ b/id/server/modules/moa-id-modul-citizencard_authentication/pom.xml
@@ -20,15 +20,14 @@
   		<artifactId>moa-id-lib</artifactId>
   		<scope>test</scope>
   		<type>test-jar</type>
-  		<version>3.0.3-Snapshot</version>
   	</dependency>
   	
-<!--   	<dependency>
-			<groupId>MOA</groupId>
-			<artifactId>moa-common</artifactId>
+  	<dependency>
+			<groupId>MOA.id.server</groupId>
+			<artifactId>moa-id-commons</artifactId>
 			<type>test-jar</type>
 			<scope>test</scope>
-		</dependency> -->
+		</dependency>
   	
   	<dependency>
   		<groupId>MOA.id.server</groupId>
@@ -39,7 +38,19 @@
             <groupId>xalan-bin-dist</groupId>
             <artifactId>xalan</artifactId>
             <scope>provided</scope>
-        </dependency>
+            <exclusions>
+            	<exclusion>
+            		<artifactId>xml-apis</artifactId>
+            		<groupId>xml-apis</groupId>
+            	</exclusion>
+            </exclusions>
+  	   	</dependency>
+        
+        <dependency>
+					<groupId>xalan-bin-dist</groupId>
+					<artifactId>xml-apis</artifactId>
+					<scope>provided</scope>
+				</dependency>
         
   		<dependency>
 			<groupId>org.springframework</groupId>
-- 
cgit v1.2.3