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

Conflicts:
	common/pom.xml
	id/server/auth/.settings/org.eclipse.wst.common.component
	id/server/auth/src/main/webapp/index.html
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
	id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
	id/server/idserverlib/src/main/resources/resources/wsdl/MOA-ID-1.x.wsdl
	pom.xml
	spss/handbook/clients/api/pom.xml
	spss/handbook/clients/pom.xml
	spss/handbook/clients/referencedData/pom.xml
	spss/handbook/clients/webservice/pom.xml
	spss/handbook/pom.xml
	spss/pom.xml
	spss/server/pom.xml
	spss/server/serverlib/pom.xml
	spss/server/serverws/.settings/org.eclipse.wst.common.component
	spss/server/serverws/pom.xml
	spss/server/tools/pom.xml

2 files changed, 251 insertions, 0 deletions

diff --git a/repository/iaik/prod/iaik_tsl/1.0/iaik_tsl-1.0.jar b/repository/iaik/prod/iaik_tsl/1.0/iaik_tsl-1.0.jar
new file mode 100644
index 000000000..2d661e8d6
--- /dev/null
+++ b/repository/iaik/prod/iaik_tsl/1.0/iaik_tsl-1.0.jar
diff --git a/repository/iaik/prod/iaik_tsl/1.0/iaik_tsl-1.0.pom b/repository/iaik/prod/iaik_tsl/1.0/iaik_tsl-1.0.pom
new file mode 100644
index 000000000..e7cd54c8d
--- /dev/null
+++ b/repository/iaik/prod/iaik_tsl/1.0/iaik_tsl-1.0.pom
@@ -0,0 +1,251 @@
+<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.prod</groupId>
+	<artifactId>iaik_tsl</artifactId>
+	<packaging>jar</packaging>
+	<version>1.0</version>
+	<name>TSL_library</name>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+		<endorsed.dir>${project.build.directory}/endorsed</endorsed.dir>
+	</properties>
+
+
+	<build>
+		<resources>
+			<resource>
+				<filtering>true</filtering>
+				<directory>src/main/resources</directory>
+			</resource>
+		</resources>
+
+		<finalName>${project.artifactId}</finalName>
+
+		<plugins>
+			<plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>copy-dependencies</id>
+						<phase>validate</phase>
+						<goals>
+							<goal>copy-dependencies</goal>
+						</goals>
+						<configuration>
+							<outputDirectory>${endorsed.dir}</outputDirectory>
+							<excludeTransitive>true</excludeTransitive>
+							<includeArtifactIds>jaxb-api,jaxb-impl</includeArtifactIds>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>2.5</version>
+				<configuration>
+					<encoding>UTF-8</encoding>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.0</version>
+				<configuration>
+					<compilerArguments>
+						<verbose />
+						<endorseddirs>${endorsed.dir}</endorseddirs>
+					</compilerArguments>
+					<source>${java.version}</source>
+					<target>${java.version}</target>
+					<fork>true</fork>
+					<compilerVersion>${java.version}</compilerVersion>
+					<encoding>${project.build.sourceEncoding}</encoding>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<version>1.2</version>
+				<executions>
+					<execution>
+						<id>enforce-versions</id>
+						<goals>
+							<goal>enforce</goal>
+						</goals>
+						<configuration>
+							<rules>
+								<requireJavaVersion>
+									<version>1.5</version>
+								</requireJavaVersion>
+							</rules>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>org.apache.maven.plugins</groupId>
+										<artifactId>maven-dependency-plugin</artifactId>
+										<versionRange>[2.0,)</versionRange>
+										<goals>
+											<goal>copy-dependencies</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore />
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+
+	<profiles>
+		<profile>
+			<id>profile-for-jdk1.6</id>
+			<activation>
+				<activeByDefault>false</activeByDefault>
+				<jdk>[1.6,)</jdk>
+			</activation>
+			<properties>
+				<java.version>1.6</java.version>
+				<envClassifier>jdk${java.version}</envClassifier>
+			</properties>
+			<build>
+				<finalName>${project.artifactId}-${project.version}-${envClassifier}</finalName>
+			</build>
+			<dependencies>
+				<!-- Requires JAVA 1.6 -->
+				<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>
+
+			</dependencies>
+		</profile>
+		<profile>
+			<id>profile-for-jdk1.5</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+				<jdk>(,1.5]</jdk>
+			</activation>
+			<properties>
+				<java.version>1.5</java.version>
+				<envClassifier>jdk${java.version}</envClassifier>
+			</properties>
+			<build>
+				<finalName>${project.artifactId}-${project.version}-${envClassifier}</finalName>
+			</build>
+			<dependencies>
+				<!-- Last Version with JAVA 1.5 -->
+				<dependency>
+					<groupId>javax.xml.bind</groupId>
+					<artifactId>jaxb-api</artifactId>
+					<version>2.2.4</version>
+				</dependency>
+				<dependency>
+					<groupId>com.sun.xml.bind</groupId>
+					<artifactId>jaxb-impl</artifactId>
+					<version>2.2.4-1</version>
+				</dependency>
+			</dependencies>
+		</profile>
+	</profiles>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>iaik</groupId>
+			<artifactId>iaik_xsect_eval</artifactId>
+			<version>1.1709142</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 (snapshot 20121011-125127  eval)</version>-->
+			<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.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