Merge remote-tracking branch 'remotes/origin/vidp' into moa2_0_tlenz

Conflicts:
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
	id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
	id/server/moa-id-commons/pom.xml
	id/server/stork2-saml-engine/pom.xml
	pom.xml
	repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.jar
	repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.pom

1 files changed, 74 insertions, 15 deletions

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index cd49c6b94..5e7fe2684 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -23,17 +23,12 @@
 			<url>https://build.shibboleth.net/nexus/content/groups/public/</url>

 		</repository>

 	</repositories>

-

+	

 	<dependencies>

-  	<dependency>

-    	<groupId>eu.stork</groupId>

-      <artifactId>SamlEngine</artifactId>

-     <version>1.1.0</version>

-     </dependency>

      <dependency>

      	<groupId>eu.stork</groupId>

       <artifactId>oasis-dss-api</artifactId>

-      <version>1.0.0-SNAPSHOT</version>

+      <version>1.0.0-RELEASE</version>

     </dependency>

     

     <dependency>

@@ -41,6 +36,34 @@
     		<artifactId>moa-id-commons</artifactId>

     		<version>${pom.version}</version>

     </dependency>

+	  <!--

+	   <dependency>

+    		<groupId>MOA.id</groupId>

+    		<artifactId>stork-saml-engine</artifactId>

+    		<version>1.5.2</version>

+    </dependency>

+        <dependency>

+            <groupId>MOA.id</groupId>

+            <artifactId>mw-messages-api</artifactId>

+            <version>2.0</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.4.0</version>

+        </dependency>

+

+    <dependency>

+    		<groupId>MOA.id.server</groupId>

+    		<artifactId>moa-id-commons</artifactId>

+    		<version>${pom.version}</version>

+    </dependency>

 		<dependency>

 			<groupId>MOA</groupId>

 			<artifactId>moa-common</artifactId>

@@ -59,17 +82,22 @@
 		<dependency>

 			<groupId>axis</groupId>

 			<artifactId>axis</artifactId>

+			<version>1.1</version>

 		</dependency>

-

-<!-- 		<dependency>

+		

+		<dependency>

 			<groupId>com.sun</groupId>

 			<artifactId>webservices-tools</artifactId>

 			<version>2.0.1</version>

 		</dependency>

- 		<dependency>

+		<dependency>

 			<groupId>com.sun</groupId>

 			<artifactId>webservices-rt</artifactId>

 			<version>2.0.1</version>

+		</dependency>

+<!--<dependency>

+			<groupId>javax.xml.bind</groupId>

+			<artifactId>jaxb-api</artifactId>

 		</dependency> -->

 		

 		<dependency>

@@ -118,7 +146,33 @@
             <!-- 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.5</version>

+        </dependency>

+        <dependency>

+            <groupId>org.slf4j</groupId>

+            <artifactId>slf4j-simple</artifactId>

+            <version>1.7.5</version>

+        </dependency>

+        <dependency>

+            <groupId>org.slf4j</groupId>

+            <artifactId>jcl-over-slf4j</artifactId>

+            <version>1.7.5</version>

+        </dependency>

+        <dependency>

+            <groupId>org.slf4j</groupId>

+            <artifactId>log4j-over-slf4j</artifactId>

+            <version>1.7.5</version>

+        </dependency>

+        <dependency>

+            <groupId>org.slf4j</groupId>

+            <artifactId>jul-to-slf4j</artifactId>

+            <version>1.7.5</version>

+        </dependency>

 		

 		<dependency>

 			<groupId>junit</groupId>

@@ -136,6 +190,7 @@
 		<dependency>

 			<groupId>commons-fileupload</groupId>

 			<artifactId>commons-fileupload</artifactId>

+            <version>1.3</version>

 		</dependency>

 		<dependency>

 			<groupId>commons-httpclient</groupId>

@@ -188,7 +243,10 @@
 			<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>

@@ -239,15 +297,16 @@
 				<groupId>org.apache.maven.plugins</groupId>

 				<artifactId>maven-compiler-plugin</artifactId>

 				<configuration>

-					<source>1.6</source>

-					<target>1.6</target>

+					<source>1.5</source>

+					<target>1.5</target>

 				</configuration>

 			</plugin>

 			<plugin>

 				<groupId>org.apache.maven.plugins</groupId>

 				<artifactId>maven-jar-plugin</artifactId>

 				<configuration>

-					<skipTests>true</skipTests>

+				<skip>true</skip>

+				<skipTests>true</skipTests>

 					<archive>

 						<addMavenDescriptor>false</addMavenDescriptor>

 					</archive>