Merge branch 'ISA-1.18-action' into moa-2.1-Snapshot

Conflicts:
	id/server/idserverlib/pom.xml

1 files changed, 0 insertions, 57 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/util/xsd/persondata/MaritalStatusType.java b/id/server/idserverlib/src/main/java/at/gv/util/xsd/persondata/MaritalStatusType.java
deleted file mode 100644
index 7f908d424..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/util/xsd/persondata/MaritalStatusType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-
-package at.gv.util.xsd.persondata;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MaritalStatusType.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="MaritalStatusType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}token">
- *     &lt;enumeration value="single"/>
- *     &lt;enumeration value="married"/>
- *     &lt;enumeration value="divorced"/>
- *     &lt;enumeration value="widowed"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "MaritalStatusType")
-@XmlEnum
-public enum MaritalStatusType {
-
-    @XmlEnumValue("single")
-    SINGLE("single"),
-    @XmlEnumValue("married")
-    MARRIED("married"),
-    @XmlEnumValue("divorced")
-    DIVORCED("divorced"),
-    @XmlEnumValue("widowed")
-    WIDOWED("widowed");
-    private final String value;
-
-    MaritalStatusType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static MaritalStatusType fromValue(String v) {
-        for (MaritalStatusType c: MaritalStatusType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}