Merge branch 'master' of https://github.com/demoiselle/framework.git

Dancovich
2 parents d8b0021b 57d62641
Showing 7 changed files with 49 additions and 22 deletions Show diff stats
documentation/reference/pt-BR/paginacao.xml
impl/core/src/main/java/br/gov/frameworkdemoiselle/internal/interceptor/TransactionalInterceptor.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/security/SecurityException.java
impl/core/src/main/java/br/gov/frameworkdemoiselle/util/Beans.java
impl/core/src/test/java/br/gov/frameworkdemoiselle/util/BeansTest.java
impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/SecurityObserver.java
site/apt/release-notes.apt
@@ -93,10 +93,10 @@ public class PaginationContext {
 @Configuration
 public class PaginationConfig {
-	@Key("default_page_size")
+	@Name("default_page_size")
 	private int defaultPageSize = 10;
-	@Key("max_page_links")
+	@Name("max_page_links")
 	private int maxPageLinks = 5;
 }]]></programlisting>
@@ -82,6 +82,7 @@ public class TransactionalInterceptor implements Serializable {
 		try {
 			instance = Beans.getReference(TransactionInfo.class);
+			instance.getCounter();
 		} catch (ContextNotActiveException cause) {
 			instance = new TransactionInfo() {
@@ -57,4 +57,14 @@ public class SecurityException extends DemoiselleException {
 	public SecurityException(String message) {
 		super(message);
 	}
+
+	/**
+	 * Constructor with the cause.
+	 * 
+	 * @param cause
+	 *            exception cause
+	 */
+	public SecurityException(Throwable cause) {
+		super(cause);
+	}
 }
@@ -74,12 +74,11 @@ public final class Beans {
 		return manager;
 	}
-	@SuppressWarnings("unchecked")
 	public static <T> T getReference(final Class<T> beanClass, Annotation... qualifiers) {
 		T instance;
 		try {
-			instance = (T) getReference(manager.getBeans(beanClass, qualifiers));
+			instance = (T) getReference(manager.getBeans(beanClass, qualifiers), beanClass);
 		} catch (NoSuchElementException cause) {
 			StringBuffer buffer = new StringBuffer();
@@ -97,12 +96,11 @@ public final class Beans {
 		return instance;
 	}
-	@SuppressWarnings("unchecked")
 	public static <T> T getReference(final Class<T> beanClass) {
 		T instance;
 		try {
-			instance = (T) getReference(manager.getBeans(beanClass));
+			instance = (T) getReference(manager.getBeans(beanClass), beanClass);
 		} catch (NoSuchElementException cause) {
 			String message = getBundle().getString("bean-not-found", beanClass.getCanonicalName());
@@ -128,12 +126,17 @@ public final class Beans {
 	}
 	@SuppressWarnings("unchecked")
-	private static <T> T getReference(Set<Bean<?>> beans) {
+	private static <T> T getReference(Set<Bean<?>> beans, Class<T> beanClass) {
 		Bean<?> bean = beans.iterator().next();
-		return (T) manager.getReference(bean, bean.getBeanClass(), manager.createCreationalContext(bean));
+		return (T) manager.getReference(bean, beanClass == null ? bean.getBeanClass() : beanClass,
+				manager.createCreationalContext(bean));
+	}
+
+	private static <T> T getReference(Set<Bean<?>> beans) {
+		return getReference(beans, null);
 	}
 	private static ResourceBundle getBundle() {
 		return ResourceBundleProducer.create("demoiselle-core-bundle", Locale.getDefault());
 	}
 -}
+}
 \ No newline at end of file
@@ -50,6 +50,7 @@ import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 import org.easymock.EasyMock;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.powermock.api.easymock.PowerMock;
@@ -73,10 +74,9 @@ public class BeansTest {
 		expect(beanManager.createCreationalContext(EasyMock.anyObject(Contextual.class))).andReturn(null);
 		expect(beanManager.getBeans(EasyMock.anyObject(Class.class))).andReturn(collection);
-		expect(beanManager.getReference(EasyMock.anyObject(Bean.class), EasyMock.anyObject(Class.class),
+		expect(
+				beanManager.getReference(EasyMock.anyObject(Bean.class), EasyMock.anyObject(Class.class),
 						EasyMock.anyObject(CreationalContext.class))).andReturn(object);
-		
-		expect(bean.getBeanClass()).andReturn(null);
 		replayAll(beanManager, bean);
@@ -103,7 +103,8 @@ public class BeansTest {
 		expect(bean.getBeanClass()).andReturn(null);
 		expect(beanManager.createCreationalContext(EasyMock.anyObject(Contextual.class))).andReturn(null);
 		expect(beanManager.getBeans("something")).andReturn(collection);
-		expect(beanManager.getReference(EasyMock.anyObject(Bean.class), EasyMock.anyObject(Class.class),
+		expect(
+				beanManager.getReference(EasyMock.anyObject(Bean.class), EasyMock.anyObject(Class.class),
 						EasyMock.anyObject(CreationalContext.class))).andReturn(object);
 		replayAll(beanManager, bean);
@@ -61,8 +61,7 @@ public class SecurityObserver implements Serializable {
 	private static final long serialVersionUID = 1L;
-	@Inject
-	private JsfSecurityConfig config;
+	private transient JsfSecurityConfig config;
 	private transient Map<String, Object> savedParams;
@@ -83,11 +82,19 @@ public class SecurityObserver implements Serializable {
 		return this.savedParams;
 	}
+	public JsfSecurityConfig getConfig() {
+		if (this.config == null) {
+			this.config = Beans.getReference(JsfSecurityConfig.class);
+		}
+
+		return this.config;
+	}
+
 	private void saveCurrentState() {
 		clear();
 		FacesContext facesContext = Beans.getReference(FacesContext.class);
-		if (!config.getLoginPage().equals(facesContext.getViewRoot().getViewId())) {
+		if (!getConfig().getLoginPage().equals(facesContext.getViewRoot().getViewId())) {
 			getSavedParams().putAll(facesContext.getExternalContext().getRequestParameterMap());
 			savedViewId = facesContext.getViewRoot().getViewId();
 		}
@@ -97,7 +104,7 @@ public class SecurityObserver implements Serializable {
 		saveCurrentState();
 		try {
-			Redirector.redirect(config.getLoginPage());
+			Redirector.redirect(getConfig().getLoginPage());
 		} catch (PageNotFoundException cause) {
 			// TODO Colocar a mensagem no bundle
@@ -116,9 +123,9 @@ public class SecurityObserver implements Serializable {
 			if (savedViewId != null) {
 				Redirector.redirect(savedViewId, getSavedParams());
-			} else if (config.isRedirectEnabled()) {
+			} else if (getConfig().isRedirectEnabled()) {
 				redirectedFromConfig = true;
-				Redirector.redirect(config.getRedirectAfterLogin(), getSavedParams());
+				Redirector.redirect(getConfig().getRedirectAfterLogin(), getSavedParams());
 			}
 		} catch (PageNotFoundException cause) {
@@ -140,8 +147,8 @@ public class SecurityObserver implements Serializable {
 	public void onLogoutSuccessful(@Observes final AfterLogoutSuccessful event) {
 		try {
-			if (config.isRedirectEnabled()) {
-				Redirector.redirect(config.getRedirectAfterLogout());
+			if (getConfig().isRedirectEnabled()) {
+				Redirector.redirect(getConfig().getRedirectAfterLogout());
 			}
 		} catch (PageNotFoundException cause) {
@@ -165,4 +172,5 @@ public class SecurityObserver implements Serializable {
 		savedViewId = null;
 		getSavedParams().clear();
 	}
+
 }
@@ -38,10 +38,14 @@
 Notas de Versão
-* v2.3.0
+* v2.3.1
   * {{{http://demoiselle.atlassian.net/secure/ReleaseNote.jspa?projectId=10007&version=10101}Notas de Versão no JIRA}}
+* {{{../2.3.0/}v2.3.0}}
+
+  * {{{http://demoiselle.atlassian.net/secure/ReleaseNote.jspa?projectId=10007&version=10218}Notas de Versão no JIRA}}
+
 * {{{../2.2.2/}v2.2.2}}
   * {{{http://sourceforge.net/apps/mantisbt/demoiselle/view.php?id=752}0000752}} [Bug] Correção da exceção retornada pelo interceptador de ExceptionHandler.
	@@ -93,10 +93,10 @@ public class PaginationContext {		@@ -93,10 +93,10 @@ public class PaginationContext {
93	@Configuration	93	@Configuration
94	public class PaginationConfig {	94	public class PaginationConfig {
95		95
96	- @Key("default_page_size")	96	+ @Name("default_page_size")
97	private int defaultPageSize = 10;	97	private int defaultPageSize = 10;
98		98
99	- @Key("max_page_links")	99	+ @Name("max_page_links")
100	private int maxPageLinks = 5;	100	private int maxPageLinks = 5;
101	}]]></programlisting>	101	}]]></programlisting>
102		102
	@@ -82,6 +82,7 @@ public class TransactionalInterceptor implements Serializable {		@@ -82,6 +82,7 @@ public class TransactionalInterceptor implements Serializable {
82		82
83	try {	83	try {
84	instance = Beans.getReference(TransactionInfo.class);	84	instance = Beans.getReference(TransactionInfo.class);
		85	+ instance.getCounter();
85		86
86	} catch (ContextNotActiveException cause) {	87	} catch (ContextNotActiveException cause) {
87	instance = new TransactionInfo() {	88	instance = new TransactionInfo() {
	@@ -57,4 +57,14 @@ public class SecurityException extends DemoiselleException {		@@ -57,4 +57,14 @@ public class SecurityException extends DemoiselleException {
57	public SecurityException(String message) {	57	public SecurityException(String message) {
58	super(message);	58	super(message);
59	}	59	}
		60	+
		61	+ /**
		62	+ * Constructor with the cause.
		63	+ *
		64	+ * @param cause
		65	+ * exception cause
		66	+ */
		67	+ public SecurityException(Throwable cause) {
		68	+ super(cause);
		69	+ }
60	}	70	}