Commit dcdd0de230d8692f7f3549e9c4dec138a3d3dbcf
1 parent
fea00899
Exists in
master
Alterado evento observado no ManagementBootstrap, evento anterior não
era disparado quando o servidor fazia redeploy da aplicação.
Showing
2 changed files
with
4 additions
and
4 deletions
Show diff stats
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/ManagementBootstrap.java
| @@ -13,7 +13,6 @@ import javax.enterprise.inject.spi.AfterDeploymentValidation; | @@ -13,7 +13,6 @@ import javax.enterprise.inject.spi.AfterDeploymentValidation; | ||
| 13 | import javax.enterprise.inject.spi.AnnotatedType; | 13 | import javax.enterprise.inject.spi.AnnotatedType; |
| 14 | import javax.enterprise.inject.spi.Bean; | 14 | import javax.enterprise.inject.spi.Bean; |
| 15 | import javax.enterprise.inject.spi.BeanManager; | 15 | import javax.enterprise.inject.spi.BeanManager; |
| 16 | -import javax.enterprise.inject.spi.BeforeShutdown; | ||
| 17 | import javax.enterprise.inject.spi.Extension; | 16 | import javax.enterprise.inject.spi.Extension; |
| 18 | import javax.enterprise.inject.spi.ProcessAnnotatedType; | 17 | import javax.enterprise.inject.spi.ProcessAnnotatedType; |
| 19 | 18 | ||
| @@ -23,6 +22,7 @@ import br.gov.frameworkdemoiselle.internal.context.ManagedContext; | @@ -23,6 +22,7 @@ import br.gov.frameworkdemoiselle.internal.context.ManagedContext; | ||
| 23 | import br.gov.frameworkdemoiselle.internal.management.ManagedType; | 22 | import br.gov.frameworkdemoiselle.internal.management.ManagedType; |
| 24 | import br.gov.frameworkdemoiselle.internal.management.Management; | 23 | import br.gov.frameworkdemoiselle.internal.management.Management; |
| 25 | import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; | 24 | import br.gov.frameworkdemoiselle.internal.producer.ResourceBundleProducer; |
| 25 | +import br.gov.frameworkdemoiselle.lifecycle.AfterShutdownProccess; | ||
| 26 | import br.gov.frameworkdemoiselle.lifecycle.ManagementExtension; | 26 | import br.gov.frameworkdemoiselle.lifecycle.ManagementExtension; |
| 27 | import br.gov.frameworkdemoiselle.stereotype.ManagementController; | 27 | import br.gov.frameworkdemoiselle.stereotype.ManagementController; |
| 28 | import br.gov.frameworkdemoiselle.util.Beans; | 28 | import br.gov.frameworkdemoiselle.util.Beans; |
| @@ -72,7 +72,7 @@ public class ManagementBootstrap implements Extension { | @@ -72,7 +72,7 @@ public class ManagementBootstrap implements Extension { | ||
| 72 | monitoringManager.initialize(managementExtensionCache); | 72 | monitoringManager.initialize(managementExtensionCache); |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | - public void unregisterAvailableManagedTypes(@Observes final BeforeShutdown event) { | 75 | + public void unregisterAvailableManagedTypes(@Observes final AfterShutdownProccess event) { |
| 76 | 76 | ||
| 77 | Management manager = Beans.getReference(Management.class); | 77 | Management manager = Beans.getReference(Management.class); |
| 78 | manager.shutdown(managementExtensionCache); | 78 | manager.shutdown(managementExtensionCache); |
impl/extension/jmx/src/main/java/br/gov/frameworkdemoiselle/jmx/internal/MBeanManager.java
| @@ -39,10 +39,10 @@ package br.gov.frameworkdemoiselle.jmx.internal; | @@ -39,10 +39,10 @@ package br.gov.frameworkdemoiselle.jmx.internal; | ||
| 39 | import java.util.Collection; | 39 | import java.util.Collection; |
| 40 | import java.util.HashMap; | 40 | import java.util.HashMap; |
| 41 | 41 | ||
| 42 | -import javax.inject.Singleton; | 42 | +import javax.enterprise.context.ApplicationScoped; |
| 43 | import javax.management.ObjectInstance; | 43 | import javax.management.ObjectInstance; |
| 44 | 44 | ||
| 45 | -@Singleton | 45 | +@ApplicationScoped |
| 46 | public class MBeanManager { | 46 | public class MBeanManager { |
| 47 | 47 | ||
| 48 | private HashMap<String,ObjectInstance> registeredMBeans = new HashMap<String,ObjectInstance>(); | 48 | private HashMap<String,ObjectInstance> registeredMBeans = new HashMap<String,ObjectInstance>(); |