Merge branch 'moa-2.1-Snapshot'

Conflicts:
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
	pom.xml

5 files changed, 11 insertions, 86 deletions

diff --git a/repository/at/gv/util/egovutils/1.0.2/egovutils-1.0.2.jar b/repository/at/gv/util/egovutils/1.0.2/egovutils-1.0.2.jar
deleted file mode 100644
index 821e525a4..000000000
--- a/repository/at/gv/util/egovutils/1.0.2/egovutils-1.0.2.jar
+++ /dev/null
diff --git a/repository/at/gv/util/egovutils/1.0.4/egovutils-1.0.4.pom b/repository/at/gv/util/egovutils/1.0.4/egovutils-1.0.4.pom
deleted file mode 100644
index 4a46fcee4..000000000
--- a/repository/at/gv/util/egovutils/1.0.4/egovutils-1.0.4.pom
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>at.gv.util</groupId>
-	<artifactId>egovutils</artifactId>
-	<version>1.0.4</version>
-	<name>zuseutil</name>
-	<url>http://maven.apache.org</url>
-	<properties>
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>xerces</groupId>
-			<artifactId>xercesImpl</artifactId>
-			<version>2.11.0</version>
-		</dependency>
-		<dependency>
-			<groupId>xalan</groupId>
-			<artifactId>xalan</artifactId>
-			<version>2.7.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun</groupId>
-			<artifactId>webservices-tools</artifactId>
-			<version>2.0.1</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun</groupId>
-			<artifactId>webservices-rt</artifactId>
-			<version>2.0.1</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-validator</groupId>
-			<artifactId>commons-validator</artifactId>
-			<version>1.3.1</version>
-		</dependency>
-		<dependency>
-			<groupId>bouncycastle</groupId>
-			<artifactId>bcprov-jdk16</artifactId>
-			<version>140</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-			<version>1.6.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.6.1</version>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
-			<scope>provided</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.4</version>
-		</dependency>
-		<dependency>
-			<groupId>commons-lang</groupId>
-			<artifactId>commons-lang</artifactId>
-			<version>2.5</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>commons-httpclient</groupId>
-			<artifactId>commons-httpclient</artifactId>
-			<version>3.1</version>
-		</dependency>
-	</dependencies>
-	
-</project>
diff --git a/repository/at/gv/util/egovutils/1.0.4/egovutils-1.0.4.jar b/repository/at/gv/util/egovutils/1.0.7/egovutils-1.0.7.jar
index 1fb2b7c22..1ed9e413f 100644
--- a/repository/at/gv/util/egovutils/1.0.4/egovutils-1.0.4.jar
+++ b/repository/at/gv/util/egovutils/1.0.7/egovutils-1.0.7.jar
diff --git a/repository/at/gv/util/egovutils/1.0.2/egovutils-1.0.2.pom b/repository/at/gv/util/egovutils/1.0.7/egovutils-1.0.7.pom
index e97b459c6..ffad37237 100644
--- a/repository/at/gv/util/egovutils/1.0.2/egovutils-1.0.2.pom
+++ b/repository/at/gv/util/egovutils/1.0.7/egovutils-1.0.7.pom
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>at.gv.util</groupId>
 	<artifactId>egovutils</artifactId>
-	<version>1.0.2</version>
+	<version>1.0.7</version>
 	<name>zuseutil</name>
 	<url>http://maven.apache.org</url>
 	<properties>
@@ -35,9 +35,14 @@
 		<dependency>
 			<groupId>commons-validator</groupId>
 			<artifactId>commons-validator</artifactId>
-			<version>1.3.1</version>
+			<version>1.4.0</version>
 		</dependency>
 		<dependency>
+			<groupId>commons-beanutils</groupId>
+			<artifactId>commons-beanutils</artifactId>
+			<version>1.9.2</version>
+		</dependency>		
+		<dependency>
 			<groupId>bouncycastle</groupId>
 			<artifactId>bcprov-jdk16</artifactId>
 			<version>140</version>
@@ -45,12 +50,12 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>1.6.1</version>
+			<version>1.7.7</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>
-			<version>1.6.1</version>
+			<version>1.7.7</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
@@ -61,12 +66,12 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.4</version>
+			<version>1.9</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
-			<version>2.5</version>
+			<version>2.6</version>
 			<type>jar</type>
 			<scope>compile</scope>
 		</dependency>
diff --git a/repository/iaik/iaik_tsl/1.1/iaik_tsl-1.1.jar b/repository/iaik/iaik_tsl/1.1/iaik_tsl-1.1.jar
new file mode 100644
index 000000000..6fa0fef7c
--- /dev/null
+++ b/repository/iaik/iaik_tsl/1.1/iaik_tsl-1.1.jar