Cleanup JAXB export

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/DataSet.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/DataSet.java
index 4d1bcba3a09ab0c598cae4c3440e93f9b70f4be9..b446aab3adc3ddeb2ef15f5a560e4e52e3db4ea7 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/DataSet.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/DataSet.java
@@ -194,6 +194,7 @@ public class DataSet {
        @XmlElement(name = "StatisticalMeasure", namespace = "http://etaxonomy.eu/cdm/model/description/1.0", type = StatisticalMeasure.class),\r
        @XmlElement(name = "SynonymRelationshipType", namespace = "http://etaxonomy.eu/cdm/model/taxon/1.0", type = SynonymRelationshipType.class),\r
        @XmlElement(name = "TaxonRelationshipType", namespace = "http://etaxonomy.eu/cdm/model/taxon/1.0", type = TaxonRelationshipType.class),\r
+//     @XmlElement(name = "TdwgArea", namespace = "http://etaxonomy.eu/cdm/model/location/1.0", type = TdwgArea.class),\r
        @XmlElement(name = "TextFormat", namespace = "http://etaxonomy.eu/cdm/model/description/1.0", type = TextFormat.class),\r
        @XmlElement(name = "WaterbodyOrCountry", namespace = "http://etaxonomy.eu/cdm/model/location/1.0", type = WaterbodyOrCountry.class)\r
     })\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbExport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbExport.java
index 13a0264f66fce087ad92c0656e534e8d65488791..89a6c42fb1cbfad4896f0673ad4e032cf1b07ed8 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbExport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbExport.java
@@ -130,7 +130,7 @@ public class JaxbExport extends CdmExportBase<JaxbExportConfigurator, JaxbExport
                if (jaxbExpConfig.isDoTermVocabularies() == true) {\r
                        if (termVocabularyRows == 0) { termVocabularyRows = MAX_ROWS; }\r
                        logger.info("# TermVocabulary");\r
-                       dataSet.setTermVocabularies(getTermService().getAllTermVocabularies(MAX_ROWS, 0));;\r
+                       dataSet.setTermVocabularies(getTermService().listTermVocabularies(termVocabularyRows, 0, null, null));\r
                }\r
 \r
 //             if (jaxbExpConfig.isDoLanguageData() == true) {\r