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

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/MandateContentType.java.svn-base b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/MandateContentType.java.svn-base
new file mode 100644
index 000000000..84ce2727b
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/text-base/MandateContentType.java.svn-base
@@ -0,0 +1,233 @@
+//

+// 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 java.math.BigInteger;

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

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

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

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

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

+import javax.xml.datatype.XMLGregorianCalendar;

+

+

+/**

+ * <p>Java class for mandateContentType complex type.

+ * 

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

+ * 

+ * <pre>

+ * &lt;complexType name="mandateContentType">

+ *   &lt;complexContent>

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

+ *       &lt;sequence>

+ *         &lt;element name="validFrom" type="{http://www.w3.org/2001/XMLSchema}date"/>

+ *         &lt;element name="validTo" type="{http://www.w3.org/2001/XMLSchema}date"/>

+ *         &lt;element name="transactionLimit" type="{http://www.w3.org/2001/XMLSchema}integer"/>

+ *         &lt;element name="transactionLimitCurrency" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}currencyType"/>

+ *         &lt;element name="isJoint" type="{http://www.w3.org/2001/XMLSchema}string"/>

+ *         &lt;element name="ischained" type="{http://www.w3.org/2001/XMLSchema}boolean"/>

+ *         &lt;element name="typePower" type="{http://www.w3.org/2001/XMLSchema}string"/>

+ *       &lt;/sequence>

+ *     &lt;/restriction>

+ *   &lt;/complexContent>

+ * &lt;/complexType>

+ * </pre>

+ * 

+ * 

+ */

+@XmlAccessorType(XmlAccessType.FIELD)

+@XmlType(name = "mandateContentType", propOrder = {

+    "validFrom",

+    "validTo",

+    "transactionLimit",

+    "transactionLimitCurrency",

+    "isJoint",

+    "ischained",

+    "typePower"

+})

+public class MandateContentType {

+

+    @XmlElement(required = true)

+    @XmlSchemaType(name = "date")

+    protected XMLGregorianCalendar validFrom;

+    @XmlElement(required = true)

+    @XmlSchemaType(name = "date")

+    protected XMLGregorianCalendar validTo;

+    @XmlElement(required = true)

+    protected BigInteger transactionLimit;

+    @XmlElement(required = true)

+    protected String transactionLimitCurrency;

+    @XmlElement(required = true)

+    protected String isJoint;

+    protected boolean ischained;

+    @XmlElement(required = true)

+    protected String typePower;

+

+    /**

+     * Gets the value of the validFrom property.

+     * 

+     * @return

+     *     possible object is

+     *     {@link XMLGregorianCalendar }

+     *     

+     */

+    public XMLGregorianCalendar getValidFrom() {

+        return validFrom;

+    }

+

+    /**

+     * Sets the value of the validFrom property.

+     * 

+     * @param value

+     *     allowed object is

+     *     {@link XMLGregorianCalendar }

+     *     

+     */

+    public void setValidFrom(XMLGregorianCalendar value) {

+        this.validFrom = value;

+    }

+

+    /**

+     * Gets the value of the validTo property.

+     * 

+     * @return

+     *     possible object is

+     *     {@link XMLGregorianCalendar }

+     *     

+     */

+    public XMLGregorianCalendar getValidTo() {

+        return validTo;

+    }

+

+    /**

+     * Sets the value of the validTo property.

+     * 

+     * @param value

+     *     allowed object is

+     *     {@link XMLGregorianCalendar }

+     *     

+     */

+    public void setValidTo(XMLGregorianCalendar value) {

+        this.validTo = value;

+    }

+

+    /**

+     * Gets the value of the transactionLimit property.

+     * 

+     * @return

+     *     possible object is

+     *     {@link BigInteger }

+     *     

+     */

+    public BigInteger getTransactionLimit() {

+        return transactionLimit;

+    }

+

+    /**

+     * Sets the value of the transactionLimit property.

+     * 

+     * @param value

+     *     allowed object is

+     *     {@link BigInteger }

+     *     

+     */

+    public void setTransactionLimit(BigInteger value) {

+        this.transactionLimit = value;

+    }

+

+    /**

+     * Gets the value of the transactionLimitCurrency property.

+     * 

+     * @return

+     *     possible object is

+     *     {@link String }

+     *     

+     */

+    public String getTransactionLimitCurrency() {

+        return transactionLimitCurrency;

+    }

+

+    /**

+     * Sets the value of the transactionLimitCurrency property.

+     * 

+     * @param value

+     *     allowed object is

+     *     {@link String }

+     *     

+     */

+    public void setTransactionLimitCurrency(String value) {

+        this.transactionLimitCurrency = value;

+    }

+

+    /**

+     * Gets the value of the isJoint property.

+     * 

+     * @return

+     *     possible object is

+     *     {@link String }

+     *     

+     */

+    public String getIsJoint() {

+        return isJoint;

+    }

+

+    /**

+     * Sets the value of the isJoint property.

+     * 

+     * @param value

+     *     allowed object is

+     *     {@link String }

+     *     

+     */

+    public void setIsJoint(String value) {

+        this.isJoint = value;

+    }

+

+    /**

+     * Gets the value of the ischained property.

+     * 

+     */

+    public boolean isIschained() {

+        return ischained;

+    }

+

+    /**

+     * Sets the value of the ischained property.

+     * 

+     */

+    public void setIschained(boolean value) {

+        this.ischained = value;

+    }

+

+    /**

+     * Gets the value of the typePower property.

+     * 

+     * @return

+     *     possible object is

+     *     {@link String }

+     *     

+     */

+    public String getTypePower() {

+        return typePower;

+    }

+

+    /**

+     * Sets the value of the typePower property.

+     * 

+     * @param value

+     *     allowed object is

+     *     {@link String }

+     *     

+     */

+    public void setTypePower(String value) {

+        this.typePower = value;

+    }

+

+}