(no commit message)

diff --git a/cdmlib-io/src/main/resources/schema/cdm/cdm.xsd b/cdmlib-io/src/main/resources/schema/cdm/cdm.xsd
index a847620bad88a521d7802a51c0a4e924c4cfd2aa..4f4456c08eb041aba2f8db568bff551c42c19362 100644 (file)
--- a/cdmlib-io/src/main/resources/schema/cdm/cdm.xsd
+++ b/cdmlib-io/src/main/resources/schema/cdm/cdm.xsd
@@ -52,7 +52,6 @@
               <xs:choice minOccurs="0" maxOccurs="unbounded">
                 <xs:element ref="description:AbsenceTerm"/>
                 <xs:element ref="common:AnnotationType"/>
-                <xs:element ref="reference:BibtexEntryType"/>
                 <xs:element ref="location:Continent"/>
                 <xs:element ref="occurrence:DerivationEventType"/>
                 <xs:element ref="occurrence:DeterminationModifier"/>
@@ -60,7 +59,6 @@
                 <xs:element ref="description:Feature"/>
                 <xs:element ref="name:HybridRelationshipType"/>
                 <xs:element ref="agent:InstitutionType"/>
-                <xs:element ref="common:Keyword"/>
                 <xs:element ref="common:Language"/>
                 <xs:element ref="common:MarkerType"/>
                 <xs:element ref="description:MeasurementUnit"/>

diff --git a/cdmlib-io/src/main/resources/schema/cdm/common.xsd b/cdmlib-io/src/main/resources/schema/cdm/common.xsd
index 86acf66c02a92c3efc5e52dfefda1a4cb2951998..1ff307840f7a6b2dcc87f210cf1aa0ae49d86157 100644 (file)
--- a/cdmlib-io/src/main/resources/schema/cdm/common.xsd
+++ b/cdmlib-io/src/main/resources/schema/cdm/common.xsd
@@ -75,7 +75,7 @@
         <xs:sequence>
           <xs:element name="Username" type="xs:string"/>
           <xs:element name="Password" type="xs:string"/>
-          <xs:element name="EmailAddress" type="xs:string"/>
+          <xs:element name="EmailAddress" type="xs:string" minOccurs="0"/>
           <xs:element name="GrantedAuthorities" minOccurs="0">
             <xs:complexType>
               <xs:sequence>

diff --git a/cdmlib-io/src/main/resources/schema/cdm/description.xsd b/cdmlib-io/src/main/resources/schema/cdm/description.xsd
index 47f3e6182a501ac6c2078caf2d3b1eba4b9ab4c9..4fafa2d22cfd4ab2da9e9500782bc118f42790c6 100644 (file)
--- a/cdmlib-io/src/main/resources/schema/cdm/description.xsd
+++ b/cdmlib-io/src/main/resources/schema/cdm/description.xsd
@@ -378,7 +378,7 @@
     <xs:complexContent>
       <xs:extension base="common:AnnotatableEntity">
         <xs:sequence>
-          <xs:element ref="description:Feature" minOccurs="0"/>
+          <xs:element name="Feature" type="xs:IDREF" minOccurs="0" maxOccurs="unbounded"/>
           <xs:element name="Modifiers" minOccurs="0">
             <xs:complexType>
               <xs:sequence>

diff --git a/cdmlib-io/src/main/resources/schema/cdm/name.xsd b/cdmlib-io/src/main/resources/schema/cdm/name.xsd
index 878ff779b6792be6c3548e82769207f7299d91b4..9317f1f0009593b85f5d40decfa1207f600ffb9b 100644 (file)
--- a/cdmlib-io/src/main/resources/schema/cdm/name.xsd
+++ b/cdmlib-io/src/main/resources/schema/cdm/name.xsd
@@ -352,9 +352,6 @@
     <xs:complexContent>
       <xs:extension base="name:NonViralName">
         <xs:sequence>
-          <xs:element name="IsMonomHybrid" type="xs:boolean"/>
-          <xs:element name="IsBinomHybrid" type="xs:boolean"/>
-          <xs:element name="IsTrinomHybrid" type="xs:boolean"/>
           <xs:element name="IsAnamorphic" type="xs:boolean"/>
          </xs:sequence>
       </xs:extension>