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, 45 insertions, 4 deletions

diff --git a/spss/server/tools/moa-spss-tools.iml b/spss/server/tools/moa-spss-tools.iml
new file mode 100644
index 000000000..25d80b1dd
--- /dev/null
+++ b/spss/server/tools/moa-spss-tools.iml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_moa:1.5" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_jce_full:5.101" level="project" />
+    <orderEntry type="library" name="Maven: iaik.prod:iaik_ecc:2.19" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+    <orderEntry type="library" name="Maven: xalan-bin-dist:xalan:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: xalan:serializer:2.7.1" level="project" />
+    <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.3.04" level="project" />
+    <orderEntry type="library" name="Maven: commons-io:commons-io:1.3.2" level="project" />
+  </component>
+</module>
+
diff --git a/spss/server/tools/pom.xml b/spss/server/tools/pom.xml
index 48e0a998c..503c49545 100644
--- a/spss/server/tools/pom.xml
+++ b/spss/server/tools/pom.xml
@@ -25,6 +25,10 @@
       <scope>compile</scope>
     </dependency>
     -->
+
+
+
+
     <dependency>
       <groupId>iaik.prod</groupId> 
       <artifactId>iaik_moa</artifactId> 
@@ -52,6 +56,10 @@
     </dependency>
   </dependencies>
 
+
+
+
+
   <build>
     <plugins>
       <plugin>
@@ -63,6 +71,16 @@
           </archive>
         </configuration>
       </plugin>
+
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-compiler-plugin</artifactId>
+              <configuration>
+                  <source>1.5</source>
+                  <target>1.5</target>
+              </configuration>
+          </plugin>
     </plugins>
   </build>
+
 </project>
diff --git a/spss/server/tools/src/main/java/at/gv/egovernment/moa/spss/server/tools/CertTool.java b/spss/server/tools/src/main/java/at/gv/egovernment/moa/spss/server/tools/CertTool.java
index 0c144ce73..d334501d2 100644
--- a/spss/server/tools/src/main/java/at/gv/egovernment/moa/spss/server/tools/CertTool.java
+++ b/spss/server/tools/src/main/java/at/gv/egovernment/moa/spss/server/tools/CertTool.java
@@ -60,7 +60,7 @@ public class CertTool {
 
   /** Error message if the DN cannot be parsed according to RFC2253. */
   private static final String ILLEGAL_RFC2253_NAME =
-    "Kein gültiger RFC2253-Name";
+    "Kein gültiger RFC2253-Name";
 
   /**
    * Main entry point of the tool.
@@ -163,7 +163,7 @@ public class CertTool {
       
       certStore.storeCertificate(cert, null);
       
-      System.out.println("\nDas Zertifikat wurde erfolreich hinzugefügt.\n");
+      System.out.println("\nDas Zertifikat wurde erfolreich hinzugef�gt.\n");
 
     } catch (FileNotFoundException e) {
       System.err.println("Zertifikat nicht gefunden: " + certFile);
@@ -175,10 +175,10 @@ public class CertTool {
         "Fehler beim Lesen des Zertifikats: " + e.getMessage());
     } catch (DirectoryStoreException e) {
       System.err.println(
-        "Fehler beim Öffnen des Zertifikatsspeichers: " + e.getMessage());
+        "Fehler beim Öffnen des Zertifikatsspeichers: " + e.getMessage());
     } catch (CertStoreException e) {
       System.err.println(
-        "Fehler beim Hinzufügen des Zertifikats: " + e.getMessage());
+        "Fehler beim Hinzufügen des Zertifikats: " + e.getMessage());
     } catch (Throwable t) {
       System.err.println("Allgemeiner Fehler: " + t.getMessage());
       t.printStackTrace();