From 4ede141216f8f32082c796ddd2dec3cfeaf67f56 Mon Sep 17 00:00:00 2001
From: Cleverson Sacramento <cleverson.sacramento@gmail.com>
Date: Mon, 16 Jul 2012 09:52:11 -0300
Subject: [PATCH] Ajuste no nome do ServletContextListener do framework

---
 archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml               |  9 ++++++++-
 impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/DemoiselleServletContextListener.java | 20 --------------------
 impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/ServletContextListener.java           | 19 +++++++++++++++++++
 impl/extension/jsf/src/main/resources/META-INF/web-fragment.xml                                        | 43 ++++++++++++++++++++++++++++++++++++++++---
 4 files changed, 67 insertions(+), 24 deletions(-)
 delete mode 100644 impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/DemoiselleServletContextListener.java
 create mode 100644 impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/ServletContextListener.java

diff --git a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
index ad4a12c..f0f8d9e 100755
--- a/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
+++ b/archetype/jsf-jpa/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml
@@ -10,6 +10,13 @@
 	</listener>
  	-->
 
+ 	<!-- If you are using servlet 2.5 then uncomment this listener -->
+ 	<!--
+	<listener>
+		<listener-class>br.gov.frameworkdemoiselle.util.ServletContextListener</listener-class>
+	</listener>
+ 	-->
+
 	<servlet>
 		<servlet-name>Faces Servlet</servlet-name>
 		<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
@@ -29,5 +36,5 @@
 		</web-resource-collection>
 		<auth-constraint />
 	</security-constraint>
-	
+
 </web-app>
diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/DemoiselleServletContextListener.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/DemoiselleServletContextListener.java
deleted file mode 100644
index 61c2cf4..0000000
--- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/DemoiselleServletContextListener.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package br.gov.frameworkdemoiselle.util;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-import br.gov.frameworkdemoiselle.internal.bootstrap.ShutdownBootstrap;
-import br.gov.frameworkdemoiselle.internal.bootstrap.StartupBootstrap;
-
-public class DemoiselleServletContextListener implements ServletContextListener {
-
-	@Override
-	public void contextInitialized(ServletContextEvent event) {
-		StartupBootstrap.startup();
-	}
-
-	@Override
-	public void contextDestroyed(ServletContextEvent event) {
-		ShutdownBootstrap.shutdown();
-	}
-}
diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/ServletContextListener.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/ServletContextListener.java
new file mode 100644
index 0000000..431c294
--- /dev/null
+++ b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/util/ServletContextListener.java
@@ -0,0 +1,19 @@
+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 ServletContextListener 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/jsf/src/main/resources/META-INF/web-fragment.xml b/impl/extension/jsf/src/main/resources/META-INF/web-fragment.xml
index 2fed417..4483b3a 100644
--- a/impl/extension/jsf/src/main/resources/META-INF/web-fragment.xml
+++ b/impl/extension/jsf/src/main/resources/META-INF/web-fragment.xml
@@ -1,7 +1,44 @@
-<web-fragment>
+<!--
+ 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 <http://www.gnu.org/licenses/>
+ 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 <http://www.gnu.org/licenses/>
+ ou escreva para a Fundação do Software Livre (FSF) Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02111-1301, USA.
+-->
+<web-fragment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd" version="3.0">
 
 	<listener>
-		<listener-class>br.gov.frameworkdemoiselle.util.DemoiselleServletContextListener</listener-class>
+		<listener-class>br.gov.frameworkdemoiselle.util.ServletContextListener</listener-class>
 	</listener>
 
-</web-fragment>
\ No newline at end of file
+</web-fragment>
--
libgit2 0.21.2