(no commit message)

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 7002580c9cca481394ba49a3fda60d621b441fb4..adcf8b1ffeeec03bf6132f2c89842b93f184c839 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
@@ -781,5 +781,10 @@ public class DataSet {
        public void setGrantedAuthorities(List<GrantedAuthority> grantedAuthorities) {\r
                this.grantedAuthorities = grantedAuthorities;\r
        }\r
+\r
+       public void addUser(User deproxy) {\r
+               this.users.add(deproxy);\r
+               \r
+       }\r
     \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 b693c4666ac76623c9062cd7733d382c9ca3834d..28cdc9d26e9619f7d658660a7fe7bee37a3649a7 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
@@ -33,6 +33,7 @@ import eu.etaxonomy.cdm.io.common.IExportConfigurator;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;\r
 import eu.etaxonomy.cdm.model.agent.AgentBase;\r
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
+import eu.etaxonomy.cdm.model.common.User;\r
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;\r
 import eu.etaxonomy.cdm.model.reference.ReferenceBase;\r
@@ -144,18 +145,25 @@ public class JaxbExport extends CdmExportBase<JaxbExportConfigurator, JaxbExport
                int homotypicalGroupRows = numberOfRows;\r
                int UserRows= numberOfRows;\r
 \r
+               if (jaxbExpConfig.isDoUsers() == true) {\r
+                       \r
+                       if (UserRows == 0) { UserRows = MAX_ROWS; }\r
+                       logger.info("# User");\r
+                       List<User> users = getUserService().list(null, UserRows, 0, null, null);\r
+               \r
+                       \r
+                       for (User user: users){\r
+                               dataSet.addUser( (User)HibernateProxyHelper.deproxy(user));\r
+                       }\r
+                       \r
+               }\r
                if (jaxbExpConfig.isDoTermVocabularies() == true) {\r
                        if (termVocabularyRows == 0) { termVocabularyRows = MAX_ROWS; }\r
                        logger.info("# TermVocabulary");\r
                        dataSet.setTermVocabularies((List)getVocabularyService().list(null,termVocabularyRows, 0, null, null));\r
                }\r
                \r
-               if (jaxbExpConfig.isDoUsers() == true) {\r
-                       \r
-                       if (UserRows == 0) { UserRows = MAX_ROWS; }\r
-                       logger.info("# User");\r
-                       dataSet.setUsers(getUserService().list(null,UserRows, 0,null,null));\r
-               }\r
+               \r
 \r
 //             if (jaxbExpConfig.isDoLanguageData() == true) {\r
 //                     if (languageDataRows == 0) { languageDataRows = MAX_ROWS; }\r
@@ -170,13 +178,15 @@ public class JaxbExport extends CdmExportBase<JaxbExportConfigurator, JaxbExport
                        logger.info("# DefinedTermBase: " + definedTermBaseRows);\r
                        dataSet.setTerms(getTermService().list(null,definedTermBaseRows, 0,null,null));\r
                }\r
-\r
+               \r
                if (jaxbExpConfig.isDoAuthors() == true) {\r
                        if (agentRows == 0) { agentRows = getAgentService().count(AgentBase.class); }\r
                        logger.info("# Agents: " + agentRows);\r
                        //logger.info("    # Team: " + appCtr.getAgentService().count(Team.class));\r
                        dataSet.setAgents(getAgentService().list(null,agentRows, 0,null,null));\r
                }\r
+               \r
+               \r
 \r
                if (jaxbExpConfig.getDoReferences() != IImportConfigurator.DO_REFERENCES.NONE) {\r
                        if (referenceBaseRows == 0) { referenceBaseRows = getReferenceService().count(ReferenceBase.class); }\r