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

diff --git a/id/server/legacy-backup/mw-messages-api/src/main/java/eu/stork/vidp/api/messages/GetAuthDataRequest.java b/id/server/legacy-backup/mw-messages-api/src/main/java/eu/stork/vidp/api/messages/GetAuthDataRequest.java
new file mode 100644
index 000000000..fab637408
--- /dev/null
+++ b/id/server/legacy-backup/mw-messages-api/src/main/java/eu/stork/vidp/api/messages/GetAuthDataRequest.java
@@ -0,0 +1,52 @@
+/**
+ * 
+ */
+package eu.stork.vidp.api.messages;
+
+/**
+ * Encapsulates the necessary data for a GetAuthDataRequest to a SPWare
+ * 
+ * @author bzwattendorfer
+ *
+ */
+public class GetAuthDataRequest {
+
+    public GetAuthDataRequest() {
+    }
+    String sessionID;
+
+    /**
+     * Constructs a GetAuthDataRequest object
+     * @param sessionID SessionID
+     */
+    public GetAuthDataRequest(String sessionID) {
+        super();
+        this.sessionID = sessionID;
+    }
+
+    /**
+     * Gets the sessionID
+     * @return sessionID
+     */
+    public String getSessionID() {
+        return sessionID;
+    }
+
+    /**
+     * Sets the session ID
+     * @param sessionID sessionID
+     */
+    public void setSessionID(String sessionID) {
+        this.sessionID = sessionID;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("GetAuthDataRequest [");
+        builder.append("sessionID=");
+        builder.append(sessionID);
+        builder.append("]");
+        return builder.toString();
+    }
+}
diff --git a/id/server/legacy-backup/mw-messages-api/src/main/java/eu/stork/vidp/api/messages/StartAuthResponse.java b/id/server/legacy-backup/mw-messages-api/src/main/java/eu/stork/vidp/api/messages/StartAuthResponse.java
new file mode 100644
index 000000000..df63afa0e
--- /dev/null
+++ b/id/server/legacy-backup/mw-messages-api/src/main/java/eu/stork/vidp/api/messages/StartAuthResponse.java
@@ -0,0 +1,129 @@
+/**
+ * 
+ */
+package eu.stork.vidp.api.messages;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Arrays;
+
+/**
+ * Class encapsulating the HTML content to be returned to the user's browser
+ * 
+ * @author bzwattendorfer
+ *
+ */
+public class StartAuthResponse implements Serializable {
+
+    private int httpStatusCode;
+    private byte[] content;
+    private Map<String, String> httpHeaders;
+
+    /**
+     * Creates a new StartAuthenticationResponse object
+     * @param httpStatusCode HTTP Status code to be returned to the user's browser
+     * @param content HTML content to be returned to the user's browser
+     * @param httpHeaders HTTP headers to be returned to the user's browser
+     */
+    public StartAuthResponse() {
+        super();
+    }
+
+    public StartAuthResponse(int httpStatusCode, byte[] content,
+            Map<String, String> httpHeaders) {
+        super();
+        this.httpStatusCode = httpStatusCode;
+        this.content = content;
+        this.httpHeaders = httpHeaders;
+    }
+
+    /**
+     * Creates a new StartAuthenticationResponse object
+     * @param httpStatusCode HTTP Status code to be returned to the user's browser
+     * @param content HTML content to be returned to the user's browser
+     */
+    public StartAuthResponse(int httpStatusCode, byte[] content) {
+        super();
+        this.httpStatusCode = httpStatusCode;
+        this.content = content;
+        this.httpHeaders = new HashMap<String, String>();
+    }
+
+    /**
+     * Gets the HTTP status code
+     * @return HTTP status code
+     */
+    public int getHttpStatusCode() {
+        return httpStatusCode;
+    }
+
+    /**
+     * Sets the HTTP status code
+     * @param httpStatusCode HTTP status code
+     */
+    public void setHttpStatusCode(int httpStatusCode) {
+        this.httpStatusCode = httpStatusCode;
+    }
+
+    /**
+     * Gets the HTML content
+     * @return HTML content
+     */
+    public byte[] getContent() {
+        return content;
+    }
+
+    /**
+     * Sets the HTML content
+     * @param content HTML content
+     */
+    public void setContent(byte[] content) {
+        this.content = content;
+    }
+
+    /**
+     * Gets the Map containing the HTTP headers
+     * @return HTTP header map
+     */
+    public Map<String, String> getHttpHeaders() {
+        return httpHeaders;
+    }
+
+    /**
+     * Sets the Map with HTTP Headers
+     * @param httpHeaders HTTP Headers Map
+     */
+    public void setHttpHeaders(Map<String, String> httpHeaders) {
+        this.httpHeaders = httpHeaders;
+    }
+
+    /**
+     * Adds a HTTP Header to the Map
+     * @param key HTTP Header name
+     * @param value HTTP Header value
+     */
+    public void addHeader(String key, String value) {
+    }
+
+    /**
+     * Removes a HTTP Header
+     * @param key HTTP Header name
+     */
+    public void removeHeader(String key) {
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder builder = new StringBuilder();
+        builder.append("StartAuthResponse [");
+        builder.append("content=");
+        builder.append(Arrays.toString(content));
+        builder.append(", httpHeaders=");
+        builder.append(httpHeaders);
+        builder.append(", httpStatusCode=");
+        builder.append(httpStatusCode);
+        builder.append("]");
+        return builder.toString();
+    }
+}
diff --git a/id/server/legacy-backup/mw-messages-api/src/test/java/eu/stork/mw/core/mwmessagesapi/AppTest.java b/id/server/legacy-backup/mw-messages-api/src/test/java/eu/stork/mw/core/mwmessagesapi/AppTest.java
new file mode 100644
index 000000000..8845aa855
--- /dev/null
+++ b/id/server/legacy-backup/mw-messages-api/src/test/java/eu/stork/mw/core/mwmessagesapi/AppTest.java
@@ -0,0 +1,38 @@
+package eu.stork.mw.core.mwmessagesapi;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}