cleanup

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/CaucasusEuroMedActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/CaucasusEuroMedActivator.java
index 2fc85ddced71620051ef7978f8b45fd511281596..650bef8d5685e4c97c9b58ba761d721da32a0a7a 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/CaucasusEuroMedActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/CaucasusEuroMedActivator.java
@@ -52,12 +52,10 @@ import eu.etaxonomy.cdm.persistence.query.MatchMode;
 
 
 /**
- * TODO add the following to a wiki page:
- * HINT: If you are about to import into a mysql data base running under windows and if you wish to
- * dump and restore the resulting data bas under another operation systen
- * you must set the mysql system variable lower_case_table_names = 0 in order to create data base with table compatible names.
+ * Export for preliminary EuroMed - Caucasus DB.
  *
  * @author a.mueller
+ * @since 2018-11-29
  */
 public class CaucasusEuroMedActivator {
 
@@ -175,13 +173,8 @@ public class CaucasusEuroMedActivator {
        static String authorTeamFilter =  " authorTeamId IN (SELECT drvTab.authorTeamId FROM (SELECT authorTeamId FROM v_cdm_exp_authorTeamsAll) as drvTab) ";
        static String authorFilter = " authorId IN (SELECT drvTab.authorId FROM (SELECT authorId FROM v_cdm_exp_authorsAll) as drvTab) ";
 
-
-
 // **************** ALL *********************
 
-
-
-
        public void importEm2CDM (Source source, ICdmDataSource destination, DbSchemaValidation hbm2dll){
                System.out.println("Start import from BerlinModel("+ berlinModelSource.getDatabase() + ") to " + cdmDestination.getDatabase() + " ...");
                //make BerlinModel Source

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/dwca/DwcaExportActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/dwca/DwcaExportActivator.java
index 4024f02b3ba0b314eb0ecf140b7a41c32f32b130..c1acc51bd51b31260fa5779aa2b6ac015619050b 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/dwca/DwcaExportActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/dwca/DwcaExportActivator.java
@@ -31,8 +31,9 @@ import eu.etaxonomy.cdm.model.agent.Institution;
 import eu.etaxonomy.cdm.model.agent.InstitutionalMembership;\r
 import eu.etaxonomy.cdm.model.agent.Person;\r
 \r
-\r
 /**\r
+ * Activator for running a DwC-A export.\r
+ *\r
  * @author a.mueller\r
  */\r
 public class DwcaExportActivator {\r
@@ -97,7 +98,7 @@ public class DwcaExportActivator {
        private boolean doMetaData = true;\r
        private boolean doEml = false;\r
 \r
-       public ExportResult     doExport(ICdmDataSource source){\r
+       public ExportResult doExport(ICdmDataSource source){\r
                System.out.println("Start export to DWC-A ("+ fileDestination + ") ...");\r
 \r
 //             CdmUpdater su = CdmUpdater.NewInstance();\r
@@ -136,8 +137,8 @@ public class DwcaExportActivator {
 \r
                config.setFeatureExclusions(featureExclusions);\r
                // invoke import\r
-               CdmDefaultExport<DwcaTaxExportConfigurator> bmExport = new CdmDefaultExport<>();\r
-               ExportResult result = bmExport.invoke(config);\r
+               CdmDefaultExport<DwcaTaxExportConfigurator> dwcaExport = new CdmDefaultExport<>();\r
+               ExportResult result = dwcaExport.invoke(config);\r
 \r
                System.out.println("End export to DWC-A ("+ fileDestination + ")..." + "("+result.getState().toString()+")");\r
                return result;\r
@@ -174,5 +175,6 @@ public class DwcaExportActivator {
                DwcaExportActivator ex = new DwcaExportActivator();\r
                ICdmDataSource source = CdmDestinations.chooseDestination(args) != null ? CdmDestinations.chooseDestination(args) : cdmSource;\r
                ex.doExport(source);\r
+        System.exit(0);\r
        }\r
 }
\ No newline at end of file

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/dwca/DwcaImportActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/dwca/DwcaImportActivator.java
index 22219ab4de8307dd9a252e141220c07cc75ffcb2..2cc50e589433b836060fce61494b706661e24da8 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/dwca/DwcaImportActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/dwca/DwcaImportActivator.java
@@ -209,14 +209,9 @@ public class DwcaImportActivator {
                return sourceUrl;
        }
 
-
-
-       /**
-        * @param args
-        */
        public static void main(String[] args) {
                DwcaImportActivator me = new DwcaImportActivator();
                me.doImport(cdmDestination);
+        System.exit(0);
        }
-
-}
+}
\ No newline at end of file

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/edaphobase/EdaphobaseActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/edaphobase/EdaphobaseActivator.java
index 96e58917b8ee704290c50e1f21ce4c3d86537b10..2bed95f49a0514074dfc105b19d715164e087f70 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/edaphobase/EdaphobaseActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/edaphobase/EdaphobaseActivator.java
@@ -109,12 +109,9 @@ public class EdaphobaseActivator {
         return result;
     }
 
-    /**
-     * @param args
-     */
     public static void main(String[] args) {
         EdaphobaseActivator me = new EdaphobaseActivator();
         me.doImport(edaphoSource, cdmDestination);
         System.exit(0);
     }
-}
+}
\ No newline at end of file