For JAX export/import re-use CDM application controllers.

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmDefaultExport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmDefaultExport.java
index 49c64480fbca96bd9881fce1d127ea12cdd370d4..ea983807c9eb3c2c0d41be2124274291be09844c 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmDefaultExport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmDefaultExport.java
@@ -82,9 +82,9 @@ public class CdmDefaultExport<T extends IExportConfigurator> implements ICdmExpo
 //             cdmApp = config.getCdmAppController();\r
                // For Jaxb import, omit term loading\r
                if (config instanceof JaxbExportConfigurator) {\r
-                       cdmApp = config.getCdmAppController(true, true);\r
+                       cdmApp = config.getCdmAppController(false, true);\r
                } else {\r
-                       cdmApp = config.getCdmAppController(true, false);\r
+                       cdmApp = config.getCdmAppController();\r
                }\r
                \r
                System.out.println("Start export from Cdm (" + cdmApp.getDatabaseService().getUrl() +\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmDefaultImport.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmDefaultImport.java
index 1bb9eab9efc4532c5b324b8e3aadac068016d8e2..b3954dc97a8856c0e67a54f171f97c11e0d638bd 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmDefaultImport.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmDefaultImport.java
@@ -115,10 +115,9 @@ public class CdmDefaultImport<T extends IImportConfigurator> implements ICdmImpo
                }\r
                // For Jaxb import, omit term loading\r
                if (config instanceof JaxbImportConfigurator) {\r
-                       cdmApp = config.getCdmAppController(true, true);\r
-//                     cdmApp = ((JaxbImportConfigurator)config).getCdmAppController(true, true);\r
+                       cdmApp = config.getCdmAppController(false, true);\r
                } else {\r
-                       cdmApp = config.getCdmAppController(false, false);\r
+                       cdmApp = config.getCdmAppController();\r
                }\r
                \r
                ReferenceBase sourceReference = config.getSourceReference();\r