From dcdd0de230d8692f7f3549e9c4dec138a3d3dbcf Mon Sep 17 00:00:00 2001
From: Dancovich <danilo.viana@serpro.gov.br>
Date: Mon, 8 Jul 2013 11:04:51 -0300
Subject: [PATCH] Alterado evento observado no ManagementBootstrap, evento anterior não era disparado quando o servidor fazia redeploy da aplicação.

---
 impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ManagementBootstrap.java | 4 ++--
 impl/extension/jmx/src/main/java/br/gov/frameworkdemoiselle/jmx/internal/MBeanManager.java     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ManagementBootstrap.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ManagementBootstrap.java
index aca6e11..2a6da1a 100644
--- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ManagementBootstrap.java
+++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ManagementBootstrap.java
@@ -13,7 +13,6 @@ import javax.enterprise.inject.spi.AfterDeploymentValidation;
 import javax.enterprise.inject.spi.AnnotatedType;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.BeforeShutdown;
 import javax.enterprise.inject.spi.Extension;
 import javax.enterprise.inject.spi.ProcessAnnotatedType;
 
@@ -23,6 +22,7 @@ import br.gov.frameworkdemoiselle.internal.context.ManagedContext;
 import br.gov.frameworkdemoiselle.internal.management.ManagedType;
 import br.gov.frameworkdemoiselle.internal.management.Management;
 import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer;
+import br.gov.frameworkdemoiselle.lifecycle.AfterShutdownProccess;
 import br.gov.frameworkdemoiselle.lifecycle.ManagementExtension;
 import br.gov.frameworkdemoiselle.stereotype.ManagementController;
 import br.gov.frameworkdemoiselle.util.Beans;
@@ -72,7 +72,7 @@ public class ManagementBootstrap implements Extension {
 		monitoringManager.initialize(managementExtensionCache);
 	}
 
-	public void unregisterAvailableManagedTypes(@Observes final BeforeShutdown event) {
+	public void unregisterAvailableManagedTypes(@Observes final AfterShutdownProccess event) {
 
 		Management manager = Beans.getReference(Management.class);
 		manager.shutdown(managementExtensionCache);
diff --git a/impl/extension/jmx/src/main/java/br/gov/frameworkdemoiselle/jmx/internal/MBeanManager.java b/impl/extension/jmx/src/main/java/br/gov/frameworkdemoiselle/jmx/internal/MBeanManager.java
index 1d438c9..7c7b052 100644
--- a/impl/extension/jmx/src/main/java/br/gov/frameworkdemoiselle/jmx/internal/MBeanManager.java
+++ b/impl/extension/jmx/src/main/java/br/gov/frameworkdemoiselle/jmx/internal/MBeanManager.java
@@ -39,10 +39,10 @@ package br.gov.frameworkdemoiselle.jmx.internal;
 import java.util.Collection;
 import java.util.HashMap;
 
-import javax.inject.Singleton;
+import javax.enterprise.context.ApplicationScoped;
 import javax.management.ObjectInstance;
 
-@Singleton
+@ApplicationScoped
 public class MBeanManager {
 	
 	private HashMap<String,ObjectInstance> registeredMBeans = new HashMap<String,ObjectInstance>();
--
libgit2 0.21.2