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

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/AttributeStatusType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/AttributeStatusType.java
new file mode 100644
index 000000000..1a815e944
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/AttributeStatusType.java
@@ -0,0 +1,61 @@
+//

+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 

+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

+// Any modifications to this file will be lost upon recompilation of the source schema. 

+// Generated on: 2014.02.17 at 10:36:59 AM GMT 

+//

+

+

+package eu.stork.peps.complex.attributes;

+

+import javax.xml.bind.annotation.XmlEnum;

+import javax.xml.bind.annotation.XmlEnumValue;

+import javax.xml.bind.annotation.XmlType;

+

+

+/**

+ * <p>Java class for AttributeStatusType.

+ * 

+ * <p>The following schema fragment specifies the expected content contained within this class.

+ * <p>

+ * <pre>

+ * &lt;simpleType name="AttributeStatusType">

+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">

+ *     &lt;enumeration value="Available"/>

+ *     &lt;enumeration value="NotAvailable"/>

+ *     &lt;enumeration value="Withheld"/>

+ *   &lt;/restriction>

+ * &lt;/simpleType>

+ * </pre>

+ * 

+ */

+@XmlType(name = "AttributeStatusType")

+@XmlEnum

+public enum AttributeStatusType {

+

+    @XmlEnumValue("Available")

+    AVAILABLE("Available"),

+    @XmlEnumValue("NotAvailable")

+    NOT_AVAILABLE("NotAvailable"),

+    @XmlEnumValue("Withheld")

+    WITHHELD("Withheld");

+    private final String value;

+

+    AttributeStatusType(String v) {

+        value = v;

+    }

+

+    public String value() {

+        return value;

+    }

+

+    public static AttributeStatusType fromValue(String v) {

+        for (AttributeStatusType c: AttributeStatusType.values()) {

+            if (c.value.equals(v)) {

+                return c;

+            }

+        }

+        throw new IllegalArgumentException(v);

+    }

+

+}