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

3 files changed, 159 insertions, 0 deletions

diff --git a/repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/iaik_tsl-0.0.1-SNAPSHOT.jar b/repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/iaik_tsl-0.0.1-SNAPSHOT.jar
new file mode 100644
index 000000000..cc461be04
--- /dev/null
+++ b/repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/iaik_tsl-0.0.1-SNAPSHOT.jar
diff --git a/repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/iaik_tsl-0.0.1-SNAPSHOT.pom b/repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/iaik_tsl-0.0.1-SNAPSHOT.pom
new file mode 100644
index 000000000..e7fe82da2
--- /dev/null
+++ b/repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/iaik_tsl-0.0.1-SNAPSHOT.pom
@@ -0,0 +1,135 @@
+<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>
+  <groupId>iaik</groupId>
+  <artifactId>iaik_tsl</artifactId>
+  <packaging>jar</packaging>
+  <version>0.0.1-SNAPSHOT</version>
+  <name>TSL_library</name>
+  
+  <build>
+    <resources>
+		<resource>
+			<filtering>true</filtering>
+			<directory>src/main/resources</directory>
+		</resource>
+	</resources>  
+      
+    <finalName>${project.artifactId}</finalName>  
+      
+  	<plugins>
+  	    <plugin>
+      		<groupId>org.apache.maven.plugins</groupId>
+      		<artifactId>maven-enforcer-plugin</artifactId>
+      		<executions>
+        		<execution>
+          			<id>enforce-versions</id>
+          			<goals>
+            			<goal>enforce</goal>
+          			</goals>
+          			<configuration>
+            			<rules>
+              				<requireJavaVersion>
+                				<version>1.5</version>
+              				</requireJavaVersion>
+            			</rules>
+          			</configuration>
+        		</execution>
+      		</executions>
+    	</plugin>
+  	    
+		<plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-compiler-plugin</artifactId>
+			<version>3.0</version>
+			<configuration>
+			    <compilerArguments>
+					<verbose />
+				</compilerArguments>
+				<source>1.5</source>
+				<target>1.5</target>
+			</configuration>
+		</plugin>
+				
+  	</plugins>
+  </build>
+  
+  <dependencies>
+	<dependency>
+		<groupId>iaik</groupId>
+		<artifactId>iaik_xsect_eval</artifactId>
+		<version>1.17</version>
+	</dependency>
+	<dependency>
+		<groupId>iaik</groupId>
+		<artifactId>iaik_ecc_signed</artifactId>
+		<version>2.19</version>
+	</dependency>
+	<dependency>
+		<groupId>iaik</groupId>
+		<artifactId>iaik_jce_eval_signed</artifactId>
+		<version>3.181</version>
+	</dependency>
+	<dependency>
+		<groupId>iaik</groupId>
+		<artifactId>iaik_pki_module</artifactId>
+		<version>1.0</version>
+	</dependency>
+ 	<dependency>
+		<groupId>iaik</groupId>
+		<artifactId>iaik_javax_crypto</artifactId>
+		<version>1.0</version>
+	</dependency>
+<!--  	<dependency>
+		<groupId>iaik</groupId>
+		<artifactId>iaik_util</artifactId>
+		<version>0.23</version>
+	</dependency> -->
+	<dependency>
+		<groupId>iaik</groupId>
+		<artifactId>iaik_jsse</artifactId>
+		<version>4.4</version>
+	</dependency>
+	<dependency>
+		<groupId>iaik</groupId>
+		<artifactId>iaik_ssl</artifactId>
+		<version>4.4</version>
+	</dependency>
+	<dependency>
+		<groupId>iaik</groupId>
+		<artifactId>w3c_http</artifactId>
+		<version>1.0</version>
+	</dependency>
+	<dependency>
+		<groupId>org.xerial</groupId>
+		<artifactId>sqlite-jdbc</artifactId>
+		<version>3.7.2</version>
+	</dependency>
+ 	<dependency>
+		<groupId>javax.xml.bind</groupId>
+		<artifactId>jaxb-api</artifactId>
+		<version>2.2.6</version>
+	</dependency>
+	<dependency>
+		<groupId>com.sun.xml.bind</groupId>
+		<artifactId>jaxb-impl</artifactId>
+		<version>2.2.6</version>
+	</dependency>
+	<dependency>
+		<groupId>javax.activation</groupId>
+		<artifactId>activation</artifactId>
+		<version>1.1.1</version>
+	</dependency>
+	<dependency>
+		<groupId>stax</groupId>
+		<artifactId>stax-api</artifactId>
+		<version>1.0.1</version>
+	</dependency>
+	<dependency>
+		<groupId>xerces</groupId>
+		<artifactId>xercesImpl</artifactId>
+		<version>2.7.1</version>
+	</dependency>
+	
+  </dependencies>
+  
+</project>
\ No newline at end of file
diff --git a/repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/maven-metadata-local.xml b/repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/maven-metadata-local.xml
new file mode 100644
index 000000000..64ac0d4ca
--- /dev/null
+++ b/repository/iaik/iaik_tsl/0.0.1-SNAPSHOT/maven-metadata-local.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata modelVersion="1.1.0">
+  <groupId>iaik</groupId>
+  <artifactId>iaik_tsl</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <versioning>
+    <snapshot>
+      <localCopy>true</localCopy>
+    </snapshot>
+    <lastUpdated>20130308070150</lastUpdated>
+    <snapshotVersions>
+      <snapshotVersion>
+        <extension>jar</extension>
+        <value>0.0.1-SNAPSHOT</value>
+        <updated>20130308070150</updated>
+      </snapshotVersion>
+      <snapshotVersion>
+        <extension>pom</extension>
+        <value>0.0.1-SNAPSHOT</value>
+        <updated>20130308070150</updated>
+      </snapshotVersion>
+    </snapshotVersions>
+  </versioning>
+</metadata>