some fixes in various files

diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
index 1a91b8decd92c9a3c52a3aaf2dd61fbfcbeed197..74e270b44c06ba474be469ed3ac572968096c0f0 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
@@ -34,7 +34,6 @@ Export-Package: eu.etaxonomy.cdm.print,
  eu.etaxonomy.cdm.remote.json.processor.matcher,
  eu.etaxonomy.cdm.remote.json.processor.value,
  eu.etaxonomy.cdm.remote.json.util,
- eu.etaxonomy.cdm.remote.l10n,
  eu.etaxonomy.cdm.remote.oauth2,
  eu.etaxonomy.cdm.remote.service,
  eu.etaxonomy.cdm.remote.view,

diff --git a/eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd b/eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd
index 67da9e734946eaf630a6d823fcb79161c2155a4f..2bb9352e92608228dbf90d869d6de4d344c8c6ed 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd
+++ b/eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/cdm/database/schema/dataset.dtd
@@ -26,8 +26,9 @@
     ANNOTATION_MARKER*,
     ANNOTATION_MARKER_AUD*,
     AUDITEVENT*,
-    CDM_VIEW*,
-    CDM_VIEW_CDM_VIEW*,
+    AUTHORITY*,
+    CDMLINK*,
+    CDMLINK_AUD*,
     CDMPREFERENCE*,
     COLLECTION*,
     COLLECTION_ANNOTATION*,
@@ -56,6 +57,8 @@
     DEFINEDTERMBASE_RECOMMENDEDMODIFIERENUMERATION_AUD*,
     DEFINEDTERMBASE_REPRESENTATION*,
     DEFINEDTERMBASE_REPRESENTATION_AUD*,
+    DEFINEDTERMBASE_INVERSEREPRESENTATION*,
+    DEFINEDTERMBASE_INVERSEREPRESENTATION_AUD*,
     DEFINEDTERMBASE_STATISTICALMEASURE*,
     DEFINEDTERMBASE_STATISTICALMEASURE_AUD*,
     DEFINEDTERMBASE_SUPPORTEDCATEGORICALENUMERATION*,
@@ -110,12 +113,8 @@
     DETERMINATIONEVENT_REFERENCE_AUD*,
     EXTENSION*,
     EXTENSION_AUD*,
-    FEATURENODE*,
-    FEATURENODE_AUD*,
-    FEATURETREE*,
-    FEATURETREE_AUD*,
-    FEATURETREE_REPRESENTATION*,
-    FEATURETREE_REPRESENTATION_AUD*,
+    FEATURESTATE*,
+    FEATURESTATE_AUD*,
     GATHERINGEVENT*,
     GATHERINGEVENT_ANNOTATION*,
     GATHERINGEVENT_ANNOTATION_AUD*,
@@ -153,6 +152,8 @@
     MARKER*,
     MARKER_AUD*,
     MEDIA*,
+    MEDIAMETADATA*,
+    MEDIAMETADATA_AUD*,
     MEDIAREPRESENTATION*,
     MEDIAREPRESENTATIONPART*,
     MEDIAREPRESENTATIONPART_AUD*,
@@ -187,13 +188,16 @@
     NOMENCLATURALSTATUS_AUD*,
     NOMENCLATURALSTATUS_MARKER*,
     NOMENCLATURALSTATUS_MARKER_AUD*,
-    ORIGINALSOURCE*,
-    ORIGINALSOURCE_ANNOTATION*,
-    ORIGINALSOURCE_ANNOTATION_AUD*,
-    ORIGINALSOURCE_AUD*,
-    ORIGINALSOURCE_MARKER*,
-    ORIGINALSOURCE_MARKER_AUD*,
+    ORIGINALSOURCEBASE*,
+    ORIGINALSOURCEBASE_AUD*,
+    ORIGINALSOURCEBASE_ANNOTATION*,
+    ORIGINALSOURCEBASE_ANNOTATION_AUD*,
+    ORIGINALSOURCEBASE_EXTERNALLINK*,
+    ORIGINALSOURCEBASE_EXTERNALLINK_AUD*,
+    ORIGINALSOURCEBASE_MARKER*,
+    ORIGINALSOURCEBASE_MARKER_AUD*,
     PERMISSIONGROUP*,
+    PERMISSIONGROUP_AUTHORITY*,
     PERMISSIONGROUP_GRANTEDAUTHORITYIMPL*,
     PERSON_KEYWORD*,
     PERSON_KEYWORD_AUD*,
@@ -211,8 +215,6 @@
     REFERENCE_ORIGINALSOURCE_AUD*,
     REFERENCE_RIGHTSINFO*,
     REFERENCE_RIGHTSINFO_AUD*,
-    TERMBASE_INVERSEREPRESENTATION*,
-    TERMBASE_INVERSEREPRESENTATION_AUD*,
     REPRESENTATION*,
     REPRESENTATION_ANNOTATION*,
     REPRESENTATION_ANNOTATION_AUD*,
@@ -304,8 +306,8 @@
     TAXONNODE*,
     TAXONNODE_ANNOTATION*,
     TAXONNODE_ANNOTATION_AUD*,
-    TAXONNODE_EXCLUDEDNOTE*,
-    TAXONNODE_EXCLUDEDNOTE_AUD*,
+    TAXONNODE_STATUSNOTE*,
+    TAXONNODE_STATUSNOTE_AUD*,
     TAXONNODE_MARKER*,
     TAXONNODE_MARKER_AUD*,
     TAXONRELATIONSHIP*,
@@ -314,19 +316,22 @@
     TAXONRELATIONSHIP_AUD*,
     TAXONRELATIONSHIP_MARKER*,
     TAXONRELATIONSHIP_MARKER_AUD*,
-    TERMVOCABULARY*,
-    TERMVOCABULARY_AUD*,
-    TERMVOCABULARY_REPRESENTATION*,
-    TERMVOCABULARY_REPRESENTATION_AUD*,
+    TERMRELATION*,
+    TERMRELATION_AUD*,
+    TERMCOLLECTION*,
+    TERMCOLLECTION_AUD*,
+    TERMCOLLECTION_REPRESENTATION*,
+    TERMCOLLECTION_REPRESENTATION_AUD*,
     TYPEDESIGNATIONBASE*,
     TYPEDESIGNATIONBASE_ANNOTATION*,
     TYPEDESIGNATIONBASE_ANNOTATION_AUD*,
     TYPEDESIGNATIONBASE_AUD*,
     TYPEDESIGNATIONBASE_MARKER*,
     TYPEDESIGNATIONBASE_MARKER_AUD*,
-    USER*,
-    USER_GRANTEDAUTHORITYIMPL*,
-    USER_PERMISSIONGROUP*)>
+    USERACCOUNT*,
+    USERACCOUNT_AUTHORITY*,
+    USERACCOUNT_GRANTEDAUTHORITYIMPL*,
+    USERACCOUNT_PERMISSIONGROUP*)>
 
 <!ELEMENT ADDRESS EMPTY>
 <!ATTLIST ADDRESS
@@ -385,13 +390,14 @@
     CODE CDATA #IMPLIED
     NAME CDATA #IMPLIED
     NOMENCLATURALTITLE CDATA #IMPLIED
-    FIRSTNAME CDATA #IMPLIED
+    GIVENNAME CDATA #IMPLIED
     INITIALS CDATA #IMPLIED
-    LASTNAME CDATA #IMPLIED
+    FAMILYNAME CDATA #IMPLIED
     LIFESPAN_END CDATA #IMPLIED
     LIFESPAN_START CDATA #IMPLIED
     PREFIX CDATA #IMPLIED
     SUFFIX CDATA #IMPLIED
+    ORCID CDATA #IMPLIED
     PROTECTEDNOMENCLATURALTITLECACHE CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
@@ -445,13 +451,14 @@
     UPDATEDBY_ID CDATA #IMPLIED
     NOMENCLATURALTITLE CDATA #IMPLIED
     PROTECTEDNOMENCLATURALTITLECACHE CDATA #IMPLIED
-    FIRSTNAME CDATA #IMPLIED
+    GIVENNAME CDATA #IMPLIED
     INITIALS CDATA #IMPLIED
-    LASTNAME CDATA #IMPLIED
+    FAMILYNAME CDATA #IMPLIED
     LIFESPAN_END CDATA #IMPLIED
     LIFESPAN_START CDATA #IMPLIED
     PREFIX CDATA #IMPLIED
     SUFFIX CDATA #IMPLIED
+    ORCID CDATA #IMPLIED
     CONTACT_ID CDATA #IMPLIED
     CODE CDATA #IMPLIED
     NAME CDATA #IMPLIED
@@ -609,21 +616,65 @@
     UUID CDATA #IMPLIED
 >
 
-<!ELEMENT CDM_VIEW EMPTY>
-<!ATTLIST CDM_VIEW
+<!ELEMENT AUTHORITY EMPTY>
+<!ATTLIST AUTHORITY
+    DTYPE CDATA #REQUIRED
+    ID CDATA #REQUIRED
+    CREATED CDATA #REQUIRED
+    UUID CDATA #REQUIRED
+    PROPERTY CDATA #REQUIRED
+    PERMISSIONCLASS CDATA #REQUIRED
+    OPERATIONS CDATA #REQUIRED
+    TARGETUUID CDATA #REQUIRED
+    CREATEDBY_ID CDATA #REQUIRED
+>
+
+<!ELEMENT CDMLINK EMPTY>
+<!ATTLIST CDMLINK
     ID CDATA #REQUIRED
     CREATED CDATA #IMPLIED
     UUID CDATA #IMPLIED
-    DESCRIPTION CDATA #IMPLIED
-    NAME CDATA #IMPLIED
-    CREATEDBY_ID CDATA #IMPLIED
+    UPDATED CDATA #IMPLIED
+    ENDPOS CDATA #IMPLIED
+    STARTPOS CDATA #IMPLIED
+    AGENT_ID CDATA #IMPLIED
+    ANNOTATION_ID CDATA #IMPLIED
+    DESCRIPTION_ID CDATA #IMPLIED
+    KEY_ID CDATA #IMPLIED
+    LANGUAGESTRING_ID CDATA #IMPLIED
+    MEDIA_ID CDATA #IMPLIED
+    OCCURRENCE_ID CDATA #IMPLIED
     REFERENCE_ID CDATA #IMPLIED
+    SOURCE_ID CDATA #IMPLIED
+    TAXON_ID CDATA #IMPLIED
+    TAXONNAME_ID CDATA #IMPLIED
+    CREATEDBY_ID CDATA #IMPLIED
+    UPDATEDBY_ID CDATA #IMPLIED
 >
 
-<!ELEMENT CDM_VIEW_CDM_VIEW EMPTY>
-<!ATTLIST CDM_VIEW_CDM_VIEW
-    CDM_VIEW_ID CDATA #REQUIRED
-    SUPERVIEWS_ID CDATA #REQUIRED
+<!ELEMENT CDMLINK_AUD EMPTY>
+<!ATTLIST CDMLINK_AUD
+    ID CDATA #REQUIRED
+    REV CDATA #REQUIRED
+    REVTYPE CDATA #IMPLIED
+    CREATED CDATA #IMPLIED
+    UUID CDATA #IMPLIED
+    UPDATED CDATA #IMPLIED
+    ENDPOS CDATA #IMPLIED
+    STARTPOS CDATA #IMPLIED
+    AGENT_ID CDATA #IMPLIED
+    ANNOTATION_ID CDATA #IMPLIED
+    DESCRIPTION_ID CDATA #IMPLIED
+    KEY_ID CDATA #IMPLIED
+    LANGUAGESTRING_ID CDATA #IMPLIED
+    MEDIA_ID CDATA #IMPLIED
+    OCCURRENCE_ID CDATA #IMPLIED
+    REFERENCE_ID CDATA #IMPLIED
+    SOURCE_ID CDATA #IMPLIED
+    TAXON_ID CDATA #IMPLIED
+    TAXONNAME_ID CDATA #IMPLIED
+    CREATEDBY_ID CDATA #IMPLIED
+    UPDATEDBY_ID CDATA #IMPLIED
 >
 
 <!ELEMENT CDMPREFERENCE EMPTY>
@@ -815,13 +866,8 @@
     SYMMETRICAL CDATA #IMPLIED
     TRANSITIVE CDATA #IMPLIED
     DEFAULTCOLOR CDATA #IMPLIED
-    SUPPORTSCOMMONTAXONNAME CDATA #IMPLIED
-    SUPPORTSDISTRIBUTION CDATA #IMPLIED
-    SUPPORTSINDIVIDUALASSOCIATION CDATA #IMPLIED
-    SUPPORTSQUANTITATIVEDATA CDATA #IMPLIED
-    SUPPORTSTAXONINTERACTION CDATA #IMPLIED
-    SUPPORTSTEXTDATA CDATA #IMPLIED
-    SUPPORTSCATEGORICALDATA CDATA #IMPLIED
+    AVAILABLEFOR CDATA #IMPLIED
+    SUPPORTEDDATATYPES CDATA #IMPLIED
     POINTAPPROXIMATION_ERRORRADIUS CDATA #IMPLIED
     POINTAPPROXIMATION_LATITUDE CDATA #IMPLIED
     POINTAPPROXIMATION_LONGITUDE CDATA #IMPLIED
@@ -830,6 +876,11 @@
     ISO3166_A2 CDATA #IMPLIED
     ABSENCETERM CDATA #IMPLIED
     ISTECHNICAL CDATA #REQUIRED
+    LASTRETRIEVED CDATA #IMPLIED
+    EXTERNALID CDATA #IMPLIED
+    EXTERNALLINK CDATA #IMPLIED
+    AUTHORITYTYPE CDATA #IMPLIED
+    IMPORTMETHOD CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     KINDOF_ID CDATA #IMPLIED
@@ -840,6 +891,9 @@
     SHAPE_ID CDATA #IMPLIED
     TYPE_ID CDATA #IMPLIED
     STRUCTURE_ID CDATA #IMPLIED
+    PROPERTY_ID CDATA #IMPLIED
+    STRUCTUREMODIFIER_ID CDATA #IMPLIED
+    PROPERTYMODIFIER_ID CDATA #IMPLIED
 >
 
 <!ELEMENT DEFINEDTERMBASE_AUD EMPTY>
@@ -869,25 +923,28 @@
     SYMMETRICAL CDATA #IMPLIED
     TRANSITIVE CDATA #IMPLIED
     DEFAULTCOLOR CDATA #IMPLIED
-    SUPPORTSCOMMONTAXONNAME CDATA #IMPLIED
-    SUPPORTSDISTRIBUTION CDATA #IMPLIED
-    SUPPORTSINDIVIDUALASSOCIATION CDATA #IMPLIED
-    SUPPORTSQUANTITATIVEDATA CDATA #IMPLIED
-    SUPPORTSTAXONINTERACTION CDATA #IMPLIED
-    SUPPORTSTEXTDATA CDATA #IMPLIED
-    SUPPORTSCATEGORICALDATA CDATA #IMPLIED
+    AVAILABLEFOR CDATA #IMPLIED
+    SUPPORTEDDATATYPES CDATA #IMPLIED
     POINTAPPROXIMATION_ERRORRADIUS CDATA #IMPLIED
     POINTAPPROXIMATION_LATITUDE CDATA #IMPLIED
     POINTAPPROXIMATION_LONGITUDE CDATA #IMPLIED
     VALIDPERIOD_END CDATA #IMPLIED
     VALIDPERIOD_START CDATA #IMPLIED
     ISO3166_A2 CDATA #IMPLIED
+    LASTRETRIEVED CDATA #IMPLIED
+    EXTERNALID CDATA #IMPLIED
+    EXTERNALLINK CDATA #IMPLIED
+    AUTHORITYTYPE CDATA #IMPLIED
+    IMPORTMETHOD CDATA #IMPLIED
     LEVEL_ID CDATA #IMPLIED
     POINTAPPROXIMATION_REFERENCESYSTEM_ID CDATA #IMPLIED
     SHAPE_ID CDATA #IMPLIED
     TYPE_ID CDATA #IMPLIED
     TYPE_ID CDATA #IMPLIED
     STRUCTURE_ID CDATA #IMPLIED
+    PROPERTY_ID CDATA #IMPLIED
+    STRUCTUREMODIFIER_ID CDATA #IMPLIED
+    PROPERTYMODIFIER_ID CDATA #IMPLIED
 >
 
 <!ELEMENT DEFINEDTERMBASE_CONTINENT EMPTY>
@@ -946,6 +1003,21 @@
     REVTYPE CDATA #IMPLIED
 >
 
+
+<!ELEMENT DEFINEDTERMBASE_INVERSEREPRESENTATION EMPTY>
+<!ATTLIST DEFINEDTERMBASE_INVERSEREPRESENTATION
+    DEFINEDTERMBASE_ID CDATA #REQUIRED
+    INVERSEREPRESENTATIONS_ID CDATA #REQUIRED
+>
+
+<!ELEMENT DEFINEDTERMBASE_INVERSEREPRESENTATION_AUD EMPTY>
+<!ATTLIST DEFINEDTERMBASE_INVERSEREPRESENTATION_AUD
+    REV CDATA #REQUIRED
+    DEFINEDTERMBASE_ID CDATA #REQUIRED
+    INVERSEREPRESENTATIONS_ID CDATA #REQUIRED
+    REVTYPE CDATA #IMPLIED
+>
+
 <!ELEMENT DEFINEDTERMBASE_STATISTICALMEASURE EMPTY>
 <!ATTLIST DEFINEDTERMBASE_STATISTICALMEASURE
     DEFINEDTERMBASE_ID CDATA #REQUIRED
@@ -1060,6 +1132,7 @@
     TITLECACHE CDATA #IMPLIED
     IMAGEGALLERY CDATA #IMPLIED
     ISDEFAULT CDATA #IMPLIED
+    TYPES CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     SPECIMEN_ID CDATA #IMPLIED
@@ -1095,6 +1168,7 @@
     TITLECACHE CDATA #IMPLIED
     IMAGEGALLERY CDATA #IMPLIED
     ISDEFAULT CDATA #IMPLIED
+    TYPES CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     SPECIMEN_ID CDATA #IMPLIED
@@ -1211,6 +1285,11 @@
     ORIGINALNAMESTRING CDATA #IMPLIED
     ORDERRELEVANT CDATA #IMPLIED
     NAME CDATA #IMPLIED
+    PERIOD_START  CDATA #IMPLIED
+    PERIOD_EXTREMESTART  CDATA #IMPLIED
+    PERIOD_END  CDATA #IMPLIED
+    PERIOD_EXTREMEEND  CDATA #IMPLIED
+    PERIOD_FREETEXT  CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     CITATION_ID CDATA #IMPLIED
@@ -1256,6 +1335,11 @@
     FEATURE_ID CDATA #IMPLIED
     INDESCRIPTION_ID CDATA #IMPLIED
     NAME CDATA #IMPLIED
+    PERIOD_START  CDATA #IMPLIED
+    PERIOD_EXTREMESTART  CDATA #IMPLIED
+    PERIOD_END  CDATA #IMPLIED
+    PERIOD_EXTREMEEND  CDATA #IMPLIED
+    PERIOD_FREETEXT  CDATA #IMPLIED
     LANGUAGE_ID CDATA #IMPLIED
     UNIT_ID CDATA #IMPLIED
     FORMAT_ID CDATA #IMPLIED
@@ -1407,14 +1491,14 @@
 <!ELEMENT DETERMINATIONEVENT_REFERENCE EMPTY>
 <!ATTLIST DETERMINATIONEVENT_REFERENCE
     DETERMINATIONEVENT_ID CDATA #REQUIRED
-    SETOFREFERENCES_ID CDATA #REQUIRED
+    REFERENCES_ID CDATA #REQUIRED
 >
 
 <!ELEMENT DETERMINATIONEVENT_REFERENCE_AUD EMPTY>
 <!ATTLIST DETERMINATIONEVENT_REFERENCE_AUD
     REV CDATA #REQUIRED
     DETERMINATIONEVENT_ID CDATA #REQUIRED
-    SETOFREFERENCES_ID CDATA #REQUIRED
+    REFERENCES_ID CDATA #REQUIRED
     REVTYPE CDATA #IMPLIED
 >
 
@@ -1444,70 +1528,58 @@
     TYPE_ID CDATA #IMPLIED
 >
 
-<!ELEMENT FEATURENODE EMPTY>
-<!ATTLIST FEATURENODE
+<!ELEMENT EXTERNALLINK EMPTY>
+<!ATTLIST EXTERNALLINK
     ID CDATA #REQUIRED
     CREATED CDATA #IMPLIED
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
+    LINKTYPE CDATA #IMPLIED
+    SIZE CDATA #IMPLIED
+    URI CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
-    FEATURE_ID CDATA #IMPLIED
-    PARENT_FK CDATA #IMPLIED
 >
 
-<!ELEMENT FEATURENODE_AUD EMPTY>
-<!ATTLIST FEATURENODE_AUD
+<!ELEMENT EXTERNALLINK_AUD EMPTY>
+<!ATTLIST EXTERNALLINK_AUD
     ID CDATA #REQUIRED
     REV CDATA #REQUIRED
     REVTYPE CDATA #IMPLIED
     CREATED CDATA #IMPLIED
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
+    LINKTYPE CDATA #IMPLIED
+    SIZE CDATA #IMPLIED
+    URI CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
-    FEATURE_ID CDATA #IMPLIED
-    PARENT_FK CDATA #IMPLIED
 >
 
-<!ELEMENT FEATURETREE EMPTY>
-<!ATTLIST FEATURETREE
+<!ELEMENT FEATURESTATE EMPTY>
+<!ATTLIST FEATURESTATE
     ID CDATA #REQUIRED
+    REV CDATA #REQUIRED
+    REVTYPE CDATA #IMPLIED
     CREATED CDATA #IMPLIED
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
-    URI CDATA #IMPLIED
+    FEATURE_ID CDATA #IMPLIED
+    STATE_ID CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
-    ROOT_ID CDATA #IMPLIED
 >
 
-<!ELEMENT FEATURETREE_AUD EMPTY>
-<!ATTLIST FEATURETREE_AUD
+<!ELEMENT FEATURESTATE_AUD EMPTY>
+<!ATTLIST FEATURESTATE_AUD
     ID CDATA #REQUIRED
-    REV CDATA #REQUIRED
-    REVTYPE CDATA #IMPLIED
     CREATED CDATA #IMPLIED
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
-    URI CDATA #IMPLIED
+    FEATURE_ID CDATA #IMPLIED
+    STATE_ID CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
-    ROOT_ID CDATA #IMPLIED
->
-
-<!ELEMENT FEATURETREE_REPRESENTATION EMPTY>
-<!ATTLIST FEATURETREE_REPRESENTATION
-    FEATURETREE_ID CDATA #REQUIRED
-    REPRESENTATIONS_ID CDATA #REQUIRED
->
-
-<!ELEMENT FEATURETREE_REPRESENTATION_AUD EMPTY>
-<!ATTLIST FEATURETREE_REPRESENTATION_AUD
-    REV CDATA #REQUIRED
-    FEATURETREE_ID CDATA #REQUIRED
-    REPRESENTATIONS_ID CDATA #REQUIRED
-    REVTYPE CDATA #IMPLIED
 >
 
 <!ELEMENT GATHERINGEVENT EMPTY>
@@ -1686,6 +1758,7 @@
     ORIGINALNAMESTRING CDATA #IMPLIED
     DOUBTFUL CDATA #IMPLIED
     RULECONSIDERED CDATA #IMPLIED
+    CODEEDITION CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     CITATION_ID CDATA #IMPLIED
@@ -1720,6 +1793,7 @@
     ORIGINALNAMESTRING CDATA #IMPLIED
     DOUBTFUL CDATA #IMPLIED
     RULECONSIDERED CDATA #IMPLIED
+    CODEEDITION CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     CITATION_ID CDATA #IMPLIED
@@ -1896,7 +1970,9 @@
     CREATED CDATA #IMPLIED
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
-    MEDIACREATED CDATA #IMPLIED
+    MEDIACREATED_START CDATA #IMPLIED
+    MEDIACREATED_END CDATA #IMPLIED
+    MEDIACREATED_FREETEXT CDATA #IMPLIED
     CITATIONMICROREFERENCE CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
@@ -1904,6 +1980,28 @@
     CITATION_ID CDATA #IMPLIED
 >
 
+<!ATTLIST MEDIAMETADATA
+    ID CDATA #REQUIRED
+    CREATED CDATA #IMPLIED
+    UUID CDATA #IMPLIED
+    CREATEDBY_ID CDATA #IMPLIED
+    PAIRKEY CDATA #IMPLIED
+    PAIRVALUE CDATA #IMPLIED
+    MEDIAREPRESENTATION_ID CDATA #IMPLIED
+>
+
+<!ATTLIST MEDIAMETADATA_AUD
+    ID CDATA #REQUIRED
+    REV CDATA #REQUIRED
+    REVTYPE CDATA #IMPLIED
+    CREATED CDATA #IMPLIED
+    UUID CDATA #IMPLIED
+    CREATEDBY_ID CDATA #IMPLIED
+    PAIRKEY CDATA #IMPLIED
+    PAIRVALUE CDATA #IMPLIED
+    MEDIAREPRESENTATION_ID CDATA #IMPLIED
+>
+
 <!ELEMENT MEDIAREPRESENTATION EMPTY>
 <!ATTLIST MEDIAREPRESENTATION
     ID CDATA #REQUIRED
@@ -2004,7 +2102,9 @@
     CREATED CDATA #IMPLIED
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
-    MEDIACREATED CDATA #IMPLIED
+    MEDIACREATED_START CDATA #IMPLIED
+    MEDIACREATED_END CDATA #IMPLIED
+    MEDIACREATED_FREETEXT CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     ARTIST_ID CDATA #IMPLIED
@@ -2124,6 +2224,7 @@
     ORIGINALNAMESTRING CDATA #IMPLIED
     DOUBTFUL CDATA #IMPLIED
     RULECONSIDERED CDATA #IMPLIED
+    CODEEDITION CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     CITATION_ID CDATA #IMPLIED
@@ -2158,6 +2259,7 @@
     ORIGINALNAMESTRING CDATA #IMPLIED
     DOUBTFUL CDATA #IMPLIED
     RULECONSIDERED CDATA #IMPLIED
+    CODEEDITION CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     CITATION_ID CDATA #IMPLIED
@@ -2189,6 +2291,7 @@
     CITATIONMICROREFERENCE CDATA #IMPLIED
     ORIGINALNAMESTRING CDATA #IMPLIED
     RULECONSIDERED CDATA #IMPLIED
+    CODEEDITION CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     CITATION_ID CDATA #IMPLIED
@@ -2220,6 +2323,7 @@
     CITATIONMICROREFERENCE CDATA #IMPLIED
     ORIGINALNAMESTRING CDATA #IMPLIED
     RULECONSIDERED CDATA #IMPLIED
+    CODEEDITION CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     CITATION_ID CDATA #IMPLIED
@@ -2240,8 +2344,8 @@
     REVTYPE CDATA #IMPLIED
 >
 
-<!ELEMENT ORIGINALSOURCE EMPTY>
-<!ATTLIST ORIGINALSOURCE
+<!ELEMENT ORIGINALSOURCEBASE EMPTY>
+<!ATTLIST ORIGINALSOURCEBASE
     ID CDATA #REQUIRED
     CREATED CDATA #IMPLIED
     UUID CDATA #IMPLIED
@@ -2253,24 +2357,11 @@
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     CITATION_ID CDATA #IMPLIED
+    CDMSOURCE_ID CDATA #IMPLIED
 >
 
-<!ELEMENT ORIGINALSOURCE_ANNOTATION EMPTY>
-<!ATTLIST ORIGINALSOURCE_ANNOTATION
-    ORIGINALSOURCE_ID CDATA #REQUIRED
-    ANNOTATIONS_ID CDATA #REQUIRED
->
-
-<!ELEMENT ORIGINALSOURCE_ANNOTATION_AUD EMPTY>
-<!ATTLIST ORIGINALSOURCE_ANNOTATION_AUD
-    REV CDATA #REQUIRED
-    ORIGINALSOURCE_ID CDATA #REQUIRED
-    ANNOTATIONS_ID CDATA #REQUIRED
-    REVTYPE CDATA #IMPLIED
->
-
-<!ELEMENT ORIGINALSOURCE_AUD EMPTY>
-<!ATTLIST ORIGINALSOURCE_AUD
+<!ELEMENT ORIGINALSOURCEBASE_AUD EMPTY>
+<!ATTLIST ORIGINALSOURCEBASE_AUD
     ID CDATA #REQUIRED
     REV CDATA #REQUIRED
     REVTYPE CDATA #IMPLIED
@@ -2284,16 +2375,45 @@
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     CITATION_ID CDATA #IMPLIED
+    CDMSOURCE_ID CDATA #IMPLIED
+>
+
+<!ELEMENT ORIGINALSOURCEBASE_ANNOTATION EMPTY>
+<!ATTLIST ORIGINALSOURCEBASE_ANNOTATION
+    ORIGINALSOURCE_ID CDATA #REQUIRED
+    ANNOTATIONS_ID CDATA #REQUIRED
 >
 
-<!ELEMENT ORIGINALSOURCE_MARKER EMPTY>
-<!ATTLIST ORIGINALSOURCE_MARKER
+<!ELEMENT ORIGINALSOURCEBASE_ANNOTATION_AUD EMPTY>
+<!ATTLIST ORIGINALSOURCEBASE_ANNOTATION_AUD
+    REV CDATA #REQUIRED
+    ORIGINALSOURCE_ID CDATA #REQUIRED
+    ANNOTATIONS_ID CDATA #REQUIRED
+    REVTYPE CDATA #IMPLIED
+>
+
+<!ELEMENT ORIGINALSOURCEBASE_EXTERNALLINK EMPTY>
+<!ATTLIST ORIGINALSOURCEBASE_EXTERNALLINK
+    ORIGINALSOURCE_ID CDATA #REQUIRED
+    LINKS_ID CDATA #REQUIRED
+>
+
+<!ELEMENT ORIGINALSOURCEBASE_EXTERNALLINK_AUD EMPTY>
+<!ATTLIST ORIGINALSOURCEBASE_EXTERNALLINK_AUD
+    REV CDATA #REQUIRED
+    ORIGINALSOURCE_ID CDATA #REQUIRED
+    LINKS_ID CDATA #REQUIRED
+    REVTYPE CDATA #IMPLIED
+>
+
+<!ELEMENT ORIGINALSOURCEBASE_MARKER EMPTY>
+<!ATTLIST ORIGINALSOURCEBASE_MARKER
     ORIGINALSOURCE_ID CDATA #REQUIRED
     MARKERS_ID CDATA #REQUIRED
 >
 
-<!ELEMENT ORIGINALSOURCE_MARKER_AUD EMPTY>
-<!ATTLIST ORIGINALSOURCE_MARKER_AUD
+<!ELEMENT ORIGINALSOURCEBASE_MARKER_AUD EMPTY>
+<!ATTLIST ORIGINALSOURCEBASE_MARKER_AUD
     REV CDATA #REQUIRED
     ORIGINALSOURCE_ID CDATA #REQUIRED
     MARKERS_ID CDATA #REQUIRED
@@ -2309,6 +2429,12 @@
     CREATEDBY_ID CDATA #IMPLIED
 >
 
+<!ELEMENT PERMISSIONGROUP_AUTHORITY EMPTY>
+<!ATTLIST PERMISSIONGROUP_AUTHORITY
+    GROUP_ID CDATA #REQUIRED
+    AUTHORITIES_ID CDATA #REQUIRED
+>
+
 <!ELEMENT PERMISSIONGROUP_GRANTEDAUTHORITYIMPL EMPTY>
 <!ATTLIST PERMISSIONGROUP_GRANTEDAUTHORITYIMPL
     GROUP_ID CDATA #REQUIRED
@@ -2346,6 +2472,8 @@
     URI CDATA #IMPLIED
     DATEPUBLISHED_END CDATA #IMPLIED
     DATEPUBLISHED_START CDATA #IMPLIED
+    DATEPUBLISHED_FREETEXT CDATA #IMPLIED
+    DATEPUBLISHED_VERBATIMDATE CDATA #IMPLIED
     TITLE CDATA #IMPLIED
     PAGES CDATA #IMPLIED
     SERIES CDATA #IMPLIED
@@ -2377,6 +2505,7 @@
     EXTERNALID CDATA #IMPLIED
     EXTERNALLINK CDATA #IMPLIED
     AUTHORITYTYPE CDATA #IMPLIED
+    IMPORTMETHOD CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     AUTHORSHIP_ID CDATA #IMPLIED
@@ -2426,6 +2555,8 @@
     AUTHORSHIP_ID CDATA #IMPLIED
     DATEPUBLISHED_END CDATA #IMPLIED
     DATEPUBLISHED_START CDATA #IMPLIED
+    DATEPUBLISHED_FREETEXT CDATA #IMPLIED
+    DATEPUBLISHED_VERBATIMDATE CDATA #IMPLIED
     TITLE CDATA #IMPLIED
     ABBREVTITLE CDATA #IMPLIED
     ABBREVTITLECACHE CDATA #IMPLIED
@@ -2462,6 +2593,7 @@
     EXTERNALID CDATA #IMPLIED
     EXTERNALLINK CDATA #IMPLIED
     AUTHORITYTYPE CDATA #IMPLIED
+    IMPORTMETHOD CDATA #IMPLIED
     CROSSREF_ID CDATA #IMPLIED
     TYPE_ID CDATA #IMPLIED
     INBOOK_ID CDATA #IMPLIED
@@ -2540,19 +2672,6 @@
     REVTYPE CDATA #IMPLIED
 >
 
-<!ELEMENT TERMBASE_INVERSEREPRESENTATION EMPTY>
-<!ATTLIST TERMBASE_INVERSEREPRESENTATION
-    TERM_ID CDATA #REQUIRED
-    INVERSEREPRESENTATIONS_ID CDATA #REQUIRED
->
-
-<!ELEMENT TERMBASE_INVERSEREPRESENTATION_AUD EMPTY>
-<!ATTLIST TERMBASE_INVERSEREPRESENTATION_AUD
-    REV CDATA #REQUIRED
-    TERM_ID CDATA #REQUIRED
-    INVERSEREPRESENTATIONS_ID CDATA #REQUIRED
-    REVTYPE CDATA #IMPLIED
->
 
 <!ELEMENT REPRESENTATION EMPTY>
 <!ATTLIST REPRESENTATION
@@ -2563,6 +2682,7 @@
     TEXT CDATA #IMPLIED
     ABBREVIATEDLABEL CDATA #IMPLIED
     LABEL CDATA #IMPLIED
+    PLURAL CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     LANGUAGE_ID CDATA #IMPLIED
@@ -2593,6 +2713,7 @@
     TEXT CDATA #IMPLIED
     ABBREVIATEDLABEL CDATA #IMPLIED
     LABEL CDATA #IMPLIED
+    PLURAL CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     LANGUAGE_ID CDATA #IMPLIED
@@ -3008,6 +3129,7 @@
     CREATED CDATA #IMPLIED
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
+    NUMBER CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     STATE_ID CDATA #IMPLIED
@@ -3021,6 +3143,7 @@
     CREATED CDATA #IMPLIED
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
+    NUMBER CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     STATE_ID CDATA #IMPLIED
@@ -3063,6 +3186,7 @@
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
     VALUE CDATA #IMPLIED
+    VALUE_SCALE CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     TYPE_ID CDATA #IMPLIED
@@ -3077,6 +3201,7 @@
     UUID CDATA #IMPLIED
     UPDATED CDATA #IMPLIED
     VALUE CDATA #IMPLIED
+    VALUE_SCALE CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     TYPE_ID CDATA #IMPLIED
@@ -3110,10 +3235,6 @@
     DOUBTFUL CDATA #IMPLIED
     PUBLISHED CDATA #IMPLIED
     TAXONSTATUSUNKNOWN CDATA #IMPLIED
-    UNPLACED CDATA #IMPLIED
-    EXCLUDED CDATA #IMPLIED
-    PARTIAL CDATA #IMPLIED
-    PROPARTE CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     TAXONNAME_FK CDATA #IMPLIED
@@ -3152,10 +3273,6 @@
     DOUBTFUL CDATA #IMPLIED
     PUBLISHED CDATA #IMPLIED
     TAXONSTATUSUNKNOWN CDATA #IMPLIED
-    UNPLACED CDATA #IMPLIED
-    EXCLUDED CDATA #IMPLIED
-    PARTIAL CDATA #IMPLIED
-    PROPARTE CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     TAXONNAME_FK CDATA #IMPLIED
@@ -3282,6 +3399,8 @@
     COMBINATIONAUTHORSHIP_ID CDATA #IMPLIED
     EXBASIONYMAUTHORSHIP_ID CDATA #IMPLIED
     EXCOMBINATIONAUTHORSHIP_ID CDATA #IMPLIED
+    INBASIONYMAUTHORSHIP_ID CDATA #IMPLIED
+    INCOMBINATIONAUTHORSHIP_ID CDATA #IMPLIED
 >
 
 <!ELEMENT TAXONNAME_ANNOTATION EMPTY>
@@ -3346,6 +3465,8 @@
     BREED CDATA #IMPLIED
     ORIGINALPUBLICATIONYEAR CDATA #IMPLIED
     PUBLICATIONYEAR CDATA #IMPLIED
+    INBASIONYMAUTHORSHIP_ID CDATA #IMPLIED
+    INCOMBINATIONAUTHORSHIP_ID CDATA #IMPLIED
 >
 
 <!ELEMENT TAXONNAME_EXTENSION EMPTY>
@@ -3455,8 +3576,7 @@
     TREEINDEX CDATA #IMPLIED
     COUNTCHILDREN CDATA #IMPLIED
     MICROREFERENCEFORPARENTCHILDRELATION CDATA #IMPLIED
-    EXCLUDED CDATA #IMPLIED
-    UNPLACED CDATA #IMPLIED
+    STATUS CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     CLASSIFICATION_ID CDATA #IMPLIED
@@ -3476,8 +3596,7 @@
     TREEINDEX CDATA #IMPLIED
     COUNTCHILDREN CDATA #IMPLIED
     MICROREFERENCEFORPARENTCHILDRELATION CDATA #IMPLIED
-    EXCLUDED CDATA #IMPLIED
-    UNPLACED CDATA #IMPLIED
+    STATUS CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     CLASSIFICATION_ID CDATA #IMPLIED
@@ -3501,18 +3620,18 @@
     ANNOTATIONS_ID CDATA #REQUIRED
     REVTYPE CDATA #IMPLIED
 >
-<!ELEMENT TAXONNNODE_EXCLUDEDNOTE EMPTY>
-<!ATTLIST TAXONNODE_EXCLUDEDNOTE
+<!ELEMENT TAXONNNODE_STATUSNOTE EMPTY>
+<!ATTLIST TAXONNODE_STATUSNOTE
     TAXONNODE_ID CDATA #REQUIRED
-    EXCLUDEDNOTE_ID CDATA #REQUIRED
-    EXCLUDEDNOTE_MAPKEY_ID CDATA #REQUIRED
+    STATUSNOTE_ID CDATA #REQUIRED
+    STATUSNOTE_KEY CDATA #REQUIRED
 >
-<!ELEMENT TAXONNODE_EXCLUDEDNOTE_AUD EMPTY>
-<!ATTLIST TAXONNODE_EXCLUDEDNOTE_AUD
+<!ELEMENT TAXONNODE_STATUSNOTE_AUD EMPTY>
+<!ATTLIST TAXONNODE_STATUSNOTE_AUD
     REV CDATA #REQUIRED
     TAXONNODE_ID CDATA #REQUIRED
-    EXCLUDEDNOTE_ID CDATA #REQUIRED
-    EXCLUDEDNOTE_MAPKEY_ID CDATA #REQUIRED
+    STATUSNOTE_ID CDATA #REQUIRED
+    STATUSNOTE_KEY CDATA #REQUIRED
     REVTYPE CDATA #IMPLIED
 >
 <!ELEMENT TAXONNNODE_MARKER EMPTY>
@@ -3593,8 +3712,8 @@
     REVTYPE CDATA #IMPLIED
 >
 
-<!ELEMENT TERMVOCABULARY EMPTY>
-<!ATTLIST TERMVOCABULARY
+<!ELEMENT TERMCOLLECTION EMPTY>
+<!ATTLIST TERMCOLLECTION
     DTYPE CDATA #IMPLIED
     ID CDATA #REQUIRED
     CREATED CDATA #IMPLIED
@@ -3605,12 +3724,21 @@
     TERMSOURCEURI CDATA #IMPLIED
     TITLECACHE CDATA #IMPLIED
     PROTECTEDTITLECACHE CDATA #IMPLIED
+    ALLOWDUPLICATES CDATA #IMPLIED
+    ORDERRELEVANT CDATA #IMPLIED
+    ISFLAT CDATA #IMPLIED
+    LASTRETRIEVED CDATA #IMPLIED
+    EXTERNALID CDATA #IMPLIED
+    EXTERNALLINK CDATA #IMPLIED
+    AUTHORITYTYPE CDATA #IMPLIED
+    IMPORTMETHOD CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
+    ROOT_ID CDATA #IMPLIED
 >
 
-<!ELEMENT TERMVOCABULARY_AUD EMPTY>
-<!ATTLIST TERMVOCABULARY_AUD
+<!ELEMENT TERMCOLLECTION_AUD EMPTY>
+<!ATTLIST TERMCOLLECTION_AUD
     DTYPE CDATA #IMPLIED
     ID CDATA #REQUIRED
     REV CDATA #REQUIRED
@@ -3623,24 +3751,63 @@
     TERMSOURCEURI CDATA #IMPLIED
     TITLECACHE CDATA #IMPLIED
     PROTECTEDTITLECACHE CDATA #IMPLIED
+    ALLOWDUPLICATES CDATA #IMPLIED
+    ORDERRELEVANT CDATA #IMPLIED
+    ISFLAT CDATA #IMPLIED
+    LASTRETRIEVED CDATA #IMPLIED
+    EXTERNALID CDATA #IMPLIED
+    EXTERNALLINK CDATA #IMPLIED
+    AUTHORITYTYPE CDATA #IMPLIED
+    IMPORTMETHOD CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
+    ROOT_ID CDATA #IMPLIED
 >
 
-<!ELEMENT TERMVOCABULARY_REPRESENTATION EMPTY>
-<!ATTLIST TERMVOCABULARY_REPRESENTATION
-    TERMVOCABULARY_ID CDATA #REQUIRED
+<!ELEMENT TERMCOLLECTION_REPRESENTATION EMPTY>
+<!ATTLIST TERMCOLLECTION_REPRESENTATION
+    TERMCOLLECTION_ID CDATA #REQUIRED
     REPRESENTATIONS_ID CDATA #REQUIRED
 >
 
-<!ELEMENT TERMVOCABULARY_REPRESENTATION_AUD EMPTY>
-<!ATTLIST TERMVOCABULARY_REPRESENTATION_AUD
+<!ELEMENT TERMCOLLECTION_REPRESENTATION_AUD EMPTY>
+<!ATTLIST TERMCOLLECTION_REPRESENTATION_AUD
     REV CDATA #REQUIRED
-    TERMVOCABULARY_ID CDATA #REQUIRED
+    TERMCOLLECTION_ID CDATA #REQUIRED
     REPRESENTATIONS_ID CDATA #REQUIRED
     REVTYPE CDATA #IMPLIED
 >
 
+
+
+<!ELEMENT TERMRELATION EMPTY>
+<!ATTLIST TERMRELATION
+    ID CDATA #REQUIRED
+    CREATED CDATA #IMPLIED
+    UUID CDATA #IMPLIED
+    UPDATED CDATA #IMPLIED
+    CREATEDBY_ID CDATA #IMPLIED
+    UPDATEDBY_ID CDATA #IMPLIED
+    TERM_ID CDATA #IMPLIED
+    GRAPH_ID CDATA #IMPLIED
+    PARENT_ID CDATA #IMPLIED
+>
+
+<!ELEMENT TERMRELATION_AUD EMPTY>
+<!ATTLIST TERMRELATION_AUD
+    ID CDATA #REQUIRED
+    REV CDATA #REQUIRED
+    REVTYPE CDATA #IMPLIED
+    CREATED CDATA #IMPLIED
+    UUID CDATA #IMPLIED
+    UPDATED CDATA #IMPLIED
+    CREATEDBY_ID CDATA #IMPLIED
+    UPDATEDBY_ID CDATA #IMPLIED
+    TERM_ID CDATA #IMPLIED
+    GRAPH_ID CDATA #IMPLIED
+    PARENT_ID CDATA #IMPLIED
+>
+
 <!ELEMENT TYPEDESIGNATIONBASE EMPTY>
 <!ATTLIST TYPEDESIGNATIONBASE
     DTYPE CDATA #IMPLIED
@@ -3654,6 +3821,7 @@
     CONSERVEDTYPE CDATA #IMPLIED
     LECTOTYPE CDATA #IMPLIED
     REJECTEDTYPE CDATA #IMPLIED
+    ISVERBATIM CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
     UPDATEDBY_ID CDATA #IMPLIED
     CITATION_ID CDATA #IMPLIED
@@ -3694,6 +3862,7 @@
     CONSERVEDTYPE CDATA #IMPLIED
     LECTOTYPE CDATA #IMPLIED
     REJECTEDTYPE CDATA #IMPLIED
+    ISVERBATIM CDATA #IMPLIED
     TYPENAME_ID CDATA #IMPLIED
     TYPESPECIMEN_ID CDATA #IMPLIED
     TYPESTATUS_ID CDATA #IMPLIED
@@ -3714,7 +3883,7 @@
 >
 
 <!ELEMENT USER EMPTY>
-<!ATTLIST USER
+<!ATTLIST USERACCOUNT
     ID CDATA #REQUIRED
     CREATED CDATA #IMPLIED
     UUID CDATA #IMPLIED
@@ -3724,18 +3893,25 @@
     EMAILADDRESS CDATA #IMPLIED
     ENABLED CDATA #IMPLIED
     PASSWORD CDATA #IMPLIED
+    SALT CDATA #IMPLIED
     USERNAME CDATA #IMPLIED
     CREATEDBY_ID CDATA #IMPLIED
 >
 
-<!ELEMENT USER_GRANTEDAUTHORITYIMPL EMPTY>
-<!ATTLIST USER_GRANTEDAUTHORITYIMPL
+<!ELEMENT USERACCOUNT_AUTHORITY EMPTY>
+<!ATTLIST USERACCOUNT_AUTHORITY
+    USER_ID CDATA #REQUIRED
+    AUTHORITIES_ID CDATA #REQUIRED
+>
+
+<!ELEMENT USERACCOUNT_GRANTEDAUTHORITYIMPL EMPTY>
+<!ATTLIST USERACCOUNT_GRANTEDAUTHORITYIMPL
     USER_ID CDATA #REQUIRED
     GRANTEDAUTHORITIES_ID CDATA #REQUIRED
 >
 
-<!ELEMENT USER_PERMISSIONGROUP EMPTY>
-<!ATTLIST USER_PERMISSIONGROUP
+<!ELEMENT USERACCOUNT_PERMISSIONGROUP EMPTY>
+<!ATTLIST USERACCOUNT_PERMISSIONGROUP
     MEMBERS_ID CDATA #REQUIRED
     GROUPS_ID CDATA #REQUIRED
 >

diff --git a/eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/taxeditor/lazyloading/CdmEntityCacherTest.xml b/eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/taxeditor/lazyloading/CdmEntityCacherTest.xml
index d1747604ded3c475a69aad8bb6968151d5f9cc08..1bc68e5dc1110763cd3c5dd1581b1a35c4eae822 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/taxeditor/lazyloading/CdmEntityCacherTest.xml
+++ b/eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/taxeditor/lazyloading/CdmEntityCacherTest.xml
@@ -123,4 +123,4 @@
   <OriginalSourceBase DTYPE="IdentifiableSource" id="23711" created="2014-03-10 10:06:48.0" uuid="f77555fe-0d98-4c9f-98ed-a5bca6b1e342" updated="2014-03-10 10:07:33.0" createdby_id="30" updatedby_id="30" citation_id="50" sourceType="PTS"/>
 
   <LanguageString id="10"/>
-</dataset>
+</dataset>
\ No newline at end of file