Download as
Browse Code »

Commit 18de47703b065acd3a3d8a26b7f08a4909c4801f

Authored by Cleverson Sacramento
1 parent 502a3ecf
Exists in master

FWK-203: Exclusão de funcionalidades e classes depreciadas na versão 2.4 

Task-Url: https://demoiselle.atlassian.net/browse/FWK-203
Showing 9 changed files with 5 additions and 291 deletions   Show diff stats
impl/core/src/main/java/br/gov/frameworkdemoiselle/util/NameQualifier.java
  Diff comments   View file @18de477
@@ -38,16 +38,14 @@ package br.gov.frameworkdemoiselle.util; @@ -38,16 +38,14 @@ package br.gov.frameworkdemoiselle.util;
38 38
39 import javax.enterprise.util.AnnotationLiteral; 39 import javax.enterprise.util.AnnotationLiteral;
40 40
41 -import util.beans.ambiguous.AmbiguousQualifier;  
42 import br.gov.frameworkdemoiselle.annotation.Name; 41 import br.gov.frameworkdemoiselle.annotation.Name;
43 42
44 /** 43 /**
45 - * Annotation litteral that allows to create instances of the {@link Name} qualifier.  
46 - * The created instance can then be used to call {@link Beans#getReference(Class type, Annotation... qualifiers)}.  
47 - * 44 + * Annotation litteral that allows to create instances of the {@link Name} qualifier. The created instance can then be
  45 + * used to call {@link Beans#getReference(Class type, Annotation... qualifiers)}.
  46 + *
48 * @see Beans 47 * @see Beans
49 * @see AmbiguousQualifier 48 * @see AmbiguousQualifier
50 - *  
51 * @author SERPRO 49 * @author SERPRO
52 */ 50 */
53 @SuppressWarnings("all") 51 @SuppressWarnings("all")
@@ -61,7 +59,7 @@ public class NameQualifier extends AnnotationLiteral<Name> implements Name { @@ -61,7 +59,7 @@ public class NameQualifier extends AnnotationLiteral<Name> implements Name {
61 * Constructor with string value of name qualifier. 59 * Constructor with string value of name qualifier.
62 * 60 *
63 * @param value 61 * @param value
64 - * value of name qualifier. 62 + * value of name qualifier.
65 */ 63 */
66 public NameQualifier(String value) { 64 public NameQualifier(String value) {
67 this.value = value; 65 this.value = value;
impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/EntityManagerProducer.java
  Diff comments   View file @18de477
@@ -47,7 +47,6 @@ import javax.enterprise.inject.spi.InjectionPoint; @@ -47,7 +47,6 @@ import javax.enterprise.inject.spi.InjectionPoint;
47 import javax.inject.Inject; 47 import javax.inject.Inject;
48 import javax.persistence.EntityManager; 48 import javax.persistence.EntityManager;
49 49
50 -import util.beans.ambiguous.AmbiguousQualifier;  
51 import br.gov.frameworkdemoiselle.annotation.Name; 50 import br.gov.frameworkdemoiselle.annotation.Name;
52 import br.gov.frameworkdemoiselle.internal.configuration.EntityManagerConfig; 51 import br.gov.frameworkdemoiselle.internal.configuration.EntityManagerConfig;
53 import br.gov.frameworkdemoiselle.internal.proxy.EntityManagerProxy; 52 import br.gov.frameworkdemoiselle.internal.proxy.EntityManagerProxy;
impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ApplicationExceptionHandler.java
  Diff comments   View file @18de477
@@ -100,7 +100,7 @@ public class ApplicationExceptionHandler extends AbstractExceptionHandler { @@ -100,7 +100,7 @@ public class ApplicationExceptionHandler extends AbstractExceptionHandler {
100 "A tela de exibição de erros: \"" 100 "A tela de exibição de erros: \""
101 + ex.getViewId() 101 + ex.getViewId()
102 + "\" não foi encontrada. Caso o seu projeto possua outra, defina no arquivo de configuração a chave \"" 102 + "\" não foi encontrada. Caso o seu projeto possua outra, defina no arquivo de configuração a chave \""
103 - + "frameworkdemoiselle.handle.application.exception.page" + "\"", ex); 103 + + "frameworkdemoiselle.exception.default.redirect.page" + "\"", ex);
104 } 104 }
105 return handled; 105 return handled;
106 } 106 }
impl/extension/jsf/src/test/java/exception/handler/configuration/compatibility/ExceptionHandlerRedirectConfigTest.java
View file @502a3ec
@@ -1,84 +0,0 @@ @@ -1,84 +0,0 @@
1 -/*  
2 - * Demoiselle Framework  
3 - * Copyright (C) 2010 SERPRO  
4 - * ----------------------------------------------------------------------------  
5 - * This file is part of Demoiselle Framework.  
6 - *  
7 - * Demoiselle Framework is free software; you can redistribute it and/or  
8 - * modify it under the terms of the GNU Lesser General Public License version 3  
9 - * as published by the Free Software Foundation.  
10 - *  
11 - * This program is distributed in the hope that it will be useful,  
12 - * but WITHOUT ANY WARRANTY; without even the implied warranty of  
13 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the  
14 - * GNU General Public License for more details.  
15 - *  
16 - * You should have received a copy of the GNU Lesser General Public License version 3  
17 - * along with this program; if not, see <http://www.gnu.org/licenses/>  
18 - * or write to the Free Software Foundation, Inc., 51 Franklin Street,  
19 - * Fifth Floor, Boston, MA 02110-1301, USA.  
20 - * ----------------------------------------------------------------------------  
21 - * Este arquivo é parte do Framework Demoiselle.  
22 - *  
23 - * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou  
24 - * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação  
25 - * do Software Livre (FSF).  
26 - *  
27 - * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA  
28 - * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou  
29 - * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português  
30 - * para maiores detalhes.  
31 - *  
32 - * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título  
33 - * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>  
34 - * ou escreva para a Fundação do Software Livre (FSF) Inc.,  
35 - * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.  
36 - */  
37 -package exception.handler.configuration.compatibility;  
38 -  
39 -import static org.junit.Assert.assertTrue;  
40 -  
41 -import java.io.IOException;  
42 -import java.net.URL;  
43 -  
44 -import org.apache.commons.httpclient.HttpClient;  
45 -import org.apache.commons.httpclient.HttpException;  
46 -import org.apache.commons.httpclient.methods.GetMethod;  
47 -import org.jboss.arquillian.container.test.api.Deployment;  
48 -import org.jboss.arquillian.junit.Arquillian;  
49 -import org.jboss.arquillian.test.api.ArquillianResource;  
50 -import org.jboss.shrinkwrap.api.spec.WebArchive;  
51 -import org.junit.Test;  
52 -import org.junit.runner.RunWith;  
53 -  
54 -import test.Tests;  
55 -import exception.handler.common.DummyException;  
56 -import exception.handler.common.ExceptionHandlerConfigBean;  
57 -  
58 -@RunWith(Arquillian.class)  
59 -public class ExceptionHandlerRedirectConfigTest {  
60 -  
61 - @ArquillianResource  
62 - private URL deploymentUrl;  
63 -  
64 - private static final String PATH = "src/test/resources/exception-handler-redirect-config-compatibility";  
65 -  
66 - @Deployment(testable = false)  
67 - public static WebArchive createDeployment() {  
68 - return Tests.createDeployment().addClasses(DummyException.class, ExceptionHandlerConfigBean.class)  
69 - .addAsWebResource(Tests.createFileAsset(PATH + "/index.xhtml"), "index.xhtml")  
70 - .addAsWebResource(Tests.createFileAsset(PATH + "/error_page.xhtml"), "error_page.xhtml")  
71 - .addAsWebInfResource(Tests.createFileAsset(PATH + "/web.xml"), "web.xml")  
72 - .addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");  
73 - }  
74 -  
75 - @Test  
76 - public void notHandlerConfiguration() throws HttpException, IOException {  
77 - HttpClient client = new HttpClient();  
78 - GetMethod method = new GetMethod(deploymentUrl + "/index.jsf");  
79 -  
80 - client.executeMethod(method);  
81 - String message = method.getResponseBodyAsString();  
82 - assertTrue(message.contains("Called the page /error_page"));  
83 - }  
84 -}  
impl/extension/jsf/src/test/java/exception/handler/configuration/compatibility/ExceptionNotHandlerConfigTest.java
View file @502a3ec
@@ -1,84 +0,0 @@ @@ -1,84 +0,0 @@
1 -/*  
2 - * Demoiselle Framework  
3 - * Copyright (C) 2010 SERPRO  
4 - * ----------------------------------------------------------------------------  
5 - * This file is part of Demoiselle Framework.  
6 - *  
7 - * Demoiselle Framework is free software; you can redistribute it and/or  
8 - * modify it under the terms of the GNU Lesser General Public License version 3  
9 - * as published by the Free Software Foundation.  
10 - *  
11 - * This program is distributed in the hope that it will be useful,  
12 - * but WITHOUT ANY WARRANTY; without even the implied warranty of  
13 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the  
14 - * GNU General Public License for more details.  
15 - *  
16 - * You should have received a copy of the GNU Lesser General Public License version 3  
17 - * along with this program; if not, see <http://www.gnu.org/licenses/>  
18 - * or write to the Free Software Foundation, Inc., 51 Franklin Street,  
19 - * Fifth Floor, Boston, MA 02110-1301, USA.  
20 - * ----------------------------------------------------------------------------  
21 - * Este arquivo é parte do Framework Demoiselle.  
22 - *  
23 - * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou  
24 - * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação  
25 - * do Software Livre (FSF).  
26 - *  
27 - * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA  
28 - * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou  
29 - * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português  
30 - * para maiores detalhes.  
31 - *  
32 - * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título  
33 - * "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>  
34 - * ou escreva para a Fundação do Software Livre (FSF) Inc.,  
35 - * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.  
36 - */  
37 -package exception.handler.configuration.compatibility;  
38 -  
39 -import static org.junit.Assert.assertEquals;  
40 -  
41 -import java.io.IOException;  
42 -import java.net.URL;  
43 -  
44 -import org.apache.commons.httpclient.HttpClient;  
45 -import org.apache.commons.httpclient.HttpException;  
46 -import org.apache.commons.httpclient.HttpStatus;  
47 -import org.apache.commons.httpclient.methods.GetMethod;  
48 -import org.jboss.arquillian.container.test.api.Deployment;  
49 -import org.jboss.arquillian.junit.Arquillian;  
50 -import org.jboss.arquillian.test.api.ArquillianResource;  
51 -import org.jboss.shrinkwrap.api.spec.WebArchive;  
52 -import org.junit.Test;  
53 -import org.junit.runner.RunWith;  
54 -  
55 -import test.Tests;  
56 -import exception.handler.common.DummyException;  
57 -import exception.handler.common.ExceptionHandlerConfigBean;  
58 -  
59 -@RunWith(Arquillian.class)  
60 -public class ExceptionNotHandlerConfigTest {  
61 -  
62 - @ArquillianResource  
63 - private URL deploymentUrl;  
64 -  
65 - private static final String PATH = "src/test/resources/exception-handler-config-compatibility";  
66 -  
67 - @Deployment(testable = false)  
68 - public static WebArchive createDeployment() {  
69 - return Tests.createDeployment().addClasses(DummyException.class, ExceptionHandlerConfigBean.class)  
70 - .addAsWebResource(Tests.createFileAsset(PATH + "/index.xhtml"), "index.xhtml")  
71 - .addAsWebResource(Tests.createFileAsset(PATH + "/application_error.xhtml"), "application_error.xhtml")  
72 - .addAsWebInfResource(Tests.createFileAsset(PATH + "/web.xml"), "web.xml")  
73 - .addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties");  
74 - }  
75 -  
76 - @Test  
77 - public void notHandlerConfiguration() throws HttpException, IOException {  
78 - HttpClient client = new HttpClient();  
79 - GetMethod method = new GetMethod(deploymentUrl + "/index.jsf");  
80 -  
81 - int status = client.executeMethod(method);  
82 - assertEquals(HttpStatus.SC_INTERNAL_SERVER_ERROR, status);  
83 - }  
84 -}  
impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/application_error.xhtml
View file @502a3ec
@@ -1,9 +0,0 @@ @@ -1,9 +0,0 @@
1 -<html xmlns:h="http://java.sun.com/jsf/html"  
2 - xmlns:ui="http://java.sun.com/jsf/facelets">  
3 -  
4 - <h:message />  
5 - <h:body>  
6 - Called the page /application_error  
7 - </h:body>  
8 -  
9 -</html>  
10 \ No newline at end of file 0 \ No newline at end of file
impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/demoiselle.properties
View file @502a3ec
@@ -1,36 +0,0 @@ @@ -1,36 +0,0 @@
1 -# Demoiselle Framework  
2 -# Copyright (C) 2010 SERPRO  
3 -# ----------------------------------------------------------------------------  
4 -# This file is part of Demoiselle Framework.  
5 -#  
6 -# Demoiselle Framework is free software; you can redistribute it and/or  
7 -# modify it under the terms of the GNU Lesser General Public License version 3  
8 -# as published by the Free Software Foundation.  
9 -#  
10 -# This program is distributed in the hope that it will be useful,  
11 -# but WITHOUT ANY WARRANTY; without even the implied warranty of  
12 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the  
13 -# GNU General Public License for more details.  
14 -#  
15 -# You should have received a copy of the GNU Lesser General Public License version 3  
16 -# along with this program; if not, see <http://www.gnu.org/licenses/>  
17 -# or write to the Free Software Foundation, Inc., 51 Franklin Street,  
18 -# Fifth Floor, Boston, MA 02110-1301, USA.  
19 -# ----------------------------------------------------------------------------  
20 -# Este arquivo é parte do Framework Demoiselle.  
21 -#  
22 -# O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou  
23 -# modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação  
24 -# do Software Livre (FSF).  
25 -#  
26 -# Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA  
27 -# GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou  
28 -# APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português  
29 -# para maiores detalhes.  
30 -#  
31 -# Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título  
32 -# "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses/>  
33 -# ou escreva para a Fundação do Software Livre (FSF) Inc.,  
34 -# 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.  
35 -  
36 -frameworkdemoiselle.handle.application.exception=false  
37 \ No newline at end of file 0 \ No newline at end of file
impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/index.xhtml
View file @502a3ec
@@ -1,9 +0,0 @@ @@ -1,9 +0,0 @@
1 -<html xmlns:h="http://java.sun.com/jsf/html"  
2 - xmlns:ui="http://java.sun.com/jsf/facelets">  
3 -  
4 -<h:message />  
5 - <h:body>  
6 - #{exceptionHandlerConfigBean.exp}  
7 - </h:body>  
8 -  
9 -</html>  
impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/web.xml
View file @502a3ec
@@ -1,61 +0,0 @@ @@ -1,61 +0,0 @@
1 -<!--  
2 - Demoiselle Framework  
3 - Copyright (C) 2010 SERPRO  
4 - ============================================================================  
5 - This file is part of Demoiselle Framework.  
6 -  
7 - Demoiselle Framework is free software; you can redistribute it and/or  
8 - modify it under the terms of the GNU Lesser General Public License version 3  
9 - as published by the Free Software Foundation.  
10 -  
11 - This program is distributed in the hope that it will be useful,  
12 - but WITHOUT ANY WARRANTY; without even the implied warranty of  
13 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the  
14 - GNU General Public License for more details.  
15 -  
16 - You should have received a copy of the GNU Lesser General Public License version 3  
17 - along with this program; if not, see <http://www.gnu.org/licenses />  
18 - or write to the Free Software Foundation, Inc., 51 Franklin Street,  
19 - Fifth Floor, Boston, MA 02110-1301, USA.  
20 - ============================================================================  
21 - Este arquivo é parte do Framework Demoiselle.  
22 -  
23 - O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou  
24 - modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação  
25 - do Software Livre (FSF).  
26 -  
27 - Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA  
28 - GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou  
29 - APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português  
30 - para maiores detalhes.  
31 -  
32 - Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título  
33 - "LICENCA.txt", junto com esse programa. Se não, acesse <http://www.gnu.org/licenses />  
34 - ou escreva para a Fundação do Software Livre (FSF) Inc.,  
35 - 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.  
36 --->  
37 -<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"  
38 - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">  
39 -  
40 - <listener>  
41 - <listener-class>br.gov.frameworkdemoiselle.util.ServletListener</listener-class>  
42 - </listener>  
43 - <filter>  
44 - <filter-name>Demoiselle Servlet Filter</filter-name>  
45 - <filter-class>br.gov.frameworkdemoiselle.util.ServletFilter</filter-class>  
46 - </filter>  
47 - <filter-mapping>  
48 - <filter-name>Demoiselle Servlet Filter</filter-name>  
49 - <url-pattern>/*</url-pattern>  
50 - </filter-mapping>  
51 -  
52 - <servlet>  
53 - <servlet-name>Faces Servlet</servlet-name>  
54 - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>  
55 - <load-on-startup>1</load-on-startup>  
56 - </servlet>  
57 - <servlet-mapping>  
58 - <servlet-name>Faces Servlet</servlet-name>  
59 - <url-pattern>*.jsf</url-pattern>  
60 - </servlet-mapping>  
61 -</web-app>  
62 \ No newline at end of file 0 \ No newline at end of file