From 63ba58abf29a9dbbe2befa708d47e0883757717d Mon Sep 17 00:00:00 2001 From: Cleverson Sacramento Date: Thu, 19 Jul 2012 17:27:22 -0300 Subject: [PATCH] Criação da extensão Servlet e transferência de recursos da extensão JSF para a Servlet. --- impl/extension/jsf/pom.xml | 12 ++++-------- impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/JsfBootstrap.java | 11 +++++++++++ impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletRequestProducer.java | 53 ----------------------------------------------------- impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletResponseProducer.java | 53 ----------------------------------------------------- impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpSessionProducer.java | 55 ------------------------------------------------------- impl/extension/jsf/src/main/resources/META-INF/web-fragment.xml | 44 -------------------------------------------- impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletRequestProducerTest.java | 81 --------------------------------------------------------------------------------- impl/extension/pom.xml | 1 + impl/extension/servlet/.gitignore | 5 +++++ impl/extension/servlet/pom.xml | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletRequestProducer.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletResponseProducer.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpSessionProducer.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ServletLocaleProducer.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/ServletContextListener.java | 44 ++++++++++++++++++++++++++++++++++++++++++++ impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/ServletFilter.java | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/ServletListener.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ impl/extension/servlet/src/main/resources/META-INF/beans.xml | 40 ++++++++++++++++++++++++++++++++++++++++ impl/extension/servlet/src/main/resources/META-INF/web-fragment.xml | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ impl/extension/servlet/src/main/resources/demoiselle-servlet-bundle.properties | 36 ++++++++++++++++++++++++++++++++++++ parent/framework/pom.xml | 5 +++++ 21 files changed, 626 insertions(+), 294 deletions(-) delete mode 100644 impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletRequestProducer.java delete mode 100644 impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletResponseProducer.java delete mode 100644 impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpSessionProducer.java delete mode 100644 impl/extension/jsf/src/main/resources/META-INF/web-fragment.xml delete mode 100644 impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletRequestProducerTest.java create mode 100644 impl/extension/servlet/.gitignore create mode 100755 impl/extension/servlet/pom.xml create mode 100644 impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletRequestProducer.java create mode 100644 impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletResponseProducer.java create mode 100644 impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpSessionProducer.java create mode 100644 impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ServletLocaleProducer.java create mode 100644 impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/ServletContextListener.java create mode 100644 impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/ServletFilter.java create mode 100644 impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/ServletListener.java create mode 100644 impl/extension/servlet/src/main/resources/META-INF/beans.xml create mode 100644 impl/extension/servlet/src/main/resources/META-INF/web-fragment.xml create mode 100644 impl/extension/servlet/src/main/resources/demoiselle-servlet-bundle.properties diff --git a/impl/extension/jsf/pom.xml b/impl/extension/jsf/pom.xml index 946c60d..e9b4b6c 100755 --- a/impl/extension/jsf/pom.xml +++ b/impl/extension/jsf/pom.xml @@ -53,6 +53,10 @@ + br.gov.frameworkdemoiselle + demoiselle-servlet + + com.sun.faces jsf-api @@ -61,14 +65,6 @@ jsf-impl - javax.servlet - jstl - - - javax.servlet - servlet-api - - javax.el el-api diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/JsfBootstrap.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/JsfBootstrap.java index 13c286c..f1e7691 100644 --- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/JsfBootstrap.java +++ b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/bootstrap/JsfBootstrap.java @@ -38,11 +38,22 @@ package br.gov.frameworkdemoiselle.internal.bootstrap; import javax.enterprise.event.Observes; import javax.enterprise.inject.spi.AfterBeanDiscovery; +import javax.enterprise.inject.spi.AnnotatedType; +import javax.enterprise.inject.spi.ProcessAnnotatedType; import br.gov.frameworkdemoiselle.internal.context.ViewContext; +import br.gov.frameworkdemoiselle.internal.producer.ServletLocaleProducer; public class JsfBootstrap extends AbstractBootstrap { + protected void cancelServletLocaleProducer(@Observes final ProcessAnnotatedType event) { + final AnnotatedType annotatedType = event.getAnnotatedType(); + + if (annotatedType.getJavaClass() == ServletLocaleProducer.class) { + event.veto(); + } + } + public void loadContexts(@Observes final AfterBeanDiscovery event) { addContext(new ViewContext(), event); } diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletRequestProducer.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletRequestProducer.java deleted file mode 100644 index 359ddb5..0000000 --- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletRequestProducer.java +++ /dev/null @@ -1,53 +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 br.gov.frameworkdemoiselle.internal.producer; - -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Produces; -import javax.faces.context.FacesContext; -import javax.servlet.http.HttpServletRequest; - -public class HttpServletRequestProducer { - - @Produces - @Default - @RequestScoped - public HttpServletRequest create(final FacesContext facesContext) { - return (HttpServletRequest) facesContext.getExternalContext().getRequest(); - } -} diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletResponseProducer.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletResponseProducer.java deleted file mode 100644 index b252efa..0000000 --- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletResponseProducer.java +++ /dev/null @@ -1,53 +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 br.gov.frameworkdemoiselle.internal.producer; - -import javax.enterprise.context.RequestScoped; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Produces; -import javax.faces.context.FacesContext; -import javax.servlet.http.HttpServletResponse; - -public class HttpServletResponseProducer { - - @Produces - @Default - @RequestScoped - public HttpServletResponse create(final FacesContext facesContext) { - return (HttpServletResponse) facesContext.getExternalContext().getResponse(); - } -} diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpSessionProducer.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpSessionProducer.java deleted file mode 100644 index 8ec467b..0000000 --- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpSessionProducer.java +++ /dev/null @@ -1,55 +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 br.gov.frameworkdemoiselle.internal.producer; - -import javax.enterprise.context.SessionScoped; -import javax.enterprise.inject.Default; -import javax.enterprise.inject.Produces; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - -import br.gov.frameworkdemoiselle.internal.proxy.HttpSessionProxy; - -public class HttpSessionProducer { - - @Produces - @Default - @SessionScoped - public HttpSession create(final HttpServletRequest request) { - return new HttpSessionProxy(request.getSession()); - } -} diff --git a/impl/extension/jsf/src/main/resources/META-INF/web-fragment.xml b/impl/extension/jsf/src/main/resources/META-INF/web-fragment.xml deleted file mode 100644 index 4483b3a..0000000 --- a/impl/extension/jsf/src/main/resources/META-INF/web-fragment.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - br.gov.frameworkdemoiselle.util.ServletContextListener - - - diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletRequestProducerTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletRequestProducerTest.java deleted file mode 100644 index 1056dc3..0000000 --- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletRequestProducerTest.java +++ /dev/null @@ -1,81 +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 br.gov.frameworkdemoiselle.internal.producer; - -import static org.easymock.EasyMock.expect; -import static org.junit.Assert.assertEquals; -import static org.powermock.api.easymock.PowerMock.replay; -import static org.powermock.api.easymock.PowerMock.verifyAll; - -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; -import javax.servlet.http.HttpServletRequest; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.powermock.api.easymock.PowerMock; -import org.powermock.core.classloader.annotations.PrepareForTest; -import org.powermock.modules.junit4.PowerMockRunner; - -@RunWith(PowerMockRunner.class) -@PrepareForTest({ HttpServletRequest.class }) -public class HttpServletRequestProducerTest { - - private HttpServletRequestProducer producer; - - @Before - public void before() { - this.producer = new HttpServletRequestProducer(); - } - - @Test - public void testCreate() { - FacesContext facesContext = PowerMock.createMock(FacesContext.class); - ExternalContext externalContext = PowerMock.createMock(ExternalContext.class); - HttpServletRequest request = PowerMock.createMock(HttpServletRequest.class); - - expect(externalContext.getRequest()).andReturn(request); - expect(facesContext.getExternalContext()).andReturn(externalContext); - replay(facesContext, externalContext, request); - - assertEquals(request, producer.create(facesContext)); - - verifyAll(); - } - -} diff --git a/impl/extension/pom.xml b/impl/extension/pom.xml index f8dc8e0..fea9ab7 100755 --- a/impl/extension/pom.xml +++ b/impl/extension/pom.xml @@ -48,6 +48,7 @@ jta + servlet jsf se jpa diff --git a/impl/extension/servlet/.gitignore b/impl/extension/servlet/.gitignore new file mode 100644 index 0000000..221c8fc --- /dev/null +++ b/impl/extension/servlet/.gitignore @@ -0,0 +1,5 @@ +/target +/.project +/.classpath +/.settings +/.externalToolBuilders diff --git a/impl/extension/servlet/pom.xml b/impl/extension/servlet/pom.xml new file mode 100755 index 0000000..be5574a --- /dev/null +++ b/impl/extension/servlet/pom.xml @@ -0,0 +1,72 @@ + + + + 4.0.0 + + demoiselle-servlet + jar + + + br.gov.frameworkdemoiselle + demoiselle-extension-parent + 2.3.0-BETA2-SNAPSHOT + ../../../parent/extension/pom.xml + + + Servlet Extension + + + + + javax.servlet + jstl + + + javax.servlet + servlet-api + + + + + + demoiselle.sourceforge.net + Demoiselle Maven Repository + http://demoiselle.sourceforge.net/repository/release + + + diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletRequestProducer.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletRequestProducer.java new file mode 100644 index 0000000..8f27efc --- /dev/null +++ b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletRequestProducer.java @@ -0,0 +1,58 @@ +/* + * 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 br.gov.frameworkdemoiselle.internal.producer; + +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Default; +import javax.enterprise.inject.Produces; +import javax.servlet.http.HttpServletRequest; + +@RequestScoped +public class HttpServletRequestProducer { + + private HttpServletRequest request; + + @Default + @Produces + public HttpServletRequest create() { + return request; + } + + public void setRequest(HttpServletRequest request) { + this.request = request; + } +} diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletResponseProducer.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletResponseProducer.java new file mode 100644 index 0000000..f788ab7 --- /dev/null +++ b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpServletResponseProducer.java @@ -0,0 +1,58 @@ +/* + * 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 br.gov.frameworkdemoiselle.internal.producer; + +import javax.enterprise.context.RequestScoped; +import javax.enterprise.inject.Default; +import javax.enterprise.inject.Produces; +import javax.servlet.http.HttpServletResponse; + +@RequestScoped +public class HttpServletResponseProducer { + + private HttpServletResponse response; + + @Default + @Produces + public HttpServletResponse create() { + return response; + } + + public void setResponse(HttpServletResponse response) { + this.response = response; + } +} diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpSessionProducer.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpSessionProducer.java new file mode 100644 index 0000000..60345ff --- /dev/null +++ b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/HttpSessionProducer.java @@ -0,0 +1,53 @@ +/* + * 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 br.gov.frameworkdemoiselle.internal.producer; + +import javax.enterprise.context.SessionScoped; +import javax.enterprise.inject.Default; +import javax.enterprise.inject.Produces; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +public class HttpSessionProducer { + + @Produces + @Default + @SessionScoped + public HttpSession create(final HttpServletRequest request) { + return request.getSession(); + } +} diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ServletLocaleProducer.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ServletLocaleProducer.java new file mode 100644 index 0000000..0707531 --- /dev/null +++ b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/internal/producer/ServletLocaleProducer.java @@ -0,0 +1,56 @@ +/* + * 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 br.gov.frameworkdemoiselle.internal.producer; + +import java.util.Locale; + +import javax.enterprise.inject.Default; +import javax.enterprise.inject.Produces; +import javax.inject.Inject; +import javax.servlet.http.HttpServletRequest; + +public class ServletLocaleProducer { + + @Inject + private HttpServletRequest request; + + @Produces + @Default + public Locale create() { + return request.getLocale(); + } +} diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/ServletContextListener.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/ServletContextListener.java new file mode 100644 index 0000000..22d7a2c --- /dev/null +++ b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/ServletContextListener.java @@ -0,0 +1,44 @@ +/* + * 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 br.gov.frameworkdemoiselle.util; + +/** + * @deprecated Use br.gov.frameworkdemoiselle.util.ServletListener instead. + */ +@Deprecated +public class ServletContextListener extends ServletListener { +} diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/ServletFilter.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/ServletFilter.java new file mode 100644 index 0000000..d4b284a --- /dev/null +++ b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/ServletFilter.java @@ -0,0 +1,75 @@ +/* + * 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 br.gov.frameworkdemoiselle.util; + +import java.io.IOException; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import br.gov.frameworkdemoiselle.internal.producer.HttpServletRequestProducer; +import br.gov.frameworkdemoiselle.internal.producer.HttpServletResponseProducer; + +public class ServletFilter implements Filter { + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + } + + @Override + public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, + ServletException { + + HttpServletRequestProducer requestProducer = Beans.getReference(HttpServletRequestProducer.class); + requestProducer.setRequest((HttpServletRequest) request); + + HttpServletResponseProducer responseProducer = Beans.getReference(HttpServletResponseProducer.class); + responseProducer.setResponse((HttpServletResponse) response); + + chain.doFilter(request, response); + } + + @Override + public void destroy() { + } +} diff --git a/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/ServletListener.java b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/ServletListener.java new file mode 100644 index 0000000..37d75eb --- /dev/null +++ b/impl/extension/servlet/src/main/java/br/gov/frameworkdemoiselle/util/ServletListener.java @@ -0,0 +1,55 @@ +/* + * 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 br.gov.frameworkdemoiselle.util; + +import javax.servlet.ServletContextEvent; + +import br.gov.frameworkdemoiselle.internal.bootstrap.ShutdownBootstrap; +import br.gov.frameworkdemoiselle.internal.bootstrap.StartupBootstrap; + +public class ServletListener implements javax.servlet.ServletContextListener { + + @Override + public void contextInitialized(ServletContextEvent event) { + StartupBootstrap.startup(); + } + + @Override + public void contextDestroyed(ServletContextEvent event) { + ShutdownBootstrap.shutdown(); + } +} diff --git a/impl/extension/servlet/src/main/resources/META-INF/beans.xml b/impl/extension/servlet/src/main/resources/META-INF/beans.xml new file mode 100644 index 0000000..527e828 --- /dev/null +++ b/impl/extension/servlet/src/main/resources/META-INF/beans.xml @@ -0,0 +1,40 @@ + + + + \ No newline at end of file diff --git a/impl/extension/servlet/src/main/resources/META-INF/web-fragment.xml b/impl/extension/servlet/src/main/resources/META-INF/web-fragment.xml new file mode 100644 index 0000000..fb3ed54 --- /dev/null +++ b/impl/extension/servlet/src/main/resources/META-INF/web-fragment.xml @@ -0,0 +1,53 @@ + + + + + br.gov.frameworkdemoiselle.util.ServletListener + + + + Demoiselle Servlet Filter + br.gov.frameworkdemoiselle.util.ServletFilter + + + Demoiselle Servlet Filter + /* + + + diff --git a/impl/extension/servlet/src/main/resources/demoiselle-servlet-bundle.properties b/impl/extension/servlet/src/main/resources/demoiselle-servlet-bundle.properties new file mode 100644 index 0000000..52a1346 --- /dev/null +++ b/impl/extension/servlet/src/main/resources/demoiselle-servlet-bundle.properties @@ -0,0 +1,36 @@ +# 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. + +id-converter-not-found=Voc\u00EA precisa criar um FacesConverter para a classe "{0}". \ No newline at end of file diff --git a/parent/framework/pom.xml b/parent/framework/pom.xml index 327e968..71e07e6 100755 --- a/parent/framework/pom.xml +++ b/parent/framework/pom.xml @@ -38,6 +38,11 @@ br.gov.frameworkdemoiselle + demoiselle-servlet + 2.3.0-BETA2-SNAPSHOT + + + br.gov.frameworkdemoiselle demoiselle-jsf 2.3.0-BETA2-SNAPSHOT -- libgit2 0.21.2