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

6 files changed, 637 insertions, 0 deletions

diff --git a/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jar b/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jar
new file mode 100644
index 000000000..b9b08856c
--- /dev/null
+++ b/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jar
diff --git a/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jar.md5 b/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jar.md5
new file mode 100644
index 000000000..1b409ac45
--- /dev/null
+++ b/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jar.md5
@@ -0,0 +1 @@
+a9ebe33840edea5854f3e8b8c0c03cab
\ No newline at end of file
diff --git a/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jar.sha1 b/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jar.sha1
new file mode 100644
index 000000000..c7e599b34
--- /dev/null
+++ b/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.jar.sha1
@@ -0,0 +1 @@
+b999d8a518efa41bdf67bd9fd964e9b09affe5dd
\ No newline at end of file
diff --git a/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom b/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom
new file mode 100644
index 000000000..3f6ccf7e5
--- /dev/null
+++ b/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom
@@ -0,0 +1,633 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<groupId>iaik</groupId>
+	<artifactId>commons-iaik</artifactId>
+	<name>COMMONS IAIK Library</name>
+	<version>0.5.5</version>
+
+	<description>Sammlung haeufig verwendeter Klassen und Methoden</description>
+	<url>http://www.iaik.tugraz.at</url>
+	<inceptionYear>2006</inceptionYear>
+	<developers>
+		<developer>
+			<id>tknall</id>
+			<name>Thomas Knall</name>
+			<email>thomas.knall@iaik.tugraz.at</email>
+			<organization>IAIK</organization>
+			<roles>
+				<role>developer</role>
+			</roles>
+			<timezone>+1</timezone>
+		</developer>
+	</developers>
+
+	<organization>
+		<name>IAIK - Institute for Applied Information Processing and Communications</name>
+		<url>http://www.iaik.tugraz.at</url>
+	</organization>
+
+	<pluginRepositories>
+	<!--
+		<pluginRepository>
+			<id>tlc</id>
+			<name>TLC Repository</name>
+			<url>http://commons.ucalgary.ca/pub/m2</url>
+		</pluginRepository>
+	-->
+	<!--
+		<pluginRepository>
+			<id>apache.org</id>
+			<name>Maven Plugin Snapshots</name>
+			<url>http://people.apache.org/repo/m2-snapshot-repository</url>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+		</pluginRepository>
+	-->
+	</pluginRepositories>
+
+	<scm>
+		<connection>scm:svn:http://bugzilla.iaik.tugraz.at/asit/prj/commons-iaik/trunk/</connection>
+		<url>http://bugzilla.iaik.tugraz.at/asit/prj/commons-iaik/trunk/</url>
+	</scm>
+	
+	<distributionManagement>
+		<site>
+			<id>website</id>
+			<url>
+				file://development/c:/data/public/websites/PROJECTS/${artifactId}/${project.version}
+			</url>
+		</site>
+	</distributionManagement>
+	
+	<build>
+
+		<resources>
+
+			<resource>
+				<filtering>true</filtering>
+				<directory>src/main/resources</directory>
+				<includes>
+					<include>**/CommonsIAIK.properties</include>
+				</includes>
+				<excludes>
+					<exclude>srgb.profile</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/resources</directory>
+				<includes>
+					<!-- needed for ITextText only -->
+					<include>**/taglib.tld</include>
+				</includes>
+				<excludes>
+					<exclude>srgb.profile</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**/*.xml</include>
+					<include>**/*.xsd</include>
+				</includes>
+				<excludes>
+					<exclude>**/application_config.xml</exclude>
+					<exclude>**/application_default_config.xml</exclude>
+				</excludes>
+			</resource>
+
+		</resources>
+
+		<finalName>${artifactId}-${version}</finalName>
+
+		<plugins>
+			<!--
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>maven-buildnumber-plugin</artifactId>
+				<version>0.9.6</version>
+				<configuration>
+					<format>{0,date,yyyy-MM-dd'T'HH:mm:ssZ}</format>
+					<items>
+						<item>timestamp</item>
+					</items>
+				</configuration>
+				<executions>
+					<execution>
+						<phase>validate</phase>
+						<goals>
+							<goal>create</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			-->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.3</version>
+				<configuration>
+					<showsuccess>true</showsuccess>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-site-plugin</artifactId>
+				<configuration>
+					<locales>en</locales>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+					<excludes>
+						<exclude>at/iaik/commons/test/*/</exclude>
+					</excludes>
+				</configuration>
+			</plugin>
+			<!-- plugin>
+				<groupId>com.pyx4me</groupId>
+				<artifactId>proguard-maven-plugin</artifactId>
+				<executions>
+				<execution>
+				<phase>package</phase>
+				<goals><goal>proguard</goal></goals>
+				</execution>
+				</executions>
+				<configuration>
+				<obfuscate>true</obfuscate>
+				<libs>
+				<lib>${java.home}/lib/rt.jar</lib>
+				<lib>${java.home}/lib/jsse.jar</lib>
+				</libs>
+				</configuration>
+				</plugin-->
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<mainClass>at.iaik.commons.metadata.CommonsIAIK</mainClass>
+							<!--
+								<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+							-->
+							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+							<addClasspath>true</addClasspath>
+						</manifest>
+						<manifestEntries>
+						<!--
+							<Implementation-Build>${buildNumber}</Implementation-Build>
+						-->
+							<Implementation-Build>${build.date}</Implementation-Build>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>2.2-beta-2</version>
+				<configuration>
+					<descriptors>
+						<!--
+						<descriptor>src/main/assembly/assemble_libraries.xml</descriptor>
+						<descriptor>src/main/assembly/assemble_repository.xml</descriptor>
+						-->
+						<descriptor>src/main/assembly/assemble_libraries.xml</descriptor>
+					</descriptors>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<additionalparam></additionalparam>
+					<show>public</show>
+					<links>
+						<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+						<link>http://java.sun.com/j2ee/1.4/docs/api/</link>
+						<!--
+						<link>http://struts.apache.org/1.2.9/api/</link>
+						-->
+						<link>http://struts.apache.org/1.3.10/apidocs/</link>
+						<link>http://logging.apache.org/log4j/docs/api/</link>
+						<link>http://www.jconfig.org/javadoc/</link>
+						<link>http://www.hibernate.org/hib_docs/v3/api/</link>
+						<link>http://tomcat.apache.org/tomcat-5.5-doc/catalina/docs/api/</link>
+						<link>http://www.saxproject.org/apidoc/</link>
+					</links>
+					<source>1.5</source>
+					<target>1.5</target>
+					<verbose>false</verbose>
+					<windowtitle>${pom.name} v${pom.version}:${build.date} API</windowtitle>
+					<bottom>Copyright ${pom.inceptionYear} &lt;a href="${pom.organization.url}" target="_blank">${pom.organization.name}&lt;/a>. All Rights Reserved.</bottom>
+				</configuration>
+			</plugin>
+
+		</plugins>
+
+	</build>
+
+	<dependencies>
+		
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.4</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jsp-api</artifactId>
+			<version>2.0</version>
+			<optional>true</optional>
+		</dependency>
+		
+		<!-- apache struts upgraded to 1.3.x: see http://wiki.apache.org/struts/StrutsUpgradeNotes12to13 -->
+		<!--
+		<dependency>
+			<groupId>struts</groupId>
+			<artifactId>struts</artifactId>
+			<version>1.2.9</version>
+			<optional>true</optional>
+		</dependency>
+		-->
+		<dependency>
+			<groupId>org.apache.struts</groupId>
+			<artifactId>struts-core</artifactId>
+			<version>1.3.10</version>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.struts</groupId>
+			<artifactId>struts-taglib</artifactId>
+			<version>1.3.10</version>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate</artifactId>
+			<version>3.1.3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.14</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.jconfig</groupId>
+			<artifactId>jconfig</artifactId>
+			<version>2.9</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>axis</groupId>
+			<artifactId>axis</artifactId>
+			<version>1.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>axis</groupId>
+			<artifactId>axis-saaj</artifactId>
+			<version>1.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>axis</groupId>
+			<artifactId>axis-wsdl4j</artifactId>
+			<version>1.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>axis</groupId>
+			<artifactId>axis-jaxrpc</artifactId>
+			<version>1.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-discovery</groupId>
+			<artifactId>commons-discovery</artifactId>
+			<version>0.2</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>jdom</groupId>
+			<artifactId>jdom</artifactId>
+			<version>1.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>javax.mail</groupId>
+			<artifactId>mail</artifactId>
+			<version>1.4</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.9.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>tomcat</groupId>
+			<artifactId>catalina</artifactId>
+			<version>5.0.28</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>xml-apis</groupId>
+			<artifactId>xml-apis</artifactId>
+			<version>1.3.02</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>1.4</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.serializer</groupId>
+			<artifactId>serializer</artifactId>
+			<version>2.7.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.xmlgraphics</groupId>
+			<artifactId>xmlgraphics-commons</artifactId>
+			<version>1.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>xalan</groupId>
+			<artifactId>xalan</artifactId>
+			<version>2.7.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.1</version>
+			<scope>test</scope>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>2.4</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>3.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>iaik</groupId>
+			<artifactId>iaik_jce_eval_signed</artifactId>
+			<version>3.16</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>iaik</groupId>
+			<artifactId>iaik_ixsil_eval</artifactId>
+			<version>1.2.2</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>iaik</groupId>
+			<artifactId>asit</artifactId>
+			<version>1.3.4</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>iaik</groupId>
+			<artifactId>zsproxy</artifactId>
+			<version>2007-03-02</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>batik</groupId>
+			<artifactId>batik-all</artifactId>
+			<version>1.6</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>fop</groupId>
+			<artifactId>fop</artifactId>
+			<version>0.92beta</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>knowcenter</groupId>
+			<artifactId>pdf-as</artifactId>
+			<version>3.0.9-20090203</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>iaik</groupId>
+			<artifactId>iaik_xsect_eval</artifactId>
+			<version>1.11build48</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>iaik</groupId>
+			<artifactId>iaik_ecc_eval_signed</artifactId>
+			<version>2.15</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>iaik</groupId>
+			<artifactId>iaik_cms_eval</artifactId>
+			<version>4.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>at.gv.bmi</groupId>
+			<artifactId>szr-client</artifactId>
+			<version>3.71</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-cli</groupId>
+			<artifactId>commons-cli</artifactId>
+			<version>1.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.lowagie</groupId>
+			<artifactId>itext</artifactId>
+			<!--
+			<version>2.0.7</version>
+			-->
+			<version>2.1.3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.1.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml.bind</groupId>
+			<artifactId>jaxb-api</artifactId>
+			<version>2.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>javax.xml</groupId>
+			<artifactId>jaxb-impl</artifactId>
+			<version>2.1.6</version>
+			<optional>true</optional>
+		</dependency>
+
+	</dependencies>
+
+	<properties>
+		<build.date>2009-02-05</build.date>
+	</properties>
+
+	<reporting>
+
+		<plugins>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>
+					maven-project-info-reports-plugin
+				</artifactId>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>dependencies</report>
+							<report>project-team</report>
+							<!-- report>mailing-list</report -->
+							<report>cim</report>
+							<!-- report>issue-tracking</report -->
+							<report>license</report>
+							<report>scm</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<configuration>
+					<additionalparam></additionalparam>
+					<public>true</public>
+					<package>true</package>
+					<private>true</private>
+					<links>
+						<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+						<link>http://java.sun.com/j2ee/1.4/docs/api/</link>
+						<!--
+						<link>http://struts.apache.org/1.2.9/api/</link>
+						-->
+						<link>http://struts.apache.org/1.3.10/apidocs/</link>
+						<link>http://logging.apache.org/log4j/docs/api/</link>
+					</links>
+					<source>1.5</source>
+					<target>1.5</target>
+					<windowtitle>${pom.name} v${pom.version}:${build.date} API</windowtitle>
+					<bottom>Copyright ${pom.inceptionYear} &lt;a href="${pom.organization.url}" target="_blank"&gt;${pom.organization.name}&lt;/a&gt;. All Rights Reserved.</bottom>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>taglist-maven-plugin</artifactId>
+				<version>2.0-beta-1</version>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-jxr-plugin</artifactId>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-report-plugin</artifactId>
+				<configuration>
+					<showSuccess>true</showSuccess>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-pmd-plugin</artifactId>
+				<configuration>
+					<targetJdk>1.5</targetJdk>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-changes-plugin</artifactId>
+				<configuration>
+					<xmlPath>${basedir}/src/site/changes.xml</xmlPath>
+				</configuration>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>changes-report</report>
+						</reports>
+					</reportSet>
+				</reportSets>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-clover-plugin</artifactId>
+			</plugin>
+
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>changelog-maven-plugin</artifactId>
+				<version>2.0-beta-1</version>
+				<configuration>
+					<type>range</type>
+					<range>30</range>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-docck-plugin</artifactId>
+			</plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<configuration>
+					<configLocation>
+						${basedir}/src/site/checkstyle/sun_checks_modified.xml
+					</configLocation>
+				</configuration>
+			</plugin>
+
+		</plugins>
+
+	</reporting>
+
+</project>
diff --git a/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom.md5 b/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom.md5
new file mode 100644
index 000000000..11fa5b7a1
--- /dev/null
+++ b/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom.md5
@@ -0,0 +1 @@
+e0ba073d10f5a19f62322fc171971ff0
\ No newline at end of file
diff --git a/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom.sha1 b/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom.sha1
new file mode 100644
index 000000000..24cc66dfb
--- /dev/null
+++ b/repository/iaik/commons-iaik/0.5.5/commons-iaik-0.5.5.pom.sha1
@@ -0,0 +1 @@
+ecb2fcf08eb6f8a89ec587edd908fbb7d312a5ca
\ No newline at end of file