improved monitoring for application controller

diff --git a/.gitattributes b/.gitattributes
index 2c40ddf6b8c730107704c79193513266c906c1dc..9d5fe74805295ca318662e75ffd6491a1677ce64 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -20,6 +20,7 @@ app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/IldisActivator.j
 app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/SalvadorActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/SalvadorExport.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/TreeCreator.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/app/common/AppImportApplicationListener.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/common/CacheUpdater.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/common/CdmImportSources.java -text

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/common/AppImportApplicationListener.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/common/AppImportApplicationListener.java
new file mode 100644 (file)
index 0000000..f2f9d7e
--- /dev/null
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/common/AppImportApplicationListener.java
@@ -0,0 +1,29 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy \r
+* http://www.e-taxonomy.eu\r
+* \r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.cdm.app.common;\r
+\r
+import org.apache.log4j.Logger;\r
+import org.springframework.context.ApplicationEvent;\r
+import org.springframework.context.ApplicationListener;\r
+\r
+/**\r
+ * @author a.mueller\r
+ * @date 28.09.2011\r
+ *\r
+ */\r
+public class AppImportApplicationListener implements ApplicationListener<ApplicationEvent> {\r
+       private static final Logger logger = Logger.getLogger(AppImportApplicationListener.class);\r
+\r
+       @Override\r
+       public void onApplicationEvent(ApplicationEvent event) {\r
+               logger.warn(event);\r
+       }\r
+\r
+}\r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/common/TestActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/common/TestActivator.java
index bbf3bc28b560da6d1a6fb3d45f6b88afa58bb8ae..977abac7cf477d305591243f089b987babab107e 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/common/TestActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/common/TestActivator.java
@@ -9,16 +9,21 @@
 \r
 package eu.etaxonomy.cdm.app.common;\r
 \r
+import java.util.ArrayList;\r
 import java.util.HashSet;\r
 import java.util.List;\r
 import java.util.Set;\r
 \r
 import org.apache.log4j.Logger;\r
+import org.springframework.context.ApplicationListener;\r
+import org.springframework.core.io.ClassPathResource;\r
 \r
 import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
 import eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator;\r
 import eu.etaxonomy.cdm.api.service.config.TaxonServiceConfiguratorImpl;\r
 import eu.etaxonomy.cdm.api.service.pager.Pager;\r
+import eu.etaxonomy.cdm.common.DefaultProgressMonitor;\r
+import eu.etaxonomy.cdm.common.IProgressMonitor;\r
 import eu.etaxonomy.cdm.database.DbSchemaValidation;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
 import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK;\r
@@ -43,11 +48,11 @@ public class TestActivator {
        static final int limitSave = 2000;\r
 \r
 //     static final CHECK check = CHECK.CHECK_AND_IMPORT;\r
-       static final CHECK check = CHECK.IMPORT_WITHOUT_CHECK;\r
-       static DbSchemaValidation dbSchemaValidation = DbSchemaValidation.VALIDATE;\r
+       static final CHECK check = CHECK.CHECK_ONLY;\r
+       static DbSchemaValidation dbSchemaValidation = DbSchemaValidation.CREATE;\r
 //     static DbSchemaValidation dbSchemaValidation = DbSchemaValidation.UPDATE;\r
 //     static DbSchemaValidation dbSchemaValidation = DbSchemaValidation.VALIDATE;\r
-       static final NomenclaturalCode nomenclaturalCode  = NomenclaturalCode.ICZN;\r
+       static final NomenclaturalCode nomenclaturalCode  = NomenclaturalCode.ICBN;\r
 \r
 \r
        \r
@@ -59,8 +64,22 @@ public class TestActivator {
                ICdmDataSource destination = cdmDestination;\r
                \r
                CdmApplicationController app;\r
-               app = CdmApplicationController.NewInstance(destination, dbSchemaValidation);\r
                \r
+//             applicationEventMulticaster\r
+//             app = CdmApplicationController.NewInstance(destination, dbSchemaValidation);\r
+               \r
+               IProgressMonitor progressMonitor = DefaultProgressMonitor.NewInstance();\r
+               String resourcePath= "/eu/etaxonomy/cdm/appimportTestApplicationContext.xml";\r
+               ClassPathResource resource = new ClassPathResource(resourcePath);\r
+               ApplicationListener<?> listener = new AppImportApplicationListener();\r
+               List<ApplicationListener> listeners = new ArrayList<ApplicationListener>();\r
+               listeners.add(listener);\r
+//             app = CdmApplicationController.NewInstance(resource, destination, dbSchemaValidation, false, progressMonitor, listeners);\r
+               app = CdmApplicationController.NewInstance(resource, destination, dbSchemaValidation, false, progressMonitor);\r
+               \r
+               if (true){\r
+                       return;\r
+               }\r
                \r
                app.changeDataSource(destination);\r
                ICdmDataSource cdmDestination = CdmDestinations.cdm_edit_cichorieae_preview_B();\r