Merge branch '2.4.0' of git@github.com:demoiselle/framework.git into 2.4.0

Cleverson Sacramento
2 parents fa6bf549 231d335a
Showing 11 changed files with 21 additions and 27 deletions Show diff stats
documentation/reference/pt-BR/properties.xml
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/CustomContextBootstrap.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/StaticContextImpl.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryConversationContextImpl.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryRequestContextImpl.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporarySessionContextImpl.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/context/TemporaryViewContextImpl.java
impl/extension/jmx/src/main/java/br/gov/frameworkdemoiselle/internal/configuration/JMXConfig.java
impl/extension/jmx/src/test/java/management/tests/basic/DynamicMBeanProxyTest.java
impl/extension/jmx/src/test/resources/configuration/demoiselle.properties
impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/context/FacesViewContextImpl.java
@@ -276,28 +276,28 @@
 				</thead>
 				<tbody>
 					<row valign="top">
-						<entry role="">frameworkdemoiselle.&#8203;management.&#8203;jmx.&#8203;mbean.&#8203;domain</entry>
+						<entry role="">frameworkdemoiselle.&#8203;management.&#8203;mbean.&#8203;domain</entry>
 						<entry>
 							<para>Define o domínio padrão onde classes anotadas com <emphasis>@ManagementController</emphasis> serão registradas no MBeanServer.</para>
 							<para>Na especificação JMX, um MBean é registrado no MBeanServer com um nome no formato <emphasis>domain:name=MBeanName</emphasis>
-							(ex: <emphasis>br.&#8203;gov.&#8203;frameworkdemoiselle.&#8203;jmx.&#8203;name=NotificationBroadcaster</emphasis>). Esse parâmetro controla a porção <emphasis>domain</emphasis>
+							(ex: <emphasis>br.&#8203;gov.&#8203;frameworkdemoiselle:&#8203;name=NotificationBroadcaster</emphasis>). Esse parâmetro controla a porção <emphasis>domain</emphasis>
 							desse formato.</para>
 						</entry>
 						<entry>O pacote da classe anotada com <emphasis>@Management&#8203;Controller</emphasis></entry>
 					</row>
 					<row valign="top">
-						<entry colsep="1">frameworkdemoiselle.&#8203;management.&#8203;jmx.&#8203;notification.&#8203;domain</entry>
+						<entry colsep="1">frameworkdemoiselle.&#8203;management.&#8203;notification.&#8203;domain</entry>
 						<entry colsep="1">
-							<para>O mesmo que <emphasis>frameworkdemoiselle.&#8203;management.&#8203;jmx.&#8203;mbean.&#8203;domain</emphasis>, mas apenas para o domínio do
-							MBean <emphasis role="bold">br.&#8203;gov.&#8203;frameworkdemoiselle.&#8203;jmx.&#8203;internal.&#8203;NotificationBroadcaster</emphasis>. Esse MBean é automaticamente
+							<para>O mesmo que <emphasis>frameworkdemoiselle.&#8203;management.&#8203;mbean.&#8203;domain</emphasis>, mas apenas para o domínio do
+							MBean <emphasis role="bold">br.&#8203;gov.&#8203;frameworkdemoiselle.&#8203;internal.&#8203;NotificationBroadcaster</emphasis>. Esse MBean é automaticamente
 							registrado para receber notificações enviadas usando a classe <emphasis role="bold">br.&#8203;gov.&#8203;frameworkdemoiselle.&#8203;management.&#8203;NotificationManager</emphasis></para>
 						</entry>
 						<entry>br.&#8203;gov.&#8203;frameworkdemoiselle.&#8203;jmx</entry>
 					</row>
 					<row valign="top">
-						<entry>frameworkdemoiselle.&#8203;management.&#8203;jmx.&#8203;notification.&#8203;name</entry>
+						<entry>frameworkdemoiselle.&#8203;management.&#8203;notification.&#8203;name</entry>
 						<entry>
-							<para>O nome usado para registrar a classe <emphasis role="bold">br.&#8203;gov.&#8203;frameworkdemoiselle.&#8203;jmx.&#8203;internal.&#8203;NotificationBroadcaster</emphasis> como MBean.</para>
+							<para>O nome usado para registrar a classe <emphasis role="bold">br.&#8203;gov.&#8203;frameworkdemoiselle.&#8203;internal.&#8203;NotificationBroadcaster</emphasis> como MBean.</para>
 						</entry>
 						<entry>Notification&#8203;Broadcaster</entry>
 					</row>
@@ -6,6 +6,7 @@ import java.util.List;
 import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.AfterBeanDiscovery;
 import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
  
 import br.gov.frameworkdemoiselle.context.CustomContext;
 import br.gov.frameworkdemoiselle.context.StaticContext;
@@ -26,6 +27,13 @@ public class CustomContextBootstrap implements Extension{
  
 	private List<CustomContext> contexts;
  
+	public <T extends CustomContext> void vetoCustomContexts(@Observes ProcessAnnotatedType<T> event){
+		//Veta os subtipos de CustomContext, para que não conflitem com o produtor de contextos personalizados. 
+		if( CustomContext.class.isAssignableFrom( event.getAnnotatedType().getJavaClass() )){
+			event.veto();
+		}
+	}
+	
 	public void initializeContexts(@Observes AfterBeanDiscovery event){
 		//Cadastra os contextos contidos no demoiselle-core
 		if (contexts==null || contexts.isEmpty()){
@@ -48,8 +48,6 @@
  */
 package br.gov.frameworkdemoiselle.internal.context;
  
-import javax.enterprise.inject.Alternative;
-
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.annotation.StaticScoped;
 import br.gov.frameworkdemoiselle.context.StaticContext;
@@ -63,7 +61,6 @@ import br.gov.frameworkdemoiselle.context.StaticContext;
  *
  */
 @Priority(Priority.MIN_PRIORITY)
-@Alternative
 public class StaticContextImpl extends AbstractStaticContext implements StaticContext {
  
 	public StaticContextImpl() {
@@ -49,7 +49,6 @@
 package br.gov.frameworkdemoiselle.internal.context;
  
 import javax.enterprise.context.ConversationScoped;
-import javax.enterprise.inject.Alternative;
  
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.context.ConversationContext;
@@ -65,7 +64,6 @@ import br.gov.frameworkdemoiselle.context.ConversationContext;
  *
  */
 @Priority(Priority.MIN_PRIORITY)
-@Alternative
 public class TemporaryConversationContextImpl extends AbstractStaticContext implements ConversationContext {
  
 	public TemporaryConversationContextImpl() {
@@ -49,7 +49,6 @@
 package br.gov.frameworkdemoiselle.internal.context;
  
 import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.Alternative;
  
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.context.RequestContext;
@@ -65,7 +64,6 @@ import br.gov.frameworkdemoiselle.context.RequestContext;
  *
  */
 @Priority(Priority.MIN_PRIORITY)
-@Alternative
 public class TemporaryRequestContextImpl extends AbstractThreadLocalContext implements RequestContext {
  
 	public TemporaryRequestContextImpl() {
@@ -49,7 +49,6 @@
 package br.gov.frameworkdemoiselle.internal.context;
  
 import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.Alternative;
  
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.context.SessionContext;
@@ -66,7 +65,6 @@ import br.gov.frameworkdemoiselle.context.SessionContext;
  *
  */
 @Priority(Priority.MIN_PRIORITY)
-@Alternative
 public class TemporarySessionContextImpl extends AbstractStaticContext implements SessionContext {
  
 	public TemporarySessionContextImpl() {
@@ -48,8 +48,6 @@
  */
 package br.gov.frameworkdemoiselle.internal.context;
  
-import javax.enterprise.inject.Alternative;
-
 import br.gov.frameworkdemoiselle.annotation.Priority;
 import br.gov.frameworkdemoiselle.annotation.ViewScoped;
 import br.gov.frameworkdemoiselle.context.ViewContext;
@@ -65,7 +63,6 @@ import br.gov.frameworkdemoiselle.context.ViewContext;
  *
  */
 @Priority(Priority.MIN_PRIORITY)
-@Alternative
 public class TemporaryViewContextImpl extends AbstractThreadLocalContext implements ViewContext {
  
 	public TemporaryViewContextImpl() {
@@ -65,7 +65,7 @@ import br.gov.frameworkdemoiselle.stereotype.ManagementController;
  * @author serpro
  *
  */
-@Configuration(prefix = "frameworkdemoiselle.management.jmx")
+@Configuration(prefix = "frameworkdemoiselle.management")
 public class JMXConfig {
  
 	@Name("mbean.domain")
@@ -105,7 +105,7 @@ public class DynamicMBeanProxyTest {
  
 		ObjectName name = null;
 		try {
-			name = new ObjectName("br.gov.frameworkdemoiselle.jmx.domain:name=ManagedTest");
+			name = new ObjectName("br.gov.frameworkdemoiselle.domain:name=ManagedTest");
 		} catch (MalformedObjectNameException e) {
 			Assert.fail();
 		}
@@ -125,7 +125,7 @@ public class DynamicMBeanProxyTest {
  
 		ObjectName name = null;
 		try {
-			name = new ObjectName("br.gov.frameworkdemoiselle.jmx.domain:name=ManagedTest");
+			name = new ObjectName("br.gov.frameworkdemoiselle.domain:name=ManagedTest");
 		} catch (MalformedObjectNameException e) {
 			Assert.fail();
 		}
@@ -149,7 +149,7 @@ public class DynamicMBeanProxyTest {
  
 		ObjectName name = null;
 		try {
-			name = new ObjectName("br.gov.frameworkdemoiselle.jmx.domain:name=ManagedTest");
+			name = new ObjectName("br.gov.frameworkdemoiselle.domain:name=ManagedTest");
 		} catch (MalformedObjectNameException e) {
 			Assert.fail();
 		}
@@ -172,7 +172,7 @@ public class DynamicMBeanProxyTest {
  
 		ObjectName name = null;
 		try {
-			name = new ObjectName("br.gov.frameworkdemoiselle.jmx.domain:name=ManagedTest");
+			name = new ObjectName("br.gov.frameworkdemoiselle.domain:name=ManagedTest");
 		} catch (MalformedObjectNameException e) {
 			Assert.fail();
 		}
-frameworkdemoiselle.management.jmx.mbean.domain=br.gov.frameworkdemoiselle.jmx.domain
 \ No newline at end of file
+frameworkdemoiselle.management.mbean.domain=br.gov.frameworkdemoiselle.domain
 \ No newline at end of file
@@ -38,7 +38,6 @@ package br.gov.frameworkdemoiselle.internal.context;
  
 import java.util.Map;
  
-import javax.enterprise.inject.Alternative;
 import javax.faces.component.UIViewRoot;
 import javax.faces.context.FacesContext;
  
@@ -57,7 +56,6 @@ import br.gov.frameworkdemoiselle.util.Faces;
  *
  */
 @Priority(Priority.L2_PRIORITY)
-@Alternative
 public class FacesViewContextImpl extends AbstractCustomContext implements ViewContext {
  
 	public FacesViewContextImpl() {
...	...	@@ -276,28 +276,28 @@
276	276	</thead>
277	277	<tbody>
278	278	<row valign="top">
279		- <entry role="">frameworkdemoiselle.management.jmx.mbean.domain</entry>
	279	+ <entry role="">frameworkdemoiselle.management.mbean.domain</entry>
280	280	<entry>
281	281	<para>Define o domínio padrão onde classes anotadas com <emphasis>@ManagementController</emphasis> serão registradas no MBeanServer.</para>
282	282	<para>Na especificação JMX, um MBean é registrado no MBeanServer com um nome no formato <emphasis>domain:name=MBeanName</emphasis>
283		- (ex: <emphasis>br.gov.frameworkdemoiselle.jmx.name=NotificationBroadcaster</emphasis>). Esse parâmetro controla a porção <emphasis>domain</emphasis>
	283	+ (ex: <emphasis>br.gov.frameworkdemoiselle:name=NotificationBroadcaster</emphasis>). Esse parâmetro controla a porção <emphasis>domain</emphasis>
284	284	desse formato.</para>
285	285	</entry>
286	286	<entry>O pacote da classe anotada com <emphasis>@ManagementController</emphasis></entry>
287	287	</row>
288	288	<row valign="top">
289		- <entry colsep="1">frameworkdemoiselle.management.jmx.notification.domain</entry>
	289	+ <entry colsep="1">frameworkdemoiselle.management.notification.domain</entry>
290	290	<entry colsep="1">
291		- <para>O mesmo que <emphasis>frameworkdemoiselle.management.jmx.mbean.domain</emphasis>, mas apenas para o domínio do
292		- MBean <emphasis role="bold">br.gov.frameworkdemoiselle.jmx.internal.NotificationBroadcaster</emphasis>. Esse MBean é automaticamente
	291	+ <para>O mesmo que <emphasis>frameworkdemoiselle.management.mbean.domain</emphasis>, mas apenas para o domínio do
	292	+ MBean <emphasis role="bold">br.gov.frameworkdemoiselle.internal.NotificationBroadcaster</emphasis>. Esse MBean é automaticamente
293	293	registrado para receber notificações enviadas usando a classe <emphasis role="bold">br.gov.frameworkdemoiselle.management.NotificationManager</emphasis></para>
294	294	</entry>
295	295	<entry>br.gov.frameworkdemoiselle.jmx</entry>
296	296	</row>
297	297	<row valign="top">
298		- <entry>frameworkdemoiselle.management.jmx.notification.name</entry>
	298	+ <entry>frameworkdemoiselle.management.notification.name</entry>
299	299	<entry>
300		- <para>O nome usado para registrar a classe <emphasis role="bold">br.gov.frameworkdemoiselle.jmx.internal.NotificationBroadcaster</emphasis> como MBean.</para>
	300	+ <para>O nome usado para registrar a classe <emphasis role="bold">br.gov.frameworkdemoiselle.internal.NotificationBroadcaster</emphasis> como MBean.</para>
301	301	</entry>
302	302	<entry>NotificationBroadcaster</entry>
303	303	</row>
...	...
...	...	@@ -6,6 +6,7 @@ import java.util.List;
6	6	import javax.enterprise.event.Observes;
7	7	import javax.enterprise.inject.spi.AfterBeanDiscovery;
8	8	import javax.enterprise.inject.spi.Extension;
	9	+import javax.enterprise.inject.spi.ProcessAnnotatedType;
9	10
10	11	import br.gov.frameworkdemoiselle.context.CustomContext;
11	12	import br.gov.frameworkdemoiselle.context.StaticContext;
...	...	@@ -26,6 +27,13 @@ public class CustomContextBootstrap implements Extension{
26	27
27	28	private List<CustomContext> contexts;
28	29
	30	+ public <T extends CustomContext> void vetoCustomContexts(@Observes ProcessAnnotatedType<T> event){
	31	+ //Veta os subtipos de CustomContext, para que não conflitem com o produtor de contextos personalizados.
	32	+ if( CustomContext.class.isAssignableFrom( event.getAnnotatedType().getJavaClass() )){
	33	+ event.veto();
	34	+ }
	35	+ }
	36	+
29	37	public void initializeContexts(@Observes AfterBeanDiscovery event){
30	38	//Cadastra os contextos contidos no demoiselle-core
31	39	if (contexts==null \|\| contexts.isEmpty()){
...	...
...	...	@@ -48,8 +48,6 @@
48	48	*/
49	49	package br.gov.frameworkdemoiselle.internal.context;
50	50
51		-import javax.enterprise.inject.Alternative;
52		-
53	51	import br.gov.frameworkdemoiselle.annotation.Priority;
54	52	import br.gov.frameworkdemoiselle.annotation.StaticScoped;
55	53	import br.gov.frameworkdemoiselle.context.StaticContext;
...	...	@@ -63,7 +61,6 @@ import br.gov.frameworkdemoiselle.context.StaticContext;
63	61	*
64	62	*/
65	63	@Priority(Priority.MIN_PRIORITY)
66		-@Alternative
67	64	public class StaticContextImpl extends AbstractStaticContext implements StaticContext {
68	65
69	66	public StaticContextImpl() {
...	...
...	...	@@ -49,7 +49,6 @@
49	49	package br.gov.frameworkdemoiselle.internal.context;
50	50
51	51	import javax.enterprise.context.ConversationScoped;
52		-import javax.enterprise.inject.Alternative;
53	52
54	53	import br.gov.frameworkdemoiselle.annotation.Priority;
55	54	import br.gov.frameworkdemoiselle.context.ConversationContext;
...	...	@@ -65,7 +64,6 @@ import br.gov.frameworkdemoiselle.context.ConversationContext;
65	64	*
66	65	*/
67	66	@Priority(Priority.MIN_PRIORITY)
68		-@Alternative
69	67	public class TemporaryConversationContextImpl extends AbstractStaticContext implements ConversationContext {
70	68
71	69	public TemporaryConversationContextImpl() {
...	...
...	...	@@ -49,7 +49,6 @@
49	49	package br.gov.frameworkdemoiselle.internal.context;
50	50
51	51	import javax.enterprise.context.RequestScoped;
52		-import javax.enterprise.inject.Alternative;
53	52
54	53	import br.gov.frameworkdemoiselle.annotation.Priority;
55	54	import br.gov.frameworkdemoiselle.context.RequestContext;
...	...	@@ -65,7 +64,6 @@ import br.gov.frameworkdemoiselle.context.RequestContext;
65	64	*
66	65	*/
67	66	@Priority(Priority.MIN_PRIORITY)
68		-@Alternative
69	67	public class TemporaryRequestContextImpl extends AbstractThreadLocalContext implements RequestContext {
70	68
71	69	public TemporaryRequestContextImpl() {
...	...
...	...	@@ -49,7 +49,6 @@
49	49	package br.gov.frameworkdemoiselle.internal.context;
50	50
51	51	import javax.enterprise.context.SessionScoped;
52		-import javax.enterprise.inject.Alternative;
53	52
54	53	import br.gov.frameworkdemoiselle.annotation.Priority;
55	54	import br.gov.frameworkdemoiselle.context.SessionContext;
...	...	@@ -66,7 +65,6 @@ import br.gov.frameworkdemoiselle.context.SessionContext;
66	65	*
67	66	*/
68	67	@Priority(Priority.MIN_PRIORITY)
69		-@Alternative
70	68	public class TemporarySessionContextImpl extends AbstractStaticContext implements SessionContext {
71	69
72	70	public TemporarySessionContextImpl() {
...	...
...	...	@@ -65,7 +65,7 @@ import br.gov.frameworkdemoiselle.stereotype.ManagementController;
65	65	* @author serpro
66	66	*
67	67	*/
68		-@Configuration(prefix = "frameworkdemoiselle.management.jmx")
	68	+@Configuration(prefix = "frameworkdemoiselle.management")
69	69	public class JMXConfig {
70	70
71	71	@Name("mbean.domain")
...	...
...	...	@@ -105,7 +105,7 @@ public class DynamicMBeanProxyTest {
105	105
106	106	ObjectName name = null;
107	107	try {
108		- name = new ObjectName("br.gov.frameworkdemoiselle.jmx.domain:name=ManagedTest");
	108	+ name = new ObjectName("br.gov.frameworkdemoiselle.domain:name=ManagedTest");
109	109	} catch (MalformedObjectNameException e) {
110	110	Assert.fail();
111	111	}
...	...	@@ -125,7 +125,7 @@ public class DynamicMBeanProxyTest {
125	125
126	126	ObjectName name = null;
127	127	try {
128		- name = new ObjectName("br.gov.frameworkdemoiselle.jmx.domain:name=ManagedTest");
	128	+ name = new ObjectName("br.gov.frameworkdemoiselle.domain:name=ManagedTest");
129	129	} catch (MalformedObjectNameException e) {
130	130	Assert.fail();
131	131	}
...	...	@@ -149,7 +149,7 @@ public class DynamicMBeanProxyTest {
149	149
150	150	ObjectName name = null;
151	151	try {
152		- name = new ObjectName("br.gov.frameworkdemoiselle.jmx.domain:name=ManagedTest");
	152	+ name = new ObjectName("br.gov.frameworkdemoiselle.domain:name=ManagedTest");
153	153	} catch (MalformedObjectNameException e) {
154	154	Assert.fail();
155	155	}
...	...	@@ -172,7 +172,7 @@ public class DynamicMBeanProxyTest {
172	172
173	173	ObjectName name = null;
174	174	try {
175		- name = new ObjectName("br.gov.frameworkdemoiselle.jmx.domain:name=ManagedTest");
	175	+ name = new ObjectName("br.gov.frameworkdemoiselle.domain:name=ManagedTest");
176	176	} catch (MalformedObjectNameException e) {
177	177	Assert.fail();
178	178	}
...	...
1		-frameworkdemoiselle.management.jmx.mbean.domain=br.gov.frameworkdemoiselle.jmx.domain
2	1	\ No newline at end of file
	2	+frameworkdemoiselle.management.mbean.domain=br.gov.frameworkdemoiselle.domain
3	3	\ No newline at end of file
...	...
...	...	@@ -38,7 +38,6 @@ package br.gov.frameworkdemoiselle.internal.context;
38	38
39	39	import java.util.Map;
40	40
41		-import javax.enterprise.inject.Alternative;
42	41	import javax.faces.component.UIViewRoot;
43	42	import javax.faces.context.FacesContext;
44	43
...	...	@@ -57,7 +56,6 @@ import br.gov.frameworkdemoiselle.util.Faces;
57	56	*
58	57	*/
59	58	@Priority(Priority.L2_PRIORITY)
60		-@Alternative
61	59	public class FacesViewContextImpl extends AbstractCustomContext implements ViewContext {
62	60
63	61	public FacesViewContextImpl() {
...	...