fully remove of hyperjaxb functionality from DB-configuration implementation

17 files changed, 242 insertions, 1071 deletions

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
index 11eca81f5..6dacc2ec4 100644
--- 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
@@ -11,20 +11,10 @@ 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;
@@ -35,8 +25,7 @@ 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;
@@ -46,6 +35,8 @@ import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
 import org.jvnet.jaxb2_commons.locator.ObjectLocator;
 import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
 
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+
 
 /**
  * <p>Java class for anonymous complex type.
@@ -99,7 +90,7 @@ public class CPEPS
     protected Boolean supportsXMLSignature;
     @XmlAttribute(name = "Hjid")
     protected Long hjid;
-    protected transient List<CPEPSAttributeValueItem> attributeValueItems;
+   // protected transient List<CPEPSAttributeValueItem> attributeValueItems;
 
     /**
      * Gets the value of the attributeValue property.
@@ -293,31 +284,31 @@ public class CPEPS
         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);
-        }
-    }
+//    @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)) {
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
deleted file mode 100644
index 0af8c64b4..000000000
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/CPEPSAttributeValueItem.java
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// 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/Contact.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/Contact.java
index 38835db05..25a9c03ea 100644
--- 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
@@ -11,18 +11,7 @@ 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;
@@ -32,7 +21,7 @@ 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;
@@ -41,6 +30,7 @@ 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;
+//import org.jvnet.hyperjaxb3.item.ItemUtils;
 
 
 /**
@@ -109,8 +99,8 @@ public class Contact
     protected List<String> phone;
     @XmlAttribute(name = "Hjid")
     protected Long hjid;
-    protected transient List<ContactMailItem> mailItems;
-    protected transient List<ContactPhoneItem> phoneItems;
+//    protected transient List<ContactMailItem> mailItems;
+//    protected transient List<ContactPhoneItem> phoneItems;
 
     /**
      * Gets the value of the surName property.
@@ -319,57 +309,57 @@ public class Contact
         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);
-        }
-    }
+//    @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)) {
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
deleted file mode 100644
index d7c656bd7..000000000
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ContactMailItem.java
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// 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
deleted file mode 100644
index ae9c57ea0..000000000
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/ContactPhoneItem.java
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// 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/IdentityLinkSigners.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentityLinkSigners.java
index c48d4522d..90f46efe1 100644
--- 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
@@ -11,24 +11,14 @@ 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;
@@ -73,7 +63,7 @@ public class IdentityLinkSigners
     protected List<String> x509SubjectName;
     @XmlAttribute(name = "Hjid")
     protected Long hjid;
-    protected transient List<IdentityLinkSignersX509SubjectNameItem> x509SubjectNameItems;
+//    protected transient List<IdentityLinkSignersX509SubjectNameItem> x509SubjectNameItems;
 
     /**
      * Gets the value of the x509SubjectName property.
@@ -140,31 +130,31 @@ public class IdentityLinkSigners
         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);
-        }
-    }
+//    @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)) {
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
deleted file mode 100644
index c0679df1c..000000000
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/IdentityLinkSignersX509SubjectNameItem.java
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// 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/LegacyAllowed.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/LegacyAllowed.java
index 12a48c88e..1a45642d1 100644
--- 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
@@ -11,24 +11,14 @@ 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;
@@ -73,7 +63,7 @@ public class LegacyAllowed
     protected List<String> protocolName;
     @XmlAttribute(name = "Hjid")
     protected Long hjid;
-    protected transient List<LegacyAllowedProtocolNameItem> protocolNameItems;
+//    protected transient List<LegacyAllowedProtocolNameItem> protocolNameItems;
 
     /**
      * Gets the value of the protocolName property.
@@ -140,31 +130,31 @@ public class LegacyAllowed
         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);
-        }
-    }
+//    @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)) {
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
deleted file mode 100644
index 91aae9742..000000000
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/LegacyAllowedProtocolNameItem.java
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// 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/MOAIDConfiguration.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAIDConfiguration.java
index 64e4be82b..810139c84 100644
--- 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
@@ -12,19 +12,10 @@ 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;
@@ -37,8 +28,7 @@ import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlTransient;
 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;
@@ -511,22 +501,24 @@ public class MOAIDConfiguration
     
     @Temporal(TemporalType.TIMESTAMP)
     public Date getTimestampItem() {
-        return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getTimestamp());
+        //return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getTimestamp());
+    	return new Date();
     }
 
     public void setTimestampItem(Date target) {
-        setTimestamp(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, target));
+        //setTimestamp(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, target));
     }
 
     
     
     @Temporal(TemporalType.TIMESTAMP)
     public Date getPvp2RefreshItem() {
-        return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getPvp2Refresh());
+        //return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getPvp2Refresh());
+    	return new Date();
     }
 
     public void setPvp2RefreshItem(Date target) {
-        setPvp2Refresh(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, target));
+        //setPvp2Refresh(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, target));
     }
 
     public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy 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
index 247be940c..a87a6d1f6 100644
--- 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
@@ -11,25 +11,14 @@ 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;
@@ -38,6 +27,7 @@ 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;
+//import org.jvnet.hyperjaxb3.item.ItemUtils;
 
 
 /**
@@ -78,7 +68,7 @@ public class Mandates
     protected List<String> profileName;
     @XmlAttribute(name = "Hjid")
     protected Long hjid;
-    protected transient List<MandatesProfileNameItem> profileNameItems;
+//    protected transient List<MandatesProfileNameItem> profileNameItems;
 
     /**
      * Gets the value of the profiles property.
@@ -171,31 +161,31 @@ public class Mandates
         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);
-        }
-    }
+//    @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)) {
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
deleted file mode 100644
index 0ef09c0dc..000000000
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MandatesProfileNameItem.java
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// 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/OAPVP2.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OAPVP2.java
index d5cee7b83..ea34d7a06 100644
--- 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
@@ -10,16 +10,8 @@ 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;
@@ -31,8 +23,7 @@ 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;
@@ -196,11 +187,12 @@ public class OAPVP2
     
     @Temporal(TemporalType.TIMESTAMP)
     public Date getUpdateRequiredItem() {
-        return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getUpdateRequired());
+        //return XmlAdapterUtils.unmarshall(XMLGregorianCalendarAsDateTime.class, this.getUpdateRequired());
+    	return new Date();
     }
 
     public void setUpdateRequiredItem(Date target) {
-        setUpdateRequired(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, target));
+        //setUpdateRequired(XmlAdapterUtils.marshall(XMLGregorianCalendarAsDateTime.class, target));
     }
 
     public boolean equals(ObjectLocator thisLocator, ObjectLocator thatLocator, Object object, EqualsStrategy 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
index 2e80cb0d5..673e7b9ce 100644
--- 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
@@ -11,18 +11,7 @@ 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;
@@ -31,8 +20,7 @@ import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlTransient;
 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;
@@ -42,6 +30,8 @@ import org.jvnet.jaxb2_commons.lang.JAXBHashCodeStrategy;
 import org.jvnet.jaxb2_commons.locator.ObjectLocator;
 import org.jvnet.jaxb2_commons.locator.util.LocatorUtils;
 
+import com.sun.tools.xjc.runtime.ZeroOneBooleanAdapter;
+
 
 /**
  * <p>Java class for anonymous complex type.
@@ -81,7 +71,7 @@ public class TestCredentials
     protected Boolean enableTestCredentials;
     @XmlAttribute(name = "Hjid")
     protected Long hjid;
-    protected transient List<TestCredentialsCredentialOIDItem> credentialOIDItems;
+    //protected transient List<TestCredentialsCredentialOIDItem> credentialOIDItems;
 
     @XmlTransient
     protected boolean useTestIDLTrustStore;
@@ -185,31 +175,31 @@ public class TestCredentials
         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);
-        }
-    }
+//    @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);
+//        }
+//    }
 
     
     
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
deleted file mode 100644
index 3e386be66..000000000
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/TestCredentialsCredentialOIDItem.java
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// 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/VerifyAuthBlock.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyAuthBlock.java
index 155863b03..01a5c9b1b 100644
--- 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
@@ -11,18 +11,7 @@ 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;
@@ -30,7 +19,7 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlTransient;
 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;
@@ -39,6 +28,7 @@ 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;
+//import org.jvnet.hyperjaxb3.item.ItemUtils;
 
 
 /**
@@ -79,7 +69,7 @@ public class VerifyAuthBlock
     protected List<String> verifyTransformsInfoProfileID;
     @XmlAttribute(name = "Hjid")
     protected Long hjid;
-    protected transient List<VerifyAuthBlockVerifyTransformsInfoProfileIDItem> verifyTransformsInfoProfileIDItems;
+//    protected List<VerifyAuthBlockVerifyTransformsInfoProfileIDItem> verifyTransformsInfoProfileIDItems;
 
     @XmlTransient
     protected String TestTrustProfileID;
@@ -192,31 +182,31 @@ public class VerifyAuthBlock
         this.hjid = value;
     }
 
-    @OneToMany(targetEntity = VerifyAuthBlockVerifyTransformsInfoProfileIDItem.class, cascade = {
-        CascadeType.ALL
-    })
+//    @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 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)) {
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
deleted file mode 100644
index 8955525dd..000000000
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/VerifyAuthBlockVerifyTransformsInfoProfileIDItem.java
+++ /dev/null
@@ -1,93 +0,0 @@
-//
-// 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;
-    }
-
-}