add deprecated MOA-ID 2.x database DAOs to source

90 files changed, 23965 insertions, 0 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/AbstractSimpleIdentificationType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/AbstractSimpleIdentificationType.java
new file mode 100644
index 000000000..a21cf62e2
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/AbstractSimpleIdentificationType.java
@@ -0,0 +1,161 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for AbstractSimpleIdentificationType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="AbstractSimpleIdentificationType">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "AbstractSimpleIdentificationType", propOrder = {
+    "value"
+})
+
+
+
+public class AbstractSimpleIdentificationType
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlValue
+    protected String value;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof AbstractSimpleIdentificationType)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final AbstractSimpleIdentificationType that = ((AbstractSimpleIdentificationType) object);
+        {
+            String lhsValue;
+            lhsValue = this.getValue();
+            String rhsValue;
+            rhsValue = that.getValue();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theValue;
+            theValue = this.getValue();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/AttributeProviderPlugin.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/AttributeProviderPlugin.java
new file mode 100644
index 000000000..25b9ea1b1
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/AttributeProviderPlugin.java
@@ -0,0 +1,254 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for AttributeProviderPlugin complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="AttributeProviderPlugin">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="url" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         &lt;element name="attributes" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "AttributeProviderPlugin", propOrder = {
+    "name",
+    "url",
+    "attributes"
+})
+
+
+
+public class AttributeProviderPlugin
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(required = true)
+    protected String name;
+    @XmlElement(required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String url;
+    @XmlElement(required = true)
+    protected String attributes;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setName(String value) {
+        this.name = value;
+    }
+
+    /**
+     * Gets the value of the url property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getUrl() {
+        return url;
+    }
+
+    /**
+     * Sets the value of the url property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setUrl(String value) {
+        this.url = value;
+    }
+
+    /**
+     * Gets the value of the attributes property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getAttributes() {
+        return attributes;
+    }
+
+    /**
+     * Sets the value of the attributes property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAttributes(String value) {
+        this.attributes = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof AttributeProviderPlugin)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final AttributeProviderPlugin that = ((AttributeProviderPlugin) object);
+        {
+            String lhsName;
+            lhsName = this.getName();
+            String rhsName;
+            rhsName = that.getName();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) {
+                return false;
+            }
+        }
+        {
+            String lhsUrl;
+            lhsUrl = this.getUrl();
+            String rhsUrl;
+            rhsUrl = that.getUrl();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "url", lhsUrl), LocatorUtils.property(thatLocator, "url", rhsUrl), lhsUrl, rhsUrl)) {
+                return false;
+            }
+        }
+        {
+            String lhsAttributes;
+            lhsAttributes = this.getAttributes();
+            String rhsAttributes;
+            rhsAttributes = that.getAttributes();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "attributes", lhsAttributes), LocatorUtils.property(thatLocator, "attributes", rhsAttributes), lhsAttributes, rhsAttributes)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theName;
+            theName = this.getName();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName);
+        }
+        {
+            String theUrl;
+            theUrl = this.getUrl();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "url", theUrl), currentHashCode, theUrl);
+        }
+        {
+            String theAttributes;
+            theAttributes = this.getAttributes();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "attributes", theAttributes), currentHashCode, theAttributes);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/AuthComponentGeneral.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/AuthComponentGeneral.java
new file mode 100644
index 000000000..4e3b4a64f
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/AuthComponentGeneral.java
@@ -0,0 +1,80 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.buergerkarte.at/namespaces/moaconfig#}AuthComponentType">
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+
+
+public class AuthComponentGeneral
+    extends AuthComponentType
+    implements Serializable, Equals, HashCode
+{
+
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof AuthComponentGeneral)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        if (!super.equals(thisLocator, thatLocator, object, strategy)) {
+            return false;
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = super.hashCode(locator, strategy);
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/AuthComponentOA.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/AuthComponentOA.java
new file mode 100644
index 000000000..04efb0afe
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/AuthComponentOA.java
@@ -0,0 +1,735 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="BKUURLS">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="OnlineBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *                   &lt;element name="HandyBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *                   &lt;element name="LocalBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}IdentificationNumber" minOccurs="0"/>
+ *         &lt;element name="Templates" type="{http://www.buergerkarte.at/namespaces/moaconfig#}TemplatesType" minOccurs="0"/>
+ *         &lt;element name="TransformsInfo" type="{http://www.buergerkarte.at/namespaces/moaconfig#}TransformsInfoType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="Mandates" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="Profiles" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *                   &lt;element name="ProfileName" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element name="testCredentials" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="credentialOID" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *                 &lt;/sequence>
+ *                 &lt;attribute name="enableTestCredentials" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}OA_STORK" minOccurs="0"/>
+ *         &lt;element name="OA_SSO" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="UseSSO" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *                   &lt;element name="AuthDataFrame" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *                   &lt;element name="SingleLogOutURL" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}OA_SAML1" minOccurs="0"/>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}OA_PVP2" minOccurs="0"/>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}OA_OAUTH20" minOccurs="0"/>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}EncBPKInformation" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "bkuurls",
+    "identificationNumber",
+    "templates",
+    "transformsInfo",
+    "mandates",
+    "testCredentials",
+    "oastork",
+    "oasso",
+    "oasaml1",
+    "oapvp2",
+    "oaoauth20",
+    "encBPKInformation"
+})
+
+
+
+public class AuthComponentOA
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "BKUURLS", required = true)
+    protected BKUURLS bkuurls;
+    @XmlElement(name = "IdentificationNumber")
+    protected IdentificationNumber identificationNumber;
+    @XmlElement(name = "Templates")
+    protected TemplatesType templates;
+    @XmlElement(name = "TransformsInfo")
+    protected List<TransformsInfoType> transformsInfo;
+    @XmlElement(name = "Mandates")
+    protected Mandates mandates;
+    protected TestCredentials testCredentials;
+    @XmlElement(name = "OA_STORK")
+    protected OASTORK oastork;
+    @XmlElement(name = "OA_SSO")
+    protected OASSO oasso;
+    @XmlElement(name = "OA_SAML1")
+    protected OASAML1 oasaml1;
+    @XmlElement(name = "OA_PVP2")
+    protected OAPVP2 oapvp2;
+    @XmlElement(name = "OA_OAUTH20")
+    protected OAOAUTH20 oaoauth20;
+    @XmlElement(name = "EncBPKInformation")
+    protected EncBPKInformation encBPKInformation;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the bkuurls property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BKUURLS }
+     *     
+     */
+    @ManyToOne(targetEntity = BKUURLS.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public BKUURLS getBKUURLS() {
+        return bkuurls;
+    }
+
+    /**
+     * Sets the value of the bkuurls property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BKUURLS }
+     *     
+     */
+    public void setBKUURLS(BKUURLS value) {
+        this.bkuurls = value;
+    }
+
+    /**
+     * Gets the value of the identificationNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IdentificationNumber }
+     *     
+     */
+    @ManyToOne(targetEntity = IdentificationNumber.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public IdentificationNumber getIdentificationNumber() {
+        return identificationNumber;
+    }
+
+    /**
+     * Sets the value of the identificationNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IdentificationNumber }
+     *     
+     */
+    public void setIdentificationNumber(IdentificationNumber value) {
+        this.identificationNumber = value;
+    }
+
+    /**
+     * Gets the value of the templates property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TemplatesType }
+     *     
+     */
+    @ManyToOne(targetEntity = TemplatesType.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public TemplatesType getTemplates() {
+        return templates;
+    }
+
+    /**
+     * Sets the value of the templates property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TemplatesType }
+     *     
+     */
+    public void setTemplates(TemplatesType value) {
+        this.templates = value;
+    }
+
+    /**
+     * Gets the value of the transformsInfo property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the transformsInfo property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getTransformsInfo().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link TransformsInfoType }
+     * 
+     * 
+     */
+    @OneToMany(targetEntity = TransformsInfoType.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<TransformsInfoType> getTransformsInfo() {
+        if (transformsInfo == null) {
+            transformsInfo = new ArrayList<TransformsInfoType>();
+        }
+        return this.transformsInfo;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setTransformsInfo(List<TransformsInfoType> transformsInfo) {
+        this.transformsInfo = transformsInfo;
+    }
+
+    /**
+     * Gets the value of the mandates property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Mandates }
+     *     
+     */
+    @ManyToOne(targetEntity = Mandates.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public Mandates getMandates() {
+        return mandates;
+    }
+
+    /**
+     * Sets the value of the mandates property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Mandates }
+     *     
+     */
+    public void setMandates(Mandates value) {
+        this.mandates = value;
+    }
+
+    /**
+     * Gets the value of the testCredentials property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TestCredentials }
+     *     
+     */
+    @ManyToOne(targetEntity = TestCredentials.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public TestCredentials getTestCredentials() {
+        return testCredentials;
+    }
+
+    /**
+     * Sets the value of the testCredentials property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TestCredentials }
+     *     
+     */
+    public void setTestCredentials(TestCredentials value) {
+        this.testCredentials = value;
+    }
+
+    /**
+     * Gets the value of the oastork property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link OASTORK }
+     *     
+     */
+    @ManyToOne(targetEntity = OASTORK.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public OASTORK getOASTORK() {
+        return oastork;
+    }
+
+    /**
+     * Sets the value of the oastork property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link OASTORK }
+     *     
+     */
+    public void setOASTORK(OASTORK value) {
+        this.oastork = value;
+    }
+
+    /**
+     * Gets the value of the oasso property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link OASSO }
+     *     
+     */
+    @ManyToOne(targetEntity = OASSO.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public OASSO getOASSO() {
+        return oasso;
+    }
+
+    /**
+     * Sets the value of the oasso property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link OASSO }
+     *     
+     */
+    public void setOASSO(OASSO value) {
+        this.oasso = value;
+    }
+
+    /**
+     * Gets the value of the oasaml1 property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link OASAML1 }
+     *     
+     */
+    @ManyToOne(targetEntity = OASAML1 .class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public OASAML1 getOASAML1() {
+        return oasaml1;
+    }
+
+    /**
+     * Sets the value of the oasaml1 property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link OASAML1 }
+     *     
+     */
+    public void setOASAML1(OASAML1 value) {
+        this.oasaml1 = value;
+    }
+
+    /**
+     * Gets the value of the oapvp2 property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link OAPVP2 }
+     *     
+     */
+    @ManyToOne(targetEntity = OAPVP2 .class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public OAPVP2 getOAPVP2() {
+        return oapvp2;
+    }
+
+    /**
+     * Sets the value of the oapvp2 property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link OAPVP2 }
+     *     
+     */
+    public void setOAPVP2(OAPVP2 value) {
+        this.oapvp2 = value;
+    }
+
+    /**
+     * Gets the value of the oaoauth20 property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link OAOAUTH20 }
+     *     
+     */
+    @ManyToOne(targetEntity = OAOAUTH20 .class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public OAOAUTH20 getOAOAUTH20() {
+        return oaoauth20;
+    }
+
+    /**
+     * Sets the value of the oaoauth20 property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link OAOAUTH20 }
+     *     
+     */
+    public void setOAOAUTH20(OAOAUTH20 value) {
+        this.oaoauth20 = value;
+    }
+
+    /**
+     * Gets the value of the encBPKInformation property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link EncBPKInformation }
+     *     
+     */
+    @ManyToOne(targetEntity = EncBPKInformation.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public EncBPKInformation getEncBPKInformation() {
+        return encBPKInformation;
+    }
+
+    /**
+     * Sets the value of the encBPKInformation property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link EncBPKInformation }
+     *     
+     */
+    public void setEncBPKInformation(EncBPKInformation value) {
+        this.encBPKInformation = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof AuthComponentOA)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final AuthComponentOA that = ((AuthComponentOA) object);
+        {
+            BKUURLS lhsBKUURLS;
+            lhsBKUURLS = this.getBKUURLS();
+            BKUURLS rhsBKUURLS;
+            rhsBKUURLS = that.getBKUURLS();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "bkuurls", lhsBKUURLS), LocatorUtils.property(thatLocator, "bkuurls", rhsBKUURLS), lhsBKUURLS, rhsBKUURLS)) {
+                return false;
+            }
+        }
+        {
+            IdentificationNumber lhsIdentificationNumber;
+            lhsIdentificationNumber = this.getIdentificationNumber();
+            IdentificationNumber rhsIdentificationNumber;
+            rhsIdentificationNumber = that.getIdentificationNumber();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "identificationNumber", lhsIdentificationNumber), LocatorUtils.property(thatLocator, "identificationNumber", rhsIdentificationNumber), lhsIdentificationNumber, rhsIdentificationNumber)) {
+                return false;
+            }
+        }
+        {
+            TemplatesType lhsTemplates;
+            lhsTemplates = this.getTemplates();
+            TemplatesType rhsTemplates;
+            rhsTemplates = that.getTemplates();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "templates", lhsTemplates), LocatorUtils.property(thatLocator, "templates", rhsTemplates), lhsTemplates, rhsTemplates)) {
+                return false;
+            }
+        }
+        {
+            List<TransformsInfoType> lhsTransformsInfo;
+            lhsTransformsInfo = (((this.transformsInfo!= null)&&(!this.transformsInfo.isEmpty()))?this.getTransformsInfo():null);
+            List<TransformsInfoType> rhsTransformsInfo;
+            rhsTransformsInfo = (((that.transformsInfo!= null)&&(!that.transformsInfo.isEmpty()))?that.getTransformsInfo():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "transformsInfo", lhsTransformsInfo), LocatorUtils.property(thatLocator, "transformsInfo", rhsTransformsInfo), lhsTransformsInfo, rhsTransformsInfo)) {
+                return false;
+            }
+        }
+        {
+            Mandates lhsMandates;
+            lhsMandates = this.getMandates();
+            Mandates rhsMandates;
+            rhsMandates = that.getMandates();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "mandates", lhsMandates), LocatorUtils.property(thatLocator, "mandates", rhsMandates), lhsMandates, rhsMandates)) {
+                return false;
+            }
+        }
+        {
+            TestCredentials lhsTestCredentials;
+            lhsTestCredentials = this.getTestCredentials();
+            TestCredentials rhsTestCredentials;
+            rhsTestCredentials = that.getTestCredentials();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "testCredentials", lhsTestCredentials), LocatorUtils.property(thatLocator, "testCredentials", rhsTestCredentials), lhsTestCredentials, rhsTestCredentials)) {
+                return false;
+            }
+        }
+        {
+            OASTORK lhsOASTORK;
+            lhsOASTORK = this.getOASTORK();
+            OASTORK rhsOASTORK;
+            rhsOASTORK = that.getOASTORK();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "oastork", lhsOASTORK), LocatorUtils.property(thatLocator, "oastork", rhsOASTORK), lhsOASTORK, rhsOASTORK)) {
+                return false;
+            }
+        }
+        {
+            OASSO lhsOASSO;
+            lhsOASSO = this.getOASSO();
+            OASSO rhsOASSO;
+            rhsOASSO = that.getOASSO();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "oasso", lhsOASSO), LocatorUtils.property(thatLocator, "oasso", rhsOASSO), lhsOASSO, rhsOASSO)) {
+                return false;
+            }
+        }
+        {
+            OASAML1 lhsOASAML1;
+            lhsOASAML1 = this.getOASAML1();
+            OASAML1 rhsOASAML1;
+            rhsOASAML1 = that.getOASAML1();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "oasaml1", lhsOASAML1), LocatorUtils.property(thatLocator, "oasaml1", rhsOASAML1), lhsOASAML1, rhsOASAML1)) {
+                return false;
+            }
+        }
+        {
+            OAPVP2 lhsOAPVP2;
+            lhsOAPVP2 = this.getOAPVP2();
+            OAPVP2 rhsOAPVP2;
+            rhsOAPVP2 = that.getOAPVP2();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "oapvp2", lhsOAPVP2), LocatorUtils.property(thatLocator, "oapvp2", rhsOAPVP2), lhsOAPVP2, rhsOAPVP2)) {
+                return false;
+            }
+        }
+        {
+            OAOAUTH20 lhsOAOAUTH20;
+            lhsOAOAUTH20 = this.getOAOAUTH20();
+            OAOAUTH20 rhsOAOAUTH20;
+            rhsOAOAUTH20 = that.getOAOAUTH20();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "oaoauth20", lhsOAOAUTH20), LocatorUtils.property(thatLocator, "oaoauth20", rhsOAOAUTH20), lhsOAOAUTH20, rhsOAOAUTH20)) {
+                return false;
+            }
+        }
+        {
+            EncBPKInformation lhsEncBPKInformation;
+            lhsEncBPKInformation = this.getEncBPKInformation();
+            EncBPKInformation rhsEncBPKInformation;
+            rhsEncBPKInformation = that.getEncBPKInformation();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "encBPKInformation", lhsEncBPKInformation), LocatorUtils.property(thatLocator, "encBPKInformation", rhsEncBPKInformation), lhsEncBPKInformation, rhsEncBPKInformation)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            BKUURLS theBKUURLS;
+            theBKUURLS = this.getBKUURLS();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "bkuurls", theBKUURLS), currentHashCode, theBKUURLS);
+        }
+        {
+            IdentificationNumber theIdentificationNumber;
+            theIdentificationNumber = this.getIdentificationNumber();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "identificationNumber", theIdentificationNumber), currentHashCode, theIdentificationNumber);
+        }
+        {
+            TemplatesType theTemplates;
+            theTemplates = this.getTemplates();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "templates", theTemplates), currentHashCode, theTemplates);
+        }
+        {
+            List<TransformsInfoType> theTransformsInfo;
+            theTransformsInfo = (((this.transformsInfo!= null)&&(!this.transformsInfo.isEmpty()))?this.getTransformsInfo():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "transformsInfo", theTransformsInfo), currentHashCode, theTransformsInfo);
+        }
+        {
+            Mandates theMandates;
+            theMandates = this.getMandates();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "mandates", theMandates), currentHashCode, theMandates);
+        }
+        {
+            TestCredentials theTestCredentials;
+            theTestCredentials = this.getTestCredentials();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "testCredentials", theTestCredentials), currentHashCode, theTestCredentials);
+        }
+        {
+            OASTORK theOASTORK;
+            theOASTORK = this.getOASTORK();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "oastork", theOASTORK), currentHashCode, theOASTORK);
+        }
+        {
+            OASSO theOASSO;
+            theOASSO = this.getOASSO();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "oasso", theOASSO), currentHashCode, theOASSO);
+        }
+        {
+            OASAML1 theOASAML1;
+            theOASAML1 = this.getOASAML1();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "oasaml1", theOASAML1), currentHashCode, theOASAML1);
+        }
+        {
+            OAPVP2 theOAPVP2;
+            theOAPVP2 = this.getOAPVP2();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "oapvp2", theOAPVP2), currentHashCode, theOAPVP2);
+        }
+        {
+            OAOAUTH20 theOAOAUTH20;
+            theOAOAUTH20 = this.getOAOAUTH20();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "oaoauth20", theOAOAUTH20), currentHashCode, theOAOAUTH20);
+        }
+        {
+            EncBPKInformation theEncBPKInformation;
+            theEncBPKInformation = this.getEncBPKInformation();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "encBPKInformation", theEncBPKInformation), currentHashCode, theEncBPKInformation);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/AuthComponentType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/AuthComponentType.java
new file mode 100644
index 000000000..d02c65c42
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/AuthComponentType.java
@@ -0,0 +1,650 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for AuthComponentType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="AuthComponentType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}GeneralConfiguration"/>
+ *         &lt;element name="Protocols">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="SAML1" minOccurs="0">
+ *                     &lt;complexType>
+ *                       &lt;complexContent>
+ *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           &lt;sequence>
+ *                             &lt;element name="SourceID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *                           &lt;/sequence>
+ *                           &lt;attribute name="isActive" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *                         &lt;/restriction>
+ *                       &lt;/complexContent>
+ *                     &lt;/complexType>
+ *                   &lt;/element>
+ *                   &lt;element name="PVP2" minOccurs="0">
+ *                     &lt;complexType>
+ *                       &lt;complexContent>
+ *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           &lt;sequence>
+ *                             &lt;element name="PublicURLPrefix" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *                             &lt;element name="IssuerName" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *                             &lt;element name="Organization">
+ *                               &lt;complexType>
+ *                                 &lt;complexContent>
+ *                                   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                                     &lt;sequence>
+ *                                       &lt;element name="Name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *                                       &lt;element name="DisplayName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *                                       &lt;element name="URL" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *                                     &lt;/sequence>
+ *                                   &lt;/restriction>
+ *                                 &lt;/complexContent>
+ *                               &lt;/complexType>
+ *                             &lt;/element>
+ *                             &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}Contact" maxOccurs="unbounded"/>
+ *                           &lt;/sequence>
+ *                           &lt;attribute name="isActive" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *                         &lt;/restriction>
+ *                       &lt;/complexContent>
+ *                     &lt;/complexType>
+ *                   &lt;/element>
+ *                   &lt;element name="OAuth" minOccurs="0">
+ *                     &lt;complexType>
+ *                       &lt;complexContent>
+ *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           &lt;attribute name="isActive" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *                         &lt;/restriction>
+ *                       &lt;/complexContent>
+ *                     &lt;/complexType>
+ *                   &lt;/element>
+ *                   &lt;element name="LegacyAllowed">
+ *                     &lt;complexType>
+ *                       &lt;complexContent>
+ *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           &lt;sequence>
+ *                             &lt;element name="ProtocolName" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *                           &lt;/sequence>
+ *                         &lt;/restriction>
+ *                       &lt;/complexContent>
+ *                     &lt;/complexType>
+ *                   &lt;/element>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element name="SSO">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;choice>
+ *                   &lt;element name="target" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *                   &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}IdentificationNumber"/>
+ *                 &lt;/choice>
+ *                 &lt;attribute name="PublicURL" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 &lt;attribute name="FriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *                 &lt;attribute name="SpecialText" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element name="SecurityLayer">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="TransformsInfo" type="{http://www.buergerkarte.at/namespaces/moaconfig#}TransformsInfoType" maxOccurs="unbounded"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element name="MOA-SP">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="ConnectionParameter" type="{http://www.buergerkarte.at/namespaces/moaconfig#}ConnectionParameterClientAuthType" minOccurs="0"/>
+ *                   &lt;element name="VerifyIdentityLink">
+ *                     &lt;complexType>
+ *                       &lt;complexContent>
+ *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           &lt;sequence>
+ *                             &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}TrustProfileID"/>
+ *                           &lt;/sequence>
+ *                         &lt;/restriction>
+ *                       &lt;/complexContent>
+ *                     &lt;/complexType>
+ *                   &lt;/element>
+ *                   &lt;element name="VerifyAuthBlock">
+ *                     &lt;complexType>
+ *                       &lt;complexContent>
+ *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           &lt;sequence>
+ *                             &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}TrustProfileID"/>
+ *                             &lt;element name="VerifyTransformsInfoProfileID" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *                           &lt;/sequence>
+ *                         &lt;/restriction>
+ *                       &lt;/complexContent>
+ *                     &lt;/complexType>
+ *                   &lt;/element>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element name="IdentityLinkSigners" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element name="ForeignIdentities" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="ConnectionParameter" type="{http://www.buergerkarte.at/namespaces/moaconfig#}ConnectionParameterClientAuthType"/>
+ *                   &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}STORK" minOccurs="0"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element name="OnlineMandates" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="ConnectionParameter" type="{http://www.buergerkarte.at/namespaces/moaconfig#}ConnectionParameterClientAuthType"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "AuthComponentType", propOrder = {
+    "generalConfiguration",
+    "protocols",
+    "sso",
+    "securityLayer",
+    "moasp",
+    "identityLinkSigners",
+    "foreignIdentities",
+    "onlineMandates"
+})
+@XmlSeeAlso({
+    AuthComponentGeneral.class
+})
+
+
+
+public class AuthComponentType
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "GeneralConfiguration", required = true)
+    protected GeneralConfiguration generalConfiguration;
+    @XmlElement(name = "Protocols", required = true)
+    protected Protocols protocols;
+    @XmlElement(name = "SSO", required = true)
+    protected SSO sso;
+    @XmlElement(name = "SecurityLayer", required = true)
+    protected SecurityLayer securityLayer;
+    @XmlElement(name = "MOA-SP", required = true)
+    protected MOASP moasp;
+    @XmlElement(name = "IdentityLinkSigners")
+    protected IdentityLinkSigners identityLinkSigners;
+    @XmlElement(name = "ForeignIdentities")
+    protected ForeignIdentities foreignIdentities;
+    @XmlElement(name = "OnlineMandates")
+    protected OnlineMandates onlineMandates;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the generalConfiguration property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link GeneralConfiguration }
+     *     
+     */
+    @ManyToOne(targetEntity = GeneralConfiguration.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public GeneralConfiguration getGeneralConfiguration() {
+        return generalConfiguration;
+    }
+
+    /**
+     * Sets the value of the generalConfiguration property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link GeneralConfiguration }
+     *     
+     */
+    public void setGeneralConfiguration(GeneralConfiguration value) {
+        this.generalConfiguration = value;
+    }
+
+    /**
+     * Gets the value of the protocols property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Protocols }
+     *     
+     */
+    @ManyToOne(targetEntity = Protocols.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public Protocols getProtocols() {
+        return protocols;
+    }
+
+    /**
+     * Sets the value of the protocols property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Protocols }
+     *     
+     */
+    public void setProtocols(Protocols value) {
+        this.protocols = value;
+    }
+
+    /**
+     * Gets the value of the sso property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SSO }
+     *     
+     */
+    @ManyToOne(targetEntity = SSO.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public SSO getSSO() {
+        return sso;
+    }
+
+    /**
+     * Sets the value of the sso property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SSO }
+     *     
+     */
+    public void setSSO(SSO value) {
+        this.sso = value;
+    }
+
+    /**
+     * Gets the value of the securityLayer property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SecurityLayer }
+     *     
+     */
+    @ManyToOne(targetEntity = SecurityLayer.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public SecurityLayer getSecurityLayer() {
+        return securityLayer;
+    }
+
+    /**
+     * Sets the value of the securityLayer property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SecurityLayer }
+     *     
+     */
+    public void setSecurityLayer(SecurityLayer value) {
+        this.securityLayer = value;
+    }
+
+    /**
+     * Gets the value of the moasp property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link MOASP }
+     *     
+     */
+    @ManyToOne(targetEntity = MOASP.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public MOASP getMOASP() {
+        return moasp;
+    }
+
+    /**
+     * Sets the value of the moasp property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link MOASP }
+     *     
+     */
+    public void setMOASP(MOASP value) {
+        this.moasp = value;
+    }
+
+    /**
+     * Gets the value of the identityLinkSigners property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IdentityLinkSigners }
+     *     
+     */
+    @ManyToOne(targetEntity = IdentityLinkSigners.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public IdentityLinkSigners getIdentityLinkSigners() {
+        return identityLinkSigners;
+    }
+
+    /**
+     * Sets the value of the identityLinkSigners property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IdentityLinkSigners }
+     *     
+     */
+    public void setIdentityLinkSigners(IdentityLinkSigners value) {
+        this.identityLinkSigners = value;
+    }
+
+    /**
+     * Gets the value of the foreignIdentities property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ForeignIdentities }
+     *     
+     */
+    @ManyToOne(targetEntity = ForeignIdentities.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public ForeignIdentities getForeignIdentities() {
+        return foreignIdentities;
+    }
+
+    /**
+     * Sets the value of the foreignIdentities property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ForeignIdentities }
+     *     
+     */
+    public void setForeignIdentities(ForeignIdentities value) {
+        this.foreignIdentities = value;
+    }
+
+    /**
+     * Gets the value of the onlineMandates property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link OnlineMandates }
+     *     
+     */
+    @ManyToOne(targetEntity = OnlineMandates.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public OnlineMandates getOnlineMandates() {
+        return onlineMandates;
+    }
+
+    /**
+     * Sets the value of the onlineMandates property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link OnlineMandates }
+     *     
+     */
+    public void setOnlineMandates(OnlineMandates value) {
+        this.onlineMandates = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof AuthComponentType)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final AuthComponentType that = ((AuthComponentType) object);
+        {
+            GeneralConfiguration lhsGeneralConfiguration;
+            lhsGeneralConfiguration = this.getGeneralConfiguration();
+            GeneralConfiguration rhsGeneralConfiguration;
+            rhsGeneralConfiguration = that.getGeneralConfiguration();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "generalConfiguration", lhsGeneralConfiguration), LocatorUtils.property(thatLocator, "generalConfiguration", rhsGeneralConfiguration), lhsGeneralConfiguration, rhsGeneralConfiguration)) {
+                return false;
+            }
+        }
+        {
+            Protocols lhsProtocols;
+            lhsProtocols = this.getProtocols();
+            Protocols rhsProtocols;
+            rhsProtocols = that.getProtocols();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "protocols", lhsProtocols), LocatorUtils.property(thatLocator, "protocols", rhsProtocols), lhsProtocols, rhsProtocols)) {
+                return false;
+            }
+        }
+        {
+            SSO lhsSSO;
+            lhsSSO = this.getSSO();
+            SSO rhsSSO;
+            rhsSSO = that.getSSO();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "sso", lhsSSO), LocatorUtils.property(thatLocator, "sso", rhsSSO), lhsSSO, rhsSSO)) {
+                return false;
+            }
+        }
+        {
+            SecurityLayer lhsSecurityLayer;
+            lhsSecurityLayer = this.getSecurityLayer();
+            SecurityLayer rhsSecurityLayer;
+            rhsSecurityLayer = that.getSecurityLayer();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "securityLayer", lhsSecurityLayer), LocatorUtils.property(thatLocator, "securityLayer", rhsSecurityLayer), lhsSecurityLayer, rhsSecurityLayer)) {
+                return false;
+            }
+        }
+        {
+            MOASP lhsMOASP;
+            lhsMOASP = this.getMOASP();
+            MOASP rhsMOASP;
+            rhsMOASP = that.getMOASP();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "moasp", lhsMOASP), LocatorUtils.property(thatLocator, "moasp", rhsMOASP), lhsMOASP, rhsMOASP)) {
+                return false;
+            }
+        }
+        {
+            IdentityLinkSigners lhsIdentityLinkSigners;
+            lhsIdentityLinkSigners = this.getIdentityLinkSigners();
+            IdentityLinkSigners rhsIdentityLinkSigners;
+            rhsIdentityLinkSigners = that.getIdentityLinkSigners();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "identityLinkSigners", lhsIdentityLinkSigners), LocatorUtils.property(thatLocator, "identityLinkSigners", rhsIdentityLinkSigners), lhsIdentityLinkSigners, rhsIdentityLinkSigners)) {
+                return false;
+            }
+        }
+        {
+            ForeignIdentities lhsForeignIdentities;
+            lhsForeignIdentities = this.getForeignIdentities();
+            ForeignIdentities rhsForeignIdentities;
+            rhsForeignIdentities = that.getForeignIdentities();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "foreignIdentities", lhsForeignIdentities), LocatorUtils.property(thatLocator, "foreignIdentities", rhsForeignIdentities), lhsForeignIdentities, rhsForeignIdentities)) {
+                return false;
+            }
+        }
+        {
+            OnlineMandates lhsOnlineMandates;
+            lhsOnlineMandates = this.getOnlineMandates();
+            OnlineMandates rhsOnlineMandates;
+            rhsOnlineMandates = that.getOnlineMandates();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "onlineMandates", lhsOnlineMandates), LocatorUtils.property(thatLocator, "onlineMandates", rhsOnlineMandates), lhsOnlineMandates, rhsOnlineMandates)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            GeneralConfiguration theGeneralConfiguration;
+            theGeneralConfiguration = this.getGeneralConfiguration();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "generalConfiguration", theGeneralConfiguration), currentHashCode, theGeneralConfiguration);
+        }
+        {
+            Protocols theProtocols;
+            theProtocols = this.getProtocols();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "protocols", theProtocols), currentHashCode, theProtocols);
+        }
+        {
+            SSO theSSO;
+            theSSO = this.getSSO();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "sso", theSSO), currentHashCode, theSSO);
+        }
+        {
+            SecurityLayer theSecurityLayer;
+            theSecurityLayer = this.getSecurityLayer();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "securityLayer", theSecurityLayer), currentHashCode, theSecurityLayer);
+        }
+        {
+            MOASP theMOASP;
+            theMOASP = this.getMOASP();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "moasp", theMOASP), currentHashCode, theMOASP);
+        }
+        {
+            IdentityLinkSigners theIdentityLinkSigners;
+            theIdentityLinkSigners = this.getIdentityLinkSigners();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "identityLinkSigners", theIdentityLinkSigners), currentHashCode, theIdentityLinkSigners);
+        }
+        {
+            ForeignIdentities theForeignIdentities;
+            theForeignIdentities = this.getForeignIdentities();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "foreignIdentities", theForeignIdentities), currentHashCode, theForeignIdentities);
+        }
+        {
+            OnlineMandates theOnlineMandates;
+            theOnlineMandates = this.getOnlineMandates();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "onlineMandates", theOnlineMandates), currentHashCode, theOnlineMandates);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/BKUSelectionCustomizationType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/BKUSelectionCustomizationType.java
new file mode 100644
index 000000000..72dadbcf8
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/BKUSelectionCustomizationType.java
@@ -0,0 +1,743 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for BKUSelectionCustomizationType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="BKUSelectionCustomizationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="FontType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="BackGroundColor" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="FrontColor" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="HeaderBackGroundColor" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="HeaderFrontColor" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="HeaderText" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="ButtonBackGroundColor" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="ButtonBackGroundColorFocus" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="ButtonFontColor" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="AppletRedirectTarget" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="AppletHeight" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="AppletWidth" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="MandateLoginButton" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         &lt;element name="OnlyMandateLoginAllowed" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "BKUSelectionCustomizationType", propOrder = {
+    "fontType",
+    "backGroundColor",
+    "frontColor",
+    "headerBackGroundColor",
+    "headerFrontColor",
+    "headerText",
+    "buttonBackGroundColor",
+    "buttonBackGroundColorFocus",
+    "buttonFontColor",
+    "appletRedirectTarget",
+    "appletHeight",
+    "appletWidth",
+    "mandateLoginButton",
+    "onlyMandateLoginAllowed"
+})
+
+
+
+public class BKUSelectionCustomizationType
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "FontType")
+    protected String fontType;
+    @XmlElement(name = "BackGroundColor")
+    protected String backGroundColor;
+    @XmlElement(name = "FrontColor")
+    protected String frontColor;
+    @XmlElement(name = "HeaderBackGroundColor")
+    protected String headerBackGroundColor;
+    @XmlElement(name = "HeaderFrontColor")
+    protected String headerFrontColor;
+    @XmlElement(name = "HeaderText")
+    protected String headerText;
+    @XmlElement(name = "ButtonBackGroundColor")
+    protected String buttonBackGroundColor;
+    @XmlElement(name = "ButtonBackGroundColorFocus")
+    protected String buttonBackGroundColorFocus;
+    @XmlElement(name = "ButtonFontColor")
+    protected String buttonFontColor;
+    @XmlElement(name = "AppletRedirectTarget")
+    protected String appletRedirectTarget;
+    @XmlElement(name = "AppletHeight")
+    protected String appletHeight;
+    @XmlElement(name = "AppletWidth")
+    protected String appletWidth;
+    @XmlElement(name = "MandateLoginButton", type = String.class, defaultValue = "true")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean mandateLoginButton;
+    @XmlElement(name = "OnlyMandateLoginAllowed", type = String.class, defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean onlyMandateLoginAllowed;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the fontType property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getFontType() {
+        return fontType;
+    }
+
+    /**
+     * Sets the value of the fontType property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFontType(String value) {
+        this.fontType = value;
+    }
+
+    /**
+     * Gets the value of the backGroundColor property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getBackGroundColor() {
+        return backGroundColor;
+    }
+
+    /**
+     * Sets the value of the backGroundColor property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBackGroundColor(String value) {
+        this.backGroundColor = value;
+    }
+
+    /**
+     * Gets the value of the frontColor property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getFrontColor() {
+        return frontColor;
+    }
+
+    /**
+     * Sets the value of the frontColor property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFrontColor(String value) {
+        this.frontColor = value;
+    }
+
+    /**
+     * Gets the value of the headerBackGroundColor property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getHeaderBackGroundColor() {
+        return headerBackGroundColor;
+    }
+
+    /**
+     * Sets the value of the headerBackGroundColor property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setHeaderBackGroundColor(String value) {
+        this.headerBackGroundColor = value;
+    }
+
+    /**
+     * Gets the value of the headerFrontColor property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getHeaderFrontColor() {
+        return headerFrontColor;
+    }
+
+    /**
+     * Sets the value of the headerFrontColor property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setHeaderFrontColor(String value) {
+        this.headerFrontColor = value;
+    }
+
+    /**
+     * Gets the value of the headerText property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getHeaderText() {
+        return headerText;
+    }
+
+    /**
+     * Sets the value of the headerText property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setHeaderText(String value) {
+        this.headerText = value;
+    }
+
+    /**
+     * Gets the value of the buttonBackGroundColor property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getButtonBackGroundColor() {
+        return buttonBackGroundColor;
+    }
+
+    /**
+     * Sets the value of the buttonBackGroundColor property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setButtonBackGroundColor(String value) {
+        this.buttonBackGroundColor = value;
+    }
+
+    /**
+     * Gets the value of the buttonBackGroundColorFocus property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getButtonBackGroundColorFocus() {
+        return buttonBackGroundColorFocus;
+    }
+
+    /**
+     * Sets the value of the buttonBackGroundColorFocus property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setButtonBackGroundColorFocus(String value) {
+        this.buttonBackGroundColorFocus = value;
+    }
+
+    /**
+     * Gets the value of the buttonFontColor property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getButtonFontColor() {
+        return buttonFontColor;
+    }
+
+    /**
+     * Sets the value of the buttonFontColor property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setButtonFontColor(String value) {
+        this.buttonFontColor = value;
+    }
+
+    /**
+     * Gets the value of the appletRedirectTarget property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getAppletRedirectTarget() {
+        return appletRedirectTarget;
+    }
+
+    /**
+     * Sets the value of the appletRedirectTarget property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAppletRedirectTarget(String value) {
+        this.appletRedirectTarget = value;
+    }
+
+    /**
+     * Gets the value of the appletHeight property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getAppletHeight() {
+        return appletHeight;
+    }
+
+    /**
+     * Sets the value of the appletHeight property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAppletHeight(String value) {
+        this.appletHeight = value;
+    }
+
+    /**
+     * Gets the value of the appletWidth property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getAppletWidth() {
+        return appletWidth;
+    }
+
+    /**
+     * Sets the value of the appletWidth property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAppletWidth(String value) {
+        this.appletWidth = value;
+    }
+
+    /**
+     * Gets the value of the mandateLoginButton property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isMandateLoginButton() {
+        return mandateLoginButton;
+    }
+
+    /**
+     * Sets the value of the mandateLoginButton property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setMandateLoginButton(Boolean value) {
+        this.mandateLoginButton = value;
+    }
+
+    /**
+     * Gets the value of the onlyMandateLoginAllowed property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isOnlyMandateLoginAllowed() {
+        return onlyMandateLoginAllowed;
+    }
+
+    /**
+     * Sets the value of the onlyMandateLoginAllowed property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setOnlyMandateLoginAllowed(Boolean value) {
+        this.onlyMandateLoginAllowed = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof BKUSelectionCustomizationType)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final BKUSelectionCustomizationType that = ((BKUSelectionCustomizationType) object);
+        {
+            String lhsFontType;
+            lhsFontType = this.getFontType();
+            String rhsFontType;
+            rhsFontType = that.getFontType();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "fontType", lhsFontType), LocatorUtils.property(thatLocator, "fontType", rhsFontType), lhsFontType, rhsFontType)) {
+                return false;
+            }
+        }
+        {
+            String lhsBackGroundColor;
+            lhsBackGroundColor = this.getBackGroundColor();
+            String rhsBackGroundColor;
+            rhsBackGroundColor = that.getBackGroundColor();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "backGroundColor", lhsBackGroundColor), LocatorUtils.property(thatLocator, "backGroundColor", rhsBackGroundColor), lhsBackGroundColor, rhsBackGroundColor)) {
+                return false;
+            }
+        }
+        {
+            String lhsFrontColor;
+            lhsFrontColor = this.getFrontColor();
+            String rhsFrontColor;
+            rhsFrontColor = that.getFrontColor();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "frontColor", lhsFrontColor), LocatorUtils.property(thatLocator, "frontColor", rhsFrontColor), lhsFrontColor, rhsFrontColor)) {
+                return false;
+            }
+        }
+        {
+            String lhsHeaderBackGroundColor;
+            lhsHeaderBackGroundColor = this.getHeaderBackGroundColor();
+            String rhsHeaderBackGroundColor;
+            rhsHeaderBackGroundColor = that.getHeaderBackGroundColor();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "headerBackGroundColor", lhsHeaderBackGroundColor), LocatorUtils.property(thatLocator, "headerBackGroundColor", rhsHeaderBackGroundColor), lhsHeaderBackGroundColor, rhsHeaderBackGroundColor)) {
+                return false;
+            }
+        }
+        {
+            String lhsHeaderFrontColor;
+            lhsHeaderFrontColor = this.getHeaderFrontColor();
+            String rhsHeaderFrontColor;
+            rhsHeaderFrontColor = that.getHeaderFrontColor();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "headerFrontColor", lhsHeaderFrontColor), LocatorUtils.property(thatLocator, "headerFrontColor", rhsHeaderFrontColor), lhsHeaderFrontColor, rhsHeaderFrontColor)) {
+                return false;
+            }
+        }
+        {
+            String lhsHeaderText;
+            lhsHeaderText = this.getHeaderText();
+            String rhsHeaderText;
+            rhsHeaderText = that.getHeaderText();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "headerText", lhsHeaderText), LocatorUtils.property(thatLocator, "headerText", rhsHeaderText), lhsHeaderText, rhsHeaderText)) {
+                return false;
+            }
+        }
+        {
+            String lhsButtonBackGroundColor;
+            lhsButtonBackGroundColor = this.getButtonBackGroundColor();
+            String rhsButtonBackGroundColor;
+            rhsButtonBackGroundColor = that.getButtonBackGroundColor();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "buttonBackGroundColor", lhsButtonBackGroundColor), LocatorUtils.property(thatLocator, "buttonBackGroundColor", rhsButtonBackGroundColor), lhsButtonBackGroundColor, rhsButtonBackGroundColor)) {
+                return false;
+            }
+        }
+        {
+            String lhsButtonBackGroundColorFocus;
+            lhsButtonBackGroundColorFocus = this.getButtonBackGroundColorFocus();
+            String rhsButtonBackGroundColorFocus;
+            rhsButtonBackGroundColorFocus = that.getButtonBackGroundColorFocus();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "buttonBackGroundColorFocus", lhsButtonBackGroundColorFocus), LocatorUtils.property(thatLocator, "buttonBackGroundColorFocus", rhsButtonBackGroundColorFocus), lhsButtonBackGroundColorFocus, rhsButtonBackGroundColorFocus)) {
+                return false;
+            }
+        }
+        {
+            String lhsButtonFontColor;
+            lhsButtonFontColor = this.getButtonFontColor();
+            String rhsButtonFontColor;
+            rhsButtonFontColor = that.getButtonFontColor();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "buttonFontColor", lhsButtonFontColor), LocatorUtils.property(thatLocator, "buttonFontColor", rhsButtonFontColor), lhsButtonFontColor, rhsButtonFontColor)) {
+                return false;
+            }
+        }
+        {
+            String lhsAppletRedirectTarget;
+            lhsAppletRedirectTarget = this.getAppletRedirectTarget();
+            String rhsAppletRedirectTarget;
+            rhsAppletRedirectTarget = that.getAppletRedirectTarget();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "appletRedirectTarget", lhsAppletRedirectTarget), LocatorUtils.property(thatLocator, "appletRedirectTarget", rhsAppletRedirectTarget), lhsAppletRedirectTarget, rhsAppletRedirectTarget)) {
+                return false;
+            }
+        }
+        {
+            String lhsAppletHeight;
+            lhsAppletHeight = this.getAppletHeight();
+            String rhsAppletHeight;
+            rhsAppletHeight = that.getAppletHeight();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "appletHeight", lhsAppletHeight), LocatorUtils.property(thatLocator, "appletHeight", rhsAppletHeight), lhsAppletHeight, rhsAppletHeight)) {
+                return false;
+            }
+        }
+        {
+            String lhsAppletWidth;
+            lhsAppletWidth = this.getAppletWidth();
+            String rhsAppletWidth;
+            rhsAppletWidth = that.getAppletWidth();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "appletWidth", lhsAppletWidth), LocatorUtils.property(thatLocator, "appletWidth", rhsAppletWidth), lhsAppletWidth, rhsAppletWidth)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsMandateLoginButton;
+            lhsMandateLoginButton = this.isMandateLoginButton();
+            Boolean rhsMandateLoginButton;
+            rhsMandateLoginButton = that.isMandateLoginButton();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "mandateLoginButton", lhsMandateLoginButton), LocatorUtils.property(thatLocator, "mandateLoginButton", rhsMandateLoginButton), lhsMandateLoginButton, rhsMandateLoginButton)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsOnlyMandateLoginAllowed;
+            lhsOnlyMandateLoginAllowed = this.isOnlyMandateLoginAllowed();
+            Boolean rhsOnlyMandateLoginAllowed;
+            rhsOnlyMandateLoginAllowed = that.isOnlyMandateLoginAllowed();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "onlyMandateLoginAllowed", lhsOnlyMandateLoginAllowed), LocatorUtils.property(thatLocator, "onlyMandateLoginAllowed", rhsOnlyMandateLoginAllowed), lhsOnlyMandateLoginAllowed, rhsOnlyMandateLoginAllowed)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theFontType;
+            theFontType = this.getFontType();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "fontType", theFontType), currentHashCode, theFontType);
+        }
+        {
+            String theBackGroundColor;
+            theBackGroundColor = this.getBackGroundColor();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "backGroundColor", theBackGroundColor), currentHashCode, theBackGroundColor);
+        }
+        {
+            String theFrontColor;
+            theFrontColor = this.getFrontColor();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "frontColor", theFrontColor), currentHashCode, theFrontColor);
+        }
+        {
+            String theHeaderBackGroundColor;
+            theHeaderBackGroundColor = this.getHeaderBackGroundColor();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "headerBackGroundColor", theHeaderBackGroundColor), currentHashCode, theHeaderBackGroundColor);
+        }
+        {
+            String theHeaderFrontColor;
+            theHeaderFrontColor = this.getHeaderFrontColor();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "headerFrontColor", theHeaderFrontColor), currentHashCode, theHeaderFrontColor);
+        }
+        {
+            String theHeaderText;
+            theHeaderText = this.getHeaderText();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "headerText", theHeaderText), currentHashCode, theHeaderText);
+        }
+        {
+            String theButtonBackGroundColor;
+            theButtonBackGroundColor = this.getButtonBackGroundColor();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "buttonBackGroundColor", theButtonBackGroundColor), currentHashCode, theButtonBackGroundColor);
+        }
+        {
+            String theButtonBackGroundColorFocus;
+            theButtonBackGroundColorFocus = this.getButtonBackGroundColorFocus();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "buttonBackGroundColorFocus", theButtonBackGroundColorFocus), currentHashCode, theButtonBackGroundColorFocus);
+        }
+        {
+            String theButtonFontColor;
+            theButtonFontColor = this.getButtonFontColor();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "buttonFontColor", theButtonFontColor), currentHashCode, theButtonFontColor);
+        }
+        {
+            String theAppletRedirectTarget;
+            theAppletRedirectTarget = this.getAppletRedirectTarget();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "appletRedirectTarget", theAppletRedirectTarget), currentHashCode, theAppletRedirectTarget);
+        }
+        {
+            String theAppletHeight;
+            theAppletHeight = this.getAppletHeight();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "appletHeight", theAppletHeight), currentHashCode, theAppletHeight);
+        }
+        {
+            String theAppletWidth;
+            theAppletWidth = this.getAppletWidth();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "appletWidth", theAppletWidth), currentHashCode, theAppletWidth);
+        }
+        {
+            Boolean theMandateLoginButton;
+            theMandateLoginButton = this.isMandateLoginButton();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "mandateLoginButton", theMandateLoginButton), currentHashCode, theMandateLoginButton);
+        }
+        {
+            Boolean theOnlyMandateLoginAllowed;
+            theOnlyMandateLoginAllowed = this.isOnlyMandateLoginAllowed();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "onlyMandateLoginAllowed", theOnlyMandateLoginAllowed), currentHashCode, theOnlyMandateLoginAllowed);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/BKUSelectionType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/BKUSelectionType.java
new file mode 100644
index 000000000..4c93cc784
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/BKUSelectionType.java
@@ -0,0 +1,58 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for BKUSelectionType.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="BKUSelectionType">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token">
+ *     &lt;enumeration value="HTMLComplete"/>
+ *     &lt;enumeration value="HTMLSelect"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "BKUSelectionType")
+@XmlEnum
+public enum BKUSelectionType {
+
+    @XmlEnumValue("HTMLComplete")
+    HTML_COMPLETE("HTMLComplete"),
+    @XmlEnumValue("HTMLSelect")
+    HTML_SELECT("HTMLSelect");
+    private final String value;
+
+    BKUSelectionType(String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static BKUSelectionType fromValue(String v) {
+        for (BKUSelectionType c: BKUSelectionType.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/BKUURLS.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/BKUURLS.java
new file mode 100644
index 000000000..e995c3404
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/BKUURLS.java
@@ -0,0 +1,256 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="OnlineBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         &lt;element name="HandyBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         &lt;element name="LocalBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "onlineBKU",
+    "handyBKU",
+    "localBKU"
+})
+
+
+
+public class BKUURLS
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "OnlineBKU", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String onlineBKU;
+    @XmlElement(name = "HandyBKU", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String handyBKU;
+    @XmlElement(name = "LocalBKU", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String localBKU;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the onlineBKU property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getOnlineBKU() {
+        return onlineBKU;
+    }
+
+    /**
+     * Sets the value of the onlineBKU property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setOnlineBKU(String value) {
+        this.onlineBKU = value;
+    }
+
+    /**
+     * Gets the value of the handyBKU property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getHandyBKU() {
+        return handyBKU;
+    }
+
+    /**
+     * Sets the value of the handyBKU property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setHandyBKU(String value) {
+        this.handyBKU = value;
+    }
+
+    /**
+     * Gets the value of the localBKU property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getLocalBKU() {
+        return localBKU;
+    }
+
+    /**
+     * Sets the value of the localBKU property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setLocalBKU(String value) {
+        this.localBKU = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof BKUURLS)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final BKUURLS that = ((BKUURLS) object);
+        {
+            String lhsOnlineBKU;
+            lhsOnlineBKU = this.getOnlineBKU();
+            String rhsOnlineBKU;
+            rhsOnlineBKU = that.getOnlineBKU();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "onlineBKU", lhsOnlineBKU), LocatorUtils.property(thatLocator, "onlineBKU", rhsOnlineBKU), lhsOnlineBKU, rhsOnlineBKU)) {
+                return false;
+            }
+        }
+        {
+            String lhsHandyBKU;
+            lhsHandyBKU = this.getHandyBKU();
+            String rhsHandyBKU;
+            rhsHandyBKU = that.getHandyBKU();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "handyBKU", lhsHandyBKU), LocatorUtils.property(thatLocator, "handyBKU", rhsHandyBKU), lhsHandyBKU, rhsHandyBKU)) {
+                return false;
+            }
+        }
+        {
+            String lhsLocalBKU;
+            lhsLocalBKU = this.getLocalBKU();
+            String rhsLocalBKU;
+            rhsLocalBKU = that.getLocalBKU();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "localBKU", lhsLocalBKU), LocatorUtils.property(thatLocator, "localBKU", rhsLocalBKU), lhsLocalBKU, rhsLocalBKU)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theOnlineBKU;
+            theOnlineBKU = this.getOnlineBKU();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "onlineBKU", theOnlineBKU), currentHashCode, theOnlineBKU);
+        }
+        {
+            String theHandyBKU;
+            theHandyBKU = this.getHandyBKU();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "handyBKU", theHandyBKU), currentHashCode, theHandyBKU);
+        }
+        {
+            String theLocalBKU;
+            theLocalBKU = this.getLocalBKU();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "localBKU", theLocalBKU), currentHashCode, theLocalBKU);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/BPKDecryption.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/BPKDecryption.java
new file mode 100644
index 000000000..3101f2f92
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/BPKDecryption.java
@@ -0,0 +1,293 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="keyInformation" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         &lt;element name="iv" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         &lt;element name="keyStoreFileName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="keyAlias" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "keyInformation",
+    "iv",
+    "keyStoreFileName",
+    "keyAlias"
+})
+
+
+
+public class BPKDecryption
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(required = true)
+    protected byte[] keyInformation;
+    @XmlElement(required = true)
+    protected byte[] iv;
+    protected String keyStoreFileName;
+    protected String keyAlias;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the keyInformation property.
+     * 
+     * @return
+     *     possible object is
+     *     byte[]
+     */
+    
+    
+    @Lob
+    public byte[] getKeyInformation() {
+        return keyInformation;
+    }
+
+    /**
+     * Sets the value of the keyInformation property.
+     * 
+     * @param value
+     *     allowed object is
+     *     byte[]
+     */
+    public void setKeyInformation(byte[] value) {
+        this.keyInformation = value;
+    }
+
+    /**
+     * Gets the value of the iv property.
+     * 
+     * @return
+     *     possible object is
+     *     byte[]
+     */
+    
+    
+    @Lob
+    public byte[] getIv() {
+        return iv;
+    }
+
+    /**
+     * Sets the value of the iv property.
+     * 
+     * @param value
+     *     allowed object is
+     *     byte[]
+     */
+    public void setIv(byte[] value) {
+        this.iv = value;
+    }
+
+    /**
+     * Gets the value of the keyStoreFileName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getKeyStoreFileName() {
+        return keyStoreFileName;
+    }
+
+    /**
+     * Sets the value of the keyStoreFileName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setKeyStoreFileName(String value) {
+        this.keyStoreFileName = value;
+    }
+
+    /**
+     * Gets the value of the keyAlias property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getKeyAlias() {
+        return keyAlias;
+    }
+
+    /**
+     * Sets the value of the keyAlias property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setKeyAlias(String value) {
+        this.keyAlias = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof BPKDecryption)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final BPKDecryption that = ((BPKDecryption) object);
+        {
+            byte[] lhsKeyInformation;
+            lhsKeyInformation = this.getKeyInformation();
+            byte[] rhsKeyInformation;
+            rhsKeyInformation = that.getKeyInformation();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "keyInformation", lhsKeyInformation), LocatorUtils.property(thatLocator, "keyInformation", rhsKeyInformation), lhsKeyInformation, rhsKeyInformation)) {
+                return false;
+            }
+        }
+        {
+            byte[] lhsIv;
+            lhsIv = this.getIv();
+            byte[] rhsIv;
+            rhsIv = that.getIv();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "iv", lhsIv), LocatorUtils.property(thatLocator, "iv", rhsIv), lhsIv, rhsIv)) {
+                return false;
+            }
+        }
+        {
+            String lhsKeyStoreFileName;
+            lhsKeyStoreFileName = this.getKeyStoreFileName();
+            String rhsKeyStoreFileName;
+            rhsKeyStoreFileName = that.getKeyStoreFileName();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "keyStoreFileName", lhsKeyStoreFileName), LocatorUtils.property(thatLocator, "keyStoreFileName", rhsKeyStoreFileName), lhsKeyStoreFileName, rhsKeyStoreFileName)) {
+                return false;
+            }
+        }
+        {
+            String lhsKeyAlias;
+            lhsKeyAlias = this.getKeyAlias();
+            String rhsKeyAlias;
+            rhsKeyAlias = that.getKeyAlias();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "keyAlias", lhsKeyAlias), LocatorUtils.property(thatLocator, "keyAlias", rhsKeyAlias), lhsKeyAlias, rhsKeyAlias)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            byte[] theKeyInformation;
+            theKeyInformation = this.getKeyInformation();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "keyInformation", theKeyInformation), currentHashCode, theKeyInformation);
+        }
+        {
+            byte[] theIv;
+            theIv = this.getIv();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "iv", theIv), currentHashCode, theIv);
+        }
+        {
+            String theKeyStoreFileName;
+            theKeyStoreFileName = this.getKeyStoreFileName();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "keyStoreFileName", theKeyStoreFileName), currentHashCode, theKeyStoreFileName);
+        }
+        {
+            String theKeyAlias;
+            theKeyAlias = this.getKeyAlias();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "keyAlias", theKeyAlias), currentHashCode, theKeyAlias);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/BPKEncryption.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/BPKEncryption.java
new file mode 100644
index 000000000..f21833c13
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/BPKEncryption.java
@@ -0,0 +1,252 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="publicKey" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         &lt;element name="target" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="vkz" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "publicKey",
+    "target",
+    "vkz"
+})
+
+
+
+public class BPKEncryption
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(required = true)
+    protected byte[] publicKey;
+    @XmlElement(required = true)
+    protected String target;
+    @XmlElement(required = true)
+    protected String vkz;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the publicKey property.
+     * 
+     * @return
+     *     possible object is
+     *     byte[]
+     */
+    
+    
+    @Lob
+    public byte[] getPublicKey() {
+        return publicKey;
+    }
+
+    /**
+     * Sets the value of the publicKey property.
+     * 
+     * @param value
+     *     allowed object is
+     *     byte[]
+     */
+    public void setPublicKey(byte[] value) {
+        this.publicKey = value;
+    }
+
+    /**
+     * Gets the value of the target property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getTarget() {
+        return target;
+    }
+
+    /**
+     * Sets the value of the target property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTarget(String value) {
+        this.target = value;
+    }
+
+    /**
+     * Gets the value of the vkz property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getVkz() {
+        return vkz;
+    }
+
+    /**
+     * Sets the value of the vkz property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setVkz(String value) {
+        this.vkz = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof BPKEncryption)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final BPKEncryption that = ((BPKEncryption) object);
+        {
+            byte[] lhsPublicKey;
+            lhsPublicKey = this.getPublicKey();
+            byte[] rhsPublicKey;
+            rhsPublicKey = that.getPublicKey();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "publicKey", lhsPublicKey), LocatorUtils.property(thatLocator, "publicKey", rhsPublicKey), lhsPublicKey, rhsPublicKey)) {
+                return false;
+            }
+        }
+        {
+            String lhsTarget;
+            lhsTarget = this.getTarget();
+            String rhsTarget;
+            rhsTarget = that.getTarget();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "target", lhsTarget), LocatorUtils.property(thatLocator, "target", rhsTarget), lhsTarget, rhsTarget)) {
+                return false;
+            }
+        }
+        {
+            String lhsVkz;
+            lhsVkz = this.getVkz();
+            String rhsVkz;
+            rhsVkz = that.getVkz();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "vkz", lhsVkz), LocatorUtils.property(thatLocator, "vkz", rhsVkz), lhsVkz, rhsVkz)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            byte[] thePublicKey;
+            thePublicKey = this.getPublicKey();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "publicKey", thePublicKey), currentHashCode, thePublicKey);
+        }
+        {
+            String theTarget;
+            theTarget = this.getTarget();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "target", theTarget), currentHashCode, theTarget);
+        }
+        {
+            String theVkz;
+            theVkz = this.getVkz();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vkz", theVkz), currentHashCode, theVkz);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/BasicAuth.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/BasicAuth.java
new file mode 100644
index 000000000..d22fde8e9
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/BasicAuth.java
@@ -0,0 +1,214 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="UserID" type="{http://www.buergerkarte.at/namespaces/moaconfig#}MOAAuthDataType"/>
+ *         &lt;element name="Password" type="{http://www.buergerkarte.at/namespaces/moaconfig#}MOAAuthDataType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "userID",
+    "password"
+})
+@XmlRootElement(name = "BasicAuth")
+
+
+
+public class BasicAuth
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "UserID", required = true)
+    protected MOAAuthDataType userID;
+    @XmlElement(name = "Password", required = true)
+    protected MOAAuthDataType password;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the userID property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link MOAAuthDataType }
+     *     
+     */
+    
+    
+    @Enumerated(EnumType.STRING)
+    public MOAAuthDataType getUserID() {
+        return userID;
+    }
+
+    /**
+     * Sets the value of the userID property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link MOAAuthDataType }
+     *     
+     */
+    public void setUserID(MOAAuthDataType value) {
+        this.userID = value;
+    }
+
+    /**
+     * Gets the value of the password property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link MOAAuthDataType }
+     *     
+     */
+    
+    
+    @Enumerated(EnumType.STRING)
+    public MOAAuthDataType getPassword() {
+        return password;
+    }
+
+    /**
+     * Sets the value of the password property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link MOAAuthDataType }
+     *     
+     */
+    public void setPassword(MOAAuthDataType value) {
+        this.password = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof BasicAuth)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final BasicAuth that = ((BasicAuth) object);
+        {
+            MOAAuthDataType lhsUserID;
+            lhsUserID = this.getUserID();
+            MOAAuthDataType rhsUserID;
+            rhsUserID = that.getUserID();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "userID", lhsUserID), LocatorUtils.property(thatLocator, "userID", rhsUserID), lhsUserID, rhsUserID)) {
+                return false;
+            }
+        }
+        {
+            MOAAuthDataType lhsPassword;
+            lhsPassword = this.getPassword();
+            MOAAuthDataType rhsPassword;
+            rhsPassword = that.getPassword();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "password", lhsPassword), LocatorUtils.property(thatLocator, "password", rhsPassword), lhsPassword, rhsPassword)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            MOAAuthDataType theUserID;
+            theUserID = this.getUserID();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "userID", theUserID), currentHashCode, theUserID);
+        }
+        {
+            MOAAuthDataType thePassword;
+            thePassword = this.getPassword();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "password", thePassword), currentHashCode, thePassword);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/CPEPS.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/CPEPS.java
new file mode 100644
index 000000000..11eca81f5
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/CPEPS.java
@@ -0,0 +1,418 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+import org.jvnet.hyperjaxb3.item.ItemUtils;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="AttributeValue" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}OA_STORK" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="countryCode" use="required" type="{http://www.buergerkarte.at/namespaces/moaconfig#}CountryCodeType" />
+ *       &lt;attribute name="URL" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       &lt;attribute name="supportsXMLSignature" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "attributeValue",
+    "oastork"
+})
+@XmlRootElement(name = "C-PEPS")
+
+
+
+public class CPEPS
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "AttributeValue")
+    protected List<String> attributeValue;
+    @XmlElement(name = "OA_STORK")
+    protected List<OASTORK> oastork;
+    @XmlAttribute(name = "countryCode", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String countryCode;
+    @XmlAttribute(name = "URL", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String url;
+    @XmlAttribute(name = "supportsXMLSignature")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean supportsXMLSignature;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+    protected transient List<CPEPSAttributeValueItem> attributeValueItems;
+
+    /**
+     * Gets the value of the attributeValue property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the attributeValue property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAttributeValue().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    @Transient
+    public List<String> getAttributeValue() {
+        if (attributeValue == null) {
+            attributeValue = new ArrayList<String>();
+        }
+        return this.attributeValue;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setAttributeValue(List<String> attributeValue) {
+        this.attributeValue = attributeValue;
+    }
+
+    /**
+     * Gets the value of the oastork property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the oastork property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getOASTORK().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link OASTORK }
+     * 
+     * 
+     */
+    @ManyToMany(targetEntity = OASTORK.class, cascade = {
+        CascadeType.ALL
+    })
+    @JoinTable(name = "OA_CPEPS", joinColumns = {
+        
+    }, inverseJoinColumns = {
+        
+    })
+    public List<OASTORK> getOASTORK() {
+        if (oastork == null) {
+            oastork = new ArrayList<OASTORK>();
+        }
+        return this.oastork;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setOASTORK(List<OASTORK> oastork) {
+        this.oastork = oastork;
+    }
+
+    /**
+     * Gets the value of the countryCode property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getCountryCode() {
+        return countryCode;
+    }
+
+    /**
+     * Sets the value of the countryCode property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setCountryCode(String value) {
+        this.countryCode = value;
+    }
+
+    /**
+     * Gets the value of the url property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getURL() {
+        return url;
+    }
+
+    /**
+     * Sets the value of the url property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setURL(String value) {
+        this.url = value;
+    }
+
+    /**
+     * Gets the value of the supportsXMLSignature property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public boolean isSupportsXMLSignature() {
+        if (supportsXMLSignature == null) {
+            return new ZeroOneBooleanAdapter().unmarshal("true");
+        } else {
+            return supportsXMLSignature;
+        }
+    }
+
+    /**
+     * Sets the value of the supportsXMLSignature property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSupportsXMLSignature(Boolean value) {
+        this.supportsXMLSignature = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    @OneToMany(targetEntity = CPEPSAttributeValueItem.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<CPEPSAttributeValueItem> getAttributeValueItems() {
+        if (this.attributeValueItems == null) {
+            this.attributeValueItems = new ArrayList<CPEPSAttributeValueItem>();
+        }
+        if (ItemUtils.shouldBeWrapped(this.attributeValue)) {
+            this.attributeValue = ItemUtils.wrap(this.attributeValue, this.attributeValueItems, CPEPSAttributeValueItem.class);
+        }
+        return this.attributeValueItems;
+    }
+
+    public void setAttributeValueItems(List<CPEPSAttributeValueItem> value) {
+        this.attributeValue = null;
+        this.attributeValueItems = null;
+        this.attributeValueItems = value;
+        if (this.attributeValueItems == null) {
+            this.attributeValueItems = new ArrayList<CPEPSAttributeValueItem>();
+        }
+        if (ItemUtils.shouldBeWrapped(this.attributeValue)) {
+            this.attributeValue = ItemUtils.wrap(this.attributeValue, this.attributeValueItems, CPEPSAttributeValueItem.class);
+        }
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof CPEPS)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final CPEPS that = ((CPEPS) object);
+        {
+            List<String> lhsAttributeValue;
+            lhsAttributeValue = (((this.attributeValue!= null)&&(!this.attributeValue.isEmpty()))?this.getAttributeValue():null);
+            List<String> rhsAttributeValue;
+            rhsAttributeValue = (((that.attributeValue!= null)&&(!that.attributeValue.isEmpty()))?that.getAttributeValue():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "attributeValue", lhsAttributeValue), LocatorUtils.property(thatLocator, "attributeValue", rhsAttributeValue), lhsAttributeValue, rhsAttributeValue)) {
+                return false;
+            }
+        }
+        {
+            List<OASTORK> lhsOASTORK;
+            lhsOASTORK = (((this.oastork!= null)&&(!this.oastork.isEmpty()))?this.getOASTORK():null);
+            List<OASTORK> rhsOASTORK;
+            rhsOASTORK = (((that.oastork!= null)&&(!that.oastork.isEmpty()))?that.getOASTORK():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "oastork", lhsOASTORK), LocatorUtils.property(thatLocator, "oastork", rhsOASTORK), lhsOASTORK, rhsOASTORK)) {
+                return false;
+            }
+        }
+        {
+            String lhsCountryCode;
+            lhsCountryCode = this.getCountryCode();
+            String rhsCountryCode;
+            rhsCountryCode = that.getCountryCode();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "countryCode", lhsCountryCode), LocatorUtils.property(thatLocator, "countryCode", rhsCountryCode), lhsCountryCode, rhsCountryCode)) {
+                return false;
+            }
+        }
+        {
+            String lhsURL;
+            lhsURL = this.getURL();
+            String rhsURL;
+            rhsURL = that.getURL();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "url", lhsURL), LocatorUtils.property(thatLocator, "url", rhsURL), lhsURL, rhsURL)) {
+                return false;
+            }
+        }
+        {
+            boolean lhsSupportsXMLSignature;
+            lhsSupportsXMLSignature = ((this.supportsXMLSignature!= null)?this.isSupportsXMLSignature():false);
+            boolean rhsSupportsXMLSignature;
+            rhsSupportsXMLSignature = ((that.supportsXMLSignature!= null)?that.isSupportsXMLSignature():false);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "supportsXMLSignature", lhsSupportsXMLSignature), LocatorUtils.property(thatLocator, "supportsXMLSignature", rhsSupportsXMLSignature), lhsSupportsXMLSignature, rhsSupportsXMLSignature)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            List<String> theAttributeValue;
+            theAttributeValue = (((this.attributeValue!= null)&&(!this.attributeValue.isEmpty()))?this.getAttributeValue():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "attributeValue", theAttributeValue), currentHashCode, theAttributeValue);
+        }
+        {
+            List<OASTORK> theOASTORK;
+            theOASTORK = (((this.oastork!= null)&&(!this.oastork.isEmpty()))?this.getOASTORK():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "oastork", theOASTORK), currentHashCode, theOASTORK);
+        }
+        {
+            String theCountryCode;
+            theCountryCode = this.getCountryCode();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "countryCode", theCountryCode), currentHashCode, theCountryCode);
+        }
+        {
+            String theURL;
+            theURL = this.getURL();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "url", theURL), currentHashCode, theURL);
+        }
+        {
+            boolean theSupportsXMLSignature;
+            theSupportsXMLSignature = ((this.supportsXMLSignature!= null)?this.isSupportsXMLSignature():false);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "supportsXMLSignature", theSupportsXMLSignature), currentHashCode, theSupportsXMLSignature);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/CPEPSAttributeValueItem.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/CPEPSAttributeValueItem.java
new file mode 100644
index 000000000..0af8c64b4
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/CPEPSAttributeValueItem.java
@@ -0,0 +1,93 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import org.jvnet.hyperjaxb3.item.Item;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+
+
+
+public class CPEPSAttributeValueItem
+    implements Serializable, Item<String>
+{
+
+    @XmlElement(name = "AttributeValue", namespace = "http://www.buergerkarte.at/namespaces/moaconfig#")
+    protected String item;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the item property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getItem() {
+        return item;
+    }
+
+    /**
+     * Sets the value of the item property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setItem(String value) {
+        this.item = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ChainingModeType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ChainingModeType.java
new file mode 100644
index 000000000..56bb48820
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ChainingModeType.java
@@ -0,0 +1,58 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ChainingModeType.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="ChainingModeType">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *     &lt;enumeration value="chaining"/>
+ *     &lt;enumeration value="pkix"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "ChainingModeType")
+@XmlEnum
+public enum ChainingModeType {
+
+    @XmlEnumValue("chaining")
+    CHAINING("chaining"),
+    @XmlEnumValue("pkix")
+    PKIX("pkix");
+    private final String value;
+
+    ChainingModeType(String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static ChainingModeType fromValue(String v) {
+        for (ChainingModeType c: ChainingModeType.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ChainingModes.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ChainingModes.java
new file mode 100644
index 000000000..597a9e56c
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ChainingModes.java
@@ -0,0 +1,242 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element name="TrustAnchor">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;extension base="{http://www.buergerkarte.at/namespaces/moaconfig#}X509IssuerSerialType">
+ *                 &lt;attribute name="mode" use="required" type="{http://www.buergerkarte.at/namespaces/moaconfig#}ChainingModeType" />
+ *               &lt;/extension>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *       &lt;attribute name="systemDefaultMode" type="{http://www.buergerkarte.at/namespaces/moaconfig#}ChainingModeType" default="pkix" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "trustAnchor"
+})
+
+
+
+public class ChainingModes
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "TrustAnchor")
+    protected List<TrustAnchor> trustAnchor;
+    @XmlAttribute(name = "systemDefaultMode")
+    protected ChainingModeType systemDefaultMode;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the trustAnchor property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the trustAnchor property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getTrustAnchor().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link TrustAnchor }
+     * 
+     * 
+     */
+    @OneToMany(targetEntity = TrustAnchor.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<TrustAnchor> getTrustAnchor() {
+        if (trustAnchor == null) {
+            trustAnchor = new ArrayList<TrustAnchor>();
+        }
+        return this.trustAnchor;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setTrustAnchor(List<TrustAnchor> trustAnchor) {
+        this.trustAnchor = trustAnchor;
+    }
+
+    /**
+     * Gets the value of the systemDefaultMode property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ChainingModeType }
+     *     
+     */
+    
+    
+    @Enumerated(EnumType.STRING)
+    public ChainingModeType getSystemDefaultMode() {
+        if (systemDefaultMode == null) {
+            return ChainingModeType.PKIX;
+        } else {
+            return systemDefaultMode;
+        }
+    }
+
+    /**
+     * Sets the value of the systemDefaultMode property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ChainingModeType }
+     *     
+     */
+    public void setSystemDefaultMode(ChainingModeType value) {
+        this.systemDefaultMode = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof ChainingModes)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final ChainingModes that = ((ChainingModes) object);
+        {
+            List<TrustAnchor> lhsTrustAnchor;
+            lhsTrustAnchor = (((this.trustAnchor!= null)&&(!this.trustAnchor.isEmpty()))?this.getTrustAnchor():null);
+            List<TrustAnchor> rhsTrustAnchor;
+            rhsTrustAnchor = (((that.trustAnchor!= null)&&(!that.trustAnchor.isEmpty()))?that.getTrustAnchor():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "trustAnchor", lhsTrustAnchor), LocatorUtils.property(thatLocator, "trustAnchor", rhsTrustAnchor), lhsTrustAnchor, rhsTrustAnchor)) {
+                return false;
+            }
+        }
+        {
+            ChainingModeType lhsSystemDefaultMode;
+            lhsSystemDefaultMode = this.getSystemDefaultMode();
+            ChainingModeType rhsSystemDefaultMode;
+            rhsSystemDefaultMode = that.getSystemDefaultMode();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "systemDefaultMode", lhsSystemDefaultMode), LocatorUtils.property(thatLocator, "systemDefaultMode", rhsSystemDefaultMode), lhsSystemDefaultMode, rhsSystemDefaultMode)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            List<TrustAnchor> theTrustAnchor;
+            theTrustAnchor = (((this.trustAnchor!= null)&&(!this.trustAnchor.isEmpty()))?this.getTrustAnchor():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trustAnchor", theTrustAnchor), currentHashCode, theTrustAnchor);
+        }
+        {
+            ChainingModeType theSystemDefaultMode;
+            theSystemDefaultMode = this.getSystemDefaultMode();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "systemDefaultMode", theSystemDefaultMode), currentHashCode, theSystemDefaultMode);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ClientKeyStore.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ClientKeyStore.java
new file mode 100644
index 000000000..1df2a813a
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ClientKeyStore.java
@@ -0,0 +1,206 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>anyURI">
+ *       &lt;attribute name="password" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "value"
+})
+
+
+
+public class ClientKeyStore
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlValue
+    @XmlSchemaType(name = "anyURI")
+    protected String value;
+    @XmlAttribute(name = "password")
+    protected String password;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the password property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getPassword() {
+        return password;
+    }
+
+    /**
+     * Sets the value of the password property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPassword(String value) {
+        this.password = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof ClientKeyStore)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final ClientKeyStore that = ((ClientKeyStore) object);
+        {
+            String lhsValue;
+            lhsValue = this.getValue();
+            String rhsValue;
+            rhsValue = that.getValue();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue)) {
+                return false;
+            }
+        }
+        {
+            String lhsPassword;
+            lhsPassword = this.getPassword();
+            String rhsPassword;
+            rhsPassword = that.getPassword();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "password", lhsPassword), LocatorUtils.property(thatLocator, "password", rhsPassword), lhsPassword, rhsPassword)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theValue;
+            theValue = this.getValue();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue);
+        }
+        {
+            String thePassword;
+            thePassword = this.getPassword();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "password", thePassword), currentHashCode, thePassword);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Configuration.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Configuration.java
new file mode 100644
index 000000000..3a5482864
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Configuration.java
@@ -0,0 +1,364 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="LoginType" type="{http://www.buergerkarte.at/namespaces/moaconfig#}LoginType"/>
+ *         &lt;element name="Binding" minOccurs="0">
+ *           &lt;simpleType>
+ *             &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *               &lt;enumeration value="full"/>
+ *               &lt;enumeration value="userName"/>
+ *               &lt;enumeration value="none"/>
+ *             &lt;/restriction>
+ *           &lt;/simpleType>
+ *         &lt;/element>
+ *         &lt;choice>
+ *           &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}ParamAuth"/>
+ *           &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}BasicAuth"/>
+ *           &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}HeaderAuth"/>
+ *         &lt;/choice>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "loginType",
+    "binding",
+    "paramAuth",
+    "basicAuth",
+    "headerAuth"
+})
+@XmlRootElement(name = "Configuration")
+
+
+
+public class Configuration
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "LoginType", required = true, defaultValue = "stateful")
+    protected LoginType loginType;
+    @XmlElement(name = "Binding")
+    protected String binding;
+    @XmlElement(name = "ParamAuth")
+    protected ParamAuth paramAuth;
+    @XmlElement(name = "BasicAuth")
+    protected BasicAuth basicAuth;
+    @XmlElement(name = "HeaderAuth")
+    protected HeaderAuth headerAuth;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the loginType property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link LoginType }
+     *     
+     */
+    
+    
+    @Enumerated(EnumType.STRING)
+    public LoginType getLoginType() {
+        return loginType;
+    }
+
+    /**
+     * Sets the value of the loginType property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link LoginType }
+     *     
+     */
+    public void setLoginType(LoginType value) {
+        this.loginType = value;
+    }
+
+    /**
+     * Gets the value of the binding property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getBinding() {
+        return binding;
+    }
+
+    /**
+     * Sets the value of the binding property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBinding(String value) {
+        this.binding = value;
+    }
+
+    /**
+     * Gets the value of the paramAuth property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ParamAuth }
+     *     
+     */
+    @ManyToOne(targetEntity = ParamAuth.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public ParamAuth getParamAuth() {
+        return paramAuth;
+    }
+
+    /**
+     * Sets the value of the paramAuth property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ParamAuth }
+     *     
+     */
+    public void setParamAuth(ParamAuth value) {
+        this.paramAuth = value;
+    }
+
+    /**
+     * Gets the value of the basicAuth property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BasicAuth }
+     *     
+     */
+    @ManyToOne(targetEntity = BasicAuth.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public BasicAuth getBasicAuth() {
+        return basicAuth;
+    }
+
+    /**
+     * Sets the value of the basicAuth property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BasicAuth }
+     *     
+     */
+    public void setBasicAuth(BasicAuth value) {
+        this.basicAuth = value;
+    }
+
+    /**
+     * Gets the value of the headerAuth property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link HeaderAuth }
+     *     
+     */
+    @ManyToOne(targetEntity = HeaderAuth.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public HeaderAuth getHeaderAuth() {
+        return headerAuth;
+    }
+
+    /**
+     * Sets the value of the headerAuth property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link HeaderAuth }
+     *     
+     */
+    public void setHeaderAuth(HeaderAuth value) {
+        this.headerAuth = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof Configuration)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final Configuration that = ((Configuration) object);
+        {
+            LoginType lhsLoginType;
+            lhsLoginType = this.getLoginType();
+            LoginType rhsLoginType;
+            rhsLoginType = that.getLoginType();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "loginType", lhsLoginType), LocatorUtils.property(thatLocator, "loginType", rhsLoginType), lhsLoginType, rhsLoginType)) {
+                return false;
+            }
+        }
+        {
+            String lhsBinding;
+            lhsBinding = this.getBinding();
+            String rhsBinding;
+            rhsBinding = that.getBinding();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "binding", lhsBinding), LocatorUtils.property(thatLocator, "binding", rhsBinding), lhsBinding, rhsBinding)) {
+                return false;
+            }
+        }
+        {
+            ParamAuth lhsParamAuth;
+            lhsParamAuth = this.getParamAuth();
+            ParamAuth rhsParamAuth;
+            rhsParamAuth = that.getParamAuth();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "paramAuth", lhsParamAuth), LocatorUtils.property(thatLocator, "paramAuth", rhsParamAuth), lhsParamAuth, rhsParamAuth)) {
+                return false;
+            }
+        }
+        {
+            BasicAuth lhsBasicAuth;
+            lhsBasicAuth = this.getBasicAuth();
+            BasicAuth rhsBasicAuth;
+            rhsBasicAuth = that.getBasicAuth();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "basicAuth", lhsBasicAuth), LocatorUtils.property(thatLocator, "basicAuth", rhsBasicAuth), lhsBasicAuth, rhsBasicAuth)) {
+                return false;
+            }
+        }
+        {
+            HeaderAuth lhsHeaderAuth;
+            lhsHeaderAuth = this.getHeaderAuth();
+            HeaderAuth rhsHeaderAuth;
+            rhsHeaderAuth = that.getHeaderAuth();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "headerAuth", lhsHeaderAuth), LocatorUtils.property(thatLocator, "headerAuth", rhsHeaderAuth), lhsHeaderAuth, rhsHeaderAuth)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            LoginType theLoginType;
+            theLoginType = this.getLoginType();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "loginType", theLoginType), currentHashCode, theLoginType);
+        }
+        {
+            String theBinding;
+            theBinding = this.getBinding();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "binding", theBinding), currentHashCode, theBinding);
+        }
+        {
+            ParamAuth theParamAuth;
+            theParamAuth = this.getParamAuth();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "paramAuth", theParamAuth), currentHashCode, theParamAuth);
+        }
+        {
+            BasicAuth theBasicAuth;
+            theBasicAuth = this.getBasicAuth();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "basicAuth", theBasicAuth), currentHashCode, theBasicAuth);
+        }
+        {
+            HeaderAuth theHeaderAuth;
+            theHeaderAuth = this.getHeaderAuth();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "headerAuth", theHeaderAuth), currentHashCode, theHeaderAuth);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ConnectionParameterClientAuthType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ConnectionParameterClientAuthType.java
new file mode 100644
index 000000000..37c09858f
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ConnectionParameterClientAuthType.java
@@ -0,0 +1,143 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for ConnectionParameterClientAuthType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ConnectionParameterClientAuthType">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.buergerkarte.at/namespaces/moaconfig#}ConnectionParameterServerAuthType">
+ *       &lt;sequence>
+ *         &lt;element name="ClientKeyStore" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;simpleContent>
+ *               &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>anyURI">
+ *                 &lt;attribute name="password" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *               &lt;/extension>
+ *             &lt;/simpleContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ConnectionParameterClientAuthType", propOrder = {
+    "clientKeyStore"
+})
+
+
+public class ConnectionParameterClientAuthType
+    extends ConnectionParameterServerAuthType
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "ClientKeyStore")
+    protected ClientKeyStore clientKeyStore;
+
+    /**
+     * Gets the value of the clientKeyStore property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ClientKeyStore }
+     *     
+     */
+    @ManyToOne(targetEntity = ClientKeyStore.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public ClientKeyStore getClientKeyStore() {
+        return clientKeyStore;
+    }
+
+    /**
+     * Sets the value of the clientKeyStore property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ClientKeyStore }
+     *     
+     */
+    public void setClientKeyStore(ClientKeyStore value) {
+        this.clientKeyStore = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof ConnectionParameterClientAuthType)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        if (!super.equals(thisLocator, thatLocator, object, strategy)) {
+            return false;
+        }
+        final ConnectionParameterClientAuthType that = ((ConnectionParameterClientAuthType) object);
+        {
+            ClientKeyStore lhsClientKeyStore;
+            lhsClientKeyStore = this.getClientKeyStore();
+            ClientKeyStore rhsClientKeyStore;
+            rhsClientKeyStore = that.getClientKeyStore();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "clientKeyStore", lhsClientKeyStore), LocatorUtils.property(thatLocator, "clientKeyStore", rhsClientKeyStore), lhsClientKeyStore, rhsClientKeyStore)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = super.hashCode(locator, strategy);
+        {
+            ClientKeyStore theClientKeyStore;
+            theClientKeyStore = this.getClientKeyStore();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "clientKeyStore", theClientKeyStore), currentHashCode, theClientKeyStore);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ConnectionParameterServerAuthType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ConnectionParameterServerAuthType.java
new file mode 100644
index 000000000..8c7ae5fda
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ConnectionParameterServerAuthType.java
@@ -0,0 +1,214 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for ConnectionParameterServerAuthType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ConnectionParameterServerAuthType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="AcceptedServerCertificates" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="URL" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ConnectionParameterServerAuthType", propOrder = {
+    "acceptedServerCertificates"
+})
+@XmlSeeAlso({
+    ConnectionParameterClientAuthType.class
+})
+
+
+
+public class ConnectionParameterServerAuthType
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "AcceptedServerCertificates")
+    @XmlSchemaType(name = "anyURI")
+    protected String acceptedServerCertificates;
+    @XmlAttribute(name = "URL", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String url;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the acceptedServerCertificates property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getAcceptedServerCertificates() {
+        return acceptedServerCertificates;
+    }
+
+    /**
+     * Sets the value of the acceptedServerCertificates property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAcceptedServerCertificates(String value) {
+        this.acceptedServerCertificates = value;
+    }
+
+    /**
+     * Gets the value of the url property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getURL() {
+        return url;
+    }
+
+    /**
+     * Sets the value of the url property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setURL(String value) {
+        this.url = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof ConnectionParameterServerAuthType)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final ConnectionParameterServerAuthType that = ((ConnectionParameterServerAuthType) object);
+        {
+            String lhsAcceptedServerCertificates;
+            lhsAcceptedServerCertificates = this.getAcceptedServerCertificates();
+            String rhsAcceptedServerCertificates;
+            rhsAcceptedServerCertificates = that.getAcceptedServerCertificates();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "acceptedServerCertificates", lhsAcceptedServerCertificates), LocatorUtils.property(thatLocator, "acceptedServerCertificates", rhsAcceptedServerCertificates), lhsAcceptedServerCertificates, rhsAcceptedServerCertificates)) {
+                return false;
+            }
+        }
+        {
+            String lhsURL;
+            lhsURL = this.getURL();
+            String rhsURL;
+            rhsURL = that.getURL();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "url", lhsURL), LocatorUtils.property(thatLocator, "url", rhsURL), lhsURL, rhsURL)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theAcceptedServerCertificates;
+            theAcceptedServerCertificates = this.getAcceptedServerCertificates();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "acceptedServerCertificates", theAcceptedServerCertificates), currentHashCode, theAcceptedServerCertificates);
+        }
+        {
+            String theURL;
+            theURL = this.getURL();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "url", theURL), currentHashCode, theURL);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Contact.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Contact.java
new file mode 100644
index 000000000..38835db05
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Contact.java
@@ -0,0 +1,484 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.jvnet.hyperjaxb3.item.ItemUtils;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="SurName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="GivenName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="Mail" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/>
+ *         &lt;element name="Type">
+ *           &lt;simpleType>
+ *             &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token">
+ *               &lt;enumeration value="technical"/>
+ *               &lt;enumeration value="support"/>
+ *               &lt;enumeration value="administrative"/>
+ *               &lt;enumeration value="billing"/>
+ *               &lt;enumeration value="other"/>
+ *             &lt;/restriction>
+ *           &lt;/simpleType>
+ *         &lt;/element>
+ *         &lt;element name="Company" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="Phone" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "surName",
+    "givenName",
+    "mail",
+    "type",
+    "company",
+    "phone"
+})
+@XmlRootElement(name = "Contact")
+
+
+
+public class Contact
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "SurName", required = true)
+    protected String surName;
+    @XmlElement(name = "GivenName", required = true)
+    protected String givenName;
+    @XmlElement(name = "Mail", required = true)
+    protected List<String> mail;
+    @XmlElement(name = "Type", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String type;
+    @XmlElement(name = "Company", required = true)
+    protected String company;
+    @XmlElement(name = "Phone", required = true)
+    protected List<String> phone;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+    protected transient List<ContactMailItem> mailItems;
+    protected transient List<ContactPhoneItem> phoneItems;
+
+    /**
+     * Gets the value of the surName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getSurName() {
+        return surName;
+    }
+
+    /**
+     * Sets the value of the surName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSurName(String value) {
+        this.surName = value;
+    }
+
+    /**
+     * Gets the value of the givenName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getGivenName() {
+        return givenName;
+    }
+
+    /**
+     * Sets the value of the givenName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setGivenName(String value) {
+        this.givenName = value;
+    }
+
+    /**
+     * Gets the value of the mail property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the mail property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getMail().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    @Transient
+    public List<String> getMail() {
+        if (mail == null) {
+            mail = new ArrayList<String>();
+        }
+        return this.mail;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setMail(List<String> mail) {
+        this.mail = mail;
+    }
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setType(String value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the company property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getCompany() {
+        return company;
+    }
+
+    /**
+     * Sets the value of the company property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setCompany(String value) {
+        this.company = value;
+    }
+
+    /**
+     * Gets the value of the phone property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the phone property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getPhone().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    @Transient
+    public List<String> getPhone() {
+        if (phone == null) {
+            phone = new ArrayList<String>();
+        }
+        return this.phone;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setPhone(List<String> phone) {
+        this.phone = phone;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    @OneToMany(targetEntity = ContactMailItem.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<ContactMailItem> getMailItems() {
+        if (this.mailItems == null) {
+            this.mailItems = new ArrayList<ContactMailItem>();
+        }
+        if (ItemUtils.shouldBeWrapped(this.mail)) {
+            this.mail = ItemUtils.wrap(this.mail, this.mailItems, ContactMailItem.class);
+        }
+        return this.mailItems;
+    }
+
+    public void setMailItems(List<ContactMailItem> value) {
+        this.mail = null;
+        this.mailItems = null;
+        this.mailItems = value;
+        if (this.mailItems == null) {
+            this.mailItems = new ArrayList<ContactMailItem>();
+        }
+        if (ItemUtils.shouldBeWrapped(this.mail)) {
+            this.mail = ItemUtils.wrap(this.mail, this.mailItems, ContactMailItem.class);
+        }
+    }
+
+    @OneToMany(targetEntity = ContactPhoneItem.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<ContactPhoneItem> getPhoneItems() {
+        if (this.phoneItems == null) {
+            this.phoneItems = new ArrayList<ContactPhoneItem>();
+        }
+        if (ItemUtils.shouldBeWrapped(this.phone)) {
+            this.phone = ItemUtils.wrap(this.phone, this.phoneItems, ContactPhoneItem.class);
+        }
+        return this.phoneItems;
+    }
+
+    public void setPhoneItems(List<ContactPhoneItem> value) {
+        this.phone = null;
+        this.phoneItems = null;
+        this.phoneItems = value;
+        if (this.phoneItems == null) {
+            this.phoneItems = new ArrayList<ContactPhoneItem>();
+        }
+        if (ItemUtils.shouldBeWrapped(this.phone)) {
+            this.phone = ItemUtils.wrap(this.phone, this.phoneItems, ContactPhoneItem.class);
+        }
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof Contact)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final Contact that = ((Contact) object);
+        {
+            String lhsSurName;
+            lhsSurName = this.getSurName();
+            String rhsSurName;
+            rhsSurName = that.getSurName();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "surName", lhsSurName), LocatorUtils.property(thatLocator, "surName", rhsSurName), lhsSurName, rhsSurName)) {
+                return false;
+            }
+        }
+        {
+            String lhsGivenName;
+            lhsGivenName = this.getGivenName();
+            String rhsGivenName;
+            rhsGivenName = that.getGivenName();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "givenName", lhsGivenName), LocatorUtils.property(thatLocator, "givenName", rhsGivenName), lhsGivenName, rhsGivenName)) {
+                return false;
+            }
+        }
+        {
+            List<String> lhsMail;
+            lhsMail = (((this.mail!= null)&&(!this.mail.isEmpty()))?this.getMail():null);
+            List<String> rhsMail;
+            rhsMail = (((that.mail!= null)&&(!that.mail.isEmpty()))?that.getMail():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "mail", lhsMail), LocatorUtils.property(thatLocator, "mail", rhsMail), lhsMail, rhsMail)) {
+                return false;
+            }
+        }
+        {
+            String lhsType;
+            lhsType = this.getType();
+            String rhsType;
+            rhsType = that.getType();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType)) {
+                return false;
+            }
+        }
+        {
+            String lhsCompany;
+            lhsCompany = this.getCompany();
+            String rhsCompany;
+            rhsCompany = that.getCompany();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "company", lhsCompany), LocatorUtils.property(thatLocator, "company", rhsCompany), lhsCompany, rhsCompany)) {
+                return false;
+            }
+        }
+        {
+            List<String> lhsPhone;
+            lhsPhone = (((this.phone!= null)&&(!this.phone.isEmpty()))?this.getPhone():null);
+            List<String> rhsPhone;
+            rhsPhone = (((that.phone!= null)&&(!that.phone.isEmpty()))?that.getPhone():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "phone", lhsPhone), LocatorUtils.property(thatLocator, "phone", rhsPhone), lhsPhone, rhsPhone)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theSurName;
+            theSurName = this.getSurName();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "surName", theSurName), currentHashCode, theSurName);
+        }
+        {
+            String theGivenName;
+            theGivenName = this.getGivenName();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "givenName", theGivenName), currentHashCode, theGivenName);
+        }
+        {
+            List<String> theMail;
+            theMail = (((this.mail!= null)&&(!this.mail.isEmpty()))?this.getMail():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "mail", theMail), currentHashCode, theMail);
+        }
+        {
+            String theType;
+            theType = this.getType();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType);
+        }
+        {
+            String theCompany;
+            theCompany = this.getCompany();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "company", theCompany), currentHashCode, theCompany);
+        }
+        {
+            List<String> thePhone;
+            thePhone = (((this.phone!= null)&&(!this.phone.isEmpty()))?this.getPhone():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "phone", thePhone), currentHashCode, thePhone);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ContactMailItem.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ContactMailItem.java
new file mode 100644
index 000000000..d7c656bd7
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ContactMailItem.java
@@ -0,0 +1,93 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import org.jvnet.hyperjaxb3.item.Item;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+
+
+
+public class ContactMailItem
+    implements Serializable, Item<String>
+{
+
+    @XmlElement(name = "Mail", namespace = "http://www.buergerkarte.at/namespaces/moaconfig#")
+    protected String item;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the item property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getItem() {
+        return item;
+    }
+
+    /**
+     * Sets the value of the item property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setItem(String value) {
+        this.item = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ContactPhoneItem.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ContactPhoneItem.java
new file mode 100644
index 000000000..ae9c57ea0
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ContactPhoneItem.java
@@ -0,0 +1,93 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import org.jvnet.hyperjaxb3.item.Item;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+
+
+
+public class ContactPhoneItem
+    implements Serializable, Item<String>
+{
+
+    @XmlElement(name = "Phone", namespace = "http://www.buergerkarte.at/namespaces/moaconfig#")
+    protected String item;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the item property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getItem() {
+        return item;
+    }
+
+    /**
+     * Sets the value of the item property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setItem(String value) {
+        this.item = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/DefaultBKUs.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/DefaultBKUs.java
new file mode 100644
index 000000000..f0655c3f0
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/DefaultBKUs.java
@@ -0,0 +1,256 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="OnlineBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         &lt;element name="HandyBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         &lt;element name="LocalBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "onlineBKU",
+    "handyBKU",
+    "localBKU"
+})
+
+
+
+public class DefaultBKUs
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "OnlineBKU")
+    @XmlSchemaType(name = "anyURI")
+    protected String onlineBKU;
+    @XmlElement(name = "HandyBKU", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String handyBKU;
+    @XmlElement(name = "LocalBKU", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String localBKU;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the onlineBKU property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getOnlineBKU() {
+        return onlineBKU;
+    }
+
+    /**
+     * Sets the value of the onlineBKU property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setOnlineBKU(String value) {
+        this.onlineBKU = value;
+    }
+
+    /**
+     * Gets the value of the handyBKU property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getHandyBKU() {
+        return handyBKU;
+    }
+
+    /**
+     * Sets the value of the handyBKU property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setHandyBKU(String value) {
+        this.handyBKU = value;
+    }
+
+    /**
+     * Gets the value of the localBKU property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getLocalBKU() {
+        return localBKU;
+    }
+
+    /**
+     * Sets the value of the localBKU property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setLocalBKU(String value) {
+        this.localBKU = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof DefaultBKUs)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final DefaultBKUs that = ((DefaultBKUs) object);
+        {
+            String lhsOnlineBKU;
+            lhsOnlineBKU = this.getOnlineBKU();
+            String rhsOnlineBKU;
+            rhsOnlineBKU = that.getOnlineBKU();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "onlineBKU", lhsOnlineBKU), LocatorUtils.property(thatLocator, "onlineBKU", rhsOnlineBKU), lhsOnlineBKU, rhsOnlineBKU)) {
+                return false;
+            }
+        }
+        {
+            String lhsHandyBKU;
+            lhsHandyBKU = this.getHandyBKU();
+            String rhsHandyBKU;
+            rhsHandyBKU = that.getHandyBKU();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "handyBKU", lhsHandyBKU), LocatorUtils.property(thatLocator, "handyBKU", rhsHandyBKU), lhsHandyBKU, rhsHandyBKU)) {
+                return false;
+            }
+        }
+        {
+            String lhsLocalBKU;
+            lhsLocalBKU = this.getLocalBKU();
+            String rhsLocalBKU;
+            rhsLocalBKU = that.getLocalBKU();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "localBKU", lhsLocalBKU), LocatorUtils.property(thatLocator, "localBKU", rhsLocalBKU), lhsLocalBKU, rhsLocalBKU)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theOnlineBKU;
+            theOnlineBKU = this.getOnlineBKU();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "onlineBKU", theOnlineBKU), currentHashCode, theOnlineBKU);
+        }
+        {
+            String theHandyBKU;
+            theHandyBKU = this.getHandyBKU();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "handyBKU", theHandyBKU), currentHashCode, theHandyBKU);
+        }
+        {
+            String theLocalBKU;
+            theLocalBKU = this.getLocalBKU();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "localBKU", theLocalBKU), currentHashCode, theLocalBKU);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/DefaultTrustProfile.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/DefaultTrustProfile.java
new file mode 100644
index 000000000..9b23729c3
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/DefaultTrustProfile.java
@@ -0,0 +1,164 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}TrustProfileID"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "trustProfileID"
+})
+
+
+
+public class DefaultTrustProfile
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "TrustProfileID", required = true)
+    protected String trustProfileID;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the trustProfileID property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getTrustProfileID() {
+        return trustProfileID;
+    }
+
+    /**
+     * Sets the value of the trustProfileID property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTrustProfileID(String value) {
+        this.trustProfileID = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof DefaultTrustProfile)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final DefaultTrustProfile that = ((DefaultTrustProfile) object);
+        {
+            String lhsTrustProfileID;
+            lhsTrustProfileID = this.getTrustProfileID();
+            String rhsTrustProfileID;
+            rhsTrustProfileID = that.getTrustProfileID();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "trustProfileID", lhsTrustProfileID), LocatorUtils.property(thatLocator, "trustProfileID", rhsTrustProfileID), lhsTrustProfileID, rhsTrustProfileID)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theTrustProfileID;
+            theTrustProfileID = this.getTrustProfileID();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trustProfileID", theTrustProfileID), currentHashCode, theTrustProfileID);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/EncBPKInformation.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/EncBPKInformation.java
new file mode 100644
index 000000000..0edffdc28
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/EncBPKInformation.java
@@ -0,0 +1,257 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="bPKDecryption" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="keyInformation" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *                   &lt;element name="iv" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *                   &lt;element name="keyStoreFileName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *                   &lt;element name="keyAlias" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element name="bPKEncryption" maxOccurs="unbounded" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="publicKey" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *                   &lt;element name="target" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *                   &lt;element name="vkz" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "bpkDecryption",
+    "bpkEncryption"
+})
+@XmlRootElement(name = "EncBPKInformation")
+
+
+
+public class EncBPKInformation
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "bPKDecryption")
+    protected BPKDecryption bpkDecryption;
+    @XmlElement(name = "bPKEncryption")
+    protected List<BPKEncryption> bpkEncryption;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the bpkDecryption property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BPKDecryption }
+     *     
+     */
+    @ManyToOne(targetEntity = BPKDecryption.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public BPKDecryption getBPKDecryption() {
+        return bpkDecryption;
+    }
+
+    /**
+     * Sets the value of the bpkDecryption property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BPKDecryption }
+     *     
+     */
+    public void setBPKDecryption(BPKDecryption value) {
+        this.bpkDecryption = value;
+    }
+
+    /**
+     * Gets the value of the bpkEncryption property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the bpkEncryption property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getBPKEncryption().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link BPKEncryption }
+     * 
+     * 
+     */
+    @OneToMany(targetEntity = BPKEncryption.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<BPKEncryption> getBPKEncryption() {
+        if (bpkEncryption == null) {
+            bpkEncryption = new ArrayList<BPKEncryption>();
+        }
+        return this.bpkEncryption;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setBPKEncryption(List<BPKEncryption> bpkEncryption) {
+        this.bpkEncryption = bpkEncryption;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof EncBPKInformation)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final EncBPKInformation that = ((EncBPKInformation) object);
+        {
+            BPKDecryption lhsBPKDecryption;
+            lhsBPKDecryption = this.getBPKDecryption();
+            BPKDecryption rhsBPKDecryption;
+            rhsBPKDecryption = that.getBPKDecryption();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "bpkDecryption", lhsBPKDecryption), LocatorUtils.property(thatLocator, "bpkDecryption", rhsBPKDecryption), lhsBPKDecryption, rhsBPKDecryption)) {
+                return false;
+            }
+        }
+        {
+            List<BPKEncryption> lhsBPKEncryption;
+            lhsBPKEncryption = (((this.bpkEncryption!= null)&&(!this.bpkEncryption.isEmpty()))?this.getBPKEncryption():null);
+            List<BPKEncryption> rhsBPKEncryption;
+            rhsBPKEncryption = (((that.bpkEncryption!= null)&&(!that.bpkEncryption.isEmpty()))?that.getBPKEncryption():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "bpkEncryption", lhsBPKEncryption), LocatorUtils.property(thatLocator, "bpkEncryption", rhsBPKEncryption), lhsBPKEncryption, rhsBPKEncryption)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            BPKDecryption theBPKDecryption;
+            theBPKDecryption = this.getBPKDecryption();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "bpkDecryption", theBPKDecryption), currentHashCode, theBPKDecryption);
+        }
+        {
+            List<BPKEncryption> theBPKEncryption;
+            theBPKEncryption = (((this.bpkEncryption!= null)&&(!this.bpkEncryption.isEmpty()))?this.getBPKEncryption():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "bpkEncryption", theBPKEncryption), currentHashCode, theBPKEncryption);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ForeignIdentities.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ForeignIdentities.java
new file mode 100644
index 000000000..9f9ae0bba
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ForeignIdentities.java
@@ -0,0 +1,216 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="ConnectionParameter" type="{http://www.buergerkarte.at/namespaces/moaconfig#}ConnectionParameterClientAuthType"/>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}STORK" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "connectionParameter",
+    "stork"
+})
+
+
+
+public class ForeignIdentities
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "ConnectionParameter", required = true)
+    protected ConnectionParameterClientAuthType connectionParameter;
+    @XmlElement(name = "STORK")
+    protected STORK stork;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the connectionParameter property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ConnectionParameterClientAuthType }
+     *     
+     */
+    @ManyToOne(targetEntity = ConnectionParameterClientAuthType.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public ConnectionParameterClientAuthType getConnectionParameter() {
+        return connectionParameter;
+    }
+
+    /**
+     * Sets the value of the connectionParameter property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ConnectionParameterClientAuthType }
+     *     
+     */
+    public void setConnectionParameter(ConnectionParameterClientAuthType value) {
+        this.connectionParameter = value;
+    }
+
+    /**
+     * Verbindungsparameter zu den Country-PEPS
+     * 									(C-PEPS)
+     * 								
+     * 
+     * @return
+     *     possible object is
+     *     {@link STORK }
+     *     
+     */
+    @ManyToOne(targetEntity = STORK.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public STORK getSTORK() {
+        return stork;
+    }
+
+    /**
+     * Sets the value of the stork property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link STORK }
+     *     
+     */
+    public void setSTORK(STORK value) {
+        this.stork = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof ForeignIdentities)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final ForeignIdentities that = ((ForeignIdentities) object);
+        {
+            ConnectionParameterClientAuthType lhsConnectionParameter;
+            lhsConnectionParameter = this.getConnectionParameter();
+            ConnectionParameterClientAuthType rhsConnectionParameter;
+            rhsConnectionParameter = that.getConnectionParameter();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "connectionParameter", lhsConnectionParameter), LocatorUtils.property(thatLocator, "connectionParameter", rhsConnectionParameter), lhsConnectionParameter, rhsConnectionParameter)) {
+                return false;
+            }
+        }
+        {
+            STORK lhsSTORK;
+            lhsSTORK = this.getSTORK();
+            STORK rhsSTORK;
+            rhsSTORK = that.getSTORK();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "stork", lhsSTORK), LocatorUtils.property(thatLocator, "stork", rhsSTORK), lhsSTORK, rhsSTORK)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            ConnectionParameterClientAuthType theConnectionParameter;
+            theConnectionParameter = this.getConnectionParameter();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "connectionParameter", theConnectionParameter), currentHashCode, theConnectionParameter);
+        }
+        {
+            STORK theSTORK;
+            theSTORK = this.getSTORK();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "stork", theSTORK), currentHashCode, theSTORK);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/GeneralConfiguration.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/GeneralConfiguration.java
new file mode 100644
index 000000000..883245da8
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/GeneralConfiguration.java
@@ -0,0 +1,365 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="TimeOuts">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="Assertion" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *                   &lt;element name="MOASessionCreated" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *                   &lt;element name="MOASessionUpdated" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element name="AlternativeSourceID" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="CertStoreDirectory" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         &lt;element name="TrustManagerRevocationChecking" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element name="PublicURLPreFix" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "timeOuts",
+    "alternativeSourceID",
+    "certStoreDirectory",
+    "trustManagerRevocationChecking",
+    "publicURLPreFix"
+})
+@XmlRootElement(name = "GeneralConfiguration")
+
+
+
+public class GeneralConfiguration
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "TimeOuts", required = true)
+    protected TimeOuts timeOuts;
+    @XmlElement(name = "AlternativeSourceID", required = true)
+    protected String alternativeSourceID;
+    @XmlElement(name = "CertStoreDirectory", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String certStoreDirectory;
+    @XmlElement(name = "TrustManagerRevocationChecking", required = true, type = String.class, defaultValue = "true")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean trustManagerRevocationChecking;
+    @XmlElement(name = "PublicURLPreFix", required = true)
+    protected String publicURLPreFix;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the timeOuts property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TimeOuts }
+     *     
+     */
+    @ManyToOne(targetEntity = TimeOuts.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public TimeOuts getTimeOuts() {
+        return timeOuts;
+    }
+
+    /**
+     * Sets the value of the timeOuts property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TimeOuts }
+     *     
+     */
+    public void setTimeOuts(TimeOuts value) {
+        this.timeOuts = value;
+    }
+
+    /**
+     * Gets the value of the alternativeSourceID property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getAlternativeSourceID() {
+        return alternativeSourceID;
+    }
+
+    /**
+     * Sets the value of the alternativeSourceID property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAlternativeSourceID(String value) {
+        this.alternativeSourceID = value;
+    }
+
+    /**
+     * Gets the value of the certStoreDirectory property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getCertStoreDirectory() {
+        return certStoreDirectory;
+    }
+
+    /**
+     * Sets the value of the certStoreDirectory property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setCertStoreDirectory(String value) {
+        this.certStoreDirectory = value;
+    }
+
+    /**
+     * Gets the value of the trustManagerRevocationChecking property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isTrustManagerRevocationChecking() {
+        return trustManagerRevocationChecking;
+    }
+
+    /**
+     * Sets the value of the trustManagerRevocationChecking property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTrustManagerRevocationChecking(Boolean value) {
+        this.trustManagerRevocationChecking = value;
+    }
+
+    /**
+     * Gets the value of the publicURLPreFix property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getPublicURLPreFix() {
+        return publicURLPreFix;
+    }
+
+    /**
+     * Sets the value of the publicURLPreFix property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPublicURLPreFix(String value) {
+        this.publicURLPreFix = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof GeneralConfiguration)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final GeneralConfiguration that = ((GeneralConfiguration) object);
+        {
+            TimeOuts lhsTimeOuts;
+            lhsTimeOuts = this.getTimeOuts();
+            TimeOuts rhsTimeOuts;
+            rhsTimeOuts = that.getTimeOuts();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "timeOuts", lhsTimeOuts), LocatorUtils.property(thatLocator, "timeOuts", rhsTimeOuts), lhsTimeOuts, rhsTimeOuts)) {
+                return false;
+            }
+        }
+        {
+            String lhsAlternativeSourceID;
+            lhsAlternativeSourceID = this.getAlternativeSourceID();
+            String rhsAlternativeSourceID;
+            rhsAlternativeSourceID = that.getAlternativeSourceID();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "alternativeSourceID", lhsAlternativeSourceID), LocatorUtils.property(thatLocator, "alternativeSourceID", rhsAlternativeSourceID), lhsAlternativeSourceID, rhsAlternativeSourceID)) {
+                return false;
+            }
+        }
+        {
+            String lhsCertStoreDirectory;
+            lhsCertStoreDirectory = this.getCertStoreDirectory();
+            String rhsCertStoreDirectory;
+            rhsCertStoreDirectory = that.getCertStoreDirectory();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "certStoreDirectory", lhsCertStoreDirectory), LocatorUtils.property(thatLocator, "certStoreDirectory", rhsCertStoreDirectory), lhsCertStoreDirectory, rhsCertStoreDirectory)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsTrustManagerRevocationChecking;
+            lhsTrustManagerRevocationChecking = this.isTrustManagerRevocationChecking();
+            Boolean rhsTrustManagerRevocationChecking;
+            rhsTrustManagerRevocationChecking = that.isTrustManagerRevocationChecking();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "trustManagerRevocationChecking", lhsTrustManagerRevocationChecking), LocatorUtils.property(thatLocator, "trustManagerRevocationChecking", rhsTrustManagerRevocationChecking), lhsTrustManagerRevocationChecking, rhsTrustManagerRevocationChecking)) {
+                return false;
+            }
+        }
+        {
+            String lhsPublicURLPreFix;
+            lhsPublicURLPreFix = this.getPublicURLPreFix();
+            String rhsPublicURLPreFix;
+            rhsPublicURLPreFix = that.getPublicURLPreFix();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "publicURLPreFix", lhsPublicURLPreFix), LocatorUtils.property(thatLocator, "publicURLPreFix", rhsPublicURLPreFix), lhsPublicURLPreFix, rhsPublicURLPreFix)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            TimeOuts theTimeOuts;
+            theTimeOuts = this.getTimeOuts();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "timeOuts", theTimeOuts), currentHashCode, theTimeOuts);
+        }
+        {
+            String theAlternativeSourceID;
+            theAlternativeSourceID = this.getAlternativeSourceID();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "alternativeSourceID", theAlternativeSourceID), currentHashCode, theAlternativeSourceID);
+        }
+        {
+            String theCertStoreDirectory;
+            theCertStoreDirectory = this.getCertStoreDirectory();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "certStoreDirectory", theCertStoreDirectory), currentHashCode, theCertStoreDirectory);
+        }
+        {
+            Boolean theTrustManagerRevocationChecking;
+            theTrustManagerRevocationChecking = this.isTrustManagerRevocationChecking();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trustManagerRevocationChecking", theTrustManagerRevocationChecking), currentHashCode, theTrustManagerRevocationChecking);
+        }
+        {
+            String thePublicURLPreFix;
+            thePublicURLPreFix = this.getPublicURLPreFix();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "publicURLPreFix", thePublicURLPreFix), currentHashCode, thePublicURLPreFix);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/GenericConfiguration.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/GenericConfiguration.java
new file mode 100644
index 000000000..bd88f30f9
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/GenericConfiguration.java
@@ -0,0 +1,216 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="name" use="required">
+ *         &lt;simpleType>
+ *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *             &lt;enumeration value="DirectoryCertStoreParameters.RootDir"/>
+ *             &lt;enumeration value="AuthenticationSession.TimeOut"/>
+ *             &lt;enumeration value="AuthenticationData.TimeOut"/>
+ *             &lt;enumeration value="TrustManager.RevocationChecking"/>
+ *             &lt;enumeration value="FrontendServlets.EnableHTTPConnection"/>
+ *             &lt;enumeration value="FrontendServlets.DataURLPrefix"/>
+ *             &lt;enumeration value="AuthenticationServer.KeepAssertion"/>
+ *             &lt;enumeration value="AuthenticationServer.WriteAssertionToFile"/>
+ *             &lt;enumeration value="AuthenticationServer.SourceID"/>
+ *           &lt;/restriction>
+ *         &lt;/simpleType>
+ *       &lt;/attribute>
+ *       &lt;attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+
+
+
+public class GenericConfiguration
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlAttribute(name = "name", required = true)
+    protected String name;
+    @XmlAttribute(name = "value", required = true)
+    protected String value;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setName(String value) {
+        this.name = value;
+    }
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof GenericConfiguration)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final GenericConfiguration that = ((GenericConfiguration) object);
+        {
+            String lhsName;
+            lhsName = this.getName();
+            String rhsName;
+            rhsName = that.getName();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) {
+                return false;
+            }
+        }
+        {
+            String lhsValue;
+            lhsValue = this.getValue();
+            String rhsValue;
+            rhsValue = that.getValue();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theName;
+            theName = this.getName();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName);
+        }
+        {
+            String theValue;
+            theValue = this.getValue();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Header.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Header.java
new file mode 100644
index 000000000..da652019e
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Header.java
@@ -0,0 +1,212 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
+ *       &lt;attribute name="Value" use="required" type="{http://www.buergerkarte.at/namespaces/moaconfig#}MOAAuthDataType" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "Header")
+
+
+
+public class Header
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlAttribute(name = "Name", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String name;
+    @XmlAttribute(name = "Value", required = true)
+    protected MOAAuthDataType value;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setName(String value) {
+        this.name = value;
+    }
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link MOAAuthDataType }
+     *     
+     */
+    
+    
+    @Enumerated(EnumType.STRING)
+    public MOAAuthDataType getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link MOAAuthDataType }
+     *     
+     */
+    public void setValue(MOAAuthDataType value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof Header)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final Header that = ((Header) object);
+        {
+            String lhsName;
+            lhsName = this.getName();
+            String rhsName;
+            rhsName = that.getName();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) {
+                return false;
+            }
+        }
+        {
+            MOAAuthDataType lhsValue;
+            lhsValue = this.getValue();
+            MOAAuthDataType rhsValue;
+            rhsValue = that.getValue();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theName;
+            theName = this.getName();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName);
+        }
+        {
+            MOAAuthDataType theValue;
+            theValue = this.getValue();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/HeaderAuth.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/HeaderAuth.java
new file mode 100644
index 000000000..e9ddaf6d3
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/HeaderAuth.java
@@ -0,0 +1,185 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}Header" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "header"
+})
+@XmlRootElement(name = "HeaderAuth")
+
+
+
+public class HeaderAuth
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "Header", required = true)
+    protected List<Header> header;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the header property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the header property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getHeader().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Header }
+     * 
+     * 
+     */
+    @OneToMany(targetEntity = Header.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<Header> getHeader() {
+        if (header == null) {
+            header = new ArrayList<Header>();
+        }
+        return this.header;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setHeader(List<Header> header) {
+        this.header = header;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof HeaderAuth)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final HeaderAuth that = ((HeaderAuth) object);
+        {
+            List<Header> lhsHeader;
+            lhsHeader = (((this.header!= null)&&(!this.header.isEmpty()))?this.getHeader():null);
+            List<Header> rhsHeader;
+            rhsHeader = (((that.header!= null)&&(!that.header.isEmpty()))?that.getHeader():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "header", lhsHeader), LocatorUtils.property(thatLocator, "header", rhsHeader), lhsHeader, rhsHeader)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            List<Header> theHeader;
+            theHeader = (((this.header!= null)&&(!this.header.isEmpty()))?this.getHeader():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "header", theHeader), currentHashCode, theHeader);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentificationNumber.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentificationNumber.java
new file mode 100644
index 000000000..e9a88d7f8
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentificationNumber.java
@@ -0,0 +1,210 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Type" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="Value" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "type",
+    "value"
+})
+@XmlRootElement(name = "IdentificationNumber")
+
+
+
+public class IdentificationNumber
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "Type", required = true)
+    protected String type;
+    @XmlElement(name = "Value", required = true)
+    protected String value;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setType(String value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof IdentificationNumber)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final IdentificationNumber that = ((IdentificationNumber) object);
+        {
+            String lhsType;
+            lhsType = this.getType();
+            String rhsType;
+            rhsType = that.getType();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType)) {
+                return false;
+            }
+        }
+        {
+            String lhsValue;
+            lhsValue = this.getValue();
+            String rhsValue;
+            rhsValue = that.getValue();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theType;
+            theType = this.getType();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType);
+        }
+        {
+            String theValue;
+            theValue = this.getValue();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentityLinkSigners.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentityLinkSigners.java
new file mode 100644
index 000000000..c48d4522d
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentityLinkSigners.java
@@ -0,0 +1,209 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.hyperjaxb3.item.ItemUtils;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "x509SubjectName"
+})
+
+
+
+public class IdentityLinkSigners
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "X509SubjectName", required = true)
+    protected List<String> x509SubjectName;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+    protected transient List<IdentityLinkSignersX509SubjectNameItem> x509SubjectNameItems;
+
+    /**
+     * Gets the value of the x509SubjectName property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the x509SubjectName property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getX509SubjectName().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    @Transient
+    public List<String> getX509SubjectName() {
+        if (x509SubjectName == null) {
+            x509SubjectName = new ArrayList<String>();
+        }
+        return this.x509SubjectName;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setX509SubjectName(List<String> x509SubjectName) {
+        this.x509SubjectName = x509SubjectName;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    @OneToMany(targetEntity = IdentityLinkSignersX509SubjectNameItem.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<IdentityLinkSignersX509SubjectNameItem> getX509SubjectNameItems() {
+        if (this.x509SubjectNameItems == null) {
+            this.x509SubjectNameItems = new ArrayList<IdentityLinkSignersX509SubjectNameItem>();
+        }
+        if (ItemUtils.shouldBeWrapped(this.x509SubjectName)) {
+            this.x509SubjectName = ItemUtils.wrap(this.x509SubjectName, this.x509SubjectNameItems, IdentityLinkSignersX509SubjectNameItem.class);
+        }
+        return this.x509SubjectNameItems;
+    }
+
+    public void setX509SubjectNameItems(List<IdentityLinkSignersX509SubjectNameItem> value) {
+        this.x509SubjectName = null;
+        this.x509SubjectNameItems = null;
+        this.x509SubjectNameItems = value;
+        if (this.x509SubjectNameItems == null) {
+            this.x509SubjectNameItems = new ArrayList<IdentityLinkSignersX509SubjectNameItem>();
+        }
+        if (ItemUtils.shouldBeWrapped(this.x509SubjectName)) {
+            this.x509SubjectName = ItemUtils.wrap(this.x509SubjectName, this.x509SubjectNameItems, IdentityLinkSignersX509SubjectNameItem.class);
+        }
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof IdentityLinkSigners)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final IdentityLinkSigners that = ((IdentityLinkSigners) object);
+        {
+            List<String> lhsX509SubjectName;
+            lhsX509SubjectName = (((this.x509SubjectName!= null)&&(!this.x509SubjectName.isEmpty()))?this.getX509SubjectName():null);
+            List<String> rhsX509SubjectName;
+            rhsX509SubjectName = (((that.x509SubjectName!= null)&&(!that.x509SubjectName.isEmpty()))?that.getX509SubjectName():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "x509SubjectName", lhsX509SubjectName), LocatorUtils.property(thatLocator, "x509SubjectName", rhsX509SubjectName), lhsX509SubjectName, rhsX509SubjectName)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            List<String> theX509SubjectName;
+            theX509SubjectName = (((this.x509SubjectName!= null)&&(!this.x509SubjectName.isEmpty()))?this.getX509SubjectName():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "x509SubjectName", theX509SubjectName), currentHashCode, theX509SubjectName);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentityLinkSignersX509SubjectNameItem.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentityLinkSignersX509SubjectNameItem.java
new file mode 100644
index 000000000..c0679df1c
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentityLinkSignersX509SubjectNameItem.java
@@ -0,0 +1,93 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import org.jvnet.hyperjaxb3.item.Item;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+
+
+
+public class IdentityLinkSignersX509SubjectNameItem
+    implements Serializable, Item<String>
+{
+
+    @XmlElement(name = "X509SubjectName", namespace = "http://www.buergerkarte.at/namespaces/moaconfig#")
+    protected String item;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the item property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getItem() {
+        return item;
+    }
+
+    /**
+     * Sets the value of the item property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setItem(String value) {
+        this.item = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/InputProcessorType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/InputProcessorType.java
new file mode 100644
index 000000000..3752a7754
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/InputProcessorType.java
@@ -0,0 +1,206 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for InputProcessorType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="InputProcessorType">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
+ *       &lt;attribute name="template" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "InputProcessorType", propOrder = {
+    "value"
+})
+
+
+
+public class InputProcessorType
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlValue
+    protected String value;
+    @XmlAttribute(name = "template")
+    @XmlSchemaType(name = "anyURI")
+    protected String template;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the template property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getTemplate() {
+        return template;
+    }
+
+    /**
+     * Sets the value of the template property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTemplate(String value) {
+        this.template = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof InputProcessorType)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final InputProcessorType that = ((InputProcessorType) object);
+        {
+            String lhsValue;
+            lhsValue = this.getValue();
+            String rhsValue;
+            rhsValue = that.getValue();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue)) {
+                return false;
+            }
+        }
+        {
+            String lhsTemplate;
+            lhsTemplate = this.getTemplate();
+            String rhsTemplate;
+            rhsTemplate = that.getTemplate();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "template", lhsTemplate), LocatorUtils.property(thatLocator, "template", rhsTemplate), lhsTemplate, rhsTemplate)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theValue;
+            theValue = this.getValue();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue);
+        }
+        {
+            String theTemplate;
+            theTemplate = this.getTemplate();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "template", theTemplate), currentHashCode, theTemplate);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/InterfederationGatewayType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/InterfederationGatewayType.java
new file mode 100644
index 000000000..29069f758
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/InterfederationGatewayType.java
@@ -0,0 +1,208 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for InterfederationGatewayType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="InterfederationGatewayType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="forwardIDPIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="forwardProtocolIdentifer" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "InterfederationGatewayType", propOrder = {
+    "forwardIDPIdentifier",
+    "forwardProtocolIdentifer"
+})
+
+
+
+public class InterfederationGatewayType
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(required = true)
+    protected String forwardIDPIdentifier;
+    @XmlElement(required = true)
+    protected String forwardProtocolIdentifer;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the forwardIDPIdentifier property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getForwardIDPIdentifier() {
+        return forwardIDPIdentifier;
+    }
+
+    /**
+     * Sets the value of the forwardIDPIdentifier property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setForwardIDPIdentifier(String value) {
+        this.forwardIDPIdentifier = value;
+    }
+
+    /**
+     * Gets the value of the forwardProtocolIdentifer property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getForwardProtocolIdentifer() {
+        return forwardProtocolIdentifer;
+    }
+
+    /**
+     * Sets the value of the forwardProtocolIdentifer property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setForwardProtocolIdentifer(String value) {
+        this.forwardProtocolIdentifer = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof InterfederationGatewayType)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final InterfederationGatewayType that = ((InterfederationGatewayType) object);
+        {
+            String lhsForwardIDPIdentifier;
+            lhsForwardIDPIdentifier = this.getForwardIDPIdentifier();
+            String rhsForwardIDPIdentifier;
+            rhsForwardIDPIdentifier = that.getForwardIDPIdentifier();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "forwardIDPIdentifier", lhsForwardIDPIdentifier), LocatorUtils.property(thatLocator, "forwardIDPIdentifier", rhsForwardIDPIdentifier), lhsForwardIDPIdentifier, rhsForwardIDPIdentifier)) {
+                return false;
+            }
+        }
+        {
+            String lhsForwardProtocolIdentifer;
+            lhsForwardProtocolIdentifer = this.getForwardProtocolIdentifer();
+            String rhsForwardProtocolIdentifer;
+            rhsForwardProtocolIdentifer = that.getForwardProtocolIdentifer();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "forwardProtocolIdentifer", lhsForwardProtocolIdentifer), LocatorUtils.property(thatLocator, "forwardProtocolIdentifer", rhsForwardProtocolIdentifer), lhsForwardProtocolIdentifer, rhsForwardProtocolIdentifer)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theForwardIDPIdentifier;
+            theForwardIDPIdentifier = this.getForwardIDPIdentifier();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "forwardIDPIdentifier", theForwardIDPIdentifier), currentHashCode, theForwardIDPIdentifier);
+        }
+        {
+            String theForwardProtocolIdentifer;
+            theForwardProtocolIdentifer = this.getForwardProtocolIdentifer();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "forwardProtocolIdentifer", theForwardProtocolIdentifer), currentHashCode, theForwardProtocolIdentifer);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/InterfederationIDPType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/InterfederationIDPType.java
new file mode 100644
index 000000000..f6bdb2293
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/InterfederationIDPType.java
@@ -0,0 +1,402 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for InterfederationIDPType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="InterfederationIDPType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="attributeQueryURL" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="storeSSOSession" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element name="performPassivRequest" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element name="performLocalAuthenticationOnError" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="inboundSSO" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *       &lt;attribute name="outboundSSO" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "InterfederationIDPType", propOrder = {
+    "attributeQueryURL",
+    "storeSSOSession",
+    "performPassivRequest",
+    "performLocalAuthenticationOnError"
+})
+
+
+
+public class InterfederationIDPType
+    implements Serializable, Equals, HashCode
+{
+
+    protected String attributeQueryURL;
+    @XmlElement(required = true, type = String.class, defaultValue = "true")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean storeSSOSession;
+    @XmlElement(required = true, type = String.class, defaultValue = "true")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean performPassivRequest;
+    @XmlElement(required = true, type = String.class, defaultValue = "true")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean performLocalAuthenticationOnError;
+    @XmlAttribute(name = "inboundSSO")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean inboundSSO;
+    @XmlAttribute(name = "outboundSSO")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean outboundSSO;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the attributeQueryURL property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getAttributeQueryURL() {
+        return attributeQueryURL;
+    }
+
+    /**
+     * Sets the value of the attributeQueryURL property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAttributeQueryURL(String value) {
+        this.attributeQueryURL = value;
+    }
+
+    /**
+     * Gets the value of the storeSSOSession property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isStoreSSOSession() {
+        return storeSSOSession;
+    }
+
+    /**
+     * Sets the value of the storeSSOSession property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setStoreSSOSession(Boolean value) {
+        this.storeSSOSession = value;
+    }
+
+    /**
+     * Gets the value of the performPassivRequest property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isPerformPassivRequest() {
+        return performPassivRequest;
+    }
+
+    /**
+     * Sets the value of the performPassivRequest property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPerformPassivRequest(Boolean value) {
+        this.performPassivRequest = value;
+    }
+
+    /**
+     * Gets the value of the performLocalAuthenticationOnError property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isPerformLocalAuthenticationOnError() {
+        return performLocalAuthenticationOnError;
+    }
+
+    /**
+     * Sets the value of the performLocalAuthenticationOnError property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPerformLocalAuthenticationOnError(Boolean value) {
+        this.performLocalAuthenticationOnError = value;
+    }
+
+    /**
+     * Gets the value of the inboundSSO property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public boolean isInboundSSO() {
+        if (inboundSSO == null) {
+            return new ZeroOneBooleanAdapter().unmarshal("true");
+        } else {
+            return inboundSSO;
+        }
+    }
+
+    /**
+     * Sets the value of the inboundSSO property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setInboundSSO(Boolean value) {
+        this.inboundSSO = value;
+    }
+
+    /**
+     * Gets the value of the outboundSSO property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public boolean isOutboundSSO() {
+        if (outboundSSO == null) {
+            return new ZeroOneBooleanAdapter().unmarshal("true");
+        } else {
+            return outboundSSO;
+        }
+    }
+
+    /**
+     * Sets the value of the outboundSSO property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setOutboundSSO(Boolean value) {
+        this.outboundSSO = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof InterfederationIDPType)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final InterfederationIDPType that = ((InterfederationIDPType) object);
+        {
+            String lhsAttributeQueryURL;
+            lhsAttributeQueryURL = this.getAttributeQueryURL();
+            String rhsAttributeQueryURL;
+            rhsAttributeQueryURL = that.getAttributeQueryURL();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "attributeQueryURL", lhsAttributeQueryURL), LocatorUtils.property(thatLocator, "attributeQueryURL", rhsAttributeQueryURL), lhsAttributeQueryURL, rhsAttributeQueryURL)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsStoreSSOSession;
+            lhsStoreSSOSession = this.isStoreSSOSession();
+            Boolean rhsStoreSSOSession;
+            rhsStoreSSOSession = that.isStoreSSOSession();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "storeSSOSession", lhsStoreSSOSession), LocatorUtils.property(thatLocator, "storeSSOSession", rhsStoreSSOSession), lhsStoreSSOSession, rhsStoreSSOSession)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsPerformPassivRequest;
+            lhsPerformPassivRequest = this.isPerformPassivRequest();
+            Boolean rhsPerformPassivRequest;
+            rhsPerformPassivRequest = that.isPerformPassivRequest();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "performPassivRequest", lhsPerformPassivRequest), LocatorUtils.property(thatLocator, "performPassivRequest", rhsPerformPassivRequest), lhsPerformPassivRequest, rhsPerformPassivRequest)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsPerformLocalAuthenticationOnError;
+            lhsPerformLocalAuthenticationOnError = this.isPerformLocalAuthenticationOnError();
+            Boolean rhsPerformLocalAuthenticationOnError;
+            rhsPerformLocalAuthenticationOnError = that.isPerformLocalAuthenticationOnError();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "performLocalAuthenticationOnError", lhsPerformLocalAuthenticationOnError), LocatorUtils.property(thatLocator, "performLocalAuthenticationOnError", rhsPerformLocalAuthenticationOnError), lhsPerformLocalAuthenticationOnError, rhsPerformLocalAuthenticationOnError)) {
+                return false;
+            }
+        }
+        {
+            boolean lhsInboundSSO;
+            lhsInboundSSO = ((this.inboundSSO!= null)?this.isInboundSSO():false);
+            boolean rhsInboundSSO;
+            rhsInboundSSO = ((that.inboundSSO!= null)?that.isInboundSSO():false);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "inboundSSO", lhsInboundSSO), LocatorUtils.property(thatLocator, "inboundSSO", rhsInboundSSO), lhsInboundSSO, rhsInboundSSO)) {
+                return false;
+            }
+        }
+        {
+            boolean lhsOutboundSSO;
+            lhsOutboundSSO = ((this.outboundSSO!= null)?this.isOutboundSSO():false);
+            boolean rhsOutboundSSO;
+            rhsOutboundSSO = ((that.outboundSSO!= null)?that.isOutboundSSO():false);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "outboundSSO", lhsOutboundSSO), LocatorUtils.property(thatLocator, "outboundSSO", rhsOutboundSSO), lhsOutboundSSO, rhsOutboundSSO)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theAttributeQueryURL;
+            theAttributeQueryURL = this.getAttributeQueryURL();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "attributeQueryURL", theAttributeQueryURL), currentHashCode, theAttributeQueryURL);
+        }
+        {
+            Boolean theStoreSSOSession;
+            theStoreSSOSession = this.isStoreSSOSession();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "storeSSOSession", theStoreSSOSession), currentHashCode, theStoreSSOSession);
+        }
+        {
+            Boolean thePerformPassivRequest;
+            thePerformPassivRequest = this.isPerformPassivRequest();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "performPassivRequest", thePerformPassivRequest), currentHashCode, thePerformPassivRequest);
+        }
+        {
+            Boolean thePerformLocalAuthenticationOnError;
+            thePerformLocalAuthenticationOnError = this.isPerformLocalAuthenticationOnError();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "performLocalAuthenticationOnError", thePerformLocalAuthenticationOnError), currentHashCode, thePerformLocalAuthenticationOnError);
+        }
+        {
+            boolean theInboundSSO;
+            theInboundSSO = ((this.inboundSSO!= null)?this.isInboundSSO():false);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "inboundSSO", theInboundSSO), currentHashCode, theInboundSSO);
+        }
+        {
+            boolean theOutboundSSO;
+            theOutboundSSO = ((this.outboundSSO!= null)?this.isOutboundSSO():false);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "outboundSSO", theOutboundSSO), currentHashCode, theOutboundSSO);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/KeyName.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/KeyName.java
new file mode 100644
index 000000000..3eef9cd49
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/KeyName.java
@@ -0,0 +1,206 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
+ *       &lt;attribute name="password" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "value"
+})
+@XmlRootElement(name = "KeyName")
+
+
+
+public class KeyName
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlValue
+    protected String value;
+    @XmlAttribute(name = "password")
+    protected String password;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the password property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getPassword() {
+        return password;
+    }
+
+    /**
+     * Sets the value of the password property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPassword(String value) {
+        this.password = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof KeyName)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final KeyName that = ((KeyName) object);
+        {
+            String lhsValue;
+            lhsValue = this.getValue();
+            String rhsValue;
+            rhsValue = that.getValue();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue)) {
+                return false;
+            }
+        }
+        {
+            String lhsPassword;
+            lhsPassword = this.getPassword();
+            String rhsPassword;
+            rhsPassword = that.getPassword();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "password", lhsPassword), LocatorUtils.property(thatLocator, "password", rhsPassword), lhsPassword, rhsPassword)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theValue;
+            theValue = this.getValue();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue);
+        }
+        {
+            String thePassword;
+            thePassword = this.getPassword();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "password", thePassword), currentHashCode, thePassword);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/KeyStore.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/KeyStore.java
new file mode 100644
index 000000000..f1c0d51f6
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/KeyStore.java
@@ -0,0 +1,208 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>anyURI">
+ *       &lt;attribute name="password" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "value"
+})
+@XmlRootElement(name = "KeyStore")
+
+
+
+public class KeyStore
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlValue
+    @XmlSchemaType(name = "anyURI")
+    protected String value;
+    @XmlAttribute(name = "password")
+    protected String password;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the password property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getPassword() {
+        return password;
+    }
+
+    /**
+     * Sets the value of the password property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPassword(String value) {
+        this.password = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof KeyStore)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final KeyStore that = ((KeyStore) object);
+        {
+            String lhsValue;
+            lhsValue = this.getValue();
+            String rhsValue;
+            rhsValue = that.getValue();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue)) {
+                return false;
+            }
+        }
+        {
+            String lhsPassword;
+            lhsPassword = this.getPassword();
+            String rhsPassword;
+            rhsPassword = that.getPassword();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "password", lhsPassword), LocatorUtils.property(thatLocator, "password", rhsPassword), lhsPassword, rhsPassword)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theValue;
+            theValue = this.getValue();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue);
+        }
+        {
+            String thePassword;
+            thePassword = this.getPassword();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "password", thePassword), currentHashCode, thePassword);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/LegacyAllowed.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/LegacyAllowed.java
new file mode 100644
index 000000000..12a48c88e
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/LegacyAllowed.java
@@ -0,0 +1,209 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.hyperjaxb3.item.ItemUtils;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="ProtocolName" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "protocolName"
+})
+
+
+
+public class LegacyAllowed
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "ProtocolName")
+    protected List<String> protocolName;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+    protected transient List<LegacyAllowedProtocolNameItem> protocolNameItems;
+
+    /**
+     * Gets the value of the protocolName property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the protocolName property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getProtocolName().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    @Transient
+    public List<String> getProtocolName() {
+        if (protocolName == null) {
+            protocolName = new ArrayList<String>();
+        }
+        return this.protocolName;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setProtocolName(List<String> protocolName) {
+        this.protocolName = protocolName;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    @OneToMany(targetEntity = LegacyAllowedProtocolNameItem.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<LegacyAllowedProtocolNameItem> getProtocolNameItems() {
+        if (this.protocolNameItems == null) {
+            this.protocolNameItems = new ArrayList<LegacyAllowedProtocolNameItem>();
+        }
+        if (ItemUtils.shouldBeWrapped(this.protocolName)) {
+            this.protocolName = ItemUtils.wrap(this.protocolName, this.protocolNameItems, LegacyAllowedProtocolNameItem.class);
+        }
+        return this.protocolNameItems;
+    }
+
+    public void setProtocolNameItems(List<LegacyAllowedProtocolNameItem> value) {
+        this.protocolName = null;
+        this.protocolNameItems = null;
+        this.protocolNameItems = value;
+        if (this.protocolNameItems == null) {
+            this.protocolNameItems = new ArrayList<LegacyAllowedProtocolNameItem>();
+        }
+        if (ItemUtils.shouldBeWrapped(this.protocolName)) {
+            this.protocolName = ItemUtils.wrap(this.protocolName, this.protocolNameItems, LegacyAllowedProtocolNameItem.class);
+        }
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof LegacyAllowed)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final LegacyAllowed that = ((LegacyAllowed) object);
+        {
+            List<String> lhsProtocolName;
+            lhsProtocolName = (((this.protocolName!= null)&&(!this.protocolName.isEmpty()))?this.getProtocolName():null);
+            List<String> rhsProtocolName;
+            rhsProtocolName = (((that.protocolName!= null)&&(!that.protocolName.isEmpty()))?that.getProtocolName():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "protocolName", lhsProtocolName), LocatorUtils.property(thatLocator, "protocolName", rhsProtocolName), lhsProtocolName, rhsProtocolName)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            List<String> theProtocolName;
+            theProtocolName = (((this.protocolName!= null)&&(!this.protocolName.isEmpty()))?this.getProtocolName():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "protocolName", theProtocolName), currentHashCode, theProtocolName);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/LegacyAllowedProtocolNameItem.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/LegacyAllowedProtocolNameItem.java
new file mode 100644
index 000000000..91aae9742
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/LegacyAllowedProtocolNameItem.java
@@ -0,0 +1,93 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import org.jvnet.hyperjaxb3.item.Item;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+
+
+
+public class LegacyAllowedProtocolNameItem
+    implements Serializable, Item<String>
+{
+
+    @XmlElement(name = "ProtocolName", namespace = "http://www.buergerkarte.at/namespaces/moaconfig#")
+    protected String item;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the item property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getItem() {
+        return item;
+    }
+
+    /**
+     * Sets the value of the item property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setItem(String value) {
+        this.item = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/LoginType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/LoginType.java
new file mode 100644
index 000000000..5f1c6aa19
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/LoginType.java
@@ -0,0 +1,58 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for LoginType.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="LoginType">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token">
+ *     &lt;enumeration value="stateless"/>
+ *     &lt;enumeration value="stateful"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "LoginType")
+@XmlEnum
+public enum LoginType {
+
+    @XmlEnumValue("stateless")
+    STATELESS("stateless"),
+    @XmlEnumValue("stateful")
+    STATEFUL("stateful");
+    private final String value;
+
+    LoginType(String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static LoginType fromValue(String v) {
+        for (LoginType c: LoginType.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAAuthDataType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAAuthDataType.java
new file mode 100644
index 000000000..a1846cfc5
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAAuthDataType.java
@@ -0,0 +1,82 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for MOAAuthDataType.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="MOAAuthDataType">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token">
+ *     &lt;enumeration value="MOAGivenName"/>
+ *     &lt;enumeration value="MOAFamilyName"/>
+ *     &lt;enumeration value="MOADateOfBirth"/>
+ *     &lt;enumeration value="MOABPK"/>
+ *     &lt;enumeration value="MOAWBPK"/>
+ *     &lt;enumeration value="MOAPublicAuthority"/>
+ *     &lt;enumeration value="MOABKZ"/>
+ *     &lt;enumeration value="MOAQualifiedCertificate"/>
+ *     &lt;enumeration value="MOAStammzahl"/>
+ *     &lt;enumeration value="MOAIdentificationValueType"/>
+ *     &lt;enumeration value="MOAIPAddress"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "MOAAuthDataType")
+@XmlEnum
+public enum MOAAuthDataType {
+
+    @XmlEnumValue("MOAGivenName")
+    MOA_GIVEN_NAME("MOAGivenName"),
+    @XmlEnumValue("MOAFamilyName")
+    MOA_FAMILY_NAME("MOAFamilyName"),
+    @XmlEnumValue("MOADateOfBirth")
+    MOA_DATE_OF_BIRTH("MOADateOfBirth"),
+    MOABPK("MOABPK"),
+    MOAWBPK("MOAWBPK"),
+    @XmlEnumValue("MOAPublicAuthority")
+    MOA_PUBLIC_AUTHORITY("MOAPublicAuthority"),
+    MOABKZ("MOABKZ"),
+    @XmlEnumValue("MOAQualifiedCertificate")
+    MOA_QUALIFIED_CERTIFICATE("MOAQualifiedCertificate"),
+    @XmlEnumValue("MOAStammzahl")
+    MOA_STAMMZAHL("MOAStammzahl"),
+    @XmlEnumValue("MOAIdentificationValueType")
+    MOA_IDENTIFICATION_VALUE_TYPE("MOAIdentificationValueType"),
+    @XmlEnumValue("MOAIPAddress")
+    MOAIP_ADDRESS("MOAIPAddress");
+    private final String value;
+
+    MOAAuthDataType(String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static MOAAuthDataType fromValue(String v) {
+        for (MOAAuthDataType c: MOAAuthDataType.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAIDConfiguration.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAIDConfiguration.java
new file mode 100644
index 000000000..4807a81b3
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAIDConfiguration.java
@@ -0,0 +1,664 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.Transient;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.datatype.XMLGregorianCalendar;
+import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XMLGregorianCalendarAsDateTime;
+import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XmlAdapterUtils;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="AuthComponent_General" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;extension base="{http://www.buergerkarte.at/namespaces/moaconfig#}AuthComponentType">
+ *               &lt;/extension>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element name="OnlineApplication" type="{http://www.buergerkarte.at/namespaces/moaconfig#}OnlineApplication" maxOccurs="unbounded"/>
+ *         &lt;element name="ChainingModes" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence maxOccurs="unbounded" minOccurs="0">
+ *                   &lt;element name="TrustAnchor">
+ *                     &lt;complexType>
+ *                       &lt;complexContent>
+ *                         &lt;extension base="{http://www.buergerkarte.at/namespaces/moaconfig#}X509IssuerSerialType">
+ *                           &lt;attribute name="mode" use="required" type="{http://www.buergerkarte.at/namespaces/moaconfig#}ChainingModeType" />
+ *                         &lt;/extension>
+ *                       &lt;/complexContent>
+ *                     &lt;/complexType>
+ *                   &lt;/element>
+ *                 &lt;/sequence>
+ *                 &lt;attribute name="systemDefaultMode" type="{http://www.buergerkarte.at/namespaces/moaconfig#}ChainingModeType" default="pkix" />
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element name="TrustedCACertificates" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *         &lt;element name="GenericConfiguration" maxOccurs="unbounded" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;attribute name="name" use="required">
+ *                   &lt;simpleType>
+ *                     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ *                       &lt;enumeration value="DirectoryCertStoreParameters.RootDir"/>
+ *                       &lt;enumeration value="AuthenticationSession.TimeOut"/>
+ *                       &lt;enumeration value="AuthenticationData.TimeOut"/>
+ *                       &lt;enumeration value="TrustManager.RevocationChecking"/>
+ *                       &lt;enumeration value="FrontendServlets.EnableHTTPConnection"/>
+ *                       &lt;enumeration value="FrontendServlets.DataURLPrefix"/>
+ *                       &lt;enumeration value="AuthenticationServer.KeepAssertion"/>
+ *                       &lt;enumeration value="AuthenticationServer.WriteAssertionToFile"/>
+ *                       &lt;enumeration value="AuthenticationServer.SourceID"/>
+ *                     &lt;/restriction>
+ *                   &lt;/simpleType>
+ *                 &lt;/attribute>
+ *                 &lt;attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element name="DefaultBKUs">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="OnlineBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/>
+ *                   &lt;element name="HandyBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *                   &lt;element name="LocalBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element name="SLRequestTemplates">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="OnlineBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *                   &lt;element name="HandyBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *                   &lt;element name="LocalBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *       &lt;attribute name="timestamp" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *       &lt;attribute name="pvp2refresh" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "authComponentGeneral",
+    "onlineApplication",
+    "chainingModes",
+    "trustedCACertificates",
+    "genericConfiguration",
+    "defaultBKUs",
+    "slRequestTemplates"
+})
+@XmlRootElement(name = "MOA-IDConfiguration")
+
+
+
+public class MOAIDConfiguration
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "AuthComponent_General")
+    protected AuthComponentGeneral authComponentGeneral;
+    @XmlElement(name = "OnlineApplication", required = true)
+    protected List<OnlineApplication> onlineApplication;
+    @XmlElement(name = "ChainingModes")
+    protected ChainingModes chainingModes;
+    @XmlElement(name = "TrustedCACertificates")
+    @XmlSchemaType(name = "anyURI")
+    protected String trustedCACertificates;
+    @XmlElement(name = "GenericConfiguration")
+    protected List<GenericConfiguration> genericConfiguration;
+    @XmlElement(name = "DefaultBKUs", required = true)
+    protected DefaultBKUs defaultBKUs;
+    @XmlElement(name = "SLRequestTemplates", required = true)
+    protected SLRequestTemplates slRequestTemplates;
+    @XmlAttribute(name = "timestamp")
+    @XmlSchemaType(name = "dateTime")
+    protected XMLGregorianCalendar timestamp;
+    @XmlAttribute(name = "pvp2refresh")
+    @XmlSchemaType(name = "dateTime")
+    protected XMLGregorianCalendar pvp2Refresh;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the authComponentGeneral property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link AuthComponentGeneral }
+     *     
+     */
+    @ManyToOne(targetEntity = AuthComponentGeneral.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public AuthComponentGeneral getAuthComponentGeneral() {
+        return authComponentGeneral;
+    }
+
+    /**
+     * Sets the value of the authComponentGeneral property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link AuthComponentGeneral }
+     *     
+     */
+    public void setAuthComponentGeneral(AuthComponentGeneral value) {
+        this.authComponentGeneral = value;
+    }
+
+    /**
+     * Gets the value of the onlineApplication property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the onlineApplication property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getOnlineApplication().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link OnlineApplication }
+     * 
+     * 
+     */
+    @OneToMany(targetEntity = OnlineApplication.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<OnlineApplication> getOnlineApplication() {
+        if (onlineApplication == null) {
+            onlineApplication = new ArrayList<OnlineApplication>();
+        }
+        return this.onlineApplication;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setOnlineApplication(List<OnlineApplication> onlineApplication) {
+        this.onlineApplication = onlineApplication;
+    }
+
+    /**
+     * Gets the value of the chainingModes property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ChainingModes }
+     *     
+     */
+    @ManyToOne(targetEntity = ChainingModes.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public ChainingModes getChainingModes() {
+        return chainingModes;
+    }
+
+    /**
+     * Sets the value of the chainingModes property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ChainingModes }
+     *     
+     */
+    public void setChainingModes(ChainingModes value) {
+        this.chainingModes = value;
+    }
+
+    /**
+     * Gets the value of the trustedCACertificates property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getTrustedCACertificates() {
+        return trustedCACertificates;
+    }
+
+    /**
+     * Sets the value of the trustedCACertificates property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTrustedCACertificates(String value) {
+        this.trustedCACertificates = value;
+    }
+
+    /**
+     * Gets the value of the genericConfiguration property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the genericConfiguration property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getGenericConfiguration().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link GenericConfiguration }
+     * 
+     * 
+     */
+    @OneToMany(targetEntity = GenericConfiguration.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<GenericConfiguration> getGenericConfiguration() {
+        if (genericConfiguration == null) {
+            genericConfiguration = new ArrayList<GenericConfiguration>();
+        }
+        return this.genericConfiguration;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setGenericConfiguration(List<GenericConfiguration> genericConfiguration) {
+        this.genericConfiguration = genericConfiguration;
+    }
+
+    /**
+     * Gets the value of the defaultBKUs property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DefaultBKUs }
+     *     
+     */
+    @ManyToOne(targetEntity = DefaultBKUs.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public DefaultBKUs getDefaultBKUs() {
+        return defaultBKUs;
+    }
+
+    /**
+     * Sets the value of the defaultBKUs property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DefaultBKUs }
+     *     
+     */
+    public void setDefaultBKUs(DefaultBKUs value) {
+        this.defaultBKUs = value;
+    }
+
+    /**
+     * Gets the value of the slRequestTemplates property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SLRequestTemplates }
+     *     
+     */
+    @ManyToOne(targetEntity = SLRequestTemplates.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public SLRequestTemplates getSLRequestTemplates() {
+        return slRequestTemplates;
+    }
+
+    /**
+     * Sets the value of the slRequestTemplates property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SLRequestTemplates }
+     *     
+     */
+    public void setSLRequestTemplates(SLRequestTemplates value) {
+        this.slRequestTemplates = value;
+    }
+
+    /**
+     * Gets the value of the timestamp property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    @Transient
+    public XMLGregorianCalendar getTimestamp() {
+        return timestamp;
+    }
+
+    /**
+     * Sets the value of the timestamp property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setTimestamp(XMLGregorianCalendar value) {
+        this.timestamp = value;
+    }
+
+    /**
+     * Gets the value of the pvp2Refresh property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    @Transient
+    public XMLGregorianCalendar getPvp2Refresh() {
+        return pvp2Refresh;
+    }
+
+    /**
+     * Sets the value of the pvp2Refresh property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setPvp2Refresh(XMLGregorianCalendar value) {
+        this.pvp2Refresh = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    
+    
+    @Temporal(TemporalType.TIMESTAMP)
+    public Date getTimestampItem() {
+        return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getTimestamp());
+    }
+
+    public void setTimestampItem(Date target) {
+        setTimestamp(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, target));
+    }
+
+    
+    
+    @Temporal(TemporalType.TIMESTAMP)
+    public Date getPvp2RefreshItem() {
+        return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getPvp2Refresh());
+    }
+
+    public void setPvp2RefreshItem(Date target) {
+        setPvp2Refresh(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, target));
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof MOAIDConfiguration)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final MOAIDConfiguration that = ((MOAIDConfiguration) object);
+        {
+            AuthComponentGeneral lhsAuthComponentGeneral;
+            lhsAuthComponentGeneral = this.getAuthComponentGeneral();
+            AuthComponentGeneral rhsAuthComponentGeneral;
+            rhsAuthComponentGeneral = that.getAuthComponentGeneral();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "authComponentGeneral", lhsAuthComponentGeneral), LocatorUtils.property(thatLocator, "authComponentGeneral", rhsAuthComponentGeneral), lhsAuthComponentGeneral, rhsAuthComponentGeneral)) {
+                return false;
+            }
+        }
+        {
+            List<OnlineApplication> lhsOnlineApplication;
+            lhsOnlineApplication = (((this.onlineApplication!= null)&&(!this.onlineApplication.isEmpty()))?this.getOnlineApplication():null);
+            List<OnlineApplication> rhsOnlineApplication;
+            rhsOnlineApplication = (((that.onlineApplication!= null)&&(!that.onlineApplication.isEmpty()))?that.getOnlineApplication():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "onlineApplication", lhsOnlineApplication), LocatorUtils.property(thatLocator, "onlineApplication", rhsOnlineApplication), lhsOnlineApplication, rhsOnlineApplication)) {
+                return false;
+            }
+        }
+        {
+            ChainingModes lhsChainingModes;
+            lhsChainingModes = this.getChainingModes();
+            ChainingModes rhsChainingModes;
+            rhsChainingModes = that.getChainingModes();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "chainingModes", lhsChainingModes), LocatorUtils.property(thatLocator, "chainingModes", rhsChainingModes), lhsChainingModes, rhsChainingModes)) {
+                return false;
+            }
+        }
+        {
+            String lhsTrustedCACertificates;
+            lhsTrustedCACertificates = this.getTrustedCACertificates();
+            String rhsTrustedCACertificates;
+            rhsTrustedCACertificates = that.getTrustedCACertificates();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "trustedCACertificates", lhsTrustedCACertificates), LocatorUtils.property(thatLocator, "trustedCACertificates", rhsTrustedCACertificates), lhsTrustedCACertificates, rhsTrustedCACertificates)) {
+                return false;
+            }
+        }
+        {
+            List<GenericConfiguration> lhsGenericConfiguration;
+            lhsGenericConfiguration = (((this.genericConfiguration!= null)&&(!this.genericConfiguration.isEmpty()))?this.getGenericConfiguration():null);
+            List<GenericConfiguration> rhsGenericConfiguration;
+            rhsGenericConfiguration = (((that.genericConfiguration!= null)&&(!that.genericConfiguration.isEmpty()))?that.getGenericConfiguration():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "genericConfiguration", lhsGenericConfiguration), LocatorUtils.property(thatLocator, "genericConfiguration", rhsGenericConfiguration), lhsGenericConfiguration, rhsGenericConfiguration)) {
+                return false;
+            }
+        }
+        {
+            DefaultBKUs lhsDefaultBKUs;
+            lhsDefaultBKUs = this.getDefaultBKUs();
+            DefaultBKUs rhsDefaultBKUs;
+            rhsDefaultBKUs = that.getDefaultBKUs();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultBKUs", lhsDefaultBKUs), LocatorUtils.property(thatLocator, "defaultBKUs", rhsDefaultBKUs), lhsDefaultBKUs, rhsDefaultBKUs)) {
+                return false;
+            }
+        }
+        {
+            SLRequestTemplates lhsSLRequestTemplates;
+            lhsSLRequestTemplates = this.getSLRequestTemplates();
+            SLRequestTemplates rhsSLRequestTemplates;
+            rhsSLRequestTemplates = that.getSLRequestTemplates();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "slRequestTemplates", lhsSLRequestTemplates), LocatorUtils.property(thatLocator, "slRequestTemplates", rhsSLRequestTemplates), lhsSLRequestTemplates, rhsSLRequestTemplates)) {
+                return false;
+            }
+        }
+        {
+            XMLGregorianCalendar lhsTimestamp;
+            lhsTimestamp = this.getTimestamp();
+            XMLGregorianCalendar rhsTimestamp;
+            rhsTimestamp = that.getTimestamp();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "timestamp", lhsTimestamp), LocatorUtils.property(thatLocator, "timestamp", rhsTimestamp), lhsTimestamp, rhsTimestamp)) {
+                return false;
+            }
+        }
+        {
+            XMLGregorianCalendar lhsPvp2Refresh;
+            lhsPvp2Refresh = this.getPvp2Refresh();
+            XMLGregorianCalendar rhsPvp2Refresh;
+            rhsPvp2Refresh = that.getPvp2Refresh();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "pvp2Refresh", lhsPvp2Refresh), LocatorUtils.property(thatLocator, "pvp2Refresh", rhsPvp2Refresh), lhsPvp2Refresh, rhsPvp2Refresh)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            AuthComponentGeneral theAuthComponentGeneral;
+            theAuthComponentGeneral = this.getAuthComponentGeneral();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "authComponentGeneral", theAuthComponentGeneral), currentHashCode, theAuthComponentGeneral);
+        }
+        {
+            List<OnlineApplication> theOnlineApplication;
+            theOnlineApplication = (((this.onlineApplication!= null)&&(!this.onlineApplication.isEmpty()))?this.getOnlineApplication():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "onlineApplication", theOnlineApplication), currentHashCode, theOnlineApplication);
+        }
+        {
+            ChainingModes theChainingModes;
+            theChainingModes = this.getChainingModes();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "chainingModes", theChainingModes), currentHashCode, theChainingModes);
+        }
+        {
+            String theTrustedCACertificates;
+            theTrustedCACertificates = this.getTrustedCACertificates();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trustedCACertificates", theTrustedCACertificates), currentHashCode, theTrustedCACertificates);
+        }
+        {
+            List<GenericConfiguration> theGenericConfiguration;
+            theGenericConfiguration = (((this.genericConfiguration!= null)&&(!this.genericConfiguration.isEmpty()))?this.getGenericConfiguration():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "genericConfiguration", theGenericConfiguration), currentHashCode, theGenericConfiguration);
+        }
+        {
+            DefaultBKUs theDefaultBKUs;
+            theDefaultBKUs = this.getDefaultBKUs();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultBKUs", theDefaultBKUs), currentHashCode, theDefaultBKUs);
+        }
+        {
+            SLRequestTemplates theSLRequestTemplates;
+            theSLRequestTemplates = this.getSLRequestTemplates();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "slRequestTemplates", theSLRequestTemplates), currentHashCode, theSLRequestTemplates);
+        }
+        {
+            XMLGregorianCalendar theTimestamp;
+            theTimestamp = this.getTimestamp();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "timestamp", theTimestamp), currentHashCode, theTimestamp);
+        }
+        {
+            XMLGregorianCalendar thePvp2Refresh;
+            thePvp2Refresh = this.getPvp2Refresh();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "pvp2Refresh", thePvp2Refresh), currentHashCode, thePvp2Refresh);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAKeyBoxSelector.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAKeyBoxSelector.java
new file mode 100644
index 000000000..d69611c95
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAKeyBoxSelector.java
@@ -0,0 +1,58 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for MOAKeyBoxSelector.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * &lt;simpleType name="MOAKeyBoxSelector">
+ *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token">
+ *     &lt;enumeration value="SecureSignatureKeypair"/>
+ *     &lt;enumeration value="CertifiedKeypair"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "MOAKeyBoxSelector")
+@XmlEnum
+public enum MOAKeyBoxSelector {
+
+    @XmlEnumValue("SecureSignatureKeypair")
+    SECURE_SIGNATURE_KEYPAIR("SecureSignatureKeypair"),
+    @XmlEnumValue("CertifiedKeypair")
+    CERTIFIED_KEYPAIR("CertifiedKeypair");
+    private final String value;
+
+    MOAKeyBoxSelector(String v) {
+        value = v;
+    }
+
+    public String value() {
+        return value;
+    }
+
+    public static MOAKeyBoxSelector fromValue(String v) {
+        for (MOAKeyBoxSelector c: MOAKeyBoxSelector.values()) {
+            if (c.value.equals(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOASP.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOASP.java
new file mode 100644
index 000000000..9e2629d42
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOASP.java
@@ -0,0 +1,281 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="ConnectionParameter" type="{http://www.buergerkarte.at/namespaces/moaconfig#}ConnectionParameterClientAuthType" minOccurs="0"/>
+ *         &lt;element name="VerifyIdentityLink">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}TrustProfileID"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element name="VerifyAuthBlock">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}TrustProfileID"/>
+ *                   &lt;element name="VerifyTransformsInfoProfileID" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "connectionParameter",
+    "verifyIdentityLink",
+    "verifyAuthBlock"
+})
+
+
+
+public class MOASP
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "ConnectionParameter")
+    protected ConnectionParameterClientAuthType connectionParameter;
+    @XmlElement(name = "VerifyIdentityLink", required = true)
+    protected VerifyIdentityLink verifyIdentityLink;
+    @XmlElement(name = "VerifyAuthBlock", required = true)
+    protected VerifyAuthBlock verifyAuthBlock;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the connectionParameter property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ConnectionParameterClientAuthType }
+     *     
+     */
+    @ManyToOne(targetEntity = ConnectionParameterClientAuthType.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public ConnectionParameterClientAuthType getConnectionParameter() {
+        return connectionParameter;
+    }
+
+    /**
+     * Sets the value of the connectionParameter property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ConnectionParameterClientAuthType }
+     *     
+     */
+    public void setConnectionParameter(ConnectionParameterClientAuthType value) {
+        this.connectionParameter = value;
+    }
+
+    /**
+     * Gets the value of the verifyIdentityLink property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link VerifyIdentityLink }
+     *     
+     */
+    @ManyToOne(targetEntity = VerifyIdentityLink.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public VerifyIdentityLink getVerifyIdentityLink() {
+        return verifyIdentityLink;
+    }
+
+    /**
+     * Sets the value of the verifyIdentityLink property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link VerifyIdentityLink }
+     *     
+     */
+    public void setVerifyIdentityLink(VerifyIdentityLink value) {
+        this.verifyIdentityLink = value;
+    }
+
+    /**
+     * Gets the value of the verifyAuthBlock property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link VerifyAuthBlock }
+     *     
+     */
+    @ManyToOne(targetEntity = VerifyAuthBlock.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public VerifyAuthBlock getVerifyAuthBlock() {
+        return verifyAuthBlock;
+    }
+
+    /**
+     * Sets the value of the verifyAuthBlock property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link VerifyAuthBlock }
+     *     
+     */
+    public void setVerifyAuthBlock(VerifyAuthBlock value) {
+        this.verifyAuthBlock = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof MOASP)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final MOASP that = ((MOASP) object);
+        {
+            ConnectionParameterClientAuthType lhsConnectionParameter;
+            lhsConnectionParameter = this.getConnectionParameter();
+            ConnectionParameterClientAuthType rhsConnectionParameter;
+            rhsConnectionParameter = that.getConnectionParameter();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "connectionParameter", lhsConnectionParameter), LocatorUtils.property(thatLocator, "connectionParameter", rhsConnectionParameter), lhsConnectionParameter, rhsConnectionParameter)) {
+                return false;
+            }
+        }
+        {
+            VerifyIdentityLink lhsVerifyIdentityLink;
+            lhsVerifyIdentityLink = this.getVerifyIdentityLink();
+            VerifyIdentityLink rhsVerifyIdentityLink;
+            rhsVerifyIdentityLink = that.getVerifyIdentityLink();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "verifyIdentityLink", lhsVerifyIdentityLink), LocatorUtils.property(thatLocator, "verifyIdentityLink", rhsVerifyIdentityLink), lhsVerifyIdentityLink, rhsVerifyIdentityLink)) {
+                return false;
+            }
+        }
+        {
+            VerifyAuthBlock lhsVerifyAuthBlock;
+            lhsVerifyAuthBlock = this.getVerifyAuthBlock();
+            VerifyAuthBlock rhsVerifyAuthBlock;
+            rhsVerifyAuthBlock = that.getVerifyAuthBlock();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "verifyAuthBlock", lhsVerifyAuthBlock), LocatorUtils.property(thatLocator, "verifyAuthBlock", rhsVerifyAuthBlock), lhsVerifyAuthBlock, rhsVerifyAuthBlock)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            ConnectionParameterClientAuthType theConnectionParameter;
+            theConnectionParameter = this.getConnectionParameter();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "connectionParameter", theConnectionParameter), currentHashCode, theConnectionParameter);
+        }
+        {
+            VerifyIdentityLink theVerifyIdentityLink;
+            theVerifyIdentityLink = this.getVerifyIdentityLink();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "verifyIdentityLink", theVerifyIdentityLink), currentHashCode, theVerifyIdentityLink);
+        }
+        {
+            VerifyAuthBlock theVerifyAuthBlock;
+            theVerifyAuthBlock = this.getVerifyAuthBlock();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "verifyAuthBlock", theVerifyAuthBlock), currentHashCode, theVerifyAuthBlock);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Mandates.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Mandates.java
new file mode 100644
index 000000000..247be940c
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Mandates.java
@@ -0,0 +1,254 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.hyperjaxb3.item.ItemUtils;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Profiles" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="ProfileName" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "profiles",
+    "profileName"
+})
+
+
+
+public class Mandates
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "Profiles", required = true)
+    protected String profiles;
+    @XmlElement(name = "ProfileName")
+    protected List<String> profileName;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+    protected transient List<MandatesProfileNameItem> profileNameItems;
+
+    /**
+     * Gets the value of the profiles property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getProfiles() {
+        return profiles;
+    }
+
+    /**
+     * Sets the value of the profiles property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setProfiles(String value) {
+        this.profiles = value;
+    }
+
+    /**
+     * Gets the value of the profileName property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the profileName property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getProfileName().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    @Transient
+    public List<String> getProfileName() {
+        if (profileName == null) {
+            profileName = new ArrayList<String>();
+        }
+        return this.profileName;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setProfileName(List<String> profileName) {
+        this.profileName = profileName;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    @OneToMany(targetEntity = MandatesProfileNameItem.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<MandatesProfileNameItem> getProfileNameItems() {
+        if (this.profileNameItems == null) {
+            this.profileNameItems = new ArrayList<MandatesProfileNameItem>();
+        }
+        if (ItemUtils.shouldBeWrapped(this.profileName)) {
+            this.profileName = ItemUtils.wrap(this.profileName, this.profileNameItems, MandatesProfileNameItem.class);
+        }
+        return this.profileNameItems;
+    }
+
+    public void setProfileNameItems(List<MandatesProfileNameItem> value) {
+        this.profileName = null;
+        this.profileNameItems = null;
+        this.profileNameItems = value;
+        if (this.profileNameItems == null) {
+            this.profileNameItems = new ArrayList<MandatesProfileNameItem>();
+        }
+        if (ItemUtils.shouldBeWrapped(this.profileName)) {
+            this.profileName = ItemUtils.wrap(this.profileName, this.profileNameItems, MandatesProfileNameItem.class);
+        }
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof Mandates)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final Mandates that = ((Mandates) object);
+        {
+            String lhsProfiles;
+            lhsProfiles = this.getProfiles();
+            String rhsProfiles;
+            rhsProfiles = that.getProfiles();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "profiles", lhsProfiles), LocatorUtils.property(thatLocator, "profiles", rhsProfiles), lhsProfiles, rhsProfiles)) {
+                return false;
+            }
+        }
+        {
+            List<String> lhsProfileName;
+            lhsProfileName = (((this.profileName!= null)&&(!this.profileName.isEmpty()))?this.getProfileName():null);
+            List<String> rhsProfileName;
+            rhsProfileName = (((that.profileName!= null)&&(!that.profileName.isEmpty()))?that.getProfileName():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "profileName", lhsProfileName), LocatorUtils.property(thatLocator, "profileName", rhsProfileName), lhsProfileName, rhsProfileName)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theProfiles;
+            theProfiles = this.getProfiles();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "profiles", theProfiles), currentHashCode, theProfiles);
+        }
+        {
+            List<String> theProfileName;
+            theProfileName = (((this.profileName!= null)&&(!this.profileName.isEmpty()))?this.getProfileName():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "profileName", theProfileName), currentHashCode, theProfileName);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MandatesProfileNameItem.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MandatesProfileNameItem.java
new file mode 100644
index 000000000..0ef09c0dc
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MandatesProfileNameItem.java
@@ -0,0 +1,93 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import org.jvnet.hyperjaxb3.item.Item;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+
+
+
+public class MandatesProfileNameItem
+    implements Serializable, Item<String>
+{
+
+    @XmlElement(name = "ProfileName", namespace = "http://www.buergerkarte.at/namespaces/moaconfig#")
+    protected String item;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the item property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getItem() {
+        return item;
+    }
+
+    /**
+     * Sets the value of the item property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setItem(String value) {
+        this.item = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OAOAUTH20.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OAOAUTH20.java
new file mode 100644
index 000000000..8b533c5ff
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OAOAUTH20.java
@@ -0,0 +1,254 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="oAuthClientId" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="oAuthClientSecret" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="oAuthRedirectUri" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "oAuthClientId",
+    "oAuthClientSecret",
+    "oAuthRedirectUri"
+})
+@XmlRootElement(name = "OA_OAUTH20")
+
+
+
+public class OAOAUTH20
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(required = true)
+    protected String oAuthClientId;
+    @XmlElement(required = true)
+    protected String oAuthClientSecret;
+    @XmlElement(required = true)
+    protected String oAuthRedirectUri;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the oAuthClientId property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getOAuthClientId() {
+        return oAuthClientId;
+    }
+
+    /**
+     * Sets the value of the oAuthClientId property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setOAuthClientId(String value) {
+        this.oAuthClientId = value;
+    }
+
+    /**
+     * Gets the value of the oAuthClientSecret property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getOAuthClientSecret() {
+        return oAuthClientSecret;
+    }
+
+    /**
+     * Sets the value of the oAuthClientSecret property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setOAuthClientSecret(String value) {
+        this.oAuthClientSecret = value;
+    }
+
+    /**
+     * Gets the value of the oAuthRedirectUri property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getOAuthRedirectUri() {
+        return oAuthRedirectUri;
+    }
+
+    /**
+     * Sets the value of the oAuthRedirectUri property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setOAuthRedirectUri(String value) {
+        this.oAuthRedirectUri = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof OAOAUTH20)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final OAOAUTH20 that = ((OAOAUTH20) object);
+        {
+            String lhsOAuthClientId;
+            lhsOAuthClientId = this.getOAuthClientId();
+            String rhsOAuthClientId;
+            rhsOAuthClientId = that.getOAuthClientId();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "oAuthClientId", lhsOAuthClientId), LocatorUtils.property(thatLocator, "oAuthClientId", rhsOAuthClientId), lhsOAuthClientId, rhsOAuthClientId)) {
+                return false;
+            }
+        }
+        {
+            String lhsOAuthClientSecret;
+            lhsOAuthClientSecret = this.getOAuthClientSecret();
+            String rhsOAuthClientSecret;
+            rhsOAuthClientSecret = that.getOAuthClientSecret();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "oAuthClientSecret", lhsOAuthClientSecret), LocatorUtils.property(thatLocator, "oAuthClientSecret", rhsOAuthClientSecret), lhsOAuthClientSecret, rhsOAuthClientSecret)) {
+                return false;
+            }
+        }
+        {
+            String lhsOAuthRedirectUri;
+            lhsOAuthRedirectUri = this.getOAuthRedirectUri();
+            String rhsOAuthRedirectUri;
+            rhsOAuthRedirectUri = that.getOAuthRedirectUri();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "oAuthRedirectUri", lhsOAuthRedirectUri), LocatorUtils.property(thatLocator, "oAuthRedirectUri", rhsOAuthRedirectUri), lhsOAuthRedirectUri, rhsOAuthRedirectUri)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theOAuthClientId;
+            theOAuthClientId = this.getOAuthClientId();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "oAuthClientId", theOAuthClientId), currentHashCode, theOAuthClientId);
+        }
+        {
+            String theOAuthClientSecret;
+            theOAuthClientSecret = this.getOAuthClientSecret();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "oAuthClientSecret", theOAuthClientSecret), currentHashCode, theOAuthClientSecret);
+        }
+        {
+            String theOAuthRedirectUri;
+            theOAuthRedirectUri = this.getOAuthRedirectUri();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "oAuthRedirectUri", theOAuthRedirectUri), currentHashCode, theOAuthRedirectUri);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OAPVP2.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OAPVP2.java
new file mode 100644
index 000000000..d5cee7b83
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OAPVP2.java
@@ -0,0 +1,274 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.persistence.Transient;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.datatype.XMLGregorianCalendar;
+import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XMLGregorianCalendarAsDateTime;
+import org.jvnet.hyperjaxb3.xml.bind.annotation.adapters.XmlAdapterUtils;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="metadataURL" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         &lt;element name="certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         &lt;element name="updateRequired" type="{http://www.w3.org/2001/XMLSchema}dateTime"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "metadataURL",
+    "certificate",
+    "updateRequired"
+})
+@XmlRootElement(name = "OA_PVP2")
+
+
+
+public class OAPVP2
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String metadataURL;
+    @XmlElement(required = true)
+    protected byte[] certificate;
+    @XmlElement(required = true)
+    @XmlSchemaType(name = "dateTime")
+    protected XMLGregorianCalendar updateRequired;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the metadataURL property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getMetadataURL() {
+        return metadataURL;
+    }
+
+    /**
+     * Sets the value of the metadataURL property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setMetadataURL(String value) {
+        this.metadataURL = value;
+    }
+
+    /**
+     * Gets the value of the certificate property.
+     * 
+     * @return
+     *     possible object is
+     *     byte[]
+     */
+    
+    
+    @Lob
+    public byte[] getCertificate() {
+        return certificate;
+    }
+
+    /**
+     * Sets the value of the certificate property.
+     * 
+     * @param value
+     *     allowed object is
+     *     byte[]
+     */
+    public void setCertificate(byte[] value) {
+        this.certificate = value;
+    }
+
+    /**
+     * Gets the value of the updateRequired property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    @Transient
+    public XMLGregorianCalendar getUpdateRequired() {
+        return updateRequired;
+    }
+
+    /**
+     * Sets the value of the updateRequired property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link XMLGregorianCalendar }
+     *     
+     */
+    public void setUpdateRequired(XMLGregorianCalendar value) {
+        this.updateRequired = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    
+    
+    @Temporal(TemporalType.TIMESTAMP)
+    public Date getUpdateRequiredItem() {
+        return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getUpdateRequired());
+    }
+
+    public void setUpdateRequiredItem(Date target) {
+        setUpdateRequired(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, target));
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof OAPVP2)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final OAPVP2 that = ((OAPVP2) object);
+        {
+            String lhsMetadataURL;
+            lhsMetadataURL = this.getMetadataURL();
+            String rhsMetadataURL;
+            rhsMetadataURL = that.getMetadataURL();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "metadataURL", lhsMetadataURL), LocatorUtils.property(thatLocator, "metadataURL", rhsMetadataURL), lhsMetadataURL, rhsMetadataURL)) {
+                return false;
+            }
+        }
+        {
+            byte[] lhsCertificate;
+            lhsCertificate = this.getCertificate();
+            byte[] rhsCertificate;
+            rhsCertificate = that.getCertificate();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "certificate", lhsCertificate), LocatorUtils.property(thatLocator, "certificate", rhsCertificate), lhsCertificate, rhsCertificate)) {
+                return false;
+            }
+        }
+        {
+            XMLGregorianCalendar lhsUpdateRequired;
+            lhsUpdateRequired = this.getUpdateRequired();
+            XMLGregorianCalendar rhsUpdateRequired;
+            rhsUpdateRequired = that.getUpdateRequired();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "updateRequired", lhsUpdateRequired), LocatorUtils.property(thatLocator, "updateRequired", rhsUpdateRequired), lhsUpdateRequired, rhsUpdateRequired)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theMetadataURL;
+            theMetadataURL = this.getMetadataURL();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "metadataURL", theMetadataURL), currentHashCode, theMetadataURL);
+        }
+        {
+            byte[] theCertificate;
+            theCertificate = this.getCertificate();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "certificate", theCertificate), currentHashCode, theCertificate);
+        }
+        {
+            XMLGregorianCalendar theUpdateRequired;
+            theUpdateRequired = this.getUpdateRequired();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "updateRequired", theUpdateRequired), currentHashCode, theUpdateRequired);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OASAML1.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OASAML1.java
new file mode 100644
index 000000000..b8ebf5e48
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OASAML1.java
@@ -0,0 +1,580 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="isActive" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         &lt;element name="provideStammzahl" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element name="provideAUTHBlock" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element name="provideIdentityLink" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element name="provideCertificate" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element name="provideFullMandatorData" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element name="useCondition" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         &lt;element name="conditionLength" type="{http://www.w3.org/2001/XMLSchema}integer" minOccurs="0"/>
+ *         &lt;element name="sourceID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="provideAllErrors" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "isActive",
+    "provideStammzahl",
+    "provideAUTHBlock",
+    "provideIdentityLink",
+    "provideCertificate",
+    "provideFullMandatorData",
+    "useCondition",
+    "conditionLength",
+    "sourceID",
+    "provideAllErrors"
+})
+@XmlRootElement(name = "OA_SAML1")
+
+
+
+public class OASAML1
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(type = String.class, defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean isActive;
+    @XmlElement(required = true, type = String.class, defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean provideStammzahl;
+    @XmlElement(required = true, type = String.class, defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean provideAUTHBlock;
+    @XmlElement(required = true, type = String.class, defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean provideIdentityLink;
+    @XmlElement(required = true, type = String.class, defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean provideCertificate;
+    @XmlElement(required = true, type = String.class, defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean provideFullMandatorData;
+    @XmlElement(type = String.class)
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean useCondition;
+    protected BigInteger conditionLength;
+    protected String sourceID;
+    @XmlElement(type = String.class, defaultValue = "true")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean provideAllErrors;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the isActive property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isIsActive() {
+        return isActive;
+    }
+
+    /**
+     * Sets the value of the isActive property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIsActive(Boolean value) {
+        this.isActive = value;
+    }
+
+    /**
+     * Gets the value of the provideStammzahl property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isProvideStammzahl() {
+        return provideStammzahl;
+    }
+
+    /**
+     * Sets the value of the provideStammzahl property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setProvideStammzahl(Boolean value) {
+        this.provideStammzahl = value;
+    }
+
+    /**
+     * Gets the value of the provideAUTHBlock property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isProvideAUTHBlock() {
+        return provideAUTHBlock;
+    }
+
+    /**
+     * Sets the value of the provideAUTHBlock property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setProvideAUTHBlock(Boolean value) {
+        this.provideAUTHBlock = value;
+    }
+
+    /**
+     * Gets the value of the provideIdentityLink property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isProvideIdentityLink() {
+        return provideIdentityLink;
+    }
+
+    /**
+     * Sets the value of the provideIdentityLink property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setProvideIdentityLink(Boolean value) {
+        this.provideIdentityLink = value;
+    }
+
+    /**
+     * Gets the value of the provideCertificate property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isProvideCertificate() {
+        return provideCertificate;
+    }
+
+    /**
+     * Sets the value of the provideCertificate property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setProvideCertificate(Boolean value) {
+        this.provideCertificate = value;
+    }
+
+    /**
+     * Gets the value of the provideFullMandatorData property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isProvideFullMandatorData() {
+        return provideFullMandatorData;
+    }
+
+    /**
+     * Sets the value of the provideFullMandatorData property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setProvideFullMandatorData(Boolean value) {
+        this.provideFullMandatorData = value;
+    }
+
+    /**
+     * Gets the value of the useCondition property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isUseCondition() {
+        return useCondition;
+    }
+
+    /**
+     * Sets the value of the useCondition property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setUseCondition(Boolean value) {
+        this.useCondition = value;
+    }
+
+    /**
+     * Gets the value of the conditionLength property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    
+    
+    public BigInteger getConditionLength() {
+        return conditionLength;
+    }
+
+    /**
+     * Sets the value of the conditionLength property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setConditionLength(BigInteger value) {
+        this.conditionLength = value;
+    }
+
+    /**
+     * Gets the value of the sourceID property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getSourceID() {
+        return sourceID;
+    }
+
+    /**
+     * Sets the value of the sourceID property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSourceID(String value) {
+        this.sourceID = value;
+    }
+
+    /**
+     * Gets the value of the provideAllErrors property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isProvideAllErrors() {
+        return provideAllErrors;
+    }
+
+    /**
+     * Sets the value of the provideAllErrors property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setProvideAllErrors(Boolean value) {
+        this.provideAllErrors = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof OASAML1)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final OASAML1 that = ((OASAML1) object);
+        {
+            Boolean lhsIsActive;
+            lhsIsActive = this.isIsActive();
+            Boolean rhsIsActive;
+            rhsIsActive = that.isIsActive();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "isActive", lhsIsActive), LocatorUtils.property(thatLocator, "isActive", rhsIsActive), lhsIsActive, rhsIsActive)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsProvideStammzahl;
+            lhsProvideStammzahl = this.isProvideStammzahl();
+            Boolean rhsProvideStammzahl;
+            rhsProvideStammzahl = that.isProvideStammzahl();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "provideStammzahl", lhsProvideStammzahl), LocatorUtils.property(thatLocator, "provideStammzahl", rhsProvideStammzahl), lhsProvideStammzahl, rhsProvideStammzahl)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsProvideAUTHBlock;
+            lhsProvideAUTHBlock = this.isProvideAUTHBlock();
+            Boolean rhsProvideAUTHBlock;
+            rhsProvideAUTHBlock = that.isProvideAUTHBlock();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "provideAUTHBlock", lhsProvideAUTHBlock), LocatorUtils.property(thatLocator, "provideAUTHBlock", rhsProvideAUTHBlock), lhsProvideAUTHBlock, rhsProvideAUTHBlock)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsProvideIdentityLink;
+            lhsProvideIdentityLink = this.isProvideIdentityLink();
+            Boolean rhsProvideIdentityLink;
+            rhsProvideIdentityLink = that.isProvideIdentityLink();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "provideIdentityLink", lhsProvideIdentityLink), LocatorUtils.property(thatLocator, "provideIdentityLink", rhsProvideIdentityLink), lhsProvideIdentityLink, rhsProvideIdentityLink)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsProvideCertificate;
+            lhsProvideCertificate = this.isProvideCertificate();
+            Boolean rhsProvideCertificate;
+            rhsProvideCertificate = that.isProvideCertificate();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "provideCertificate", lhsProvideCertificate), LocatorUtils.property(thatLocator, "provideCertificate", rhsProvideCertificate), lhsProvideCertificate, rhsProvideCertificate)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsProvideFullMandatorData;
+            lhsProvideFullMandatorData = this.isProvideFullMandatorData();
+            Boolean rhsProvideFullMandatorData;
+            rhsProvideFullMandatorData = that.isProvideFullMandatorData();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "provideFullMandatorData", lhsProvideFullMandatorData), LocatorUtils.property(thatLocator, "provideFullMandatorData", rhsProvideFullMandatorData), lhsProvideFullMandatorData, rhsProvideFullMandatorData)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsUseCondition;
+            lhsUseCondition = this.isUseCondition();
+            Boolean rhsUseCondition;
+            rhsUseCondition = that.isUseCondition();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "useCondition", lhsUseCondition), LocatorUtils.property(thatLocator, "useCondition", rhsUseCondition), lhsUseCondition, rhsUseCondition)) {
+                return false;
+            }
+        }
+        {
+            BigInteger lhsConditionLength;
+            lhsConditionLength = this.getConditionLength();
+            BigInteger rhsConditionLength;
+            rhsConditionLength = that.getConditionLength();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "conditionLength", lhsConditionLength), LocatorUtils.property(thatLocator, "conditionLength", rhsConditionLength), lhsConditionLength, rhsConditionLength)) {
+                return false;
+            }
+        }
+        {
+            String lhsSourceID;
+            lhsSourceID = this.getSourceID();
+            String rhsSourceID;
+            rhsSourceID = that.getSourceID();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "sourceID", lhsSourceID), LocatorUtils.property(thatLocator, "sourceID", rhsSourceID), lhsSourceID, rhsSourceID)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsProvideAllErrors;
+            lhsProvideAllErrors = this.isProvideAllErrors();
+            Boolean rhsProvideAllErrors;
+            rhsProvideAllErrors = that.isProvideAllErrors();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "provideAllErrors", lhsProvideAllErrors), LocatorUtils.property(thatLocator, "provideAllErrors", rhsProvideAllErrors), lhsProvideAllErrors, rhsProvideAllErrors)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            Boolean theIsActive;
+            theIsActive = this.isIsActive();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "isActive", theIsActive), currentHashCode, theIsActive);
+        }
+        {
+            Boolean theProvideStammzahl;
+            theProvideStammzahl = this.isProvideStammzahl();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "provideStammzahl", theProvideStammzahl), currentHashCode, theProvideStammzahl);
+        }
+        {
+            Boolean theProvideAUTHBlock;
+            theProvideAUTHBlock = this.isProvideAUTHBlock();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "provideAUTHBlock", theProvideAUTHBlock), currentHashCode, theProvideAUTHBlock);
+        }
+        {
+            Boolean theProvideIdentityLink;
+            theProvideIdentityLink = this.isProvideIdentityLink();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "provideIdentityLink", theProvideIdentityLink), currentHashCode, theProvideIdentityLink);
+        }
+        {
+            Boolean theProvideCertificate;
+            theProvideCertificate = this.isProvideCertificate();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "provideCertificate", theProvideCertificate), currentHashCode, theProvideCertificate);
+        }
+        {
+            Boolean theProvideFullMandatorData;
+            theProvideFullMandatorData = this.isProvideFullMandatorData();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "provideFullMandatorData", theProvideFullMandatorData), currentHashCode, theProvideFullMandatorData);
+        }
+        {
+            Boolean theUseCondition;
+            theUseCondition = this.isUseCondition();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "useCondition", theUseCondition), currentHashCode, theUseCondition);
+        }
+        {
+            BigInteger theConditionLength;
+            theConditionLength = this.getConditionLength();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "conditionLength", theConditionLength), currentHashCode, theConditionLength);
+        }
+        {
+            String theSourceID;
+            theSourceID = this.getSourceID();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "sourceID", theSourceID), currentHashCode, theSourceID);
+        }
+        {
+            Boolean theProvideAllErrors;
+            theProvideAllErrors = this.isProvideAllErrors();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "provideAllErrors", theProvideAllErrors), currentHashCode, theProvideAllErrors);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OASSO.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OASSO.java
new file mode 100644
index 000000000..0768c1cc7
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OASSO.java
@@ -0,0 +1,260 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="UseSSO" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element name="AuthDataFrame" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element name="SingleLogOutURL" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "useSSO",
+    "authDataFrame",
+    "singleLogOutURL"
+})
+
+
+
+public class OASSO
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "UseSSO", required = true, type = String.class)
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean useSSO;
+    @XmlElement(name = "AuthDataFrame", required = true, type = String.class, defaultValue = "true")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean authDataFrame;
+    @XmlElement(name = "SingleLogOutURL", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String singleLogOutURL;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the useSSO property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isUseSSO() {
+        return useSSO;
+    }
+
+    /**
+     * Sets the value of the useSSO property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setUseSSO(Boolean value) {
+        this.useSSO = value;
+    }
+
+    /**
+     * Gets the value of the authDataFrame property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isAuthDataFrame() {
+        return authDataFrame;
+    }
+
+    /**
+     * Sets the value of the authDataFrame property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAuthDataFrame(Boolean value) {
+        this.authDataFrame = value;
+    }
+
+    /**
+     * Gets the value of the singleLogOutURL property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getSingleLogOutURL() {
+        return singleLogOutURL;
+    }
+
+    /**
+     * Sets the value of the singleLogOutURL property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSingleLogOutURL(String value) {
+        this.singleLogOutURL = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof OASSO)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final OASSO that = ((OASSO) object);
+        {
+            Boolean lhsUseSSO;
+            lhsUseSSO = this.isUseSSO();
+            Boolean rhsUseSSO;
+            rhsUseSSO = that.isUseSSO();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "useSSO", lhsUseSSO), LocatorUtils.property(thatLocator, "useSSO", rhsUseSSO), lhsUseSSO, rhsUseSSO)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsAuthDataFrame;
+            lhsAuthDataFrame = this.isAuthDataFrame();
+            Boolean rhsAuthDataFrame;
+            rhsAuthDataFrame = that.isAuthDataFrame();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "authDataFrame", lhsAuthDataFrame), LocatorUtils.property(thatLocator, "authDataFrame", rhsAuthDataFrame), lhsAuthDataFrame, rhsAuthDataFrame)) {
+                return false;
+            }
+        }
+        {
+            String lhsSingleLogOutURL;
+            lhsSingleLogOutURL = this.getSingleLogOutURL();
+            String rhsSingleLogOutURL;
+            rhsSingleLogOutURL = that.getSingleLogOutURL();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "singleLogOutURL", lhsSingleLogOutURL), LocatorUtils.property(thatLocator, "singleLogOutURL", rhsSingleLogOutURL), lhsSingleLogOutURL, rhsSingleLogOutURL)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            Boolean theUseSSO;
+            theUseSSO = this.isUseSSO();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "useSSO", theUseSSO), currentHashCode, theUseSSO);
+        }
+        {
+            Boolean theAuthDataFrame;
+            theAuthDataFrame = this.isAuthDataFrame();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "authDataFrame", theAuthDataFrame), currentHashCode, theAuthDataFrame);
+        }
+        {
+            String theSingleLogOutURL;
+            theSingleLogOutURL = this.getSingleLogOutURL();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "singleLogOutURL", theSingleLogOutURL), currentHashCode, theSingleLogOutURL);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OASTORK.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OASTORK.java
new file mode 100644
index 000000000..397fd828b
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OASTORK.java
@@ -0,0 +1,495 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="StorkLogonEnabled" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}Qaa" minOccurs="0"/>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}OAAttributes" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="VidpEnabled" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}AttributeProviders" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="requireConsent" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}C-PEPS" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "storkLogonEnabled",
+    "qaa",
+    "oaAttributes",
+    "vidpEnabled",
+    "attributeProviders",
+    "requireConsent",
+    "cpeps"
+})
+@XmlRootElement(name = "OA_STORK")
+
+
+
+public class OASTORK
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "StorkLogonEnabled", required = true, type = String.class, defaultValue = "true")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean storkLogonEnabled;
+    @XmlElement(name = "Qaa")
+    protected Integer qaa;
+    @XmlElement(name = "OAAttributes")
+    protected List<OAStorkAttribute> oaAttributes;
+    @XmlElement(name = "VidpEnabled", required = true, type = String.class, defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean vidpEnabled;
+    @XmlElement(name = "AttributeProviders")
+    protected List<AttributeProviderPlugin> attributeProviders;
+    @XmlElement(required = true, type = String.class, defaultValue = "true")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean requireConsent;
+    @XmlElement(name = "C-PEPS", required = true)
+    protected List<CPEPS> cpeps;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the storkLogonEnabled property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isStorkLogonEnabled() {
+        return storkLogonEnabled;
+    }
+
+    /**
+     * Sets the value of the storkLogonEnabled property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setStorkLogonEnabled(Boolean value) {
+        this.storkLogonEnabled = value;
+    }
+
+    /**
+     * Gets the value of the qaa property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Integer }
+     *     
+     */
+    
+    
+    public Integer getQaa() {
+        return qaa;
+    }
+
+    /**
+     * Sets the value of the qaa property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Integer }
+     *     
+     */
+    public void setQaa(Integer value) {
+        this.qaa = value;
+    }
+
+    /**
+     * Gets the value of the oaAttributes property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the oaAttributes property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getOAAttributes().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link OAStorkAttribute }
+     * 
+     * 
+     */
+    @OneToMany(targetEntity = OAStorkAttribute.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<OAStorkAttribute> getOAAttributes() {
+        if (oaAttributes == null) {
+            oaAttributes = new ArrayList<OAStorkAttribute>();
+        }
+        return this.oaAttributes;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setOAAttributes(List<OAStorkAttribute> oaAttributes) {
+        this.oaAttributes = oaAttributes;
+    }
+
+    /**
+     * Gets the value of the vidpEnabled property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isVidpEnabled() {
+        return vidpEnabled;
+    }
+
+    /**
+     * Sets the value of the vidpEnabled property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setVidpEnabled(Boolean value) {
+        this.vidpEnabled = value;
+    }
+
+    /**
+     * Gets the value of the attributeProviders property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the attributeProviders property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAttributeProviders().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link AttributeProviderPlugin }
+     * 
+     * 
+     */
+    @OneToMany(targetEntity = AttributeProviderPlugin.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<AttributeProviderPlugin> getAttributeProviders() {
+        if (attributeProviders == null) {
+            attributeProviders = new ArrayList<AttributeProviderPlugin>();
+        }
+        return this.attributeProviders;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setAttributeProviders(List<AttributeProviderPlugin> attributeProviders) {
+        this.attributeProviders = attributeProviders;
+    }
+
+    /**
+     * Gets the value of the requireConsent property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isRequireConsent() {
+        return requireConsent;
+    }
+
+    /**
+     * Sets the value of the requireConsent property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRequireConsent(Boolean value) {
+        this.requireConsent = value;
+    }
+
+    /**
+     * Gets the value of the cpeps property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the cpeps property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getCPEPS().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CPEPS }
+     * 
+     * 
+     */
+    @ManyToMany(targetEntity = CPEPS.class, cascade = {
+        CascadeType.ALL
+    })
+    @JoinTable(name = "OASTORK_CPEPS_CPEPS", joinColumns = {
+        
+    }, inverseJoinColumns = {
+        
+    })
+    public List<CPEPS> getCPEPS() {
+        if (cpeps == null) {
+            cpeps = new ArrayList<CPEPS>();
+        }
+        return this.cpeps;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setCPEPS(List<CPEPS> cpeps) {
+        this.cpeps = cpeps;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof OASTORK)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final OASTORK that = ((OASTORK) object);
+        {
+            Boolean lhsStorkLogonEnabled;
+            lhsStorkLogonEnabled = this.isStorkLogonEnabled();
+            Boolean rhsStorkLogonEnabled;
+            rhsStorkLogonEnabled = that.isStorkLogonEnabled();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "storkLogonEnabled", lhsStorkLogonEnabled), LocatorUtils.property(thatLocator, "storkLogonEnabled", rhsStorkLogonEnabled), lhsStorkLogonEnabled, rhsStorkLogonEnabled)) {
+                return false;
+            }
+        }
+        {
+            Integer lhsQaa;
+            lhsQaa = this.getQaa();
+            Integer rhsQaa;
+            rhsQaa = that.getQaa();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "qaa", lhsQaa), LocatorUtils.property(thatLocator, "qaa", rhsQaa), lhsQaa, rhsQaa)) {
+                return false;
+            }
+        }
+        {
+            List<OAStorkAttribute> lhsOAAttributes;
+            lhsOAAttributes = (((this.oaAttributes!= null)&&(!this.oaAttributes.isEmpty()))?this.getOAAttributes():null);
+            List<OAStorkAttribute> rhsOAAttributes;
+            rhsOAAttributes = (((that.oaAttributes!= null)&&(!that.oaAttributes.isEmpty()))?that.getOAAttributes():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "oaAttributes", lhsOAAttributes), LocatorUtils.property(thatLocator, "oaAttributes", rhsOAAttributes), lhsOAAttributes, rhsOAAttributes)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsVidpEnabled;
+            lhsVidpEnabled = this.isVidpEnabled();
+            Boolean rhsVidpEnabled;
+            rhsVidpEnabled = that.isVidpEnabled();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "vidpEnabled", lhsVidpEnabled), LocatorUtils.property(thatLocator, "vidpEnabled", rhsVidpEnabled), lhsVidpEnabled, rhsVidpEnabled)) {
+                return false;
+            }
+        }
+        {
+            List<AttributeProviderPlugin> lhsAttributeProviders;
+            lhsAttributeProviders = (((this.attributeProviders!= null)&&(!this.attributeProviders.isEmpty()))?this.getAttributeProviders():null);
+            List<AttributeProviderPlugin> rhsAttributeProviders;
+            rhsAttributeProviders = (((that.attributeProviders!= null)&&(!that.attributeProviders.isEmpty()))?that.getAttributeProviders():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "attributeProviders", lhsAttributeProviders), LocatorUtils.property(thatLocator, "attributeProviders", rhsAttributeProviders), lhsAttributeProviders, rhsAttributeProviders)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsRequireConsent;
+            lhsRequireConsent = this.isRequireConsent();
+            Boolean rhsRequireConsent;
+            rhsRequireConsent = that.isRequireConsent();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "requireConsent", lhsRequireConsent), LocatorUtils.property(thatLocator, "requireConsent", rhsRequireConsent), lhsRequireConsent, rhsRequireConsent)) {
+                return false;
+            }
+        }
+        {
+            List<CPEPS> lhsCPEPS;
+            lhsCPEPS = (((this.cpeps!= null)&&(!this.cpeps.isEmpty()))?this.getCPEPS():null);
+            List<CPEPS> rhsCPEPS;
+            rhsCPEPS = (((that.cpeps!= null)&&(!that.cpeps.isEmpty()))?that.getCPEPS():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "cpeps", lhsCPEPS), LocatorUtils.property(thatLocator, "cpeps", rhsCPEPS), lhsCPEPS, rhsCPEPS)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            Boolean theStorkLogonEnabled;
+            theStorkLogonEnabled = this.isStorkLogonEnabled();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "storkLogonEnabled", theStorkLogonEnabled), currentHashCode, theStorkLogonEnabled);
+        }
+        {
+            Integer theQaa;
+            theQaa = this.getQaa();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qaa", theQaa), currentHashCode, theQaa);
+        }
+        {
+            List<OAStorkAttribute> theOAAttributes;
+            theOAAttributes = (((this.oaAttributes!= null)&&(!this.oaAttributes.isEmpty()))?this.getOAAttributes():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "oaAttributes", theOAAttributes), currentHashCode, theOAAttributes);
+        }
+        {
+            Boolean theVidpEnabled;
+            theVidpEnabled = this.isVidpEnabled();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "vidpEnabled", theVidpEnabled), currentHashCode, theVidpEnabled);
+        }
+        {
+            List<AttributeProviderPlugin> theAttributeProviders;
+            theAttributeProviders = (((this.attributeProviders!= null)&&(!this.attributeProviders.isEmpty()))?this.getAttributeProviders():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "attributeProviders", theAttributeProviders), currentHashCode, theAttributeProviders);
+        }
+        {
+            Boolean theRequireConsent;
+            theRequireConsent = this.isRequireConsent();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "requireConsent", theRequireConsent), currentHashCode, theRequireConsent);
+        }
+        {
+            List<CPEPS> theCPEPS;
+            theCPEPS = (((this.cpeps!= null)&&(!this.cpeps.isEmpty()))?this.getCPEPS():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "cpeps", theCPEPS), currentHashCode, theCPEPS);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OAStorkAttribute.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OAStorkAttribute.java
new file mode 100644
index 000000000..628c7f7b4
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OAStorkAttribute.java
@@ -0,0 +1,213 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for OAStorkAttribute complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="OAStorkAttribute">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="mandatory" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "OAStorkAttribute", propOrder = {
+    "mandatory",
+    "name"
+})
+
+
+
+public class OAStorkAttribute
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(required = true, type = String.class)
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean mandatory;
+    @XmlElement(required = true)
+    protected String name;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the mandatory property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isMandatory() {
+        return mandatory;
+    }
+
+    /**
+     * Sets the value of the mandatory property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setMandatory(Boolean value) {
+        this.mandatory = value;
+    }
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setName(String value) {
+        this.name = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof OAStorkAttribute)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final OAStorkAttribute that = ((OAStorkAttribute) object);
+        {
+            Boolean lhsMandatory;
+            lhsMandatory = this.isMandatory();
+            Boolean rhsMandatory;
+            rhsMandatory = that.isMandatory();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "mandatory", lhsMandatory), LocatorUtils.property(thatLocator, "mandatory", rhsMandatory), lhsMandatory, rhsMandatory)) {
+                return false;
+            }
+        }
+        {
+            String lhsName;
+            lhsName = this.getName();
+            String rhsName;
+            rhsName = that.getName();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            Boolean theMandatory;
+            theMandatory = this.isMandatory();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "mandatory", theMandatory), currentHashCode, theMandatory);
+        }
+        {
+            String theName;
+            theName = this.getName();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OAuth.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OAuth.java
new file mode 100644
index 000000000..fbfe6dfa5
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OAuth.java
@@ -0,0 +1,168 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="isActive" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+
+
+
+public class OAuth
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlAttribute(name = "isActive")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean isActive;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the isActive property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public boolean isIsActive() {
+        if (isActive == null) {
+            return new ZeroOneBooleanAdapter().unmarshal("true");
+        } else {
+            return isActive;
+        }
+    }
+
+    /**
+     * Sets the value of the isActive property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIsActive(Boolean value) {
+        this.isActive = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof OAuth)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final OAuth that = ((OAuth) object);
+        {
+            boolean lhsIsActive;
+            lhsIsActive = ((this.isActive!= null)?this.isIsActive():false);
+            boolean rhsIsActive;
+            rhsIsActive = ((that.isActive!= null)?that.isIsActive():false);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "isActive", lhsIsActive), LocatorUtils.property(thatLocator, "isActive", rhsIsActive), lhsIsActive, rhsIsActive)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            boolean theIsActive;
+            theIsActive = ((this.isActive!= null)?this.isIsActive():false);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "isActive", theIsActive), currentHashCode, theIsActive);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ObjectFactory.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ObjectFactory.java
new file mode 100644
index 000000000..577de1706
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ObjectFactory.java
@@ -0,0 +1,757 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import javax.xml.namespace.QName;
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+
+
+/**
+ * This object contains factory methods for each 
+ * Java content interface and Java element interface 
+ * generated in the at.gv.egovernment.moa.id.commons.db.dao.config.deprecated package. 
+ * <p>An ObjectFactory allows you to programatically 
+ * construct new instances of the Java representation 
+ * for XML content. The Java representation of XML 
+ * content can consist of schema derived interfaces 
+ * and classes representing the binding of schema 
+ * type definitions, element declarations and model 
+ * groups.  Factory methods for each of these are 
+ * provided in this class.
+ * 
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+    private final static QName _EnableInfoboxValidator_QNAME = new QName("http://www.buergerkarte.at/namespaces/moaconfig#", "EnableInfoboxValidator");
+    private final static QName _AlwaysShowForm_QNAME = new QName("http://www.buergerkarte.at/namespaces/moaconfig#", "AlwaysShowForm");
+    private final static QName _AbstractSimpleIdentification_QNAME = new QName("http://www.buergerkarte.at/namespaces/moaconfig#", "AbstractSimpleIdentification");
+    private final static QName _QualityAuthenticationAssuranceLevel_QNAME = new QName("http://www.buergerkarte.at/namespaces/moaconfig#", "QualityAuthenticationAssuranceLevel");
+    private final static QName _Attributes_QNAME = new QName("http://www.buergerkarte.at/namespaces/moaconfig#", "Attributes");
+    private final static QName _AttributeProviders_QNAME = new QName("http://www.buergerkarte.at/namespaces/moaconfig#", "AttributeProviders");
+    private final static QName _OAAttributes_QNAME = new QName("http://www.buergerkarte.at/namespaces/moaconfig#", "OAAttributes");
+    private final static QName _AttributeValue_QNAME = new QName("http://www.buergerkarte.at/namespaces/moaconfig#", "AttributeValue");
+    private final static QName _CompatibilityMode_QNAME = new QName("http://www.buergerkarte.at/namespaces/moaconfig#", "CompatibilityMode");
+    private final static QName _TrustProfileID_QNAME = new QName("http://www.buergerkarte.at/namespaces/moaconfig#", "TrustProfileID");
+    private final static QName _Qaa_QNAME = new QName("http://www.buergerkarte.at/namespaces/moaconfig#", "Qaa");
+
+    /**
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.egovernment.moa.id.commons.db.dao.config.deprecated
+     * 
+     */
+    public ObjectFactory() {
+    }
+
+    /**
+     * Create an instance of {@link StorkAttribute }
+     * 
+     */
+    public StorkAttribute createStorkAttribute() {
+        return new StorkAttribute();
+    }
+
+    /**
+     * Create an instance of {@link CPEPS }
+     * 
+     */
+    public CPEPS createCPEPS() {
+        return new CPEPS();
+    }
+
+    /**
+     * Create an instance of {@link OASTORK }
+     * 
+     */
+    public OASTORK createOASTORK() {
+        return new OASTORK();
+    }
+
+    /**
+     * Create an instance of {@link OAStorkAttribute }
+     * 
+     */
+    public OAStorkAttribute createOAStorkAttribute() {
+        return new OAStorkAttribute();
+    }
+
+    /**
+     * Create an instance of {@link AttributeProviderPlugin }
+     * 
+     */
+    public AttributeProviderPlugin createAttributeProviderPlugin() {
+        return new AttributeProviderPlugin();
+    }
+
+    /**
+     * Create an instance of {@link OAPVP2 }
+     * 
+     */
+    public OAPVP2 createOAPVP2() {
+        return new OAPVP2();
+    }
+
+    /**
+     * Create an instance of {@link Header }
+     * 
+     */
+    public Header createHeader() {
+        return new Header();
+    }
+
+    /**
+     * Create an instance of {@link Parameter }
+     * 
+     */
+    public Parameter createParameter() {
+        return new Parameter();
+    }
+
+    /**
+     * Create an instance of {@link EncBPKInformation }
+     * 
+     */
+    public EncBPKInformation createEncBPKInformation() {
+        return new EncBPKInformation();
+    }
+
+    /**
+     * Create an instance of {@link BPKDecryption }
+     * 
+     */
+    public BPKDecryption createBPKDecryption() {
+        return new BPKDecryption();
+    }
+
+    /**
+     * Create an instance of {@link BPKEncryption }
+     * 
+     */
+    public BPKEncryption createBPKEncryption() {
+        return new BPKEncryption();
+    }
+
+    /**
+     * Create an instance of {@link MOAIDConfiguration }
+     * 
+     */
+    public MOAIDConfiguration createMOAIDConfiguration() {
+        return new MOAIDConfiguration();
+    }
+
+    /**
+     * Create an instance of {@link AuthComponentGeneral }
+     * 
+     */
+    public AuthComponentGeneral createAuthComponentGeneral() {
+        return new AuthComponentGeneral();
+    }
+
+    /**
+     * Create an instance of {@link OnlineApplication }
+     * 
+     */
+    public OnlineApplication createOnlineApplication() {
+        return new OnlineApplication();
+    }
+
+    /**
+     * Create an instance of {@link ChainingModes }
+     * 
+     */
+    public ChainingModes createChainingModes() {
+        return new ChainingModes();
+    }
+
+    /**
+     * Create an instance of {@link GenericConfiguration }
+     * 
+     */
+    public GenericConfiguration createGenericConfiguration() {
+        return new GenericConfiguration();
+    }
+
+    /**
+     * Create an instance of {@link DefaultBKUs }
+     * 
+     */
+    public DefaultBKUs createDefaultBKUs() {
+        return new DefaultBKUs();
+    }
+
+    /**
+     * Create an instance of {@link SLRequestTemplates }
+     * 
+     */
+    public SLRequestTemplates createSLRequestTemplates() {
+        return new SLRequestTemplates();
+    }
+
+    /**
+     * Create an instance of {@link GeneralConfiguration }
+     * 
+     */
+    public GeneralConfiguration createGeneralConfiguration() {
+        return new GeneralConfiguration();
+    }
+
+    /**
+     * Create an instance of {@link TimeOuts }
+     * 
+     */
+    public TimeOuts createTimeOuts() {
+        return new TimeOuts();
+    }
+
+    /**
+     * Create an instance of {@link Contact }
+     * 
+     */
+    public Contact createContact() {
+        return new Contact();
+    }
+
+    /**
+     * Create an instance of {@link ParamAuth }
+     * 
+     */
+    public ParamAuth createParamAuth() {
+        return new ParamAuth();
+    }
+
+    /**
+     * Create an instance of {@link Configuration }
+     * 
+     */
+    public Configuration createConfiguration() {
+        return new Configuration();
+    }
+
+    /**
+     * Create an instance of {@link BasicAuth }
+     * 
+     */
+    public BasicAuth createBasicAuth() {
+        return new BasicAuth();
+    }
+
+    /**
+     * Create an instance of {@link HeaderAuth }
+     * 
+     */
+    public HeaderAuth createHeaderAuth() {
+        return new HeaderAuth();
+    }
+
+    /**
+     * Create an instance of {@link OAOAUTH20 }
+     * 
+     */
+    public OAOAUTH20 createOAOAUTH20() {
+        return new OAOAUTH20();
+    }
+
+    /**
+     * Create an instance of {@link SAMLSigningParameter }
+     * 
+     */
+    public SAMLSigningParameter createSAMLSigningParameter() {
+        return new SAMLSigningParameter();
+    }
+
+    /**
+     * Create an instance of {@link SignatureCreationParameterType }
+     * 
+     */
+    public SignatureCreationParameterType createSignatureCreationParameterType() {
+        return new SignatureCreationParameterType();
+    }
+
+    /**
+     * Create an instance of {@link SignatureVerificationParameterType }
+     * 
+     */
+    public SignatureVerificationParameterType createSignatureVerificationParameterType() {
+        return new SignatureVerificationParameterType();
+    }
+
+    /**
+     * Create an instance of {@link OASAML1 }
+     * 
+     */
+    public OASAML1 createOASAML1() {
+        return new OASAML1();
+    }
+
+    /**
+     * Create an instance of {@link IdentificationNumber }
+     * 
+     */
+    public IdentificationNumber createIdentificationNumber() {
+        return new IdentificationNumber();
+    }
+
+    /**
+     * Create an instance of {@link KeyStore }
+     * 
+     */
+    public KeyStore createKeyStore() {
+        return new KeyStore();
+    }
+
+    /**
+     * Create an instance of {@link STORK }
+     * 
+     */
+    public STORK createSTORK() {
+        return new STORK();
+    }
+
+    /**
+     * Create an instance of {@link KeyName }
+     * 
+     */
+    public KeyName createKeyName() {
+        return new KeyName();
+    }
+
+    /**
+     * Create an instance of {@link X509IssuerSerialType }
+     * 
+     */
+    public X509IssuerSerialType createX509IssuerSerialType() {
+        return new X509IssuerSerialType();
+    }
+
+    /**
+     * Create an instance of {@link TemplateType }
+     * 
+     */
+    public TemplateType createTemplateType() {
+        return new TemplateType();
+    }
+
+    /**
+     * Create an instance of {@link ConnectionParameterClientAuthType }
+     * 
+     */
+    public ConnectionParameterClientAuthType createConnectionParameterClientAuthType() {
+        return new ConnectionParameterClientAuthType();
+    }
+
+    /**
+     * Create an instance of {@link BKUSelectionCustomizationType }
+     * 
+     */
+    public BKUSelectionCustomizationType createBKUSelectionCustomizationType() {
+        return new BKUSelectionCustomizationType();
+    }
+
+    /**
+     * Create an instance of {@link PartyRepresentativeType }
+     * 
+     */
+    public PartyRepresentativeType createPartyRepresentativeType() {
+        return new PartyRepresentativeType();
+    }
+
+    /**
+     * Create an instance of {@link AuthComponentType }
+     * 
+     */
+    public AuthComponentType createAuthComponentType() {
+        return new AuthComponentType();
+    }
+
+    /**
+     * Create an instance of {@link TemplatesType }
+     * 
+     */
+    public TemplatesType createTemplatesType() {
+        return new TemplatesType();
+    }
+
+    /**
+     * Create an instance of {@link OnlineApplicationType }
+     * 
+     */
+    public OnlineApplicationType createOnlineApplicationType() {
+        return new OnlineApplicationType();
+    }
+
+    /**
+     * Create an instance of {@link TransformsInfoType }
+     * 
+     */
+    public TransformsInfoType createTransformsInfoType() {
+        return new TransformsInfoType();
+    }
+
+    /**
+     * Create an instance of {@link InterfederationIDPType }
+     * 
+     */
+    public InterfederationIDPType createInterfederationIDPType() {
+        return new InterfederationIDPType();
+    }
+
+    /**
+     * Create an instance of {@link VerifyInfoboxesType }
+     * 
+     */
+    public VerifyInfoboxesType createVerifyInfoboxesType() {
+        return new VerifyInfoboxesType();
+    }
+
+    /**
+     * Create an instance of {@link AbstractSimpleIdentificationType }
+     * 
+     */
+    public AbstractSimpleIdentificationType createAbstractSimpleIdentificationType() {
+        return new AbstractSimpleIdentificationType();
+    }
+
+    /**
+     * Create an instance of {@link SchemaLocationType }
+     * 
+     */
+    public SchemaLocationType createSchemaLocationType() {
+        return new SchemaLocationType();
+    }
+
+    /**
+     * Create an instance of {@link ConnectionParameterServerAuthType }
+     * 
+     */
+    public ConnectionParameterServerAuthType createConnectionParameterServerAuthType() {
+        return new ConnectionParameterServerAuthType();
+    }
+
+    /**
+     * Create an instance of {@link PartyRepresentationType }
+     * 
+     */
+    public PartyRepresentationType createPartyRepresentationType() {
+        return new PartyRepresentationType();
+    }
+
+    /**
+     * Create an instance of {@link UserDatabase }
+     * 
+     */
+    public UserDatabase createUserDatabase() {
+        return new UserDatabase();
+    }
+
+    /**
+     * Create an instance of {@link InputProcessorType }
+     * 
+     */
+    public InputProcessorType createInputProcessorType() {
+        return new InputProcessorType();
+    }
+
+    /**
+     * Create an instance of {@link InterfederationGatewayType }
+     * 
+     */
+    public InterfederationGatewayType createInterfederationGatewayType() {
+        return new InterfederationGatewayType();
+    }
+
+    /**
+     * Create an instance of {@link Schema }
+     * 
+     */
+    public Schema createSchema() {
+        return new Schema();
+    }
+
+    /**
+     * Create an instance of {@link DefaultTrustProfile }
+     * 
+     */
+    public DefaultTrustProfile createDefaultTrustProfile() {
+        return new DefaultTrustProfile();
+    }
+
+    /**
+     * Create an instance of {@link AuthComponentOA }
+     * 
+     */
+    public AuthComponentOA createAuthComponentOA() {
+        return new AuthComponentOA();
+    }
+
+    /**
+     * Create an instance of {@link BKUURLS }
+     * 
+     */
+    public BKUURLS createBKUURLS() {
+        return new BKUURLS();
+    }
+
+    /**
+     * Create an instance of {@link Mandates }
+     * 
+     */
+    public Mandates createMandates() {
+        return new Mandates();
+    }
+
+    /**
+     * Create an instance of {@link TestCredentials }
+     * 
+     */
+    public TestCredentials createTestCredentials() {
+        return new TestCredentials();
+    }
+
+    /**
+     * Create an instance of {@link OASSO }
+     * 
+     */
+    public OASSO createOASSO() {
+        return new OASSO();
+    }
+
+    /**
+     * Create an instance of {@link Protocols }
+     * 
+     */
+    public Protocols createProtocols() {
+        return new Protocols();
+    }
+
+    /**
+     * Create an instance of {@link SSO }
+     * 
+     */
+    public SSO createSSO() {
+        return new SSO();
+    }
+
+    /**
+     * Create an instance of {@link SecurityLayer }
+     * 
+     */
+    public SecurityLayer createSecurityLayer() {
+        return new SecurityLayer();
+    }
+
+    /**
+     * Create an instance of {@link MOASP }
+     * 
+     */
+    public MOASP createMOASP() {
+        return new MOASP();
+    }
+
+    /**
+     * Create an instance of {@link IdentityLinkSigners }
+     * 
+     */
+    public IdentityLinkSigners createIdentityLinkSigners() {
+        return new IdentityLinkSigners();
+    }
+
+    /**
+     * Create an instance of {@link ForeignIdentities }
+     * 
+     */
+    public ForeignIdentities createForeignIdentities() {
+        return new ForeignIdentities();
+    }
+
+    /**
+     * Create an instance of {@link OnlineMandates }
+     * 
+     */
+    public OnlineMandates createOnlineMandates() {
+        return new OnlineMandates();
+    }
+
+    /**
+     * Create an instance of {@link VerifyIdentityLink }
+     * 
+     */
+    public VerifyIdentityLink createVerifyIdentityLink() {
+        return new VerifyIdentityLink();
+    }
+
+    /**
+     * Create an instance of {@link VerifyAuthBlock }
+     * 
+     */
+    public VerifyAuthBlock createVerifyAuthBlock() {
+        return new VerifyAuthBlock();
+    }
+
+    /**
+     * Create an instance of {@link SAML1 }
+     * 
+     */
+    public SAML1 createSAML1() {
+        return new SAML1();
+    }
+
+    /**
+     * Create an instance of {@link PVP2 }
+     * 
+     */
+    public PVP2 createPVP2() {
+        return new PVP2();
+    }
+
+    /**
+     * Create an instance of {@link OAuth }
+     * 
+     */
+    public OAuth createOAuth() {
+        return new OAuth();
+    }
+
+    /**
+     * Create an instance of {@link LegacyAllowed }
+     * 
+     */
+    public LegacyAllowed createLegacyAllowed() {
+        return new LegacyAllowed();
+    }
+
+    /**
+     * Create an instance of {@link Organization }
+     * 
+     */
+    public Organization createOrganization() {
+        return new Organization();
+    }
+
+    /**
+     * Create an instance of {@link ClientKeyStore }
+     * 
+     */
+    public ClientKeyStore createClientKeyStore() {
+        return new ClientKeyStore();
+    }
+
+    /**
+     * Create an instance of {@link TrustAnchor }
+     * 
+     */
+    public TrustAnchor createTrustAnchor() {
+        return new TrustAnchor();
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.buergerkarte.at/namespaces/moaconfig#", name = "EnableInfoboxValidator", defaultValue = "true")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    public JAXBElement<Boolean> createEnableInfoboxValidator(Boolean value) {
+        return new JAXBElement<Boolean>(_EnableInfoboxValidator_QNAME, Boolean.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.buergerkarte.at/namespaces/moaconfig#", name = "AlwaysShowForm", defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    public JAXBElement<Boolean> createAlwaysShowForm(Boolean value) {
+        return new JAXBElement<Boolean>(_AlwaysShowForm_QNAME, Boolean.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link AttributeProviderPlugin }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.buergerkarte.at/namespaces/moaconfig#", name = "AbstractSimpleIdentification")
+    public JAXBElement<AttributeProviderPlugin> createAbstractSimpleIdentification(AttributeProviderPlugin value) {
+        return new JAXBElement<AttributeProviderPlugin>(_AbstractSimpleIdentification_QNAME, AttributeProviderPlugin.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.buergerkarte.at/namespaces/moaconfig#", name = "QualityAuthenticationAssuranceLevel")
+    public JAXBElement<Integer> createQualityAuthenticationAssuranceLevel(Integer value) {
+        return new JAXBElement<Integer>(_QualityAuthenticationAssuranceLevel_QNAME, Integer.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link StorkAttribute }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.buergerkarte.at/namespaces/moaconfig#", name = "Attributes")
+    public JAXBElement<StorkAttribute> createAttributes(StorkAttribute value) {
+        return new JAXBElement<StorkAttribute>(_Attributes_QNAME, StorkAttribute.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link AttributeProviderPlugin }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.buergerkarte.at/namespaces/moaconfig#", name = "AttributeProviders")
+    public JAXBElement<AttributeProviderPlugin> createAttributeProviders(AttributeProviderPlugin value) {
+        return new JAXBElement<AttributeProviderPlugin>(_AttributeProviders_QNAME, AttributeProviderPlugin.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link OAStorkAttribute }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.buergerkarte.at/namespaces/moaconfig#", name = "OAAttributes")
+    public JAXBElement<OAStorkAttribute> createOAAttributes(OAStorkAttribute value) {
+        return new JAXBElement<OAStorkAttribute>(_OAAttributes_QNAME, OAStorkAttribute.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.buergerkarte.at/namespaces/moaconfig#", name = "AttributeValue")
+    public JAXBElement<Object> createAttributeValue(Object value) {
+        return new JAXBElement<Object>(_AttributeValue_QNAME, Object.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Boolean }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.buergerkarte.at/namespaces/moaconfig#", name = "CompatibilityMode", defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    public JAXBElement<Boolean> createCompatibilityMode(Boolean value) {
+        return new JAXBElement<Boolean>(_CompatibilityMode_QNAME, Boolean.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.buergerkarte.at/namespaces/moaconfig#", name = "TrustProfileID")
+    public JAXBElement<String> createTrustProfileID(String value) {
+        return new JAXBElement<String>(_TrustProfileID_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.buergerkarte.at/namespaces/moaconfig#", name = "Qaa")
+    public JAXBElement<Integer> createQaa(Integer value) {
+        return new JAXBElement<Integer>(_Qaa_QNAME, Integer.class, null, value);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OnlineApplication.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OnlineApplication.java
new file mode 100644
index 000000000..1beb8868e
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OnlineApplication.java
@@ -0,0 +1,509 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for OnlineApplication complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="OnlineApplication">
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.buergerkarte.at/namespaces/moaconfig#}OnlineApplicationType">
+ *       &lt;attribute name="publicURLPrefix" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       &lt;attribute name="keyBoxIdentifier" type="{http://www.buergerkarte.at/namespaces/moaconfig#}MOAKeyBoxSelector" default="SecureSignatureKeypair" />
+ *       &lt;attribute name="type" default="publicService">
+ *         &lt;simpleType>
+ *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
+ *             &lt;enumeration value="businessService"/>
+ *             &lt;enumeration value="publicService"/>
+ *             &lt;enumeration value="storkService"/>
+ *           &lt;/restriction>
+ *         &lt;/simpleType>
+ *       &lt;/attribute>
+ *       &lt;attribute name="calculateHPI" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *       &lt;attribute name="friendlyName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="target" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="targetFriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="storkSPTargetCountry" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="removeBPKFromAuthBlock" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "OnlineApplication")
+
+
+public class OnlineApplication
+    extends OnlineApplicationType
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlAttribute(name = "publicURLPrefix", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String publicURLPrefix;
+    @XmlAttribute(name = "keyBoxIdentifier")
+    protected MOAKeyBoxSelector keyBoxIdentifier;
+    @XmlAttribute(name = "type")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    protected String type;
+    @XmlAttribute(name = "calculateHPI")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean calculateHPI;
+    @XmlAttribute(name = "friendlyName")
+    protected String friendlyName;
+    @XmlAttribute(name = "target")
+    protected String target;
+    @XmlAttribute(name = "targetFriendlyName")
+    protected String targetFriendlyName;
+    @XmlAttribute(name = "storkSPTargetCountry")
+    protected String storkSPTargetCountry;
+    @XmlAttribute(name = "removeBPKFromAuthBlock")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean removeBPKFromAuthBlock;
+
+    /**
+     * Gets the value of the publicURLPrefix property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getPublicURLPrefix() {
+        return publicURLPrefix;
+    }
+
+    /**
+     * Sets the value of the publicURLPrefix property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPublicURLPrefix(String value) {
+        this.publicURLPrefix = value;
+    }
+
+    /**
+     * Gets the value of the keyBoxIdentifier property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link MOAKeyBoxSelector }
+     *     
+     */
+    
+    
+    @Enumerated(EnumType.STRING)
+    public MOAKeyBoxSelector getKeyBoxIdentifier() {
+        if (keyBoxIdentifier == null) {
+            return MOAKeyBoxSelector.SECURE_SIGNATURE_KEYPAIR;
+        } else {
+            return keyBoxIdentifier;
+        }
+    }
+
+    /**
+     * Sets the value of the keyBoxIdentifier property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link MOAKeyBoxSelector }
+     *     
+     */
+    public void setKeyBoxIdentifier(MOAKeyBoxSelector value) {
+        this.keyBoxIdentifier = value;
+    }
+
+    /**
+     * Gets the value of the type property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getType() {
+        if (type == null) {
+            return "publicService";
+        } else {
+            return type;
+        }
+    }
+
+    /**
+     * Sets the value of the type property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setType(String value) {
+        this.type = value;
+    }
+
+    /**
+     * Gets the value of the calculateHPI property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public boolean isCalculateHPI() {
+        if (calculateHPI == null) {
+            return new ZeroOneBooleanAdapter().unmarshal("false");
+        } else {
+            return calculateHPI;
+        }
+    }
+
+    /**
+     * Sets the value of the calculateHPI property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setCalculateHPI(Boolean value) {
+        this.calculateHPI = value;
+    }
+
+    /**
+     * Gets the value of the friendlyName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getFriendlyName() {
+        return friendlyName;
+    }
+
+    /**
+     * Sets the value of the friendlyName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFriendlyName(String value) {
+        this.friendlyName = value;
+    }
+
+    /**
+     * Gets the value of the target property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getTarget() {
+        return target;
+    }
+
+    /**
+     * Sets the value of the target property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTarget(String value) {
+        this.target = value;
+    }
+
+    /**
+     * Gets the value of the targetFriendlyName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getTargetFriendlyName() {
+        return targetFriendlyName;
+    }
+
+    /**
+     * Sets the value of the targetFriendlyName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTargetFriendlyName(String value) {
+        this.targetFriendlyName = value;
+    }
+
+    /**
+     * Gets the value of the storkSPTargetCountry property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getStorkSPTargetCountry() {
+        return storkSPTargetCountry;
+    }
+
+    /**
+     * Sets the value of the storkSPTargetCountry property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setStorkSPTargetCountry(String value) {
+        this.storkSPTargetCountry = value;
+    }
+
+    /**
+     * Gets the value of the removeBPKFromAuthBlock property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public boolean isRemoveBPKFromAuthBlock() {
+        if (removeBPKFromAuthBlock == null) {
+            return new ZeroOneBooleanAdapter().unmarshal("false");
+        } else {
+            return removeBPKFromAuthBlock;
+        }
+    }
+
+    /**
+     * Sets the value of the removeBPKFromAuthBlock property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRemoveBPKFromAuthBlock(Boolean value) {
+        this.removeBPKFromAuthBlock = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof OnlineApplication)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        if (!super.equals(thisLocator, thatLocator, object, strategy)) {
+            return false;
+        }
+        final OnlineApplication that = ((OnlineApplication) object);
+        {
+            String lhsPublicURLPrefix;
+            lhsPublicURLPrefix = this.getPublicURLPrefix();
+            String rhsPublicURLPrefix;
+            rhsPublicURLPrefix = that.getPublicURLPrefix();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "publicURLPrefix", lhsPublicURLPrefix), LocatorUtils.property(thatLocator, "publicURLPrefix", rhsPublicURLPrefix), lhsPublicURLPrefix, rhsPublicURLPrefix)) {
+                return false;
+            }
+        }
+        {
+            MOAKeyBoxSelector lhsKeyBoxIdentifier;
+            lhsKeyBoxIdentifier = this.getKeyBoxIdentifier();
+            MOAKeyBoxSelector rhsKeyBoxIdentifier;
+            rhsKeyBoxIdentifier = that.getKeyBoxIdentifier();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "keyBoxIdentifier", lhsKeyBoxIdentifier), LocatorUtils.property(thatLocator, "keyBoxIdentifier", rhsKeyBoxIdentifier), lhsKeyBoxIdentifier, rhsKeyBoxIdentifier)) {
+                return false;
+            }
+        }
+        {
+            String lhsType;
+            lhsType = this.getType();
+            String rhsType;
+            rhsType = that.getType();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "type", lhsType), LocatorUtils.property(thatLocator, "type", rhsType), lhsType, rhsType)) {
+                return false;
+            }
+        }
+        {
+            boolean lhsCalculateHPI;
+            lhsCalculateHPI = ((this.calculateHPI!= null)?this.isCalculateHPI():false);
+            boolean rhsCalculateHPI;
+            rhsCalculateHPI = ((that.calculateHPI!= null)?that.isCalculateHPI():false);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "calculateHPI", lhsCalculateHPI), LocatorUtils.property(thatLocator, "calculateHPI", rhsCalculateHPI), lhsCalculateHPI, rhsCalculateHPI)) {
+                return false;
+            }
+        }
+        {
+            String lhsFriendlyName;
+            lhsFriendlyName = this.getFriendlyName();
+            String rhsFriendlyName;
+            rhsFriendlyName = that.getFriendlyName();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "friendlyName", lhsFriendlyName), LocatorUtils.property(thatLocator, "friendlyName", rhsFriendlyName), lhsFriendlyName, rhsFriendlyName)) {
+                return false;
+            }
+        }
+        {
+            String lhsTarget;
+            lhsTarget = this.getTarget();
+            String rhsTarget;
+            rhsTarget = that.getTarget();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "target", lhsTarget), LocatorUtils.property(thatLocator, "target", rhsTarget), lhsTarget, rhsTarget)) {
+                return false;
+            }
+        }
+        {
+            String lhsTargetFriendlyName;
+            lhsTargetFriendlyName = this.getTargetFriendlyName();
+            String rhsTargetFriendlyName;
+            rhsTargetFriendlyName = that.getTargetFriendlyName();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "targetFriendlyName", lhsTargetFriendlyName), LocatorUtils.property(thatLocator, "targetFriendlyName", rhsTargetFriendlyName), lhsTargetFriendlyName, rhsTargetFriendlyName)) {
+                return false;
+            }
+        }
+        {
+            String lhsStorkSPTargetCountry;
+            lhsStorkSPTargetCountry = this.getStorkSPTargetCountry();
+            String rhsStorkSPTargetCountry;
+            rhsStorkSPTargetCountry = that.getStorkSPTargetCountry();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "storkSPTargetCountry", lhsStorkSPTargetCountry), LocatorUtils.property(thatLocator, "storkSPTargetCountry", rhsStorkSPTargetCountry), lhsStorkSPTargetCountry, rhsStorkSPTargetCountry)) {
+                return false;
+            }
+        }
+        {
+            boolean lhsRemoveBPKFromAuthBlock;
+            lhsRemoveBPKFromAuthBlock = ((this.removeBPKFromAuthBlock!= null)?this.isRemoveBPKFromAuthBlock():false);
+            boolean rhsRemoveBPKFromAuthBlock;
+            rhsRemoveBPKFromAuthBlock = ((that.removeBPKFromAuthBlock!= null)?that.isRemoveBPKFromAuthBlock():false);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "removeBPKFromAuthBlock", lhsRemoveBPKFromAuthBlock), LocatorUtils.property(thatLocator, "removeBPKFromAuthBlock", rhsRemoveBPKFromAuthBlock), lhsRemoveBPKFromAuthBlock, rhsRemoveBPKFromAuthBlock)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = super.hashCode(locator, strategy);
+        {
+            String thePublicURLPrefix;
+            thePublicURLPrefix = this.getPublicURLPrefix();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "publicURLPrefix", thePublicURLPrefix), currentHashCode, thePublicURLPrefix);
+        }
+        {
+            MOAKeyBoxSelector theKeyBoxIdentifier;
+            theKeyBoxIdentifier = this.getKeyBoxIdentifier();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "keyBoxIdentifier", theKeyBoxIdentifier), currentHashCode, theKeyBoxIdentifier);
+        }
+        {
+            String theType;
+            theType = this.getType();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "type", theType), currentHashCode, theType);
+        }
+        {
+            boolean theCalculateHPI;
+            theCalculateHPI = ((this.calculateHPI!= null)?this.isCalculateHPI():false);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "calculateHPI", theCalculateHPI), currentHashCode, theCalculateHPI);
+        }
+        {
+            String theFriendlyName;
+            theFriendlyName = this.getFriendlyName();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "friendlyName", theFriendlyName), currentHashCode, theFriendlyName);
+        }
+        {
+            String theTarget;
+            theTarget = this.getTarget();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "target", theTarget), currentHashCode, theTarget);
+        }
+        {
+            String theTargetFriendlyName;
+            theTargetFriendlyName = this.getTargetFriendlyName();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "targetFriendlyName", theTargetFriendlyName), currentHashCode, theTargetFriendlyName);
+        }
+        {
+            String theStorkSPTargetCountry;
+            theStorkSPTargetCountry = this.getStorkSPTargetCountry();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "storkSPTargetCountry", theStorkSPTargetCountry), currentHashCode, theStorkSPTargetCountry);
+        }
+        {
+            boolean theRemoveBPKFromAuthBlock;
+            theRemoveBPKFromAuthBlock = ((this.removeBPKFromAuthBlock!= null)?this.isRemoveBPKFromAuthBlock():false);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "removeBPKFromAuthBlock", theRemoveBPKFromAuthBlock), currentHashCode, theRemoveBPKFromAuthBlock);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OnlineApplicationType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OnlineApplicationType.java
new file mode 100644
index 000000000..5d3dffbdf
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OnlineApplicationType.java
@@ -0,0 +1,565 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for OnlineApplicationType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="OnlineApplicationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="isNew" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         &lt;element name="isActive" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element name="isAdminRequired" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         &lt;element name="isInterfederationIDP" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         &lt;element name="InterfederationIDP" type="{http://www.buergerkarte.at/namespaces/moaconfig#}InterfederationIDPType" minOccurs="0"/>
+ *         &lt;element name="isInterfederationGateway" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         &lt;element name="InterfederationGateway" type="{http://www.buergerkarte.at/namespaces/moaconfig#}InterfederationGatewayType" minOccurs="0"/>
+ *         &lt;element name="AuthComponent_OA" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="BKUURLS">
+ *                     &lt;complexType>
+ *                       &lt;complexContent>
+ *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           &lt;sequence>
+ *                             &lt;element name="OnlineBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *                             &lt;element name="HandyBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *                             &lt;element name="LocalBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *                           &lt;/sequence>
+ *                         &lt;/restriction>
+ *                       &lt;/complexContent>
+ *                     &lt;/complexType>
+ *                   &lt;/element>
+ *                   &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}IdentificationNumber" minOccurs="0"/>
+ *                   &lt;element name="Templates" type="{http://www.buergerkarte.at/namespaces/moaconfig#}TemplatesType" minOccurs="0"/>
+ *                   &lt;element name="TransformsInfo" type="{http://www.buergerkarte.at/namespaces/moaconfig#}TransformsInfoType" maxOccurs="unbounded" minOccurs="0"/>
+ *                   &lt;element name="Mandates" minOccurs="0">
+ *                     &lt;complexType>
+ *                       &lt;complexContent>
+ *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           &lt;sequence>
+ *                             &lt;element name="Profiles" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *                             &lt;element name="ProfileName" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *                           &lt;/sequence>
+ *                         &lt;/restriction>
+ *                       &lt;/complexContent>
+ *                     &lt;/complexType>
+ *                   &lt;/element>
+ *                   &lt;element name="testCredentials" minOccurs="0">
+ *                     &lt;complexType>
+ *                       &lt;complexContent>
+ *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           &lt;sequence>
+ *                             &lt;element name="credentialOID" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *                           &lt;/sequence>
+ *                           &lt;attribute name="enableTestCredentials" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *                         &lt;/restriction>
+ *                       &lt;/complexContent>
+ *                     &lt;/complexType>
+ *                   &lt;/element>
+ *                   &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}OA_STORK" minOccurs="0"/>
+ *                   &lt;element name="OA_SSO" minOccurs="0">
+ *                     &lt;complexType>
+ *                       &lt;complexContent>
+ *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           &lt;sequence>
+ *                             &lt;element name="UseSSO" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *                             &lt;element name="AuthDataFrame" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *                             &lt;element name="SingleLogOutURL" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *                           &lt;/sequence>
+ *                         &lt;/restriction>
+ *                       &lt;/complexContent>
+ *                     &lt;/complexType>
+ *                   &lt;/element>
+ *                   &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}OA_SAML1" minOccurs="0"/>
+ *                   &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}OA_PVP2" minOccurs="0"/>
+ *                   &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}OA_OAUTH20" minOccurs="0"/>
+ *                   &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}EncBPKInformation" minOccurs="0"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "OnlineApplicationType", propOrder = {
+    "isNew",
+    "isActive",
+    "isAdminRequired",
+    "isInterfederationIDP",
+    "interfederationIDP",
+    "isInterfederationGateway",
+    "interfederationGateway",
+    "authComponentOA"
+})
+@XmlSeeAlso({
+    OnlineApplication.class
+})
+
+
+
+public class OnlineApplicationType
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(type = String.class, defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean isNew;
+    @XmlElement(required = true, type = String.class, defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean isActive;
+    @XmlElement(type = String.class, defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean isAdminRequired;
+    @XmlElement(type = String.class, defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean isInterfederationIDP;
+    @XmlElement(name = "InterfederationIDP")
+    protected InterfederationIDPType interfederationIDP;
+    @XmlElement(type = String.class, defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean isInterfederationGateway;
+    @XmlElement(name = "InterfederationGateway")
+    protected InterfederationGatewayType interfederationGateway;
+    @XmlElement(name = "AuthComponent_OA")
+    protected AuthComponentOA authComponentOA;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the isNew property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    @Transient
+    public Boolean isIsNew() {
+        return isNew;
+    }
+
+    /**
+     * Sets the value of the isNew property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIsNew(Boolean value) {
+        this.isNew = value;
+    }
+
+    /**
+     * Gets the value of the isActive property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isIsActive() {
+        return isActive;
+    }
+
+    /**
+     * Sets the value of the isActive property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIsActive(Boolean value) {
+        this.isActive = value;
+    }
+
+    /**
+     * Gets the value of the isAdminRequired property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isIsAdminRequired() {
+        return isAdminRequired;
+    }
+
+    /**
+     * Sets the value of the isAdminRequired property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIsAdminRequired(Boolean value) {
+        this.isAdminRequired = value;
+    }
+
+    /**
+     * Gets the value of the isInterfederationIDP property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isIsInterfederationIDP() {
+        return isInterfederationIDP;
+    }
+
+    /**
+     * Sets the value of the isInterfederationIDP property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIsInterfederationIDP(Boolean value) {
+        this.isInterfederationIDP = value;
+    }
+
+    /**
+     * Gets the value of the interfederationIDP property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link InterfederationIDPType }
+     *     
+     */
+    @ManyToOne(targetEntity = InterfederationIDPType.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public InterfederationIDPType getInterfederationIDP() {
+        return interfederationIDP;
+    }
+
+    /**
+     * Sets the value of the interfederationIDP property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link InterfederationIDPType }
+     *     
+     */
+    public void setInterfederationIDP(InterfederationIDPType value) {
+        this.interfederationIDP = value;
+    }
+
+    /**
+     * Gets the value of the isInterfederationGateway property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isIsInterfederationGateway() {
+        return isInterfederationGateway;
+    }
+
+    /**
+     * Sets the value of the isInterfederationGateway property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIsInterfederationGateway(Boolean value) {
+        this.isInterfederationGateway = value;
+    }
+
+    /**
+     * Gets the value of the interfederationGateway property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link InterfederationGatewayType }
+     *     
+     */
+    @ManyToOne(targetEntity = InterfederationGatewayType.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public InterfederationGatewayType getInterfederationGateway() {
+        return interfederationGateway;
+    }
+
+    /**
+     * Sets the value of the interfederationGateway property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link InterfederationGatewayType }
+     *     
+     */
+    public void setInterfederationGateway(InterfederationGatewayType value) {
+        this.interfederationGateway = value;
+    }
+
+    /**
+     * Gets the value of the authComponentOA property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link AuthComponentOA }
+     *     
+     */
+    @ManyToOne(targetEntity = AuthComponentOA.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public AuthComponentOA getAuthComponentOA() {
+        return authComponentOA;
+    }
+
+    /**
+     * Sets the value of the authComponentOA property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link AuthComponentOA }
+     *     
+     */
+    public void setAuthComponentOA(AuthComponentOA value) {
+        this.authComponentOA = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof OnlineApplicationType)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final OnlineApplicationType that = ((OnlineApplicationType) object);
+        {
+            Boolean lhsIsNew;
+            lhsIsNew = this.isIsNew();
+            Boolean rhsIsNew;
+            rhsIsNew = that.isIsNew();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "isNew", lhsIsNew), LocatorUtils.property(thatLocator, "isNew", rhsIsNew), lhsIsNew, rhsIsNew)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsIsActive;
+            lhsIsActive = this.isIsActive();
+            Boolean rhsIsActive;
+            rhsIsActive = that.isIsActive();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "isActive", lhsIsActive), LocatorUtils.property(thatLocator, "isActive", rhsIsActive), lhsIsActive, rhsIsActive)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsIsAdminRequired;
+            lhsIsAdminRequired = this.isIsAdminRequired();
+            Boolean rhsIsAdminRequired;
+            rhsIsAdminRequired = that.isIsAdminRequired();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "isAdminRequired", lhsIsAdminRequired), LocatorUtils.property(thatLocator, "isAdminRequired", rhsIsAdminRequired), lhsIsAdminRequired, rhsIsAdminRequired)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsIsInterfederationIDP;
+            lhsIsInterfederationIDP = this.isIsInterfederationIDP();
+            Boolean rhsIsInterfederationIDP;
+            rhsIsInterfederationIDP = that.isIsInterfederationIDP();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "isInterfederationIDP", lhsIsInterfederationIDP), LocatorUtils.property(thatLocator, "isInterfederationIDP", rhsIsInterfederationIDP), lhsIsInterfederationIDP, rhsIsInterfederationIDP)) {
+                return false;
+            }
+        }
+        {
+            InterfederationIDPType lhsInterfederationIDP;
+            lhsInterfederationIDP = this.getInterfederationIDP();
+            InterfederationIDPType rhsInterfederationIDP;
+            rhsInterfederationIDP = that.getInterfederationIDP();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "interfederationIDP", lhsInterfederationIDP), LocatorUtils.property(thatLocator, "interfederationIDP", rhsInterfederationIDP), lhsInterfederationIDP, rhsInterfederationIDP)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsIsInterfederationGateway;
+            lhsIsInterfederationGateway = this.isIsInterfederationGateway();
+            Boolean rhsIsInterfederationGateway;
+            rhsIsInterfederationGateway = that.isIsInterfederationGateway();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "isInterfederationGateway", lhsIsInterfederationGateway), LocatorUtils.property(thatLocator, "isInterfederationGateway", rhsIsInterfederationGateway), lhsIsInterfederationGateway, rhsIsInterfederationGateway)) {
+                return false;
+            }
+        }
+        {
+            InterfederationGatewayType lhsInterfederationGateway;
+            lhsInterfederationGateway = this.getInterfederationGateway();
+            InterfederationGatewayType rhsInterfederationGateway;
+            rhsInterfederationGateway = that.getInterfederationGateway();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "interfederationGateway", lhsInterfederationGateway), LocatorUtils.property(thatLocator, "interfederationGateway", rhsInterfederationGateway), lhsInterfederationGateway, rhsInterfederationGateway)) {
+                return false;
+            }
+        }
+        {
+            AuthComponentOA lhsAuthComponentOA;
+            lhsAuthComponentOA = this.getAuthComponentOA();
+            AuthComponentOA rhsAuthComponentOA;
+            rhsAuthComponentOA = that.getAuthComponentOA();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "authComponentOA", lhsAuthComponentOA), LocatorUtils.property(thatLocator, "authComponentOA", rhsAuthComponentOA), lhsAuthComponentOA, rhsAuthComponentOA)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            Boolean theIsNew;
+            theIsNew = this.isIsNew();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "isNew", theIsNew), currentHashCode, theIsNew);
+        }
+        {
+            Boolean theIsActive;
+            theIsActive = this.isIsActive();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "isActive", theIsActive), currentHashCode, theIsActive);
+        }
+        {
+            Boolean theIsAdminRequired;
+            theIsAdminRequired = this.isIsAdminRequired();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "isAdminRequired", theIsAdminRequired), currentHashCode, theIsAdminRequired);
+        }
+        {
+            Boolean theIsInterfederationIDP;
+            theIsInterfederationIDP = this.isIsInterfederationIDP();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "isInterfederationIDP", theIsInterfederationIDP), currentHashCode, theIsInterfederationIDP);
+        }
+        {
+            InterfederationIDPType theInterfederationIDP;
+            theInterfederationIDP = this.getInterfederationIDP();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "interfederationIDP", theInterfederationIDP), currentHashCode, theInterfederationIDP);
+        }
+        {
+            Boolean theIsInterfederationGateway;
+            theIsInterfederationGateway = this.isIsInterfederationGateway();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "isInterfederationGateway", theIsInterfederationGateway), currentHashCode, theIsInterfederationGateway);
+        }
+        {
+            InterfederationGatewayType theInterfederationGateway;
+            theInterfederationGateway = this.getInterfederationGateway();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "interfederationGateway", theInterfederationGateway), currentHashCode, theInterfederationGateway);
+        }
+        {
+            AuthComponentOA theAuthComponentOA;
+            theAuthComponentOA = this.getAuthComponentOA();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "authComponentOA", theAuthComponentOA), currentHashCode, theAuthComponentOA);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OnlineMandates.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OnlineMandates.java
new file mode 100644
index 000000000..4e5a7bc2c
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OnlineMandates.java
@@ -0,0 +1,168 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="ConnectionParameter" type="{http://www.buergerkarte.at/namespaces/moaconfig#}ConnectionParameterClientAuthType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "connectionParameter"
+})
+
+
+
+public class OnlineMandates
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "ConnectionParameter", required = true)
+    protected ConnectionParameterClientAuthType connectionParameter;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the connectionParameter property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ConnectionParameterClientAuthType }
+     *     
+     */
+    @ManyToOne(targetEntity = ConnectionParameterClientAuthType.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public ConnectionParameterClientAuthType getConnectionParameter() {
+        return connectionParameter;
+    }
+
+    /**
+     * Sets the value of the connectionParameter property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ConnectionParameterClientAuthType }
+     *     
+     */
+    public void setConnectionParameter(ConnectionParameterClientAuthType value) {
+        this.connectionParameter = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof OnlineMandates)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final OnlineMandates that = ((OnlineMandates) object);
+        {
+            ConnectionParameterClientAuthType lhsConnectionParameter;
+            lhsConnectionParameter = this.getConnectionParameter();
+            ConnectionParameterClientAuthType rhsConnectionParameter;
+            rhsConnectionParameter = that.getConnectionParameter();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "connectionParameter", lhsConnectionParameter), LocatorUtils.property(thatLocator, "connectionParameter", rhsConnectionParameter), lhsConnectionParameter, rhsConnectionParameter)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            ConnectionParameterClientAuthType theConnectionParameter;
+            theConnectionParameter = this.getConnectionParameter();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "connectionParameter", theConnectionParameter), currentHashCode, theConnectionParameter);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Organization.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Organization.java
new file mode 100644
index 000000000..140da1b85
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Organization.java
@@ -0,0 +1,254 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="DisplayName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="URL" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "name",
+    "displayName",
+    "url"
+})
+
+
+
+public class Organization
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "Name", required = true)
+    protected String name;
+    @XmlElement(name = "DisplayName", required = true)
+    protected String displayName;
+    @XmlElement(name = "URL", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String url;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setName(String value) {
+        this.name = value;
+    }
+
+    /**
+     * Gets the value of the displayName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    /**
+     * Sets the value of the displayName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setDisplayName(String value) {
+        this.displayName = value;
+    }
+
+    /**
+     * Gets the value of the url property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getURL() {
+        return url;
+    }
+
+    /**
+     * Sets the value of the url property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setURL(String value) {
+        this.url = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof Organization)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final Organization that = ((Organization) object);
+        {
+            String lhsName;
+            lhsName = this.getName();
+            String rhsName;
+            rhsName = that.getName();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) {
+                return false;
+            }
+        }
+        {
+            String lhsDisplayName;
+            lhsDisplayName = this.getDisplayName();
+            String rhsDisplayName;
+            rhsDisplayName = that.getDisplayName();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "displayName", lhsDisplayName), LocatorUtils.property(thatLocator, "displayName", rhsDisplayName), lhsDisplayName, rhsDisplayName)) {
+                return false;
+            }
+        }
+        {
+            String lhsURL;
+            lhsURL = this.getURL();
+            String rhsURL;
+            rhsURL = that.getURL();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "url", lhsURL), LocatorUtils.property(thatLocator, "url", rhsURL), lhsURL, rhsURL)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theName;
+            theName = this.getName();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName);
+        }
+        {
+            String theDisplayName;
+            theDisplayName = this.getDisplayName();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "displayName", theDisplayName), currentHashCode, theDisplayName);
+        }
+        {
+            String theURL;
+            theURL = this.getURL();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "url", theURL), currentHashCode, theURL);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/PVP2.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/PVP2.java
new file mode 100644
index 000000000..0aee4a5d7
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/PVP2.java
@@ -0,0 +1,385 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="PublicURLPrefix" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         &lt;element name="IssuerName" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         &lt;element name="Organization">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="Name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *                   &lt;element name="DisplayName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *                   &lt;element name="URL" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}Contact" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="isActive" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "publicURLPrefix",
+    "issuerName",
+    "organization",
+    "contact"
+})
+
+
+
+public class PVP2
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "PublicURLPrefix", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String publicURLPrefix;
+    @XmlElement(name = "IssuerName", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String issuerName;
+    @XmlElement(name = "Organization", required = true)
+    protected Organization organization;
+    @XmlElement(name = "Contact", required = true)
+    protected List<Contact> contact;
+    @XmlAttribute(name = "isActive")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean isActive;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the publicURLPrefix property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getPublicURLPrefix() {
+        return publicURLPrefix;
+    }
+
+    /**
+     * Sets the value of the publicURLPrefix property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPublicURLPrefix(String value) {
+        this.publicURLPrefix = value;
+    }
+
+    /**
+     * Gets the value of the issuerName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getIssuerName() {
+        return issuerName;
+    }
+
+    /**
+     * Sets the value of the issuerName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIssuerName(String value) {
+        this.issuerName = value;
+    }
+
+    /**
+     * Gets the value of the organization property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Organization }
+     *     
+     */
+    @ManyToOne(targetEntity = Organization.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public Organization getOrganization() {
+        return organization;
+    }
+
+    /**
+     * Sets the value of the organization property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Organization }
+     *     
+     */
+    public void setOrganization(Organization value) {
+        this.organization = value;
+    }
+
+    /**
+     * Gets the value of the contact property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the contact property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getContact().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Contact }
+     * 
+     * 
+     */
+    @OneToMany(targetEntity = Contact.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<Contact> getContact() {
+        if (contact == null) {
+            contact = new ArrayList<Contact>();
+        }
+        return this.contact;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setContact(List<Contact> contact) {
+        this.contact = contact;
+    }
+
+    /**
+     * Gets the value of the isActive property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public boolean isIsActive() {
+        if (isActive == null) {
+            return new ZeroOneBooleanAdapter().unmarshal("true");
+        } else {
+            return isActive;
+        }
+    }
+
+    /**
+     * Sets the value of the isActive property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIsActive(Boolean value) {
+        this.isActive = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof PVP2)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final PVP2 that = ((PVP2) object);
+        {
+            String lhsPublicURLPrefix;
+            lhsPublicURLPrefix = this.getPublicURLPrefix();
+            String rhsPublicURLPrefix;
+            rhsPublicURLPrefix = that.getPublicURLPrefix();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "publicURLPrefix", lhsPublicURLPrefix), LocatorUtils.property(thatLocator, "publicURLPrefix", rhsPublicURLPrefix), lhsPublicURLPrefix, rhsPublicURLPrefix)) {
+                return false;
+            }
+        }
+        {
+            String lhsIssuerName;
+            lhsIssuerName = this.getIssuerName();
+            String rhsIssuerName;
+            rhsIssuerName = that.getIssuerName();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "issuerName", lhsIssuerName), LocatorUtils.property(thatLocator, "issuerName", rhsIssuerName), lhsIssuerName, rhsIssuerName)) {
+                return false;
+            }
+        }
+        {
+            Organization lhsOrganization;
+            lhsOrganization = this.getOrganization();
+            Organization rhsOrganization;
+            rhsOrganization = that.getOrganization();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "organization", lhsOrganization), LocatorUtils.property(thatLocator, "organization", rhsOrganization), lhsOrganization, rhsOrganization)) {
+                return false;
+            }
+        }
+        {
+            List<Contact> lhsContact;
+            lhsContact = (((this.contact!= null)&&(!this.contact.isEmpty()))?this.getContact():null);
+            List<Contact> rhsContact;
+            rhsContact = (((that.contact!= null)&&(!that.contact.isEmpty()))?that.getContact():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "contact", lhsContact), LocatorUtils.property(thatLocator, "contact", rhsContact), lhsContact, rhsContact)) {
+                return false;
+            }
+        }
+        {
+            boolean lhsIsActive;
+            lhsIsActive = ((this.isActive!= null)?this.isIsActive():false);
+            boolean rhsIsActive;
+            rhsIsActive = ((that.isActive!= null)?that.isIsActive():false);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "isActive", lhsIsActive), LocatorUtils.property(thatLocator, "isActive", rhsIsActive), lhsIsActive, rhsIsActive)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String thePublicURLPrefix;
+            thePublicURLPrefix = this.getPublicURLPrefix();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "publicURLPrefix", thePublicURLPrefix), currentHashCode, thePublicURLPrefix);
+        }
+        {
+            String theIssuerName;
+            theIssuerName = this.getIssuerName();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "issuerName", theIssuerName), currentHashCode, theIssuerName);
+        }
+        {
+            Organization theOrganization;
+            theOrganization = this.getOrganization();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "organization", theOrganization), currentHashCode, theOrganization);
+        }
+        {
+            List<Contact> theContact;
+            theContact = (((this.contact!= null)&&(!this.contact.isEmpty()))?this.getContact():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "contact", theContact), currentHashCode, theContact);
+        }
+        {
+            boolean theIsActive;
+            theIsActive = ((this.isActive!= null)?this.isIsActive():false);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "isActive", theIsActive), currentHashCode, theIsActive);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ParamAuth.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ParamAuth.java
new file mode 100644
index 000000000..43a45524c
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ParamAuth.java
@@ -0,0 +1,185 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}Parameter" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "parameter"
+})
+@XmlRootElement(name = "ParamAuth")
+
+
+
+public class ParamAuth
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "Parameter", required = true)
+    protected List<Parameter> parameter;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the parameter property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the parameter property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getParameter().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Parameter }
+     * 
+     * 
+     */
+    @OneToMany(targetEntity = Parameter.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<Parameter> getParameter() {
+        if (parameter == null) {
+            parameter = new ArrayList<Parameter>();
+        }
+        return this.parameter;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setParameter(List<Parameter> parameter) {
+        this.parameter = parameter;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof ParamAuth)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final ParamAuth that = ((ParamAuth) object);
+        {
+            List<Parameter> lhsParameter;
+            lhsParameter = (((this.parameter!= null)&&(!this.parameter.isEmpty()))?this.getParameter():null);
+            List<Parameter> rhsParameter;
+            rhsParameter = (((that.parameter!= null)&&(!that.parameter.isEmpty()))?that.getParameter():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "parameter", lhsParameter), LocatorUtils.property(thatLocator, "parameter", rhsParameter), lhsParameter, rhsParameter)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            List<Parameter> theParameter;
+            theParameter = (((this.parameter!= null)&&(!this.parameter.isEmpty()))?this.getParameter():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "parameter", theParameter), currentHashCode, theParameter);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Parameter.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Parameter.java
new file mode 100644
index 000000000..963edd9e4
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Parameter.java
@@ -0,0 +1,212 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}token" />
+ *       &lt;attribute name="Value" use="required" type="{http://www.buergerkarte.at/namespaces/moaconfig#}MOAAuthDataType" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+@XmlRootElement(name = "Parameter")
+
+
+
+public class Parameter
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlAttribute(name = "Name", required = true)
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
+    protected String name;
+    @XmlAttribute(name = "Value", required = true)
+    protected MOAAuthDataType value;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setName(String value) {
+        this.name = value;
+    }
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link MOAAuthDataType }
+     *     
+     */
+    
+    
+    @Enumerated(EnumType.STRING)
+    public MOAAuthDataType getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link MOAAuthDataType }
+     *     
+     */
+    public void setValue(MOAAuthDataType value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof Parameter)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final Parameter that = ((Parameter) object);
+        {
+            String lhsName;
+            lhsName = this.getName();
+            String rhsName;
+            rhsName = that.getName();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) {
+                return false;
+            }
+        }
+        {
+            MOAAuthDataType lhsValue;
+            lhsValue = this.getValue();
+            MOAAuthDataType rhsValue;
+            rhsValue = that.getValue();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "value", lhsValue), LocatorUtils.property(thatLocator, "value", rhsValue), lhsValue, rhsValue)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theName;
+            theName = this.getName();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName);
+        }
+        {
+            MOAAuthDataType theValue;
+            theValue = this.getValue();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "value", theValue), currentHashCode, theValue);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/PartyRepresentationType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/PartyRepresentationType.java
new file mode 100644
index 000000000..b5fa75f16
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/PartyRepresentationType.java
@@ -0,0 +1,331 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for PartyRepresentationType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="PartyRepresentationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="InputProcessor" type="{http://www.buergerkarte.at/namespaces/moaconfig#}InputProcessorType" minOccurs="0"/>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}AlwaysShowForm" minOccurs="0"/>
+ *         &lt;element name="ConnectionParameter" type="{http://www.buergerkarte.at/namespaces/moaconfig#}ConnectionParameterClientAuthType" minOccurs="0"/>
+ *         &lt;element name="PartyRepresentative" type="{http://www.buergerkarte.at/namespaces/moaconfig#}PartyRepresentativeType" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "PartyRepresentationType", propOrder = {
+    "inputProcessor",
+    "alwaysShowForm",
+    "connectionParameter",
+    "partyRepresentative"
+})
+
+
+
+public class PartyRepresentationType
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "InputProcessor")
+    protected InputProcessorType inputProcessor;
+    @XmlElement(name = "AlwaysShowForm", type = String.class, defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    protected Boolean alwaysShowForm;
+    @XmlElement(name = "ConnectionParameter")
+    protected ConnectionParameterClientAuthType connectionParameter;
+    @XmlElement(name = "PartyRepresentative")
+    protected List<PartyRepresentativeType> partyRepresentative;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the inputProcessor property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link InputProcessorType }
+     *     
+     */
+    @ManyToOne(targetEntity = InputProcessorType.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public InputProcessorType getInputProcessor() {
+        return inputProcessor;
+    }
+
+    /**
+     * Sets the value of the inputProcessor property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link InputProcessorType }
+     *     
+     */
+    public void setInputProcessor(InputProcessorType value) {
+        this.inputProcessor = value;
+    }
+
+    /**
+     * Default Wert fuer Formularanzeige. Soll nicht nur
+     * 						bei leerer oder standardisierter Vollmacht mit unvollstaendigen
+     * 						Daten, sondern beispielsweise zu Kontrollzwecken das
+     * 						Eingabeformular zur vervollstaendigung der Vertretenendaten immer
+     * 						angezeigt werden, wenn ein Einschreiten durch berufliche
+     * 						Parteienvertretung geschieht so kann dies mittels dieses Schalters
+     * 						veranlasst werden
+     * 					
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isAlwaysShowForm() {
+        return alwaysShowForm;
+    }
+
+    /**
+     * Sets the value of the alwaysShowForm property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAlwaysShowForm(Boolean value) {
+        this.alwaysShowForm = value;
+    }
+
+    /**
+     * Gets the value of the connectionParameter property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ConnectionParameterClientAuthType }
+     *     
+     */
+    @ManyToOne(targetEntity = ConnectionParameterClientAuthType.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public ConnectionParameterClientAuthType getConnectionParameter() {
+        return connectionParameter;
+    }
+
+    /**
+     * Sets the value of the connectionParameter property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ConnectionParameterClientAuthType }
+     *     
+     */
+    public void setConnectionParameter(ConnectionParameterClientAuthType value) {
+        this.connectionParameter = value;
+    }
+
+    /**
+     * Gets the value of the partyRepresentative property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the partyRepresentative property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getPartyRepresentative().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link PartyRepresentativeType }
+     * 
+     * 
+     */
+    @OneToMany(targetEntity = PartyRepresentativeType.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<PartyRepresentativeType> getPartyRepresentative() {
+        if (partyRepresentative == null) {
+            partyRepresentative = new ArrayList<PartyRepresentativeType>();
+        }
+        return this.partyRepresentative;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setPartyRepresentative(List<PartyRepresentativeType> partyRepresentative) {
+        this.partyRepresentative = partyRepresentative;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof PartyRepresentationType)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final PartyRepresentationType that = ((PartyRepresentationType) object);
+        {
+            InputProcessorType lhsInputProcessor;
+            lhsInputProcessor = this.getInputProcessor();
+            InputProcessorType rhsInputProcessor;
+            rhsInputProcessor = that.getInputProcessor();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "inputProcessor", lhsInputProcessor), LocatorUtils.property(thatLocator, "inputProcessor", rhsInputProcessor), lhsInputProcessor, rhsInputProcessor)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsAlwaysShowForm;
+            lhsAlwaysShowForm = this.isAlwaysShowForm();
+            Boolean rhsAlwaysShowForm;
+            rhsAlwaysShowForm = that.isAlwaysShowForm();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "alwaysShowForm", lhsAlwaysShowForm), LocatorUtils.property(thatLocator, "alwaysShowForm", rhsAlwaysShowForm), lhsAlwaysShowForm, rhsAlwaysShowForm)) {
+                return false;
+            }
+        }
+        {
+            ConnectionParameterClientAuthType lhsConnectionParameter;
+            lhsConnectionParameter = this.getConnectionParameter();
+            ConnectionParameterClientAuthType rhsConnectionParameter;
+            rhsConnectionParameter = that.getConnectionParameter();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "connectionParameter", lhsConnectionParameter), LocatorUtils.property(thatLocator, "connectionParameter", rhsConnectionParameter), lhsConnectionParameter, rhsConnectionParameter)) {
+                return false;
+            }
+        }
+        {
+            List<PartyRepresentativeType> lhsPartyRepresentative;
+            lhsPartyRepresentative = (((this.partyRepresentative!= null)&&(!this.partyRepresentative.isEmpty()))?this.getPartyRepresentative():null);
+            List<PartyRepresentativeType> rhsPartyRepresentative;
+            rhsPartyRepresentative = (((that.partyRepresentative!= null)&&(!that.partyRepresentative.isEmpty()))?that.getPartyRepresentative():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "partyRepresentative", lhsPartyRepresentative), LocatorUtils.property(thatLocator, "partyRepresentative", rhsPartyRepresentative), lhsPartyRepresentative, rhsPartyRepresentative)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            InputProcessorType theInputProcessor;
+            theInputProcessor = this.getInputProcessor();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "inputProcessor", theInputProcessor), currentHashCode, theInputProcessor);
+        }
+        {
+            Boolean theAlwaysShowForm;
+            theAlwaysShowForm = this.isAlwaysShowForm();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "alwaysShowForm", theAlwaysShowForm), currentHashCode, theAlwaysShowForm);
+        }
+        {
+            ConnectionParameterClientAuthType theConnectionParameter;
+            theConnectionParameter = this.getConnectionParameter();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "connectionParameter", theConnectionParameter), currentHashCode, theConnectionParameter);
+        }
+        {
+            List<PartyRepresentativeType> thePartyRepresentative;
+            thePartyRepresentative = (((this.partyRepresentative!= null)&&(!this.partyRepresentative.isEmpty()))?this.getPartyRepresentative():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "partyRepresentative", thePartyRepresentative), currentHashCode, thePartyRepresentative);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/PartyRepresentativeType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/PartyRepresentativeType.java
new file mode 100644
index 000000000..b37f58878
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/PartyRepresentativeType.java
@@ -0,0 +1,457 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for PartyRepresentativeType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="PartyRepresentativeType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="InputProcessor" type="{http://www.buergerkarte.at/namespaces/moaconfig#}InputProcessorType" minOccurs="0"/>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}AlwaysShowForm" minOccurs="0"/>
+ *         &lt;element name="ConnectionParameter" type="{http://www.buergerkarte.at/namespaces/moaconfig#}ConnectionParameterClientAuthType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="oid" use="required" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *       &lt;attribute name="representPhysicalParty" default="false">
+ *         &lt;simpleType>
+ *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}boolean">
+ *           &lt;/restriction>
+ *         &lt;/simpleType>
+ *       &lt;/attribute>
+ *       &lt;attribute name="representCorporateParty" default="false">
+ *         &lt;simpleType>
+ *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}boolean">
+ *           &lt;/restriction>
+ *         &lt;/simpleType>
+ *       &lt;/attribute>
+ *       &lt;attribute name="representationText" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "PartyRepresentativeType", propOrder = {
+    "inputProcessor",
+    "alwaysShowForm",
+    "connectionParameter"
+})
+
+
+
+public class PartyRepresentativeType
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "InputProcessor")
+    protected InputProcessorType inputProcessor;
+    @XmlElement(name = "AlwaysShowForm", type = String.class, defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    protected Boolean alwaysShowForm;
+    @XmlElement(name = "ConnectionParameter")
+    protected ConnectionParameterClientAuthType connectionParameter;
+    @XmlAttribute(name = "oid", required = true)
+    @XmlSchemaType(name = "anySimpleType")
+    protected String oid;
+    @XmlAttribute(name = "representPhysicalParty")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    protected Boolean representPhysicalParty;
+    @XmlAttribute(name = "representCorporateParty")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    protected Boolean representCorporateParty;
+    @XmlAttribute(name = "representationText")
+    @XmlSchemaType(name = "anySimpleType")
+    protected String representationText;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the inputProcessor property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link InputProcessorType }
+     *     
+     */
+    @ManyToOne(targetEntity = InputProcessorType.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public InputProcessorType getInputProcessor() {
+        return inputProcessor;
+    }
+
+    /**
+     * Sets the value of the inputProcessor property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link InputProcessorType }
+     *     
+     */
+    public void setInputProcessor(InputProcessorType value) {
+        this.inputProcessor = value;
+    }
+
+    /**
+     * Gets the value of the alwaysShowForm property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isAlwaysShowForm() {
+        return alwaysShowForm;
+    }
+
+    /**
+     * Sets the value of the alwaysShowForm property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAlwaysShowForm(Boolean value) {
+        this.alwaysShowForm = value;
+    }
+
+    /**
+     * Gets the value of the connectionParameter property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ConnectionParameterClientAuthType }
+     *     
+     */
+    @ManyToOne(targetEntity = ConnectionParameterClientAuthType.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public ConnectionParameterClientAuthType getConnectionParameter() {
+        return connectionParameter;
+    }
+
+    /**
+     * Sets the value of the connectionParameter property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ConnectionParameterClientAuthType }
+     *     
+     */
+    public void setConnectionParameter(ConnectionParameterClientAuthType value) {
+        this.connectionParameter = value;
+    }
+
+    /**
+     * Gets the value of the oid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getOid() {
+        return oid;
+    }
+
+    /**
+     * Sets the value of the oid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setOid(String value) {
+        this.oid = value;
+    }
+
+    /**
+     * Gets the value of the representPhysicalParty property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public boolean isRepresentPhysicalParty() {
+        if (representPhysicalParty == null) {
+            return new ZeroOneBooleanAdapter().unmarshal("false");
+        } else {
+            return representPhysicalParty;
+        }
+    }
+
+    /**
+     * Sets the value of the representPhysicalParty property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRepresentPhysicalParty(Boolean value) {
+        this.representPhysicalParty = value;
+    }
+
+    /**
+     * Gets the value of the representCorporateParty property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public boolean isRepresentCorporateParty() {
+        if (representCorporateParty == null) {
+            return new ZeroOneBooleanAdapter().unmarshal("false");
+        } else {
+            return representCorporateParty;
+        }
+    }
+
+    /**
+     * Sets the value of the representCorporateParty property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRepresentCorporateParty(Boolean value) {
+        this.representCorporateParty = value;
+    }
+
+    /**
+     * Gets the value of the representationText property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getRepresentationText() {
+        return representationText;
+    }
+
+    /**
+     * Sets the value of the representationText property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setRepresentationText(String value) {
+        this.representationText = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof PartyRepresentativeType)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final PartyRepresentativeType that = ((PartyRepresentativeType) object);
+        {
+            InputProcessorType lhsInputProcessor;
+            lhsInputProcessor = this.getInputProcessor();
+            InputProcessorType rhsInputProcessor;
+            rhsInputProcessor = that.getInputProcessor();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "inputProcessor", lhsInputProcessor), LocatorUtils.property(thatLocator, "inputProcessor", rhsInputProcessor), lhsInputProcessor, rhsInputProcessor)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsAlwaysShowForm;
+            lhsAlwaysShowForm = this.isAlwaysShowForm();
+            Boolean rhsAlwaysShowForm;
+            rhsAlwaysShowForm = that.isAlwaysShowForm();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "alwaysShowForm", lhsAlwaysShowForm), LocatorUtils.property(thatLocator, "alwaysShowForm", rhsAlwaysShowForm), lhsAlwaysShowForm, rhsAlwaysShowForm)) {
+                return false;
+            }
+        }
+        {
+            ConnectionParameterClientAuthType lhsConnectionParameter;
+            lhsConnectionParameter = this.getConnectionParameter();
+            ConnectionParameterClientAuthType rhsConnectionParameter;
+            rhsConnectionParameter = that.getConnectionParameter();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "connectionParameter", lhsConnectionParameter), LocatorUtils.property(thatLocator, "connectionParameter", rhsConnectionParameter), lhsConnectionParameter, rhsConnectionParameter)) {
+                return false;
+            }
+        }
+        {
+            String lhsOid;
+            lhsOid = this.getOid();
+            String rhsOid;
+            rhsOid = that.getOid();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "oid", lhsOid), LocatorUtils.property(thatLocator, "oid", rhsOid), lhsOid, rhsOid)) {
+                return false;
+            }
+        }
+        {
+            boolean lhsRepresentPhysicalParty;
+            lhsRepresentPhysicalParty = ((this.representPhysicalParty!= null)?this.isRepresentPhysicalParty():false);
+            boolean rhsRepresentPhysicalParty;
+            rhsRepresentPhysicalParty = ((that.representPhysicalParty!= null)?that.isRepresentPhysicalParty():false);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "representPhysicalParty", lhsRepresentPhysicalParty), LocatorUtils.property(thatLocator, "representPhysicalParty", rhsRepresentPhysicalParty), lhsRepresentPhysicalParty, rhsRepresentPhysicalParty)) {
+                return false;
+            }
+        }
+        {
+            boolean lhsRepresentCorporateParty;
+            lhsRepresentCorporateParty = ((this.representCorporateParty!= null)?this.isRepresentCorporateParty():false);
+            boolean rhsRepresentCorporateParty;
+            rhsRepresentCorporateParty = ((that.representCorporateParty!= null)?that.isRepresentCorporateParty():false);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "representCorporateParty", lhsRepresentCorporateParty), LocatorUtils.property(thatLocator, "representCorporateParty", rhsRepresentCorporateParty), lhsRepresentCorporateParty, rhsRepresentCorporateParty)) {
+                return false;
+            }
+        }
+        {
+            String lhsRepresentationText;
+            lhsRepresentationText = this.getRepresentationText();
+            String rhsRepresentationText;
+            rhsRepresentationText = that.getRepresentationText();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "representationText", lhsRepresentationText), LocatorUtils.property(thatLocator, "representationText", rhsRepresentationText), lhsRepresentationText, rhsRepresentationText)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            InputProcessorType theInputProcessor;
+            theInputProcessor = this.getInputProcessor();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "inputProcessor", theInputProcessor), currentHashCode, theInputProcessor);
+        }
+        {
+            Boolean theAlwaysShowForm;
+            theAlwaysShowForm = this.isAlwaysShowForm();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "alwaysShowForm", theAlwaysShowForm), currentHashCode, theAlwaysShowForm);
+        }
+        {
+            ConnectionParameterClientAuthType theConnectionParameter;
+            theConnectionParameter = this.getConnectionParameter();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "connectionParameter", theConnectionParameter), currentHashCode, theConnectionParameter);
+        }
+        {
+            String theOid;
+            theOid = this.getOid();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "oid", theOid), currentHashCode, theOid);
+        }
+        {
+            boolean theRepresentPhysicalParty;
+            theRepresentPhysicalParty = ((this.representPhysicalParty!= null)?this.isRepresentPhysicalParty():false);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "representPhysicalParty", theRepresentPhysicalParty), currentHashCode, theRepresentPhysicalParty);
+        }
+        {
+            boolean theRepresentCorporateParty;
+            theRepresentCorporateParty = ((this.representCorporateParty!= null)?this.isRepresentCorporateParty():false);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "representCorporateParty", theRepresentCorporateParty), currentHashCode, theRepresentCorporateParty);
+        }
+        {
+            String theRepresentationText;
+            theRepresentationText = this.getRepresentationText();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "representationText", theRepresentationText), currentHashCode, theRepresentationText);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Protocols.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Protocols.java
new file mode 100644
index 000000000..94e28d56b
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Protocols.java
@@ -0,0 +1,361 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="SAML1" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="SourceID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *                 &lt;/sequence>
+ *                 &lt;attribute name="isActive" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element name="PVP2" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="PublicURLPrefix" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *                   &lt;element name="IssuerName" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *                   &lt;element name="Organization">
+ *                     &lt;complexType>
+ *                       &lt;complexContent>
+ *                         &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                           &lt;sequence>
+ *                             &lt;element name="Name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *                             &lt;element name="DisplayName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *                             &lt;element name="URL" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *                           &lt;/sequence>
+ *                         &lt;/restriction>
+ *                       &lt;/complexContent>
+ *                     &lt;/complexType>
+ *                   &lt;/element>
+ *                   &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}Contact" maxOccurs="unbounded"/>
+ *                 &lt;/sequence>
+ *                 &lt;attribute name="isActive" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element name="OAuth" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;attribute name="isActive" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *         &lt;element name="LegacyAllowed">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element name="ProtocolName" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "saml1",
+    "pvp2",
+    "oAuth",
+    "legacyAllowed"
+})
+
+
+
+public class Protocols
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "SAML1")
+    protected SAML1 saml1;
+    @XmlElement(name = "PVP2")
+    protected PVP2 pvp2;
+    @XmlElement(name = "OAuth")
+    protected OAuth oAuth;
+    @XmlElement(name = "LegacyAllowed", required = true)
+    protected LegacyAllowed legacyAllowed;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the saml1 property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SAML1 }
+     *     
+     */
+    @ManyToOne(targetEntity = SAML1 .class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public SAML1 getSAML1() {
+        return saml1;
+    }
+
+    /**
+     * Sets the value of the saml1 property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SAML1 }
+     *     
+     */
+    public void setSAML1(SAML1 value) {
+        this.saml1 = value;
+    }
+
+    /**
+     * Gets the value of the pvp2 property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link PVP2 }
+     *     
+     */
+    @ManyToOne(targetEntity = PVP2 .class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public PVP2 getPVP2() {
+        return pvp2;
+    }
+
+    /**
+     * Sets the value of the pvp2 property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link PVP2 }
+     *     
+     */
+    public void setPVP2(PVP2 value) {
+        this.pvp2 = value;
+    }
+
+    /**
+     * Gets the value of the oAuth property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link OAuth }
+     *     
+     */
+    @ManyToOne(targetEntity = OAuth.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public OAuth getOAuth() {
+        return oAuth;
+    }
+
+    /**
+     * Sets the value of the oAuth property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link OAuth }
+     *     
+     */
+    public void setOAuth(OAuth value) {
+        this.oAuth = value;
+    }
+
+    /**
+     * Gets the value of the legacyAllowed property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link LegacyAllowed }
+     *     
+     */
+    @ManyToOne(targetEntity = LegacyAllowed.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public LegacyAllowed getLegacyAllowed() {
+        return legacyAllowed;
+    }
+
+    /**
+     * Sets the value of the legacyAllowed property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link LegacyAllowed }
+     *     
+     */
+    public void setLegacyAllowed(LegacyAllowed value) {
+        this.legacyAllowed = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof Protocols)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final Protocols that = ((Protocols) object);
+        {
+            SAML1 lhsSAML1;
+            lhsSAML1 = this.getSAML1();
+            SAML1 rhsSAML1;
+            rhsSAML1 = that.getSAML1();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "saml1", lhsSAML1), LocatorUtils.property(thatLocator, "saml1", rhsSAML1), lhsSAML1, rhsSAML1)) {
+                return false;
+            }
+        }
+        {
+            PVP2 lhsPVP2;
+            lhsPVP2 = this.getPVP2();
+            PVP2 rhsPVP2;
+            rhsPVP2 = that.getPVP2();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "pvp2", lhsPVP2), LocatorUtils.property(thatLocator, "pvp2", rhsPVP2), lhsPVP2, rhsPVP2)) {
+                return false;
+            }
+        }
+        {
+            OAuth lhsOAuth;
+            lhsOAuth = this.getOAuth();
+            OAuth rhsOAuth;
+            rhsOAuth = that.getOAuth();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "oAuth", lhsOAuth), LocatorUtils.property(thatLocator, "oAuth", rhsOAuth), lhsOAuth, rhsOAuth)) {
+                return false;
+            }
+        }
+        {
+            LegacyAllowed lhsLegacyAllowed;
+            lhsLegacyAllowed = this.getLegacyAllowed();
+            LegacyAllowed rhsLegacyAllowed;
+            rhsLegacyAllowed = that.getLegacyAllowed();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "legacyAllowed", lhsLegacyAllowed), LocatorUtils.property(thatLocator, "legacyAllowed", rhsLegacyAllowed), lhsLegacyAllowed, rhsLegacyAllowed)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            SAML1 theSAML1;
+            theSAML1 = this.getSAML1();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "saml1", theSAML1), currentHashCode, theSAML1);
+        }
+        {
+            PVP2 thePVP2;
+            thePVP2 = this.getPVP2();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "pvp2", thePVP2), currentHashCode, thePVP2);
+        }
+        {
+            OAuth theOAuth;
+            theOAuth = this.getOAuth();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "oAuth", theOAuth), currentHashCode, theOAuth);
+        }
+        {
+            LegacyAllowed theLegacyAllowed;
+            theLegacyAllowed = this.getLegacyAllowed();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "legacyAllowed", theLegacyAllowed), currentHashCode, theLegacyAllowed);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SAML1.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SAML1.java
new file mode 100644
index 000000000..342b4614e
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SAML1.java
@@ -0,0 +1,216 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="SourceID" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="isActive" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "sourceID"
+})
+
+
+
+public class SAML1
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "SourceID")
+    protected String sourceID;
+    @XmlAttribute(name = "isActive")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean isActive;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the sourceID property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getSourceID() {
+        return sourceID;
+    }
+
+    /**
+     * Sets the value of the sourceID property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSourceID(String value) {
+        this.sourceID = value;
+    }
+
+    /**
+     * Gets the value of the isActive property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public boolean isIsActive() {
+        if (isActive == null) {
+            return new ZeroOneBooleanAdapter().unmarshal("false");
+        } else {
+            return isActive;
+        }
+    }
+
+    /**
+     * Sets the value of the isActive property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIsActive(Boolean value) {
+        this.isActive = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof SAML1)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final SAML1 that = ((SAML1) object);
+        {
+            String lhsSourceID;
+            lhsSourceID = this.getSourceID();
+            String rhsSourceID;
+            rhsSourceID = that.getSourceID();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "sourceID", lhsSourceID), LocatorUtils.property(thatLocator, "sourceID", rhsSourceID), lhsSourceID, rhsSourceID)) {
+                return false;
+            }
+        }
+        {
+            boolean lhsIsActive;
+            lhsIsActive = ((this.isActive!= null)?this.isIsActive():false);
+            boolean rhsIsActive;
+            rhsIsActive = ((that.isActive!= null)?that.isIsActive():false);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "isActive", lhsIsActive), LocatorUtils.property(thatLocator, "isActive", rhsIsActive), lhsIsActive, rhsIsActive)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theSourceID;
+            theSourceID = this.getSourceID();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "sourceID", theSourceID), currentHashCode, theSourceID);
+        }
+        {
+            boolean theIsActive;
+            theIsActive = ((this.isActive!= null)?this.isIsActive():false);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "isActive", theIsActive), currentHashCode, theIsActive);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SAMLSigningParameter.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SAMLSigningParameter.java
new file mode 100644
index 000000000..5b3744502
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SAMLSigningParameter.java
@@ -0,0 +1,216 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="SignatureCreationParameter" type="{http://www.buergerkarte.at/namespaces/moaconfig#}SignatureCreationParameterType"/>
+ *         &lt;element name="SignatureVerificationParameter" type="{http://www.buergerkarte.at/namespaces/moaconfig#}SignatureVerificationParameterType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "signatureCreationParameter",
+    "signatureVerificationParameter"
+})
+@XmlRootElement(name = "SAMLSigningParameter")
+
+
+
+public class SAMLSigningParameter
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "SignatureCreationParameter", required = true)
+    protected SignatureCreationParameterType signatureCreationParameter;
+    @XmlElement(name = "SignatureVerificationParameter", required = true)
+    protected SignatureVerificationParameterType signatureVerificationParameter;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the signatureCreationParameter property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SignatureCreationParameterType }
+     *     
+     */
+    @ManyToOne(targetEntity = SignatureCreationParameterType.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public SignatureCreationParameterType getSignatureCreationParameter() {
+        return signatureCreationParameter;
+    }
+
+    /**
+     * Sets the value of the signatureCreationParameter property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SignatureCreationParameterType }
+     *     
+     */
+    public void setSignatureCreationParameter(SignatureCreationParameterType value) {
+        this.signatureCreationParameter = value;
+    }
+
+    /**
+     * Gets the value of the signatureVerificationParameter property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SignatureVerificationParameterType }
+     *     
+     */
+    @ManyToOne(targetEntity = SignatureVerificationParameterType.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public SignatureVerificationParameterType getSignatureVerificationParameter() {
+        return signatureVerificationParameter;
+    }
+
+    /**
+     * Sets the value of the signatureVerificationParameter property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SignatureVerificationParameterType }
+     *     
+     */
+    public void setSignatureVerificationParameter(SignatureVerificationParameterType value) {
+        this.signatureVerificationParameter = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof SAMLSigningParameter)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final SAMLSigningParameter that = ((SAMLSigningParameter) object);
+        {
+            SignatureCreationParameterType lhsSignatureCreationParameter;
+            lhsSignatureCreationParameter = this.getSignatureCreationParameter();
+            SignatureCreationParameterType rhsSignatureCreationParameter;
+            rhsSignatureCreationParameter = that.getSignatureCreationParameter();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "signatureCreationParameter", lhsSignatureCreationParameter), LocatorUtils.property(thatLocator, "signatureCreationParameter", rhsSignatureCreationParameter), lhsSignatureCreationParameter, rhsSignatureCreationParameter)) {
+                return false;
+            }
+        }
+        {
+            SignatureVerificationParameterType lhsSignatureVerificationParameter;
+            lhsSignatureVerificationParameter = this.getSignatureVerificationParameter();
+            SignatureVerificationParameterType rhsSignatureVerificationParameter;
+            rhsSignatureVerificationParameter = that.getSignatureVerificationParameter();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "signatureVerificationParameter", lhsSignatureVerificationParameter), LocatorUtils.property(thatLocator, "signatureVerificationParameter", rhsSignatureVerificationParameter), lhsSignatureVerificationParameter, rhsSignatureVerificationParameter)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            SignatureCreationParameterType theSignatureCreationParameter;
+            theSignatureCreationParameter = this.getSignatureCreationParameter();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "signatureCreationParameter", theSignatureCreationParameter), currentHashCode, theSignatureCreationParameter);
+        }
+        {
+            SignatureVerificationParameterType theSignatureVerificationParameter;
+            theSignatureVerificationParameter = this.getSignatureVerificationParameter();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "signatureVerificationParameter", theSignatureVerificationParameter), currentHashCode, theSignatureVerificationParameter);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SLRequestTemplates.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SLRequestTemplates.java
new file mode 100644
index 000000000..de1f9f472
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SLRequestTemplates.java
@@ -0,0 +1,256 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="OnlineBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         &lt;element name="HandyBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *         &lt;element name="LocalBKU" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "onlineBKU",
+    "handyBKU",
+    "localBKU"
+})
+
+
+
+public class SLRequestTemplates
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "OnlineBKU", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String onlineBKU;
+    @XmlElement(name = "HandyBKU", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String handyBKU;
+    @XmlElement(name = "LocalBKU", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String localBKU;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the onlineBKU property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getOnlineBKU() {
+        return onlineBKU;
+    }
+
+    /**
+     * Sets the value of the onlineBKU property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setOnlineBKU(String value) {
+        this.onlineBKU = value;
+    }
+
+    /**
+     * Gets the value of the handyBKU property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getHandyBKU() {
+        return handyBKU;
+    }
+
+    /**
+     * Sets the value of the handyBKU property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setHandyBKU(String value) {
+        this.handyBKU = value;
+    }
+
+    /**
+     * Gets the value of the localBKU property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getLocalBKU() {
+        return localBKU;
+    }
+
+    /**
+     * Sets the value of the localBKU property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setLocalBKU(String value) {
+        this.localBKU = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof SLRequestTemplates)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final SLRequestTemplates that = ((SLRequestTemplates) object);
+        {
+            String lhsOnlineBKU;
+            lhsOnlineBKU = this.getOnlineBKU();
+            String rhsOnlineBKU;
+            rhsOnlineBKU = that.getOnlineBKU();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "onlineBKU", lhsOnlineBKU), LocatorUtils.property(thatLocator, "onlineBKU", rhsOnlineBKU), lhsOnlineBKU, rhsOnlineBKU)) {
+                return false;
+            }
+        }
+        {
+            String lhsHandyBKU;
+            lhsHandyBKU = this.getHandyBKU();
+            String rhsHandyBKU;
+            rhsHandyBKU = that.getHandyBKU();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "handyBKU", lhsHandyBKU), LocatorUtils.property(thatLocator, "handyBKU", rhsHandyBKU), lhsHandyBKU, rhsHandyBKU)) {
+                return false;
+            }
+        }
+        {
+            String lhsLocalBKU;
+            lhsLocalBKU = this.getLocalBKU();
+            String rhsLocalBKU;
+            rhsLocalBKU = that.getLocalBKU();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "localBKU", lhsLocalBKU), LocatorUtils.property(thatLocator, "localBKU", rhsLocalBKU), lhsLocalBKU, rhsLocalBKU)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theOnlineBKU;
+            theOnlineBKU = this.getOnlineBKU();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "onlineBKU", theOnlineBKU), currentHashCode, theOnlineBKU);
+        }
+        {
+            String theHandyBKU;
+            theHandyBKU = this.getHandyBKU();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "handyBKU", theHandyBKU), currentHashCode, theHandyBKU);
+        }
+        {
+            String theLocalBKU;
+            theLocalBKU = this.getLocalBKU();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "localBKU", theLocalBKU), currentHashCode, theLocalBKU);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SSO.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SSO.java
new file mode 100644
index 000000000..3cc62c9e5
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SSO.java
@@ -0,0 +1,341 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;element name="target" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}IdentificationNumber"/>
+ *       &lt;/choice>
+ *       &lt;attribute name="PublicURL" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="FriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="SpecialText" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "target",
+    "identificationNumber"
+})
+
+
+
+public class SSO
+    implements Serializable, Equals, HashCode
+{
+
+    protected String target;
+    @XmlElement(name = "IdentificationNumber")
+    protected IdentificationNumber identificationNumber;
+    @XmlAttribute(name = "PublicURL")
+    protected String publicURL;
+    @XmlAttribute(name = "FriendlyName")
+    protected String friendlyName;
+    @XmlAttribute(name = "SpecialText")
+    protected String specialText;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the target property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getTarget() {
+        return target;
+    }
+
+    /**
+     * Sets the value of the target property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTarget(String value) {
+        this.target = value;
+    }
+
+    /**
+     * Gets the value of the identificationNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link IdentificationNumber }
+     *     
+     */
+    @ManyToOne(targetEntity = IdentificationNumber.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public IdentificationNumber getIdentificationNumber() {
+        return identificationNumber;
+    }
+
+    /**
+     * Sets the value of the identificationNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link IdentificationNumber }
+     *     
+     */
+    public void setIdentificationNumber(IdentificationNumber value) {
+        this.identificationNumber = value;
+    }
+
+    /**
+     * Gets the value of the publicURL property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getPublicURL() {
+        return publicURL;
+    }
+
+    /**
+     * Sets the value of the publicURL property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPublicURL(String value) {
+        this.publicURL = value;
+    }
+
+    /**
+     * Gets the value of the friendlyName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getFriendlyName() {
+        return friendlyName;
+    }
+
+    /**
+     * Sets the value of the friendlyName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFriendlyName(String value) {
+        this.friendlyName = value;
+    }
+
+    /**
+     * Gets the value of the specialText property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getSpecialText() {
+        return specialText;
+    }
+
+    /**
+     * Sets the value of the specialText property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSpecialText(String value) {
+        this.specialText = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof SSO)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final SSO that = ((SSO) object);
+        {
+            String lhsTarget;
+            lhsTarget = this.getTarget();
+            String rhsTarget;
+            rhsTarget = that.getTarget();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "target", lhsTarget), LocatorUtils.property(thatLocator, "target", rhsTarget), lhsTarget, rhsTarget)) {
+                return false;
+            }
+        }
+        {
+            IdentificationNumber lhsIdentificationNumber;
+            lhsIdentificationNumber = this.getIdentificationNumber();
+            IdentificationNumber rhsIdentificationNumber;
+            rhsIdentificationNumber = that.getIdentificationNumber();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "identificationNumber", lhsIdentificationNumber), LocatorUtils.property(thatLocator, "identificationNumber", rhsIdentificationNumber), lhsIdentificationNumber, rhsIdentificationNumber)) {
+                return false;
+            }
+        }
+        {
+            String lhsPublicURL;
+            lhsPublicURL = this.getPublicURL();
+            String rhsPublicURL;
+            rhsPublicURL = that.getPublicURL();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "publicURL", lhsPublicURL), LocatorUtils.property(thatLocator, "publicURL", rhsPublicURL), lhsPublicURL, rhsPublicURL)) {
+                return false;
+            }
+        }
+        {
+            String lhsFriendlyName;
+            lhsFriendlyName = this.getFriendlyName();
+            String rhsFriendlyName;
+            rhsFriendlyName = that.getFriendlyName();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "friendlyName", lhsFriendlyName), LocatorUtils.property(thatLocator, "friendlyName", rhsFriendlyName), lhsFriendlyName, rhsFriendlyName)) {
+                return false;
+            }
+        }
+        {
+            String lhsSpecialText;
+            lhsSpecialText = this.getSpecialText();
+            String rhsSpecialText;
+            rhsSpecialText = that.getSpecialText();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "specialText", lhsSpecialText), LocatorUtils.property(thatLocator, "specialText", rhsSpecialText), lhsSpecialText, rhsSpecialText)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theTarget;
+            theTarget = this.getTarget();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "target", theTarget), currentHashCode, theTarget);
+        }
+        {
+            IdentificationNumber theIdentificationNumber;
+            theIdentificationNumber = this.getIdentificationNumber();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "identificationNumber", theIdentificationNumber), currentHashCode, theIdentificationNumber);
+        }
+        {
+            String thePublicURL;
+            thePublicURL = this.getPublicURL();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "publicURL", thePublicURL), currentHashCode, thePublicURL);
+        }
+        {
+            String theFriendlyName;
+            theFriendlyName = this.getFriendlyName();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "friendlyName", theFriendlyName), currentHashCode, theFriendlyName);
+        }
+        {
+            String theSpecialText;
+            theSpecialText = this.getSpecialText();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "specialText", theSpecialText), currentHashCode, theSpecialText);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/STORK.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/STORK.java
new file mode 100644
index 000000000..59b300e95
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/STORK.java
@@ -0,0 +1,342 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;sequence>
+ *           &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}C-PEPS" maxOccurs="unbounded"/>
+ *           &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}SAMLSigningParameter"/>
+ *         &lt;/sequence>
+ *         &lt;sequence>
+ *           &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}QualityAuthenticationAssuranceLevel" minOccurs="0"/>
+ *         &lt;/sequence>
+ *         &lt;sequence>
+ *           &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}Attributes" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;/sequence>
+ *       &lt;/choice>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "cpeps",
+    "samlSigningParameter",
+    "qualityAuthenticationAssuranceLevel",
+    "attributes"
+})
+@XmlRootElement(name = "STORK")
+
+
+
+public class STORK
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "C-PEPS")
+    protected List<CPEPS> cpeps;
+    @XmlElement(name = "SAMLSigningParameter")
+    protected SAMLSigningParameter samlSigningParameter;
+    @XmlElement(name = "QualityAuthenticationAssuranceLevel")
+    protected Integer qualityAuthenticationAssuranceLevel;
+    @XmlElement(name = "Attributes")
+    protected List<StorkAttribute> attributes;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the cpeps property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the cpeps property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getCPEPS().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link CPEPS }
+     * 
+     * 
+     */
+    @OneToMany(targetEntity = CPEPS.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<CPEPS> getCPEPS() {
+        if (cpeps == null) {
+            cpeps = new ArrayList<CPEPS>();
+        }
+        return this.cpeps;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setCPEPS(List<CPEPS> cpeps) {
+        this.cpeps = cpeps;
+    }
+
+    /**
+     * Gets the value of the samlSigningParameter property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link SAMLSigningParameter }
+     *     
+     */
+    @ManyToOne(targetEntity = SAMLSigningParameter.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public SAMLSigningParameter getSAMLSigningParameter() {
+        return samlSigningParameter;
+    }
+
+    /**
+     * Sets the value of the samlSigningParameter property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link SAMLSigningParameter }
+     *     
+     */
+    public void setSAMLSigningParameter(SAMLSigningParameter value) {
+        this.samlSigningParameter = value;
+    }
+
+    /**
+     * Gets the value of the qualityAuthenticationAssuranceLevel property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Integer }
+     *     
+     */
+    
+    
+    public Integer getQualityAuthenticationAssuranceLevel() {
+        return qualityAuthenticationAssuranceLevel;
+    }
+
+    /**
+     * Sets the value of the qualityAuthenticationAssuranceLevel property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Integer }
+     *     
+     */
+    public void setQualityAuthenticationAssuranceLevel(Integer value) {
+        this.qualityAuthenticationAssuranceLevel = value;
+    }
+
+    /**
+     * Gets the value of the attributes property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the attributes property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getAttributes().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link StorkAttribute }
+     * 
+     * 
+     */
+    @OneToMany(targetEntity = StorkAttribute.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<StorkAttribute> getAttributes() {
+        if (attributes == null) {
+            attributes = new ArrayList<StorkAttribute>();
+        }
+        return this.attributes;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setAttributes(List<StorkAttribute> attributes) {
+        this.attributes = attributes;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof STORK)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final STORK that = ((STORK) object);
+        {
+            List<CPEPS> lhsCPEPS;
+            lhsCPEPS = (((this.cpeps!= null)&&(!this.cpeps.isEmpty()))?this.getCPEPS():null);
+            List<CPEPS> rhsCPEPS;
+            rhsCPEPS = (((that.cpeps!= null)&&(!that.cpeps.isEmpty()))?that.getCPEPS():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "cpeps", lhsCPEPS), LocatorUtils.property(thatLocator, "cpeps", rhsCPEPS), lhsCPEPS, rhsCPEPS)) {
+                return false;
+            }
+        }
+        {
+            SAMLSigningParameter lhsSAMLSigningParameter;
+            lhsSAMLSigningParameter = this.getSAMLSigningParameter();
+            SAMLSigningParameter rhsSAMLSigningParameter;
+            rhsSAMLSigningParameter = that.getSAMLSigningParameter();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "samlSigningParameter", lhsSAMLSigningParameter), LocatorUtils.property(thatLocator, "samlSigningParameter", rhsSAMLSigningParameter), lhsSAMLSigningParameter, rhsSAMLSigningParameter)) {
+                return false;
+            }
+        }
+        {
+            Integer lhsQualityAuthenticationAssuranceLevel;
+            lhsQualityAuthenticationAssuranceLevel = this.getQualityAuthenticationAssuranceLevel();
+            Integer rhsQualityAuthenticationAssuranceLevel;
+            rhsQualityAuthenticationAssuranceLevel = that.getQualityAuthenticationAssuranceLevel();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "qualityAuthenticationAssuranceLevel", lhsQualityAuthenticationAssuranceLevel), LocatorUtils.property(thatLocator, "qualityAuthenticationAssuranceLevel", rhsQualityAuthenticationAssuranceLevel), lhsQualityAuthenticationAssuranceLevel, rhsQualityAuthenticationAssuranceLevel)) {
+                return false;
+            }
+        }
+        {
+            List<StorkAttribute> lhsAttributes;
+            lhsAttributes = (((this.attributes!= null)&&(!this.attributes.isEmpty()))?this.getAttributes():null);
+            List<StorkAttribute> rhsAttributes;
+            rhsAttributes = (((that.attributes!= null)&&(!that.attributes.isEmpty()))?that.getAttributes():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "attributes", lhsAttributes), LocatorUtils.property(thatLocator, "attributes", rhsAttributes), lhsAttributes, rhsAttributes)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            List<CPEPS> theCPEPS;
+            theCPEPS = (((this.cpeps!= null)&&(!this.cpeps.isEmpty()))?this.getCPEPS():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "cpeps", theCPEPS), currentHashCode, theCPEPS);
+        }
+        {
+            SAMLSigningParameter theSAMLSigningParameter;
+            theSAMLSigningParameter = this.getSAMLSigningParameter();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "samlSigningParameter", theSAMLSigningParameter), currentHashCode, theSAMLSigningParameter);
+        }
+        {
+            Integer theQualityAuthenticationAssuranceLevel;
+            theQualityAuthenticationAssuranceLevel = this.getQualityAuthenticationAssuranceLevel();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "qualityAuthenticationAssuranceLevel", theQualityAuthenticationAssuranceLevel), currentHashCode, theQualityAuthenticationAssuranceLevel);
+        }
+        {
+            List<StorkAttribute> theAttributes;
+            theAttributes = (((this.attributes!= null)&&(!this.attributes.isEmpty()))?this.getAttributes():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "attributes", theAttributes), currentHashCode, theAttributes);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Schema.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Schema.java
new file mode 100644
index 000000000..2772ff984
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Schema.java
@@ -0,0 +1,205 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="namespace" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       &lt;attribute name="schemaLocation" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+
+
+
+public class Schema
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlAttribute(name = "namespace", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String namespace;
+    @XmlAttribute(name = "schemaLocation", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String schemaLocation;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the namespace property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getNamespace() {
+        return namespace;
+    }
+
+    /**
+     * Sets the value of the namespace property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setNamespace(String value) {
+        this.namespace = value;
+    }
+
+    /**
+     * Gets the value of the schemaLocation property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getSchemaLocation() {
+        return schemaLocation;
+    }
+
+    /**
+     * Sets the value of the schemaLocation property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setSchemaLocation(String value) {
+        this.schemaLocation = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof Schema)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final Schema that = ((Schema) object);
+        {
+            String lhsNamespace;
+            lhsNamespace = this.getNamespace();
+            String rhsNamespace;
+            rhsNamespace = that.getNamespace();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "namespace", lhsNamespace), LocatorUtils.property(thatLocator, "namespace", rhsNamespace), lhsNamespace, rhsNamespace)) {
+                return false;
+            }
+        }
+        {
+            String lhsSchemaLocation;
+            lhsSchemaLocation = this.getSchemaLocation();
+            String rhsSchemaLocation;
+            rhsSchemaLocation = that.getSchemaLocation();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "schemaLocation", lhsSchemaLocation), LocatorUtils.property(thatLocator, "schemaLocation", rhsSchemaLocation), lhsSchemaLocation, rhsSchemaLocation)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theNamespace;
+            theNamespace = this.getNamespace();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "namespace", theNamespace), currentHashCode, theNamespace);
+        }
+        {
+            String theSchemaLocation;
+            theSchemaLocation = this.getSchemaLocation();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "schemaLocation", theSchemaLocation), currentHashCode, theSchemaLocation);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SchemaLocationType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SchemaLocationType.java
new file mode 100644
index 000000000..e7cf0e2ee
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SchemaLocationType.java
@@ -0,0 +1,195 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * Spezifiziert die Lage von XML Schemas
+ * 			
+ * 
+ * <p>Java class for SchemaLocationType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="SchemaLocationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Schema" maxOccurs="unbounded">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;attribute name="namespace" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *                 &lt;attribute name="schemaLocation" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SchemaLocationType", propOrder = {
+    "schema"
+})
+
+
+
+public class SchemaLocationType
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "Schema", required = true)
+    protected List<Schema> schema;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the schema property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the schema property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getSchema().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link Schema }
+     * 
+     * 
+     */
+    @OneToMany(targetEntity = Schema.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<Schema> getSchema() {
+        if (schema == null) {
+            schema = new ArrayList<Schema>();
+        }
+        return this.schema;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setSchema(List<Schema> schema) {
+        this.schema = schema;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof SchemaLocationType)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final SchemaLocationType that = ((SchemaLocationType) object);
+        {
+            List<Schema> lhsSchema;
+            lhsSchema = (((this.schema!= null)&&(!this.schema.isEmpty()))?this.getSchema():null);
+            List<Schema> rhsSchema;
+            rhsSchema = (((that.schema!= null)&&(!that.schema.isEmpty()))?that.getSchema():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "schema", lhsSchema), LocatorUtils.property(thatLocator, "schema", rhsSchema), lhsSchema, rhsSchema)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            List<Schema> theSchema;
+            theSchema = (((this.schema!= null)&&(!this.schema.isEmpty()))?this.getSchema():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "schema", theSchema), currentHashCode, theSchema);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SecurityLayer.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SecurityLayer.java
new file mode 100644
index 000000000..75d6148a4
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SecurityLayer.java
@@ -0,0 +1,183 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="TransformsInfo" type="{http://www.buergerkarte.at/namespaces/moaconfig#}TransformsInfoType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "transformsInfo"
+})
+
+
+
+public class SecurityLayer
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "TransformsInfo", required = true)
+    protected List<TransformsInfoType> transformsInfo;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the transformsInfo property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the transformsInfo property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getTransformsInfo().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link TransformsInfoType }
+     * 
+     * 
+     */
+    @OneToMany(targetEntity = TransformsInfoType.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<TransformsInfoType> getTransformsInfo() {
+        if (transformsInfo == null) {
+            transformsInfo = new ArrayList<TransformsInfoType>();
+        }
+        return this.transformsInfo;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setTransformsInfo(List<TransformsInfoType> transformsInfo) {
+        this.transformsInfo = transformsInfo;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof SecurityLayer)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final SecurityLayer that = ((SecurityLayer) object);
+        {
+            List<TransformsInfoType> lhsTransformsInfo;
+            lhsTransformsInfo = (((this.transformsInfo!= null)&&(!this.transformsInfo.isEmpty()))?this.getTransformsInfo():null);
+            List<TransformsInfoType> rhsTransformsInfo;
+            rhsTransformsInfo = (((that.transformsInfo!= null)&&(!that.transformsInfo.isEmpty()))?that.getTransformsInfo():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "transformsInfo", lhsTransformsInfo), LocatorUtils.property(thatLocator, "transformsInfo", rhsTransformsInfo), lhsTransformsInfo, rhsTransformsInfo)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            List<TransformsInfoType> theTransformsInfo;
+            theTransformsInfo = (((this.transformsInfo!= null)&&(!this.transformsInfo.isEmpty()))?this.getTransformsInfo():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "transformsInfo", theTransformsInfo), currentHashCode, theTransformsInfo);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SignatureCreationParameterType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SignatureCreationParameterType.java
new file mode 100644
index 000000000..bdd5f731c
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SignatureCreationParameterType.java
@@ -0,0 +1,218 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * Enthaelt Informationen zu einem KeyStore bzw. Key
+ * 				zur STORK SAML AuthnRequest Signaturerstellung
+ * 			
+ * 
+ * <p>Java class for SignatureCreationParameterType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="SignatureCreationParameterType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}KeyStore"/>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}KeyName"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SignatureCreationParameterType", propOrder = {
+    "keyStore",
+    "keyName"
+})
+
+
+
+public class SignatureCreationParameterType
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "KeyStore", required = true)
+    protected KeyStore keyStore;
+    @XmlElement(name = "KeyName", required = true)
+    protected KeyName keyName;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the keyStore property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link KeyStore }
+     *     
+     */
+    @ManyToOne(targetEntity = KeyStore.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public KeyStore getKeyStore() {
+        return keyStore;
+    }
+
+    /**
+     * Sets the value of the keyStore property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link KeyStore }
+     *     
+     */
+    public void setKeyStore(KeyStore value) {
+        this.keyStore = value;
+    }
+
+    /**
+     * Gets the value of the keyName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link KeyName }
+     *     
+     */
+    @ManyToOne(targetEntity = KeyName.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public KeyName getKeyName() {
+        return keyName;
+    }
+
+    /**
+     * Sets the value of the keyName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link KeyName }
+     *     
+     */
+    public void setKeyName(KeyName value) {
+        this.keyName = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof SignatureCreationParameterType)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final SignatureCreationParameterType that = ((SignatureCreationParameterType) object);
+        {
+            KeyStore lhsKeyStore;
+            lhsKeyStore = this.getKeyStore();
+            KeyStore rhsKeyStore;
+            rhsKeyStore = that.getKeyStore();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "keyStore", lhsKeyStore), LocatorUtils.property(thatLocator, "keyStore", rhsKeyStore), lhsKeyStore, rhsKeyStore)) {
+                return false;
+            }
+        }
+        {
+            KeyName lhsKeyName;
+            lhsKeyName = this.getKeyName();
+            KeyName rhsKeyName;
+            rhsKeyName = that.getKeyName();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "keyName", lhsKeyName), LocatorUtils.property(thatLocator, "keyName", rhsKeyName), lhsKeyName, rhsKeyName)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            KeyStore theKeyStore;
+            theKeyStore = this.getKeyStore();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "keyStore", theKeyStore), currentHashCode, theKeyStore);
+        }
+        {
+            KeyName theKeyName;
+            theKeyName = this.getKeyName();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "keyName", theKeyName), currentHashCode, theKeyName);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SignatureVerificationParameterType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SignatureVerificationParameterType.java
new file mode 100644
index 000000000..dd3037bc9
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/SignatureVerificationParameterType.java
@@ -0,0 +1,168 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * Enthaelt Informationen zur Verfikation von
+ * 				Signaturen einer STORK SAML Response
+ * 			
+ * 
+ * <p>Java class for SignatureVerificationParameterType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="SignatureVerificationParameterType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}TrustProfileID"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SignatureVerificationParameterType", propOrder = {
+    "trustProfileID"
+})
+
+
+
+public class SignatureVerificationParameterType
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "TrustProfileID", required = true)
+    protected String trustProfileID;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the trustProfileID property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getTrustProfileID() {
+        return trustProfileID;
+    }
+
+    /**
+     * Sets the value of the trustProfileID property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTrustProfileID(String value) {
+        this.trustProfileID = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof SignatureVerificationParameterType)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final SignatureVerificationParameterType that = ((SignatureVerificationParameterType) object);
+        {
+            String lhsTrustProfileID;
+            lhsTrustProfileID = this.getTrustProfileID();
+            String rhsTrustProfileID;
+            rhsTrustProfileID = that.getTrustProfileID();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "trustProfileID", lhsTrustProfileID), LocatorUtils.property(thatLocator, "trustProfileID", rhsTrustProfileID), lhsTrustProfileID, rhsTrustProfileID)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theTrustProfileID;
+            theTrustProfileID = this.getTrustProfileID();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trustProfileID", theTrustProfileID), currentHashCode, theTrustProfileID);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/StorkAttribute.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/StorkAttribute.java
new file mode 100644
index 000000000..d9ff523e7
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/StorkAttribute.java
@@ -0,0 +1,213 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for StorkAttribute complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="StorkAttribute">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="mandatory" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "StorkAttribute", propOrder = {
+    "name",
+    "mandatory"
+})
+
+
+
+public class StorkAttribute
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(required = true)
+    protected String name;
+    @XmlElement(required = true, type = String.class)
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean mandatory;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the name property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Sets the value of the name property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setName(String value) {
+        this.name = value;
+    }
+
+    /**
+     * Gets the value of the mandatory property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isMandatory() {
+        return mandatory;
+    }
+
+    /**
+     * Sets the value of the mandatory property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setMandatory(Boolean value) {
+        this.mandatory = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof StorkAttribute)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final StorkAttribute that = ((StorkAttribute) object);
+        {
+            String lhsName;
+            lhsName = this.getName();
+            String rhsName;
+            rhsName = that.getName();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "name", lhsName), LocatorUtils.property(thatLocator, "name", rhsName), lhsName, rhsName)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsMandatory;
+            lhsMandatory = this.isMandatory();
+            Boolean rhsMandatory;
+            rhsMandatory = that.isMandatory();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "mandatory", lhsMandatory), LocatorUtils.property(thatLocator, "mandatory", rhsMandatory), lhsMandatory, rhsMandatory)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theName;
+            theName = this.getName();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "name", theName), currentHashCode, theName);
+        }
+        {
+            Boolean theMandatory;
+            theMandatory = this.isMandatory();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "mandatory", theMandatory), currentHashCode, theMandatory);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TemplateType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TemplateType.java
new file mode 100644
index 000000000..b81437c05
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TemplateType.java
@@ -0,0 +1,165 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * das Attribut URL spezifiziert die Lage des
+ * 				Templates
+ * 			
+ * 
+ * <p>Java class for TemplateType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TemplateType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;attribute name="URL" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TemplateType")
+
+
+
+public class TemplateType
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlAttribute(name = "URL", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String url;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the url property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getURL() {
+        return url;
+    }
+
+    /**
+     * Sets the value of the url property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setURL(String value) {
+        this.url = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof TemplateType)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final TemplateType that = ((TemplateType) object);
+        {
+            String lhsURL;
+            lhsURL = this.getURL();
+            String rhsURL;
+            rhsURL = that.getURL();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "url", lhsURL), LocatorUtils.property(thatLocator, "url", rhsURL), lhsURL, rhsURL)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theURL;
+            theURL = this.getURL();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "url", theURL), currentHashCode, theURL);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TemplatesType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TemplatesType.java
new file mode 100644
index 000000000..d558230ab
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TemplatesType.java
@@ -0,0 +1,367 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for TemplatesType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TemplatesType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Template" type="{http://www.buergerkarte.at/namespaces/moaconfig#}TemplateType" maxOccurs="3" minOccurs="0"/>
+ *         &lt;element name="AditionalAuthBlockText" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="BKUSelectionCustomization" type="{http://www.buergerkarte.at/namespaces/moaconfig#}BKUSelectionCustomizationType" minOccurs="0"/>
+ *         &lt;element name="BKUSelectionTemplate" type="{http://www.buergerkarte.at/namespaces/moaconfig#}TransformsInfoType" minOccurs="0"/>
+ *         &lt;element name="SendAssertionTemplate" type="{http://www.buergerkarte.at/namespaces/moaconfig#}TransformsInfoType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TemplatesType", propOrder = {
+    "template",
+    "aditionalAuthBlockText",
+    "bkuSelectionCustomization",
+    "bkuSelectionTemplate",
+    "sendAssertionTemplate"
+})
+
+
+
+public class TemplatesType
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "Template")
+    protected List<TemplateType> template;
+    @XmlElement(name = "AditionalAuthBlockText")
+    protected String aditionalAuthBlockText;
+    @XmlElement(name = "BKUSelectionCustomization")
+    protected BKUSelectionCustomizationType bkuSelectionCustomization;
+    @XmlElement(name = "BKUSelectionTemplate")
+    protected TransformsInfoType bkuSelectionTemplate;
+    @XmlElement(name = "SendAssertionTemplate")
+    protected TransformsInfoType sendAssertionTemplate;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the template property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the template property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getTemplate().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link TemplateType }
+     * 
+     * 
+     */
+    @OneToMany(targetEntity = TemplateType.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<TemplateType> getTemplate() {
+        if (template == null) {
+            template = new ArrayList<TemplateType>();
+        }
+        return this.template;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setTemplate(List<TemplateType> template) {
+        this.template = template;
+    }
+
+    /**
+     * Gets the value of the aditionalAuthBlockText property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getAditionalAuthBlockText() {
+        return aditionalAuthBlockText;
+    }
+
+    /**
+     * Sets the value of the aditionalAuthBlockText property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setAditionalAuthBlockText(String value) {
+        this.aditionalAuthBlockText = value;
+    }
+
+    /**
+     * Gets the value of the bkuSelectionCustomization property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BKUSelectionCustomizationType }
+     *     
+     */
+    @ManyToOne(targetEntity = BKUSelectionCustomizationType.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public BKUSelectionCustomizationType getBKUSelectionCustomization() {
+        return bkuSelectionCustomization;
+    }
+
+    /**
+     * Sets the value of the bkuSelectionCustomization property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BKUSelectionCustomizationType }
+     *     
+     */
+    public void setBKUSelectionCustomization(BKUSelectionCustomizationType value) {
+        this.bkuSelectionCustomization = value;
+    }
+
+    /**
+     * Gets the value of the bkuSelectionTemplate property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TransformsInfoType }
+     *     
+     */
+    @ManyToOne(targetEntity = TransformsInfoType.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public TransformsInfoType getBKUSelectionTemplate() {
+        return bkuSelectionTemplate;
+    }
+
+    /**
+     * Sets the value of the bkuSelectionTemplate property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TransformsInfoType }
+     *     
+     */
+    public void setBKUSelectionTemplate(TransformsInfoType value) {
+        this.bkuSelectionTemplate = value;
+    }
+
+    /**
+     * Gets the value of the sendAssertionTemplate property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TransformsInfoType }
+     *     
+     */
+    @ManyToOne(targetEntity = TransformsInfoType.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public TransformsInfoType getSendAssertionTemplate() {
+        return sendAssertionTemplate;
+    }
+
+    /**
+     * Sets the value of the sendAssertionTemplate property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link TransformsInfoType }
+     *     
+     */
+    public void setSendAssertionTemplate(TransformsInfoType value) {
+        this.sendAssertionTemplate = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof TemplatesType)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final TemplatesType that = ((TemplatesType) object);
+        {
+            List<TemplateType> lhsTemplate;
+            lhsTemplate = (((this.template!= null)&&(!this.template.isEmpty()))?this.getTemplate():null);
+            List<TemplateType> rhsTemplate;
+            rhsTemplate = (((that.template!= null)&&(!that.template.isEmpty()))?that.getTemplate():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "template", lhsTemplate), LocatorUtils.property(thatLocator, "template", rhsTemplate), lhsTemplate, rhsTemplate)) {
+                return false;
+            }
+        }
+        {
+            String lhsAditionalAuthBlockText;
+            lhsAditionalAuthBlockText = this.getAditionalAuthBlockText();
+            String rhsAditionalAuthBlockText;
+            rhsAditionalAuthBlockText = that.getAditionalAuthBlockText();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "aditionalAuthBlockText", lhsAditionalAuthBlockText), LocatorUtils.property(thatLocator, "aditionalAuthBlockText", rhsAditionalAuthBlockText), lhsAditionalAuthBlockText, rhsAditionalAuthBlockText)) {
+                return false;
+            }
+        }
+        {
+            BKUSelectionCustomizationType lhsBKUSelectionCustomization;
+            lhsBKUSelectionCustomization = this.getBKUSelectionCustomization();
+            BKUSelectionCustomizationType rhsBKUSelectionCustomization;
+            rhsBKUSelectionCustomization = that.getBKUSelectionCustomization();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "bkuSelectionCustomization", lhsBKUSelectionCustomization), LocatorUtils.property(thatLocator, "bkuSelectionCustomization", rhsBKUSelectionCustomization), lhsBKUSelectionCustomization, rhsBKUSelectionCustomization)) {
+                return false;
+            }
+        }
+        {
+            TransformsInfoType lhsBKUSelectionTemplate;
+            lhsBKUSelectionTemplate = this.getBKUSelectionTemplate();
+            TransformsInfoType rhsBKUSelectionTemplate;
+            rhsBKUSelectionTemplate = that.getBKUSelectionTemplate();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "bkuSelectionTemplate", lhsBKUSelectionTemplate), LocatorUtils.property(thatLocator, "bkuSelectionTemplate", rhsBKUSelectionTemplate), lhsBKUSelectionTemplate, rhsBKUSelectionTemplate)) {
+                return false;
+            }
+        }
+        {
+            TransformsInfoType lhsSendAssertionTemplate;
+            lhsSendAssertionTemplate = this.getSendAssertionTemplate();
+            TransformsInfoType rhsSendAssertionTemplate;
+            rhsSendAssertionTemplate = that.getSendAssertionTemplate();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "sendAssertionTemplate", lhsSendAssertionTemplate), LocatorUtils.property(thatLocator, "sendAssertionTemplate", rhsSendAssertionTemplate), lhsSendAssertionTemplate, rhsSendAssertionTemplate)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            List<TemplateType> theTemplate;
+            theTemplate = (((this.template!= null)&&(!this.template.isEmpty()))?this.getTemplate():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "template", theTemplate), currentHashCode, theTemplate);
+        }
+        {
+            String theAditionalAuthBlockText;
+            theAditionalAuthBlockText = this.getAditionalAuthBlockText();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "aditionalAuthBlockText", theAditionalAuthBlockText), currentHashCode, theAditionalAuthBlockText);
+        }
+        {
+            BKUSelectionCustomizationType theBKUSelectionCustomization;
+            theBKUSelectionCustomization = this.getBKUSelectionCustomization();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "bkuSelectionCustomization", theBKUSelectionCustomization), currentHashCode, theBKUSelectionCustomization);
+        }
+        {
+            TransformsInfoType theBKUSelectionTemplate;
+            theBKUSelectionTemplate = this.getBKUSelectionTemplate();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "bkuSelectionTemplate", theBKUSelectionTemplate), currentHashCode, theBKUSelectionTemplate);
+        }
+        {
+            TransformsInfoType theSendAssertionTemplate;
+            theSendAssertionTemplate = this.getSendAssertionTemplate();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "sendAssertionTemplate", theSendAssertionTemplate), currentHashCode, theSendAssertionTemplate);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TestCredentials.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TestCredentials.java
new file mode 100644
index 000000000..e3bd00912
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TestCredentials.java
@@ -0,0 +1,260 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+import org.jvnet.hyperjaxb3.item.ItemUtils;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="credentialOID" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="enableTestCredentials" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "credentialOID"
+})
+
+
+
+public class TestCredentials
+    implements Serializable, Equals, HashCode
+{
+
+    protected List<String> credentialOID;
+    @XmlAttribute(name = "enableTestCredentials")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean enableTestCredentials;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+    protected transient List<TestCredentialsCredentialOIDItem> credentialOIDItems;
+
+    /**
+     * Gets the value of the credentialOID property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the credentialOID property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getCredentialOID().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    @Transient
+    public List<String> getCredentialOID() {
+        if (credentialOID == null) {
+            credentialOID = new ArrayList<String>();
+        }
+        return this.credentialOID;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setCredentialOID(List<String> credentialOID) {
+        this.credentialOID = credentialOID;
+    }
+
+    /**
+     * Gets the value of the enableTestCredentials property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public boolean isEnableTestCredentials() {
+        if (enableTestCredentials == null) {
+            return new ZeroOneBooleanAdapter().unmarshal("false");
+        } else {
+            return enableTestCredentials;
+        }
+    }
+
+    /**
+     * Sets the value of the enableTestCredentials property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setEnableTestCredentials(Boolean value) {
+        this.enableTestCredentials = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    @OneToMany(targetEntity = TestCredentialsCredentialOIDItem.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<TestCredentialsCredentialOIDItem> getCredentialOIDItems() {
+        if (this.credentialOIDItems == null) {
+            this.credentialOIDItems = new ArrayList<TestCredentialsCredentialOIDItem>();
+        }
+        if (ItemUtils.shouldBeWrapped(this.credentialOID)) {
+            this.credentialOID = ItemUtils.wrap(this.credentialOID, this.credentialOIDItems, TestCredentialsCredentialOIDItem.class);
+        }
+        return this.credentialOIDItems;
+    }
+
+    public void setCredentialOIDItems(List<TestCredentialsCredentialOIDItem> value) {
+        this.credentialOID = null;
+        this.credentialOIDItems = null;
+        this.credentialOIDItems = value;
+        if (this.credentialOIDItems == null) {
+            this.credentialOIDItems = new ArrayList<TestCredentialsCredentialOIDItem>();
+        }
+        if (ItemUtils.shouldBeWrapped(this.credentialOID)) {
+            this.credentialOID = ItemUtils.wrap(this.credentialOID, this.credentialOIDItems, TestCredentialsCredentialOIDItem.class);
+        }
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof TestCredentials)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final TestCredentials that = ((TestCredentials) object);
+        {
+            List<String> lhsCredentialOID;
+            lhsCredentialOID = (((this.credentialOID!= null)&&(!this.credentialOID.isEmpty()))?this.getCredentialOID():null);
+            List<String> rhsCredentialOID;
+            rhsCredentialOID = (((that.credentialOID!= null)&&(!that.credentialOID.isEmpty()))?that.getCredentialOID():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "credentialOID", lhsCredentialOID), LocatorUtils.property(thatLocator, "credentialOID", rhsCredentialOID), lhsCredentialOID, rhsCredentialOID)) {
+                return false;
+            }
+        }
+        {
+            boolean lhsEnableTestCredentials;
+            lhsEnableTestCredentials = ((this.enableTestCredentials!= null)?this.isEnableTestCredentials():false);
+            boolean rhsEnableTestCredentials;
+            rhsEnableTestCredentials = ((that.enableTestCredentials!= null)?that.isEnableTestCredentials():false);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "enableTestCredentials", lhsEnableTestCredentials), LocatorUtils.property(thatLocator, "enableTestCredentials", rhsEnableTestCredentials), lhsEnableTestCredentials, rhsEnableTestCredentials)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            List<String> theCredentialOID;
+            theCredentialOID = (((this.credentialOID!= null)&&(!this.credentialOID.isEmpty()))?this.getCredentialOID():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "credentialOID", theCredentialOID), currentHashCode, theCredentialOID);
+        }
+        {
+            boolean theEnableTestCredentials;
+            theEnableTestCredentials = ((this.enableTestCredentials!= null)?this.isEnableTestCredentials():false);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "enableTestCredentials", theEnableTestCredentials), currentHashCode, theEnableTestCredentials);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TestCredentialsCredentialOIDItem.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TestCredentialsCredentialOIDItem.java
new file mode 100644
index 000000000..3e386be66
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TestCredentialsCredentialOIDItem.java
@@ -0,0 +1,93 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import org.jvnet.hyperjaxb3.item.Item;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+
+
+
+public class TestCredentialsCredentialOIDItem
+    implements Serializable, Item<String>
+{
+
+    @XmlElement(name = "credentialOID", namespace = "http://www.buergerkarte.at/namespaces/moaconfig#")
+    protected String item;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the item property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getItem() {
+        return item;
+    }
+
+    /**
+     * Sets the value of the item property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setItem(String value) {
+        this.item = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TimeOuts.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TimeOuts.java
new file mode 100644
index 000000000..8d1560a51
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TimeOuts.java
@@ -0,0 +1,253 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Assertion" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *         &lt;element name="MOASessionCreated" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *         &lt;element name="MOASessionUpdated" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "assertion",
+    "moaSessionCreated",
+    "moaSessionUpdated"
+})
+
+
+
+public class TimeOuts
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "Assertion", required = true)
+    protected BigInteger assertion;
+    @XmlElement(name = "MOASessionCreated", required = true)
+    protected BigInteger moaSessionCreated;
+    @XmlElement(name = "MOASessionUpdated", required = true)
+    protected BigInteger moaSessionUpdated;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the assertion property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    
+    
+    public BigInteger getAssertion() {
+        return assertion;
+    }
+
+    /**
+     * Sets the value of the assertion property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setAssertion(BigInteger value) {
+        this.assertion = value;
+    }
+
+    /**
+     * Gets the value of the moaSessionCreated property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    
+    
+    public BigInteger getMOASessionCreated() {
+        return moaSessionCreated;
+    }
+
+    /**
+     * Sets the value of the moaSessionCreated property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setMOASessionCreated(BigInteger value) {
+        this.moaSessionCreated = value;
+    }
+
+    /**
+     * Gets the value of the moaSessionUpdated property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    
+    
+    public BigInteger getMOASessionUpdated() {
+        return moaSessionUpdated;
+    }
+
+    /**
+     * Sets the value of the moaSessionUpdated property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setMOASessionUpdated(BigInteger value) {
+        this.moaSessionUpdated = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof TimeOuts)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final TimeOuts that = ((TimeOuts) object);
+        {
+            BigInteger lhsAssertion;
+            lhsAssertion = this.getAssertion();
+            BigInteger rhsAssertion;
+            rhsAssertion = that.getAssertion();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "assertion", lhsAssertion), LocatorUtils.property(thatLocator, "assertion", rhsAssertion), lhsAssertion, rhsAssertion)) {
+                return false;
+            }
+        }
+        {
+            BigInteger lhsMOASessionCreated;
+            lhsMOASessionCreated = this.getMOASessionCreated();
+            BigInteger rhsMOASessionCreated;
+            rhsMOASessionCreated = that.getMOASessionCreated();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "moaSessionCreated", lhsMOASessionCreated), LocatorUtils.property(thatLocator, "moaSessionCreated", rhsMOASessionCreated), lhsMOASessionCreated, rhsMOASessionCreated)) {
+                return false;
+            }
+        }
+        {
+            BigInteger lhsMOASessionUpdated;
+            lhsMOASessionUpdated = this.getMOASessionUpdated();
+            BigInteger rhsMOASessionUpdated;
+            rhsMOASessionUpdated = that.getMOASessionUpdated();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "moaSessionUpdated", lhsMOASessionUpdated), LocatorUtils.property(thatLocator, "moaSessionUpdated", rhsMOASessionUpdated), lhsMOASessionUpdated, rhsMOASessionUpdated)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            BigInteger theAssertion;
+            theAssertion = this.getAssertion();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "assertion", theAssertion), currentHashCode, theAssertion);
+        }
+        {
+            BigInteger theMOASessionCreated;
+            theMOASessionCreated = this.getMOASessionCreated();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "moaSessionCreated", theMOASessionCreated), currentHashCode, theMOASessionCreated);
+        }
+        {
+            BigInteger theMOASessionUpdated;
+            theMOASessionUpdated = this.getMOASessionUpdated();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "moaSessionUpdated", theMOASessionUpdated), currentHashCode, theMOASessionUpdated);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TransformsInfoType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TransformsInfoType.java
new file mode 100644
index 000000000..d36e8e5e7
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TransformsInfoType.java
@@ -0,0 +1,215 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Lob;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * das Attribut filename verweist auf eine Datei mit
+ * 				globalem Element TransformsInfo vom Typ sl10:TransformsInfo; diese
+ * 				TransformsInfo werden in den CreateXMLSignatureRequest fuer die
+ * 				Signatur des AUTH-Blocks inkludiert
+ * 			
+ * 
+ * <p>Java class for TransformsInfoType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TransformsInfoType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="transformation" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="filename" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TransformsInfoType", propOrder = {
+    "transformation"
+})
+
+
+
+public class TransformsInfoType
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(required = true)
+    protected byte[] transformation;
+    @XmlAttribute(name = "filename", required = true)
+    @XmlSchemaType(name = "anyURI")
+    protected String filename;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the transformation property.
+     * 
+     * @return
+     *     possible object is
+     *     byte[]
+     */
+    
+    
+    @Lob
+    public byte[] getTransformation() {
+        return transformation;
+    }
+
+    /**
+     * Sets the value of the transformation property.
+     * 
+     * @param value
+     *     allowed object is
+     *     byte[]
+     */
+    public void setTransformation(byte[] value) {
+        this.transformation = value;
+    }
+
+    /**
+     * Gets the value of the filename property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getFilename() {
+        return filename;
+    }
+
+    /**
+     * Sets the value of the filename property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFilename(String value) {
+        this.filename = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof TransformsInfoType)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final TransformsInfoType that = ((TransformsInfoType) object);
+        {
+            byte[] lhsTransformation;
+            lhsTransformation = this.getTransformation();
+            byte[] rhsTransformation;
+            rhsTransformation = that.getTransformation();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "transformation", lhsTransformation), LocatorUtils.property(thatLocator, "transformation", rhsTransformation), lhsTransformation, rhsTransformation)) {
+                return false;
+            }
+        }
+        {
+            String lhsFilename;
+            lhsFilename = this.getFilename();
+            String rhsFilename;
+            rhsFilename = that.getFilename();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "filename", lhsFilename), LocatorUtils.property(thatLocator, "filename", rhsFilename), lhsFilename, rhsFilename)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            byte[] theTransformation;
+            theTransformation = this.getTransformation();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "transformation", theTransformation), currentHashCode, theTransformation);
+        }
+        {
+            String theFilename;
+            theFilename = this.getFilename();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "filename", theFilename), currentHashCode, theFilename);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TrustAnchor.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TrustAnchor.java
new file mode 100644
index 000000000..296fd2923
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TrustAnchor.java
@@ -0,0 +1,131 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;extension base="{http://www.buergerkarte.at/namespaces/moaconfig#}X509IssuerSerialType">
+ *       &lt;attribute name="mode" use="required" type="{http://www.buergerkarte.at/namespaces/moaconfig#}ChainingModeType" />
+ *     &lt;/extension>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "")
+
+
+public class TrustAnchor
+    extends X509IssuerSerialType
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlAttribute(name = "mode", required = true)
+    protected ChainingModeType mode;
+
+    /**
+     * Gets the value of the mode property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link ChainingModeType }
+     *     
+     */
+    
+    
+    @Enumerated(EnumType.STRING)
+    public ChainingModeType getMode() {
+        return mode;
+    }
+
+    /**
+     * Sets the value of the mode property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link ChainingModeType }
+     *     
+     */
+    public void setMode(ChainingModeType value) {
+        this.mode = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof TrustAnchor)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        if (!super.equals(thisLocator, thatLocator, object, strategy)) {
+            return false;
+        }
+        final TrustAnchor that = ((TrustAnchor) object);
+        {
+            ChainingModeType lhsMode;
+            lhsMode = this.getMode();
+            ChainingModeType rhsMode;
+            rhsMode = that.getMode();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "mode", lhsMode), LocatorUtils.property(thatLocator, "mode", rhsMode), lhsMode, rhsMode)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = super.hashCode(locator, strategy);
+        {
+            ChainingModeType theMode;
+            theMode = this.getMode();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "mode", theMode), currentHashCode, theMode);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/UserDatabase.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/UserDatabase.java
new file mode 100644
index 000000000..48a80566a
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/UserDatabase.java
@@ -0,0 +1,1077 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for UserDatabase complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="UserDatabase">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="bpk" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="familyname" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="givenname" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="institut" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="mail" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="phone" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="username" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="password" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="password_salt" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="userRequestTokken" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="isActive" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element name="isAdmin" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element name="isUsernamePasswordAllowed" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         &lt;element name="isMandateUser" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         &lt;element name="isMailAddressVerified" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         &lt;element name="isAdminRequest" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         &lt;element name="isPVP2Generated" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/>
+ *         &lt;element name="lastLogin" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="OnlineApplication" type="{http://www.buergerkarte.at/namespaces/moaconfig#}OnlineApplication" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="onlyBusinessService" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element name="businessServiceType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "UserDatabase", propOrder = {
+    "bpk",
+    "familyname",
+    "givenname",
+    "institut",
+    "mail",
+    "phone",
+    "username",
+    "password",
+    "passwordSalt",
+    "userRequestTokken",
+    "isActive",
+    "isAdmin",
+    "isUsernamePasswordAllowed",
+    "isMandateUser",
+    "isMailAddressVerified",
+    "isAdminRequest",
+    "isPVP2Generated",
+    "lastLogin",
+    "onlineApplication",
+    "onlyBusinessService",
+    "businessServiceType"
+})
+
+
+
+public class UserDatabase
+    implements Serializable, Equals, HashCode
+{
+
+    protected String bpk;
+    protected String familyname;
+    protected String givenname;
+    @XmlElement(required = true)
+    protected String institut;
+    @XmlElement(required = true)
+    protected String mail;
+    @XmlElement(required = true)
+    protected String phone;
+    @XmlElement(required = true)
+    protected String username;
+    @XmlElement(required = true)
+    protected String password;
+    @XmlElement(name = "password_salt")
+    protected String passwordSalt;
+    protected String userRequestTokken;
+    @XmlElement(required = true, type = String.class, defaultValue = "true")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean isActive;
+    @XmlElement(required = true, type = String.class, defaultValue = "true")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean isAdmin;
+    @XmlElement(type = String.class, defaultValue = "true")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean isUsernamePasswordAllowed;
+    @XmlElement(type = String.class, defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean isMandateUser;
+    @XmlElement(type = String.class, defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean isMailAddressVerified;
+    @XmlElement(type = String.class, defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean isAdminRequest;
+    @XmlElement(type = String.class)
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean isPVP2Generated;
+    @XmlElement(required = true)
+    protected String lastLogin;
+    @XmlElement(name = "OnlineApplication")
+    protected List<OnlineApplication> onlineApplication;
+    @XmlElement(required = true, type = String.class, defaultValue = "false")
+    @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class)
+    @XmlSchemaType(name = "boolean")
+    protected Boolean onlyBusinessService;
+    protected String businessServiceType;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the bpk property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getBpk() {
+        return bpk;
+    }
+
+    /**
+     * Sets the value of the bpk property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBpk(String value) {
+        this.bpk = value;
+    }
+
+    /**
+     * Gets the value of the familyname property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getFamilyname() {
+        return familyname;
+    }
+
+    /**
+     * Sets the value of the familyname property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setFamilyname(String value) {
+        this.familyname = value;
+    }
+
+    /**
+     * Gets the value of the givenname property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getGivenname() {
+        return givenname;
+    }
+
+    /**
+     * Sets the value of the givenname property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setGivenname(String value) {
+        this.givenname = value;
+    }
+
+    /**
+     * Gets the value of the institut property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getInstitut() {
+        return institut;
+    }
+
+    /**
+     * Sets the value of the institut property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setInstitut(String value) {
+        this.institut = value;
+    }
+
+    /**
+     * Gets the value of the mail property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getMail() {
+        return mail;
+    }
+
+    /**
+     * Sets the value of the mail property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setMail(String value) {
+        this.mail = value;
+    }
+
+    /**
+     * Gets the value of the phone property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getPhone() {
+        return phone;
+    }
+
+    /**
+     * Sets the value of the phone property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPhone(String value) {
+        this.phone = value;
+    }
+
+    /**
+     * Gets the value of the username property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getUsername() {
+        return username;
+    }
+
+    /**
+     * Sets the value of the username property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setUsername(String value) {
+        this.username = value;
+    }
+
+    /**
+     * Gets the value of the password property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getPassword() {
+        return password;
+    }
+
+    /**
+     * Sets the value of the password property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPassword(String value) {
+        this.password = value;
+    }
+
+    /**
+     * Gets the value of the passwordSalt property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getPasswordSalt() {
+        return passwordSalt;
+    }
+
+    /**
+     * Sets the value of the passwordSalt property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setPasswordSalt(String value) {
+        this.passwordSalt = value;
+    }
+
+    /**
+     * Gets the value of the userRequestTokken property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getUserRequestTokken() {
+        return userRequestTokken;
+    }
+
+    /**
+     * Sets the value of the userRequestTokken property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setUserRequestTokken(String value) {
+        this.userRequestTokken = value;
+    }
+
+    /**
+     * Gets the value of the isActive property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isIsActive() {
+        return isActive;
+    }
+
+    /**
+     * Sets the value of the isActive property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIsActive(Boolean value) {
+        this.isActive = value;
+    }
+
+    /**
+     * Gets the value of the isAdmin property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isIsAdmin() {
+        return isAdmin;
+    }
+
+    /**
+     * Sets the value of the isAdmin property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIsAdmin(Boolean value) {
+        this.isAdmin = value;
+    }
+
+    /**
+     * Gets the value of the isUsernamePasswordAllowed property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isIsUsernamePasswordAllowed() {
+        return isUsernamePasswordAllowed;
+    }
+
+    /**
+     * Sets the value of the isUsernamePasswordAllowed property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIsUsernamePasswordAllowed(Boolean value) {
+        this.isUsernamePasswordAllowed = value;
+    }
+
+    /**
+     * Gets the value of the isMandateUser property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isIsMandateUser() {
+        return isMandateUser;
+    }
+
+    /**
+     * Sets the value of the isMandateUser property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIsMandateUser(Boolean value) {
+        this.isMandateUser = value;
+    }
+
+    /**
+     * Gets the value of the isMailAddressVerified property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isIsMailAddressVerified() {
+        return isMailAddressVerified;
+    }
+
+    /**
+     * Sets the value of the isMailAddressVerified property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIsMailAddressVerified(Boolean value) {
+        this.isMailAddressVerified = value;
+    }
+
+    /**
+     * Gets the value of the isAdminRequest property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isIsAdminRequest() {
+        return isAdminRequest;
+    }
+
+    /**
+     * Sets the value of the isAdminRequest property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIsAdminRequest(Boolean value) {
+        this.isAdminRequest = value;
+    }
+
+    /**
+     * Gets the value of the isPVP2Generated property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public Boolean isIsPVP2Generated() {
+        return isPVP2Generated;
+    }
+
+    /**
+     * Sets the value of the isPVP2Generated property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setIsPVP2Generated(Boolean value) {
+        this.isPVP2Generated = value;
+    }
+
+    /**
+     * Gets the value of the lastLogin property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getLastLogin() {
+        return lastLogin;
+    }
+
+    /**
+     * Sets the value of the lastLogin property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setLastLogin(String value) {
+        this.lastLogin = value;
+    }
+
+    /**
+     * Gets the value of the onlineApplication property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the onlineApplication property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getOnlineApplication().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link OnlineApplication }
+     * 
+     * 
+     */
+    @OneToMany(targetEntity = OnlineApplication.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<OnlineApplication> getOnlineApplication() {
+        if (onlineApplication == null) {
+            onlineApplication = new ArrayList<OnlineApplication>();
+        }
+        return this.onlineApplication;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setOnlineApplication(List<OnlineApplication> onlineApplication) {
+        this.onlineApplication = onlineApplication;
+    }
+
+    /**
+     * Gets the value of the onlyBusinessService property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    @Transient
+    public Boolean isOnlyBusinessService() {
+        return onlyBusinessService;
+    }
+
+    /**
+     * Sets the value of the onlyBusinessService property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setOnlyBusinessService(Boolean value) {
+        this.onlyBusinessService = value;
+    }
+
+    /**
+     * Gets the value of the businessServiceType property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    @Transient
+    public String getBusinessServiceType() {
+        return businessServiceType;
+    }
+
+    /**
+     * Sets the value of the businessServiceType property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setBusinessServiceType(String value) {
+        this.businessServiceType = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof UserDatabase)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final UserDatabase that = ((UserDatabase) object);
+        {
+            String lhsBpk;
+            lhsBpk = this.getBpk();
+            String rhsBpk;
+            rhsBpk = that.getBpk();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "bpk", lhsBpk), LocatorUtils.property(thatLocator, "bpk", rhsBpk), lhsBpk, rhsBpk)) {
+                return false;
+            }
+        }
+        {
+            String lhsFamilyname;
+            lhsFamilyname = this.getFamilyname();
+            String rhsFamilyname;
+            rhsFamilyname = that.getFamilyname();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "familyname", lhsFamilyname), LocatorUtils.property(thatLocator, "familyname", rhsFamilyname), lhsFamilyname, rhsFamilyname)) {
+                return false;
+            }
+        }
+        {
+            String lhsGivenname;
+            lhsGivenname = this.getGivenname();
+            String rhsGivenname;
+            rhsGivenname = that.getGivenname();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "givenname", lhsGivenname), LocatorUtils.property(thatLocator, "givenname", rhsGivenname), lhsGivenname, rhsGivenname)) {
+                return false;
+            }
+        }
+        {
+            String lhsInstitut;
+            lhsInstitut = this.getInstitut();
+            String rhsInstitut;
+            rhsInstitut = that.getInstitut();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "institut", lhsInstitut), LocatorUtils.property(thatLocator, "institut", rhsInstitut), lhsInstitut, rhsInstitut)) {
+                return false;
+            }
+        }
+        {
+            String lhsMail;
+            lhsMail = this.getMail();
+            String rhsMail;
+            rhsMail = that.getMail();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "mail", lhsMail), LocatorUtils.property(thatLocator, "mail", rhsMail), lhsMail, rhsMail)) {
+                return false;
+            }
+        }
+        {
+            String lhsPhone;
+            lhsPhone = this.getPhone();
+            String rhsPhone;
+            rhsPhone = that.getPhone();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "phone", lhsPhone), LocatorUtils.property(thatLocator, "phone", rhsPhone), lhsPhone, rhsPhone)) {
+                return false;
+            }
+        }
+        {
+            String lhsUsername;
+            lhsUsername = this.getUsername();
+            String rhsUsername;
+            rhsUsername = that.getUsername();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "username", lhsUsername), LocatorUtils.property(thatLocator, "username", rhsUsername), lhsUsername, rhsUsername)) {
+                return false;
+            }
+        }
+        {
+            String lhsPassword;
+            lhsPassword = this.getPassword();
+            String rhsPassword;
+            rhsPassword = that.getPassword();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "password", lhsPassword), LocatorUtils.property(thatLocator, "password", rhsPassword), lhsPassword, rhsPassword)) {
+                return false;
+            }
+        }
+        {
+            String lhsPasswordSalt;
+            lhsPasswordSalt = this.getPasswordSalt();
+            String rhsPasswordSalt;
+            rhsPasswordSalt = that.getPasswordSalt();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "passwordSalt", lhsPasswordSalt), LocatorUtils.property(thatLocator, "passwordSalt", rhsPasswordSalt), lhsPasswordSalt, rhsPasswordSalt)) {
+                return false;
+            }
+        }
+        {
+            String lhsUserRequestTokken;
+            lhsUserRequestTokken = this.getUserRequestTokken();
+            String rhsUserRequestTokken;
+            rhsUserRequestTokken = that.getUserRequestTokken();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "userRequestTokken", lhsUserRequestTokken), LocatorUtils.property(thatLocator, "userRequestTokken", rhsUserRequestTokken), lhsUserRequestTokken, rhsUserRequestTokken)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsIsActive;
+            lhsIsActive = this.isIsActive();
+            Boolean rhsIsActive;
+            rhsIsActive = that.isIsActive();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "isActive", lhsIsActive), LocatorUtils.property(thatLocator, "isActive", rhsIsActive), lhsIsActive, rhsIsActive)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsIsAdmin;
+            lhsIsAdmin = this.isIsAdmin();
+            Boolean rhsIsAdmin;
+            rhsIsAdmin = that.isIsAdmin();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "isAdmin", lhsIsAdmin), LocatorUtils.property(thatLocator, "isAdmin", rhsIsAdmin), lhsIsAdmin, rhsIsAdmin)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsIsUsernamePasswordAllowed;
+            lhsIsUsernamePasswordAllowed = this.isIsUsernamePasswordAllowed();
+            Boolean rhsIsUsernamePasswordAllowed;
+            rhsIsUsernamePasswordAllowed = that.isIsUsernamePasswordAllowed();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "isUsernamePasswordAllowed", lhsIsUsernamePasswordAllowed), LocatorUtils.property(thatLocator, "isUsernamePasswordAllowed", rhsIsUsernamePasswordAllowed), lhsIsUsernamePasswordAllowed, rhsIsUsernamePasswordAllowed)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsIsMandateUser;
+            lhsIsMandateUser = this.isIsMandateUser();
+            Boolean rhsIsMandateUser;
+            rhsIsMandateUser = that.isIsMandateUser();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "isMandateUser", lhsIsMandateUser), LocatorUtils.property(thatLocator, "isMandateUser", rhsIsMandateUser), lhsIsMandateUser, rhsIsMandateUser)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsIsMailAddressVerified;
+            lhsIsMailAddressVerified = this.isIsMailAddressVerified();
+            Boolean rhsIsMailAddressVerified;
+            rhsIsMailAddressVerified = that.isIsMailAddressVerified();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "isMailAddressVerified", lhsIsMailAddressVerified), LocatorUtils.property(thatLocator, "isMailAddressVerified", rhsIsMailAddressVerified), lhsIsMailAddressVerified, rhsIsMailAddressVerified)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsIsAdminRequest;
+            lhsIsAdminRequest = this.isIsAdminRequest();
+            Boolean rhsIsAdminRequest;
+            rhsIsAdminRequest = that.isIsAdminRequest();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "isAdminRequest", lhsIsAdminRequest), LocatorUtils.property(thatLocator, "isAdminRequest", rhsIsAdminRequest), lhsIsAdminRequest, rhsIsAdminRequest)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsIsPVP2Generated;
+            lhsIsPVP2Generated = this.isIsPVP2Generated();
+            Boolean rhsIsPVP2Generated;
+            rhsIsPVP2Generated = that.isIsPVP2Generated();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "isPVP2Generated", lhsIsPVP2Generated), LocatorUtils.property(thatLocator, "isPVP2Generated", rhsIsPVP2Generated), lhsIsPVP2Generated, rhsIsPVP2Generated)) {
+                return false;
+            }
+        }
+        {
+            String lhsLastLogin;
+            lhsLastLogin = this.getLastLogin();
+            String rhsLastLogin;
+            rhsLastLogin = that.getLastLogin();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "lastLogin", lhsLastLogin), LocatorUtils.property(thatLocator, "lastLogin", rhsLastLogin), lhsLastLogin, rhsLastLogin)) {
+                return false;
+            }
+        }
+        {
+            List<OnlineApplication> lhsOnlineApplication;
+            lhsOnlineApplication = (((this.onlineApplication!= null)&&(!this.onlineApplication.isEmpty()))?this.getOnlineApplication():null);
+            List<OnlineApplication> rhsOnlineApplication;
+            rhsOnlineApplication = (((that.onlineApplication!= null)&&(!that.onlineApplication.isEmpty()))?that.getOnlineApplication():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "onlineApplication", lhsOnlineApplication), LocatorUtils.property(thatLocator, "onlineApplication", rhsOnlineApplication), lhsOnlineApplication, rhsOnlineApplication)) {
+                return false;
+            }
+        }
+        {
+            Boolean lhsOnlyBusinessService;
+            lhsOnlyBusinessService = this.isOnlyBusinessService();
+            Boolean rhsOnlyBusinessService;
+            rhsOnlyBusinessService = that.isOnlyBusinessService();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "onlyBusinessService", lhsOnlyBusinessService), LocatorUtils.property(thatLocator, "onlyBusinessService", rhsOnlyBusinessService), lhsOnlyBusinessService, rhsOnlyBusinessService)) {
+                return false;
+            }
+        }
+        {
+            String lhsBusinessServiceType;
+            lhsBusinessServiceType = this.getBusinessServiceType();
+            String rhsBusinessServiceType;
+            rhsBusinessServiceType = that.getBusinessServiceType();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "businessServiceType", lhsBusinessServiceType), LocatorUtils.property(thatLocator, "businessServiceType", rhsBusinessServiceType), lhsBusinessServiceType, rhsBusinessServiceType)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theBpk;
+            theBpk = this.getBpk();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "bpk", theBpk), currentHashCode, theBpk);
+        }
+        {
+            String theFamilyname;
+            theFamilyname = this.getFamilyname();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "familyname", theFamilyname), currentHashCode, theFamilyname);
+        }
+        {
+            String theGivenname;
+            theGivenname = this.getGivenname();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "givenname", theGivenname), currentHashCode, theGivenname);
+        }
+        {
+            String theInstitut;
+            theInstitut = this.getInstitut();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "institut", theInstitut), currentHashCode, theInstitut);
+        }
+        {
+            String theMail;
+            theMail = this.getMail();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "mail", theMail), currentHashCode, theMail);
+        }
+        {
+            String thePhone;
+            thePhone = this.getPhone();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "phone", thePhone), currentHashCode, thePhone);
+        }
+        {
+            String theUsername;
+            theUsername = this.getUsername();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "username", theUsername), currentHashCode, theUsername);
+        }
+        {
+            String thePassword;
+            thePassword = this.getPassword();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "password", thePassword), currentHashCode, thePassword);
+        }
+        {
+            String thePasswordSalt;
+            thePasswordSalt = this.getPasswordSalt();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "passwordSalt", thePasswordSalt), currentHashCode, thePasswordSalt);
+        }
+        {
+            String theUserRequestTokken;
+            theUserRequestTokken = this.getUserRequestTokken();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "userRequestTokken", theUserRequestTokken), currentHashCode, theUserRequestTokken);
+        }
+        {
+            Boolean theIsActive;
+            theIsActive = this.isIsActive();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "isActive", theIsActive), currentHashCode, theIsActive);
+        }
+        {
+            Boolean theIsAdmin;
+            theIsAdmin = this.isIsAdmin();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "isAdmin", theIsAdmin), currentHashCode, theIsAdmin);
+        }
+        {
+            Boolean theIsUsernamePasswordAllowed;
+            theIsUsernamePasswordAllowed = this.isIsUsernamePasswordAllowed();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "isUsernamePasswordAllowed", theIsUsernamePasswordAllowed), currentHashCode, theIsUsernamePasswordAllowed);
+        }
+        {
+            Boolean theIsMandateUser;
+            theIsMandateUser = this.isIsMandateUser();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "isMandateUser", theIsMandateUser), currentHashCode, theIsMandateUser);
+        }
+        {
+            Boolean theIsMailAddressVerified;
+            theIsMailAddressVerified = this.isIsMailAddressVerified();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "isMailAddressVerified", theIsMailAddressVerified), currentHashCode, theIsMailAddressVerified);
+        }
+        {
+            Boolean theIsAdminRequest;
+            theIsAdminRequest = this.isIsAdminRequest();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "isAdminRequest", theIsAdminRequest), currentHashCode, theIsAdminRequest);
+        }
+        {
+            Boolean theIsPVP2Generated;
+            theIsPVP2Generated = this.isIsPVP2Generated();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "isPVP2Generated", theIsPVP2Generated), currentHashCode, theIsPVP2Generated);
+        }
+        {
+            String theLastLogin;
+            theLastLogin = this.getLastLogin();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "lastLogin", theLastLogin), currentHashCode, theLastLogin);
+        }
+        {
+            List<OnlineApplication> theOnlineApplication;
+            theOnlineApplication = (((this.onlineApplication!= null)&&(!this.onlineApplication.isEmpty()))?this.getOnlineApplication():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "onlineApplication", theOnlineApplication), currentHashCode, theOnlineApplication);
+        }
+        {
+            Boolean theOnlyBusinessService;
+            theOnlyBusinessService = this.isOnlyBusinessService();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "onlyBusinessService", theOnlyBusinessService), currentHashCode, theOnlyBusinessService);
+        }
+        {
+            String theBusinessServiceType;
+            theBusinessServiceType = this.getBusinessServiceType();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "businessServiceType", theBusinessServiceType), currentHashCode, theBusinessServiceType);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyAuthBlock.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyAuthBlock.java
new file mode 100644
index 000000000..ecfb6b701
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyAuthBlock.java
@@ -0,0 +1,254 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.hyperjaxb3.item.ItemUtils;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}TrustProfileID"/>
+ *         &lt;element name="VerifyTransformsInfoProfileID" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "trustProfileID",
+    "verifyTransformsInfoProfileID"
+})
+
+
+
+public class VerifyAuthBlock
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "TrustProfileID", required = true)
+    protected String trustProfileID;
+    @XmlElement(name = "VerifyTransformsInfoProfileID")
+    protected List<String> verifyTransformsInfoProfileID;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+    protected transient List<VerifyAuthBlockVerifyTransformsInfoProfileIDItem> verifyTransformsInfoProfileIDItems;
+
+    /**
+     * Gets the value of the trustProfileID property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getTrustProfileID() {
+        return trustProfileID;
+    }
+
+    /**
+     * Sets the value of the trustProfileID property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTrustProfileID(String value) {
+        this.trustProfileID = value;
+    }
+
+    /**
+     * Gets the value of the verifyTransformsInfoProfileID property.
+     * 
+     * <p>
+     * This accessor method returns a reference to the live list,
+     * not a snapshot. Therefore any modification you make to the
+     * returned list will be present inside the JAXB object.
+     * This is why there is not a <CODE>set</CODE> method for the verifyTransformsInfoProfileID property.
+     * 
+     * <p>
+     * For example, to add a new item, do as follows:
+     * <pre>
+     *    getVerifyTransformsInfoProfileID().add(newItem);
+     * </pre>
+     * 
+     * 
+     * <p>
+     * Objects of the following type(s) are allowed in the list
+     * {@link String }
+     * 
+     * 
+     */
+    @Transient
+    public List<String> getVerifyTransformsInfoProfileID() {
+        if (verifyTransformsInfoProfileID == null) {
+            verifyTransformsInfoProfileID = new ArrayList<String>();
+        }
+        return this.verifyTransformsInfoProfileID;
+    }
+
+    /**
+     * 
+     * 
+     */
+    public void setVerifyTransformsInfoProfileID(List<String> verifyTransformsInfoProfileID) {
+        this.verifyTransformsInfoProfileID = verifyTransformsInfoProfileID;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    @OneToMany(targetEntity = VerifyAuthBlockVerifyTransformsInfoProfileIDItem.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public List<VerifyAuthBlockVerifyTransformsInfoProfileIDItem> getVerifyTransformsInfoProfileIDItems() {
+        if (this.verifyTransformsInfoProfileIDItems == null) {
+            this.verifyTransformsInfoProfileIDItems = new ArrayList<VerifyAuthBlockVerifyTransformsInfoProfileIDItem>();
+        }
+        if (ItemUtils.shouldBeWrapped(this.verifyTransformsInfoProfileID)) {
+            this.verifyTransformsInfoProfileID = ItemUtils.wrap(this.verifyTransformsInfoProfileID, this.verifyTransformsInfoProfileIDItems, VerifyAuthBlockVerifyTransformsInfoProfileIDItem.class);
+        }
+        return this.verifyTransformsInfoProfileIDItems;
+    }
+
+    public void setVerifyTransformsInfoProfileIDItems(List<VerifyAuthBlockVerifyTransformsInfoProfileIDItem> value) {
+        this.verifyTransformsInfoProfileID = null;
+        this.verifyTransformsInfoProfileIDItems = null;
+        this.verifyTransformsInfoProfileIDItems = value;
+        if (this.verifyTransformsInfoProfileIDItems == null) {
+            this.verifyTransformsInfoProfileIDItems = new ArrayList<VerifyAuthBlockVerifyTransformsInfoProfileIDItem>();
+        }
+        if (ItemUtils.shouldBeWrapped(this.verifyTransformsInfoProfileID)) {
+            this.verifyTransformsInfoProfileID = ItemUtils.wrap(this.verifyTransformsInfoProfileID, this.verifyTransformsInfoProfileIDItems, VerifyAuthBlockVerifyTransformsInfoProfileIDItem.class);
+        }
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof VerifyAuthBlock)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final VerifyAuthBlock that = ((VerifyAuthBlock) object);
+        {
+            String lhsTrustProfileID;
+            lhsTrustProfileID = this.getTrustProfileID();
+            String rhsTrustProfileID;
+            rhsTrustProfileID = that.getTrustProfileID();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "trustProfileID", lhsTrustProfileID), LocatorUtils.property(thatLocator, "trustProfileID", rhsTrustProfileID), lhsTrustProfileID, rhsTrustProfileID)) {
+                return false;
+            }
+        }
+        {
+            List<String> lhsVerifyTransformsInfoProfileID;
+            lhsVerifyTransformsInfoProfileID = (((this.verifyTransformsInfoProfileID!= null)&&(!this.verifyTransformsInfoProfileID.isEmpty()))?this.getVerifyTransformsInfoProfileID():null);
+            List<String> rhsVerifyTransformsInfoProfileID;
+            rhsVerifyTransformsInfoProfileID = (((that.verifyTransformsInfoProfileID!= null)&&(!that.verifyTransformsInfoProfileID.isEmpty()))?that.getVerifyTransformsInfoProfileID():null);
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "verifyTransformsInfoProfileID", lhsVerifyTransformsInfoProfileID), LocatorUtils.property(thatLocator, "verifyTransformsInfoProfileID", rhsVerifyTransformsInfoProfileID), lhsVerifyTransformsInfoProfileID, rhsVerifyTransformsInfoProfileID)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theTrustProfileID;
+            theTrustProfileID = this.getTrustProfileID();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trustProfileID", theTrustProfileID), currentHashCode, theTrustProfileID);
+        }
+        {
+            List<String> theVerifyTransformsInfoProfileID;
+            theVerifyTransformsInfoProfileID = (((this.verifyTransformsInfoProfileID!= null)&&(!this.verifyTransformsInfoProfileID.isEmpty()))?this.getVerifyTransformsInfoProfileID():null);
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "verifyTransformsInfoProfileID", theVerifyTransformsInfoProfileID), currentHashCode, theVerifyTransformsInfoProfileID);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyAuthBlockVerifyTransformsInfoProfileIDItem.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyAuthBlockVerifyTransformsInfoProfileIDItem.java
new file mode 100644
index 000000000..8955525dd
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyAuthBlockVerifyTransformsInfoProfileIDItem.java
@@ -0,0 +1,93 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import org.jvnet.hyperjaxb3.item.Item;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+
+
+
+public class VerifyAuthBlockVerifyTransformsInfoProfileIDItem
+    implements Serializable, Item<String>
+{
+
+    @XmlElement(name = "VerifyTransformsInfoProfileID", namespace = "http://www.buergerkarte.at/namespaces/moaconfig#")
+    protected String item;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the item property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getItem() {
+        return item;
+    }
+
+    /**
+     * Sets the value of the item property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setItem(String value) {
+        this.item = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyIdentityLink.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyIdentityLink.java
new file mode 100644
index 000000000..5b54bf5f2
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyIdentityLink.java
@@ -0,0 +1,164 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for anonymous complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType>
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}TrustProfileID"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "", propOrder = {
+    "trustProfileID"
+})
+
+
+
+public class VerifyIdentityLink
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "TrustProfileID", required = true)
+    protected String trustProfileID;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the trustProfileID property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getTrustProfileID() {
+        return trustProfileID;
+    }
+
+    /**
+     * Sets the value of the trustProfileID property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setTrustProfileID(String value) {
+        this.trustProfileID = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof VerifyIdentityLink)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final VerifyIdentityLink that = ((VerifyIdentityLink) object);
+        {
+            String lhsTrustProfileID;
+            lhsTrustProfileID = this.getTrustProfileID();
+            String rhsTrustProfileID;
+            rhsTrustProfileID = that.getTrustProfileID();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "trustProfileID", lhsTrustProfileID), LocatorUtils.property(thatLocator, "trustProfileID", rhsTrustProfileID), lhsTrustProfileID, rhsTrustProfileID)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theTrustProfileID;
+            theTrustProfileID = this.getTrustProfileID();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "trustProfileID", theTrustProfileID), currentHashCode, theTrustProfileID);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyInfoboxesType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyInfoboxesType.java
new file mode 100644
index 000000000..1768a2873
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyInfoboxesType.java
@@ -0,0 +1,181 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * Verifikation zusaetzlicher Infoboxen
+ * 			
+ * 
+ * <p>Java class for VerifyInfoboxesType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="VerifyInfoboxesType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="DefaultTrustProfile" minOccurs="0">
+ *           &lt;complexType>
+ *             &lt;complexContent>
+ *               &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *                 &lt;sequence>
+ *                   &lt;element ref="{http://www.buergerkarte.at/namespaces/moaconfig#}TrustProfileID"/>
+ *                 &lt;/sequence>
+ *               &lt;/restriction>
+ *             &lt;/complexContent>
+ *           &lt;/complexType>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "VerifyInfoboxesType", propOrder = {
+    "defaultTrustProfile"
+})
+
+
+
+public class VerifyInfoboxesType
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "DefaultTrustProfile")
+    protected DefaultTrustProfile defaultTrustProfile;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the defaultTrustProfile property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link DefaultTrustProfile }
+     *     
+     */
+    @ManyToOne(targetEntity = DefaultTrustProfile.class, cascade = {
+        CascadeType.ALL
+    })
+    
+    public DefaultTrustProfile getDefaultTrustProfile() {
+        return defaultTrustProfile;
+    }
+
+    /**
+     * Sets the value of the defaultTrustProfile property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link DefaultTrustProfile }
+     *     
+     */
+    public void setDefaultTrustProfile(DefaultTrustProfile value) {
+        this.defaultTrustProfile = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof VerifyInfoboxesType)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final VerifyInfoboxesType that = ((VerifyInfoboxesType) object);
+        {
+            DefaultTrustProfile lhsDefaultTrustProfile;
+            lhsDefaultTrustProfile = this.getDefaultTrustProfile();
+            DefaultTrustProfile rhsDefaultTrustProfile;
+            rhsDefaultTrustProfile = that.getDefaultTrustProfile();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "defaultTrustProfile", lhsDefaultTrustProfile), LocatorUtils.property(thatLocator, "defaultTrustProfile", rhsDefaultTrustProfile), lhsDefaultTrustProfile, rhsDefaultTrustProfile)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            DefaultTrustProfile theDefaultTrustProfile;
+            theDefaultTrustProfile = this.getDefaultTrustProfile();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "defaultTrustProfile", theDefaultTrustProfile), currentHashCode, theDefaultTrustProfile);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/X509IssuerSerialType.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/X509IssuerSerialType.java
new file mode 100644
index 000000000..8e1e4391b
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/X509IssuerSerialType.java
@@ -0,0 +1,213 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+import org.jvnet.jaxb2_commons.lang.Equals;
+import org.jvnet.jaxb2_commons.lang.EqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.HashCode;
+import org.jvnet.jaxb2_commons.lang.HashCodeStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBEqualsStrategy;
+import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
+
+
+/**
+ * <p>Java class for X509IssuerSerialType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="X509IssuerSerialType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="X509IssuerName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="X509SerialNumber" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "X509IssuerSerialType", propOrder = {
+    "x509IssuerName",
+    "x509SerialNumber"
+})
+@XmlSeeAlso({
+    TrustAnchor.class
+})
+
+
+
+public class X509IssuerSerialType
+    implements Serializable, Equals, HashCode
+{
+
+    @XmlElement(name = "X509IssuerName", required = true)
+    protected String x509IssuerName;
+    @XmlElement(name = "X509SerialNumber", required = true)
+    protected BigInteger x509SerialNumber;
+    @XmlAttribute(name = "Hjid")
+    protected Long hjid;
+
+    /**
+     * Gets the value of the x509IssuerName property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    
+    
+    public String getX509IssuerName() {
+        return x509IssuerName;
+    }
+
+    /**
+     * Sets the value of the x509IssuerName property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setX509IssuerName(String value) {
+        this.x509IssuerName = value;
+    }
+
+    /**
+     * Gets the value of the x509SerialNumber property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link BigInteger }
+     *     
+     */
+    
+    
+    public BigInteger getX509SerialNumber() {
+        return x509SerialNumber;
+    }
+
+    /**
+     * Sets the value of the x509SerialNumber property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link BigInteger }
+     *     
+     */
+    public void setX509SerialNumber(BigInteger value) {
+        this.x509SerialNumber = value;
+    }
+
+    /**
+     * Gets the value of the hjid property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link Long }
+     *     
+     */
+    
+    
+    
+    public Long getHjid() {
+        return hjid;
+    }
+
+    /**
+     * Sets the value of the hjid property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link Long }
+     *     
+     */
+    public void setHjid(Long value) {
+        this.hjid = value;
+    }
+
+    public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy strategy) {
+        if (!(object instanceof X509IssuerSerialType)) {
+            return false;
+        }
+        if (this == object) {
+            return true;
+        }
+        final X509IssuerSerialType that = ((X509IssuerSerialType) object);
+        {
+            String lhsX509IssuerName;
+            lhsX509IssuerName = this.getX509IssuerName();
+            String rhsX509IssuerName;
+            rhsX509IssuerName = that.getX509IssuerName();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "x509IssuerName", lhsX509IssuerName), LocatorUtils.property(thatLocator, "x509IssuerName", rhsX509IssuerName), lhsX509IssuerName, rhsX509IssuerName)) {
+                return false;
+            }
+        }
+        {
+            BigInteger lhsX509SerialNumber;
+            lhsX509SerialNumber = this.getX509SerialNumber();
+            BigInteger rhsX509SerialNumber;
+            rhsX509SerialNumber = that.getX509SerialNumber();
+            if (!strategy.equals(LocatorUtils.property(thisLocator, "x509SerialNumber", lhsX509SerialNumber), LocatorUtils.property(thatLocator, "x509SerialNumber", rhsX509SerialNumber), lhsX509SerialNumber, rhsX509SerialNumber)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public boolean equals(Object object) {
+        final EqualsStrategy strategy = JAXBEqualsStrategy.INSTANCE;
+        return equals(null, null, object, strategy);
+    }
+
+    public int hashCode(ObjectLocator locator, HashCodeStrategy strategy) {
+        int currentHashCode = 1;
+        {
+            String theX509IssuerName;
+            theX509IssuerName = this.getX509IssuerName();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "x509IssuerName", theX509IssuerName), currentHashCode, theX509IssuerName);
+        }
+        {
+            BigInteger theX509SerialNumber;
+            theX509SerialNumber = this.getX509SerialNumber();
+            currentHashCode = strategy.hashCode(LocatorUtils.property(locator, "x509SerialNumber", theX509SerialNumber), currentHashCode, theX509SerialNumber);
+        }
+        return currentHashCode;
+    }
+
+    public int hashCode() {
+        final HashCodeStrategy strategy = JAXBHashCodeStrategy.INSTANCE;
+        return this.hashCode(null, strategy);
+    }
+
+}
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/package-info.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/package-info.java
new file mode 100644
index 000000000..369adb55b
--- /dev/null
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/package-info.java
@@ -0,0 +1,9 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4 
+// 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: 2015.07.20 at 12:19:30 PM CEST 
+//
+
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.buergerkarte.at/namespaces/moaconfig#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package at.gv.egovernment.moa.id.commons.db.dao.config.deprecated;