From 18de47703b065acd3a3d8a26b7f08a4909c4801f Mon Sep 17 00:00:00 2001 From: Cleverson Sacramento Date: Thu, 30 Oct 2014 09:56:32 -0200 Subject: [PATCH] FWK-203: Exclusão de funcionalidades e classes depreciadas na versão 2.4 --- impl/core/src/main/java/br/gov/frameworkdemoiselle/util/NameQualifier.java | 10 ++++------ impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/EntityManagerProducer.java | 1 - impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ApplicationExceptionHandler.java | 2 +- impl/extension/jsf/src/test/java/exception/handler/configuration/compatibility/ExceptionHandlerRedirectConfigTest.java | 84 ------------------------------------------------------------------------------------ impl/extension/jsf/src/test/java/exception/handler/configuration/compatibility/ExceptionNotHandlerConfigTest.java | 84 ------------------------------------------------------------------------------------ impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/application_error.xhtml | 9 --------- impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/demoiselle.properties | 36 ------------------------------------ impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/index.xhtml | 9 --------- impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/web.xml | 61 ------------------------------------------------------------- 9 files changed, 5 insertions(+), 291 deletions(-) delete mode 100644 impl/extension/jsf/src/test/java/exception/handler/configuration/compatibility/ExceptionHandlerRedirectConfigTest.java delete mode 100644 impl/extension/jsf/src/test/java/exception/handler/configuration/compatibility/ExceptionNotHandlerConfigTest.java delete mode 100644 impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/application_error.xhtml delete mode 100644 impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/demoiselle.properties delete mode 100644 impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/index.xhtml delete mode 100644 impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/web.xml diff --git a/impl/core/src/main/java/br/gov/frameworkdemoiselle/util/NameQualifier.java b/impl/core/src/main/java/br/gov/frameworkdemoiselle/util/NameQualifier.java index 322a3c9..a08f744 100644 --- a/impl/core/src/main/java/br/gov/frameworkdemoiselle/util/NameQualifier.java +++ b/impl/core/src/main/java/br/gov/frameworkdemoiselle/util/NameQualifier.java @@ -38,16 +38,14 @@ package br.gov.frameworkdemoiselle.util; import javax.enterprise.util.AnnotationLiteral; -import util.beans.ambiguous.AmbiguousQualifier; import br.gov.frameworkdemoiselle.annotation.Name; /** - * Annotation litteral that allows to create instances of the {@link Name} qualifier. - * The created instance can then be used to call {@link Beans#getReference(Class type, Annotation... qualifiers)}. - * + * Annotation litteral that allows to create instances of the {@link Name} qualifier. The created instance can then be + * used to call {@link Beans#getReference(Class type, Annotation... qualifiers)}. + * * @see Beans * @see AmbiguousQualifier - * * @author SERPRO */ @SuppressWarnings("all") @@ -61,7 +59,7 @@ public class NameQualifier extends AnnotationLiteral implements Name { * Constructor with string value of name qualifier. * * @param value - * value of name qualifier. + * value of name qualifier. */ public NameQualifier(String value) { this.value = value; diff --git a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/EntityManagerProducer.java b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/EntityManagerProducer.java index 81e8c17..03f2b2a 100644 --- a/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/EntityManagerProducer.java +++ b/impl/extension/jpa/src/main/java/br/gov/frameworkdemoiselle/internal/producer/EntityManagerProducer.java @@ -47,7 +47,6 @@ import javax.enterprise.inject.spi.InjectionPoint; import javax.inject.Inject; import javax.persistence.EntityManager; -import util.beans.ambiguous.AmbiguousQualifier; import br.gov.frameworkdemoiselle.annotation.Name; import br.gov.frameworkdemoiselle.internal.configuration.EntityManagerConfig; import br.gov.frameworkdemoiselle.internal.proxy.EntityManagerProxy; diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ApplicationExceptionHandler.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ApplicationExceptionHandler.java index 0640796..19d11ac 100644 --- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ApplicationExceptionHandler.java +++ b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/ApplicationExceptionHandler.java @@ -100,7 +100,7 @@ public class ApplicationExceptionHandler extends AbstractExceptionHandler { "A tela de exibição de erros: \"" + ex.getViewId() + "\" não foi encontrada. Caso o seu projeto possua outra, defina no arquivo de configuração a chave \"" - + "frameworkdemoiselle.handle.application.exception.page" + "\"", ex); + + "frameworkdemoiselle.exception.default.redirect.page" + "\"", ex); } return handled; } diff --git a/impl/extension/jsf/src/test/java/exception/handler/configuration/compatibility/ExceptionHandlerRedirectConfigTest.java b/impl/extension/jsf/src/test/java/exception/handler/configuration/compatibility/ExceptionHandlerRedirectConfigTest.java deleted file mode 100644 index 063292c..0000000 --- a/impl/extension/jsf/src/test/java/exception/handler/configuration/compatibility/ExceptionHandlerRedirectConfigTest.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Demoiselle Framework - * Copyright (C) 2010 SERPRO - * ---------------------------------------------------------------------------- - * This file is part of Demoiselle Framework. - * - * Demoiselle Framework is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License version 3 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License version 3 - * along with this program; if not, see - * or write to the Free Software Foundation, Inc., 51 Franklin Street, - * Fifth Floor, Boston, MA 02110-1301, USA. - * ---------------------------------------------------------------------------- - * Este arquivo é parte do Framework Demoiselle. - * - * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou - * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação - * do Software Livre (FSF). - * - * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA - * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou - * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português - * para maiores detalhes. - * - * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título - * "LICENCA.txt", junto com esse programa. Se não, acesse - * ou escreva para a Fundação do Software Livre (FSF) Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. - */ -package exception.handler.configuration.compatibility; - -import static org.junit.Assert.assertTrue; - -import java.io.IOException; -import java.net.URL; - -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.HttpException; -import org.apache.commons.httpclient.methods.GetMethod; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Test; -import org.junit.runner.RunWith; - -import test.Tests; -import exception.handler.common.DummyException; -import exception.handler.common.ExceptionHandlerConfigBean; - -@RunWith(Arquillian.class) -public class ExceptionHandlerRedirectConfigTest { - - @ArquillianResource - private URL deploymentUrl; - - private static final String PATH = "src/test/resources/exception-handler-redirect-config-compatibility"; - - @Deployment(testable = false) - public static WebArchive createDeployment() { - return Tests.createDeployment().addClasses(DummyException.class, ExceptionHandlerConfigBean.class) - .addAsWebResource(Tests.createFileAsset(PATH + "/index.xhtml"), "index.xhtml") - .addAsWebResource(Tests.createFileAsset(PATH + "/error_page.xhtml"), "error_page.xhtml") - .addAsWebInfResource(Tests.createFileAsset(PATH + "/web.xml"), "web.xml") - .addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties"); - } - - @Test - public void notHandlerConfiguration() throws HttpException, IOException { - HttpClient client = new HttpClient(); - GetMethod method = new GetMethod(deploymentUrl + "/index.jsf"); - - client.executeMethod(method); - String message = method.getResponseBodyAsString(); - assertTrue(message.contains("Called the page /error_page")); - } -} diff --git a/impl/extension/jsf/src/test/java/exception/handler/configuration/compatibility/ExceptionNotHandlerConfigTest.java b/impl/extension/jsf/src/test/java/exception/handler/configuration/compatibility/ExceptionNotHandlerConfigTest.java deleted file mode 100644 index 816fc1a..0000000 --- a/impl/extension/jsf/src/test/java/exception/handler/configuration/compatibility/ExceptionNotHandlerConfigTest.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Demoiselle Framework - * Copyright (C) 2010 SERPRO - * ---------------------------------------------------------------------------- - * This file is part of Demoiselle Framework. - * - * Demoiselle Framework is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License version 3 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License version 3 - * along with this program; if not, see - * or write to the Free Software Foundation, Inc., 51 Franklin Street, - * Fifth Floor, Boston, MA 02110-1301, USA. - * ---------------------------------------------------------------------------- - * Este arquivo é parte do Framework Demoiselle. - * - * O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou - * modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação - * do Software Livre (FSF). - * - * Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA - * GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou - * APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português - * para maiores detalhes. - * - * Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título - * "LICENCA.txt", junto com esse programa. Se não, acesse - * ou escreva para a Fundação do Software Livre (FSF) Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. - */ -package exception.handler.configuration.compatibility; - -import static org.junit.Assert.assertEquals; - -import java.io.IOException; -import java.net.URL; - -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.HttpException; -import org.apache.commons.httpclient.HttpStatus; -import org.apache.commons.httpclient.methods.GetMethod; -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Test; -import org.junit.runner.RunWith; - -import test.Tests; -import exception.handler.common.DummyException; -import exception.handler.common.ExceptionHandlerConfigBean; - -@RunWith(Arquillian.class) -public class ExceptionNotHandlerConfigTest { - - @ArquillianResource - private URL deploymentUrl; - - private static final String PATH = "src/test/resources/exception-handler-config-compatibility"; - - @Deployment(testable = false) - public static WebArchive createDeployment() { - return Tests.createDeployment().addClasses(DummyException.class, ExceptionHandlerConfigBean.class) - .addAsWebResource(Tests.createFileAsset(PATH + "/index.xhtml"), "index.xhtml") - .addAsWebResource(Tests.createFileAsset(PATH + "/application_error.xhtml"), "application_error.xhtml") - .addAsWebInfResource(Tests.createFileAsset(PATH + "/web.xml"), "web.xml") - .addAsResource(Tests.createFileAsset(PATH + "/demoiselle.properties"), "demoiselle.properties"); - } - - @Test - public void notHandlerConfiguration() throws HttpException, IOException { - HttpClient client = new HttpClient(); - GetMethod method = new GetMethod(deploymentUrl + "/index.jsf"); - - int status = client.executeMethod(method); - assertEquals(HttpStatus.SC_INTERNAL_SERVER_ERROR, status); - } -} diff --git a/impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/application_error.xhtml b/impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/application_error.xhtml deleted file mode 100644 index 83fe20d..0000000 --- a/impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/application_error.xhtml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - Called the page /application_error - - - \ No newline at end of file diff --git a/impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/demoiselle.properties b/impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/demoiselle.properties deleted file mode 100644 index 4780cd1..0000000 --- a/impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/demoiselle.properties +++ /dev/null @@ -1,36 +0,0 @@ -# Demoiselle Framework -# Copyright (C) 2010 SERPRO -# ---------------------------------------------------------------------------- -# This file is part of Demoiselle Framework. -# -# Demoiselle Framework is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License version 3 -# as published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License version 3 -# along with this program; if not, see -# or write to the Free Software Foundation, Inc., 51 Franklin Street, -# Fifth Floor, Boston, MA 02110-1301, USA. -# ---------------------------------------------------------------------------- -# Este arquivo é parte do Framework Demoiselle. -# -# O Framework Demoiselle é um software livre; você pode redistribuí-lo e/ou -# modificá-lo dentro dos termos da GNU LGPL versão 3 como publicada pela Fundação -# do Software Livre (FSF). -# -# Este programa é distribuído na esperança que possa ser útil, mas SEM NENHUMA -# GARANTIA; sem uma garantia implícita de ADEQUAÇÃO a qualquer MERCADO ou -# APLICAÇÃO EM PARTICULAR. Veja a Licença Pública Geral GNU/LGPL em português -# para maiores detalhes. -# -# Você deve ter recebido uma cópia da GNU LGPL versão 3, sob o título -# "LICENCA.txt", junto com esse programa. Se não, acesse -# ou escreva para a Fundação do Software Livre (FSF) Inc., -# 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA. - -frameworkdemoiselle.handle.application.exception=false \ No newline at end of file diff --git a/impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/index.xhtml b/impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/index.xhtml deleted file mode 100644 index 6b08495..0000000 --- a/impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/index.xhtml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - #{exceptionHandlerConfigBean.exp} - - - diff --git a/impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/web.xml b/impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/web.xml deleted file mode 100644 index c2a321e..0000000 --- a/impl/extension/jsf/src/test/resources/exception-handler-config-compatibility/web.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - br.gov.frameworkdemoiselle.util.ServletListener - - - Demoiselle Servlet Filter - br.gov.frameworkdemoiselle.util.ServletFilter - - - Demoiselle Servlet Filter - /* - - - - Faces Servlet - javax.faces.webapp.FacesServlet - 1 - - - Faces Servlet - *.jsf - - \ No newline at end of file -- libgit2 0.21.2