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, 390 insertions, 0 deletions

diff --git a/repository/iaik/asit/1.3.4/asit-1.3.4.pom b/repository/iaik/asit/1.3.4/asit-1.3.4.pom
new file mode 100644
index 000000000..93ca1f600
--- /dev/null
+++ b/repository/iaik/asit/1.3.4/asit-1.3.4.pom
@@ -0,0 +1,390 @@
+<?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>asit</artifactId>
+	<version>1.3.4</version>
+
+	<packaging>jar</packaging>
+
+	<name>A-SIT framework</name>
+	<description>Framework fuer A-SIT Anwendungen</description>
+	<url>http://www.iaik.tugraz.at</url>
+	<inceptionYear>2007</inceptionYear>
+
+	<developers>
+		<developer>
+			<id>atauber</id>
+			<name>Arne Tauber</name>
+			<organization>IAIK</organization>
+			<email>arne.tauber@iaik.tugraz.at</email>
+			<timezone>+1</timezone>
+			<roles>
+				<role>developer</role>
+			</roles>
+		</developer>
+		<developer>
+			<id>tknall</id>
+			<name>Thomas Knall</name>
+			<organization>IAIK</organization>
+			<email>thomas.knall@iaik.tugraz.at</email>
+			<timezone>+1</timezone>
+			<roles>
+				<role>developer</role>
+			</roles>
+		</developer>
+		<developer>
+			<id>troessler</id>
+			<name>Thomas Roessler</name>
+			<organization>IAIK</organization>
+			<email>thomas.roessler@iaik.tugraz.at</email>
+			<timezone>+1</timezone>
+			<roles>
+				<role>developer</role>
+			</roles>
+		</developer>
+	</developers>
+
+	<ciManagement>
+		<system>continuum</system>
+		<url>http://development:8088/continuum</url>
+		<notifiers>
+			<notifier>
+				<type>mail</type>
+				<configuration>
+					<address>tknall</address>
+				</configuration>
+			</notifier>
+			<notifier>
+				<type>mail</type>
+				<configuration>
+					<address>atauber</address>
+				</configuration>
+			</notifier>
+		</notifiers>
+	</ciManagement>
+
+	<scm>
+		<connection>scm:svn:http://bugzilla.iaik.tugraz.at/svn/egiz/prj/current/framework/asit/trunk</connection>
+		<developerConnection>scm:svn:http://bugzilla.iaik.tugraz.at/svn/egiz/prj/current/framework/asit/trunk</developerConnection>
+		<url>http://bugzilla.iaik.tugraz.at/svn/egiz/prj/current/framework/asit/trunk</url>
+	</scm>
+	
+	<organization>
+		<name>Institut fuer Angewandte Informationsverarbeitung und Kommunikationstechnologie</name>
+		<url>http://www.iaik.tugraz.at/</url>
+	</organization>
+
+	<distributionManagement>
+	<site>
+		<id>website</id>
+		<url>
+			file://development/c:/data/public/websites/PROJECTS/${pom.artifactId}/${pom.version}
+		</url>
+	</site>
+	</distributionManagement>
+
+	<build>
+
+		<resources>
+			<resource>
+				<filtering>true</filtering>
+				<directory>src/main/resources</directory>
+				<excludes>
+					<exclude>**/package.html</exclude>
+					<exclude>**/.svn</exclude>
+				</excludes>
+			</resource>
+			<resource>
+				<filtering>false</filtering>
+				<directory>src/main/java</directory>
+				<excludes>
+					<exclude>**/package.html</exclude>
+					<exclude>**/.svn</exclude>
+				</excludes>
+			</resource>
+		</resources>
+
+		<finalName>${artifactId}-${version}</finalName>
+
+		<plugins>
+			<plugin>
+		        <artifactId>maven-surefire-plugin</artifactId>
+		        <configuration>
+		          <!-- skip>true</skip-->
+		        </configuration>
+		      </plugin>
+			<plugin>
+				<artifactId>maven-site-plugin</artifactId>
+				<configuration>
+					<locales>en</locales>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<compilerArguments>
+						<verbose />
+					</compilerArguments>
+					<excludes>
+				      <exclude>asit/test/*/</exclude>
+				     </excludes>
+					<source>1.4</source>
+					<target>1.4</target>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<configuration>
+					<archive>
+						<manifest>
+							<!--mainClass>resource_uri_to_main_class</mainClass-->
+							<addClasspath>true</addClasspath>
+						</manifest>
+					</archive>
+				</configuration>
+			</plugin>
+
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<configuration>
+					<descriptor>src/main/assembly/assemble_libraries.xml</descriptor>
+				</configuration>
+			</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.4/api/</link>
+						<link>http://logging.apache.org/log4j/docs/api/</link>
+					</links>
+					<source>1.4</source>
+					<target>1.4</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>
+
+		</plugins>
+
+	</build>
+
+	<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.4.2/docs/api/</link>
+						<link>http://java.sun.com/j2ee/1.4/docs/api/</link>
+						<link>http://struts.apache.org/1.2.4/api/</link>
+						<link>http://logging.apache.org/log4j/docs/api/</link>
+					</links>
+					<source>1.4</source>
+					<target>1.4</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>www.ibiblio.org</groupId>
+					<artifactId>maven-jcoverage-plugin</artifactId>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-docck-plugin</artifactId>
+				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>changes-maven-plugin</artifactId>
+				</plugin>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-doap-plugin</artifactId>
+				<plugin>
+				</plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-clover-plugin</artifactId>
+				</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.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-checkstyle-plugin</artifactId>
+		        <configuration>
+		          <configLocation>${basedir}/src/site/checkstyle.xml</configLocation>
+		        </configuration>
+			</plugin>
+
+		</plugins>
+	</reporting>
+
+	<dependencies>
+		<!-- see http://maven.apache.org/guides/introduction/introduction-to-dependency-mechanism.html -->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.3</version> <!-- was:  2.3.1 -->
+			<scope>provided</scope>
+			<!--
+			   available scopes: compile, provided, runtime, test, system
+			-->
+			<!--
+				projects that are libraries should declare dependencies as optional
+				see: http://maven.apache.org/guides/introduction/introduction-to-optional-and-excludes-dependencies.html
+			 -->
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>struts</groupId>
+			<artifactId>struts</artifactId>
+			<version>1.2.4</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>iaik</groupId>
+			<artifactId>iaik_jce_eval_signed</artifactId>
+			<version>3.142</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>iaik</groupId>
+			<artifactId>iaik_ixsil_eval</artifactId>
+			<version>1.2.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>javax.mail</groupId>
+			<artifactId>mail</artifactId>
+			<version>1.4</version> <!-- was: 1.3.1 -->
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>commons-logging</groupId>
+			<artifactId>commons-logging</artifactId>
+			<version>1.0.3</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.8</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>net.sf.hibernate</groupId>
+			<artifactId>hibernate</artifactId>
+			<version>2.1.7c</version> <!-- was: 2.1.7 -->
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>fop</groupId>
+			<artifactId>fop</artifactId>
+			<version>0.20.5</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>axis</groupId>
+			<artifactId>axis-jaxrpc</artifactId>
+			<version>1.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>tomcat</groupId>
+			<artifactId>catalina</artifactId>
+			<version>4.1.31</version> <!-- was: unknown -->
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.1</version>
+			<scope>test</scope>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
+</project>