Did some clean-up, like removing the odm directory and minor modifica…

…tions in readme and developersinfo.

README.md

@@ -10,7 +10,7 @@ of the project,
 [developers information](https://github.com/CTMM-TraIT/trait_odm_to_i2b2/blob/master/src/documentation/DevelopersInformation.md)
 are part of the project.
 
-The ODM-to-i2b2 project is a fork of the REDCap-to-i2b2 project:
+The ODM-to-i2b2 project is a fork with added functionality of the REDCap-to-i2b2 project:
 https://community.i2b2.org/wiki/display/ODM2i2b2/Home
 
 This tools allows you to convert an ODM file to tabular data files that are ready to import in an i2b2-like system like
@@ -26,6 +26,6 @@ variety of tested ODM exports from OpenClinica. It also deals appropriately with
 like events and item groups.
 
 Main developers:
-- Ward Blondé
-- Freek de Bruijn
+- Ward Blondé (Harvard Medical School, Boston)
+- Freek de Bruijn (NKI, Amsterdam)
 

odm/gensrc_openclinica/org/cdisk/odm/jaxb/CLDataType.java

@@ -1,64 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.06 at 02:44:20 PM CEST 
-//
-
-
-package org.cdisk.odm.jaxb;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CLDataType.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="CLDataType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="integer"/>
- *     &lt;enumeration value="float"/>
- *     &lt;enumeration value="text"/>
- *     &lt;enumeration value="string"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "CLDataType")
-@XmlEnum
-public enum CLDataType {
-
-    @XmlEnumValue("integer")
-    INTEGER("integer"),
-    @XmlEnumValue("float")
-    FLOAT("float"),
-    @XmlEnumValue("text")
-    TEXT("text"),
-    @XmlEnumValue("string")
-    STRING("string");
-    private final String value;
-
-    CLDataType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static CLDataType fromValue(String v) {
-        for (CLDataType c: CLDataType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}

odm/gensrc_openclinica/org/cdisk/odm/jaxb/CommentType.java

@@ -1,58 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.06 at 02:44:20 PM CEST 
-//
-
-
-package org.cdisk.odm.jaxb;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for CommentType.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="CommentType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="Sponsor"/>
- *     &lt;enumeration value="Site"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "CommentType")
-@XmlEnum
-public enum CommentType {
-
-    @XmlEnumValue("Sponsor")
-    SPONSOR("Sponsor"),
-    @XmlEnumValue("Site")
-    SITE("Site");
-    private final String value;
-
-    CommentType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static CommentType fromValue(String v) {
-        for (CommentType c: CommentType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}

odm/gensrc_openclinica/org/cdisk/odm/jaxb/Comparator.java

@@ -1,57 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.06 at 02:44:20 PM CEST 
-//
-
-
-package org.cdisk.odm.jaxb;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for Comparator.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="Comparator">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="LT"/>
- *     &lt;enumeration value="LE"/>
- *     &lt;enumeration value="GT"/>
- *     &lt;enumeration value="GE"/>
- *     &lt;enumeration value="EQ"/>
- *     &lt;enumeration value="NE"/>
- *     &lt;enumeration value="IN"/>
- *     &lt;enumeration value="NOTIN"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "Comparator")
-@XmlEnum
-public enum Comparator {
-
-    LT,
-    LE,
-    GT,
-    GE,
-    EQ,
-    NE,
-    IN,
-    NOTIN;
-
-    public String value() {
-        return name();
-    }
-
-    public static Comparator fromValue(String v) {
-        return valueOf(v);
-    }
-
-}

odm/gensrc_openclinica/org/cdisk/odm/jaxb/DataType.java

@@ -1,111 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.06 at 02:44:20 PM CEST 
-//
-
-
-package org.cdisk.odm.jaxb;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for DataType.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="DataType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="integer"/>
- *     &lt;enumeration value="float"/>
- *     &lt;enumeration value="date"/>
- *     &lt;enumeration value="datetime"/>
- *     &lt;enumeration value="time"/>
- *     &lt;enumeration value="text"/>
- *     &lt;enumeration value="string"/>
- *     &lt;enumeration value="double"/>
- *     &lt;enumeration value="URI"/>
- *     &lt;enumeration value="boolean"/>
- *     &lt;enumeration value="hexBinary"/>
- *     &lt;enumeration value="base64Binary"/>
- *     &lt;enumeration value="hexFloat"/>
- *     &lt;enumeration value="base64Float"/>
- *     &lt;enumeration value="partialDate"/>
- *     &lt;enumeration value="partialTime"/>
- *     &lt;enumeration value="partialDatetime"/>
- *     &lt;enumeration value="durationDatetime"/>
- *     &lt;enumeration value="intervalDatetime"/>
- *     &lt;enumeration value="incompleteDatetime"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "DataType")
-@XmlEnum
-public enum DataType {
-
-    @XmlEnumValue("integer")
-    INTEGER("integer"),
-    @XmlEnumValue("float")
-    FLOAT("float"),
-    @XmlEnumValue("date")
-    DATE("date"),
-    @XmlEnumValue("datetime")
-    DATETIME("datetime"),
-    @XmlEnumValue("time")
-    TIME("time"),
-    @XmlEnumValue("text")
-    TEXT("text"),
-    @XmlEnumValue("string")
-    STRING("string"),
-    @XmlEnumValue("double")
-    DOUBLE("double"),
-    URI("URI"),
-    @XmlEnumValue("boolean")
-    BOOLEAN("boolean"),
-    @XmlEnumValue("hexBinary")
-    HEX_BINARY("hexBinary"),
-    @XmlEnumValue("base64Binary")
-    BASE_64_BINARY("base64Binary"),
-    @XmlEnumValue("hexFloat")
-    HEX_FLOAT("hexFloat"),
-    @XmlEnumValue("base64Float")
-    BASE_64_FLOAT("base64Float"),
-    @XmlEnumValue("partialDate")
-    PARTIAL_DATE("partialDate"),
-    @XmlEnumValue("partialTime")
-    PARTIAL_TIME("partialTime"),
-    @XmlEnumValue("partialDatetime")
-    PARTIAL_DATETIME("partialDatetime"),
-    @XmlEnumValue("durationDatetime")
-    DURATION_DATETIME("durationDatetime"),
-    @XmlEnumValue("intervalDatetime")
-    INTERVAL_DATETIME("intervalDatetime"),
-    @XmlEnumValue("incompleteDatetime")
-    INCOMPLETE_DATETIME("incompleteDatetime");
-    private final String value;
-
-    DataType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static DataType fromValue(String v) {
-        for (DataType c: DataType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}

odm/gensrc_openclinica/org/cdisk/odm/jaxb/EditPointType.java

@@ -1,61 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.05.06 at 02:44:20 PM CEST 
-//
-
-
-package org.cdisk.odm.jaxb;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for EditPointType.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="EditPointType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="Monitoring"/>
- *     &lt;enumeration value="DataManagement"/>
- *     &lt;enumeration value="DBAudit"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-@XmlType(name = "EditPointType")
-@XmlEnum
-public enum EditPointType {
-
-    @XmlEnumValue("Monitoring")
-    MONITORING("Monitoring"),
-    @XmlEnumValue("DataManagement")
-    DATA_MANAGEMENT("DataManagement"),
-    @XmlEnumValue("DBAudit")
-    DB_AUDIT("DBAudit");
-    private final String value;
-
-    EditPointType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static EditPointType fromValue(String v) {
-        for (EditPointType c: EditPointType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}