From 2e8d8ff18f1732e24df1af77d9742e04e045edca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Tue, 4 Oct 2011 16:07:38 +0000 Subject: [PATCH] improved monitoring for application controller --- .gitattributes | 1 + .../common/AppImportApplicationListener.java | 29 +++++++++++++++++++ .../cdm/app/common/TestActivator.java | 27 ++++++++++++++--- 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 app-import/src/main/java/eu/etaxonomy/cdm/app/common/AppImportApplicationListener.java diff --git a/.gitattributes b/.gitattributes index 2c40ddf6..9d5fe748 100644 --- 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 index 00000000..f2f9d7e7 --- /dev/null +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/common/AppImportApplicationListener.java @@ -0,0 +1,29 @@ +// $Id$ +/** +* Copyright (C) 2009 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ +package eu.etaxonomy.cdm.app.common; + +import org.apache.log4j.Logger; +import org.springframework.context.ApplicationEvent; +import org.springframework.context.ApplicationListener; + +/** + * @author a.mueller + * @date 28.09.2011 + * + */ +public class AppImportApplicationListener implements ApplicationListener { + private static final Logger logger = Logger.getLogger(AppImportApplicationListener.class); + + @Override + public void onApplicationEvent(ApplicationEvent event) { + logger.warn(event); + } + +} 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 bbf3bc28..977abac7 100644 --- 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 @@ package eu.etaxonomy.cdm.app.common; +import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; import org.apache.log4j.Logger; +import org.springframework.context.ApplicationListener; +import org.springframework.core.io.ClassPathResource; import eu.etaxonomy.cdm.api.application.CdmApplicationController; import eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator; import eu.etaxonomy.cdm.api.service.config.TaxonServiceConfiguratorImpl; import eu.etaxonomy.cdm.api.service.pager.Pager; +import eu.etaxonomy.cdm.common.DefaultProgressMonitor; +import eu.etaxonomy.cdm.common.IProgressMonitor; import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; import eu.etaxonomy.cdm.io.common.IImportConfigurator.CHECK; @@ -43,11 +48,11 @@ public class TestActivator { static final int limitSave = 2000; // static final CHECK check = CHECK.CHECK_AND_IMPORT; - static final CHECK check = CHECK.IMPORT_WITHOUT_CHECK; - static DbSchemaValidation dbSchemaValidation = DbSchemaValidation.VALIDATE; + static final CHECK check = CHECK.CHECK_ONLY; + static DbSchemaValidation dbSchemaValidation = DbSchemaValidation.CREATE; // static DbSchemaValidation dbSchemaValidation = DbSchemaValidation.UPDATE; // static DbSchemaValidation dbSchemaValidation = DbSchemaValidation.VALIDATE; - static final NomenclaturalCode nomenclaturalCode = NomenclaturalCode.ICZN; + static final NomenclaturalCode nomenclaturalCode = NomenclaturalCode.ICBN; @@ -59,8 +64,22 @@ public class TestActivator { ICdmDataSource destination = cdmDestination; CdmApplicationController app; - app = CdmApplicationController.NewInstance(destination, dbSchemaValidation); +// applicationEventMulticaster +// app = CdmApplicationController.NewInstance(destination, dbSchemaValidation); + + IProgressMonitor progressMonitor = DefaultProgressMonitor.NewInstance(); + String resourcePath= "/eu/etaxonomy/cdm/appimportTestApplicationContext.xml"; + ClassPathResource resource = new ClassPathResource(resourcePath); + ApplicationListener listener = new AppImportApplicationListener(); + List listeners = new ArrayList(); + listeners.add(listener); +// app = CdmApplicationController.NewInstance(resource, destination, dbSchemaValidation, false, progressMonitor, listeners); + app = CdmApplicationController.NewInstance(resource, destination, dbSchemaValidation, false, progressMonitor); + + if (true){ + return; + } app.changeDataSource(destination); ICdmDataSource cdmDestination = CdmDestinations.cdm_edit_cichorieae_preview_B(); -- 2.34.1