(no commit message)

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 706cbb1c8e692912f09784d16fe56bc46a831c71..217c8842f35027ff77b9d180dac4d9a5c54f1a85 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
@@ -110,15 +110,17 @@ public class CdmDefaultImport<T extends IImportConfigurator> implements ICdmImpo
                        logger.warn("Configuration is not valid");\r
                        return false;\r
                }\r
-               try {\r
-                       cdmApp = CdmApplicationController.NewInstance(config.getDestination(), config.getDbSchemaValidation());\r
-               } catch (DataSourceNotFoundException e) {\r
-                       logger.warn("could not connect to destination database");\r
-                       return false;\r
-               }catch (TermNotFoundException e) {\r
-                       logger.warn("could not find needed term in destination datasource");\r
-                       return false;\r
-               }\r
+               cdmApp = config.getCdmAppController();\r
+//             try {\r
+                       //cdmApp = CdmApplicationController.NewInstance(config.getDestination(), config.getDbSchemaValidation());\r
+                       \r
+//             } catch (DataSourceNotFoundException e) {\r
+//                     logger.warn("could not connect to destination database");\r
+//                     return false;\r
+//             }catch (TermNotFoundException e) {\r
+//                     logger.warn("could not find needed term in destination datasource");\r
+//                     return false;\r
+//             }\r
                \r
                \r
                ReferenceBase sourceReference = config.getSourceReference();\r

diff --git a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IImportConfigurator.java b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IImportConfigurator.java
index 2d8ebb4e817b56bca83e8fb547f150163e7c7005..da240f91497ff7212e6634e357b3141f518533a8 100644 (file)
--- a/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IImportConfigurator.java
+++ b/cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IImportConfigurator.java
@@ -1,5 +1,6 @@
 package eu.etaxonomy.cdm.io.common;\r
 \r
+import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
 import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
 import eu.etaxonomy.cdm.model.agent.Person;\r
@@ -144,4 +145,11 @@ public interface IImportConfigurator {
        \r
        public Class<ICdmIO>[] getIoClassList();\r
        \r
+       /**\r
+        * Returns a <code>CdmApplicationController</code> created by the values of this configuration.\r
+        * If a controller was already created before the last created controller is returned.\r
+        * @return\r
+        */\r
+       public CdmApplicationController getCdmAppController();\r
+       \r
 }
\ No newline at end of file