diff --git a/impl/core/src/test/java/br/gov/frameworkdemoiselle/util/BeansTest.java b/impl/core/src/test/java/br/gov/frameworkdemoiselle/util/BeansTest.java
index 47c2dbe..904f802 100644
--- a/impl/core/src/test/java/br/gov/frameworkdemoiselle/util/BeansTest.java
+++ b/impl/core/src/test/java/br/gov/frameworkdemoiselle/util/BeansTest.java
@@ -50,7 +50,6 @@ 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;
diff --git a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/HttpSessionProxy.java b/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/HttpSessionProxy.java
deleted file mode 100644
index 4880f20..0000000
--- a/impl/extension/jsf/src/main/java/br/gov/frameworkdemoiselle/internal/proxy/HttpSessionProxy.java
+++ /dev/null
@@ -1,147 +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.proxy;
-
-import java.io.Serializable;
-import java.util.Enumeration;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionContext;
-
-@SuppressWarnings("deprecation")
-public class HttpSessionProxy implements HttpSession, Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private transient final HttpSession delegate;
-
- public HttpSessionProxy(HttpSession httpSession) {
- this.delegate = httpSession;
- }
-
- @Override
- public long getCreationTime() {
- return this.delegate.getCreationTime();
- }
-
- @Override
- public String getId() {
- return this.delegate.getId();
- }
-
- @Override
- public long getLastAccessedTime() {
- return this.delegate.getLastAccessedTime();
- }
-
- @Override
- public ServletContext getServletContext() {
- return this.delegate.getServletContext();
- }
-
- @Override
- public void setMaxInactiveInterval(int interval) {
- this.delegate.setMaxInactiveInterval(interval);
- }
-
- @Override
- public int getMaxInactiveInterval() {
- return this.delegate.getMaxInactiveInterval();
- }
-
- @Override
- @Deprecated
- public HttpSessionContext getSessionContext() {
- return this.delegate.getSessionContext();
- }
-
- @Override
- public Object getAttribute(String name) {
- return this.delegate.getAttribute(name);
- }
-
- @Override
- @Deprecated
- public Object getValue(String name) {
- return this.delegate.getValue(name);
- }
-
- @Override
- public Enumeration getAttributeNames() {
- return this.delegate.getAttributeNames();
- }
-
- @Override
- @Deprecated
- public String[] getValueNames() {
- return this.delegate.getValueNames();
- }
-
- @Override
- public void setAttribute(String name, Object value) {
- this.delegate.setAttribute(name, value);
- }
-
- @Override
- @Deprecated
- public void putValue(String name, Object value) {
- this.delegate.putValue(name, value);
- }
-
- @Override
- public void removeAttribute(String name) {
- this.delegate.removeAttribute(name);
- }
-
- @Override
- @Deprecated
- public void removeValue(String name) {
- this.delegate.removeValue(name);
- }
-
- @Override
- public void invalidate() {
- this.delegate.invalidate();
- }
-
- @Override
- public boolean isNew() {
- return this.delegate.isNew();
- }
-
-}
diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpSessionProducerTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpSessionProducerTest.java
deleted file mode 100644
index 4234a2b..0000000
--- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/producer/HttpSessionProducerTest.java
+++ /dev/null
@@ -1,70 +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 org.junit.Ignore;
-import javax.servlet.http.HttpServletRequest;
-
-import org.easymock.EasyMock;
-import org.junit.Assert;
-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;
-
-import br.gov.frameworkdemoiselle.internal.proxy.HttpSessionProxy;
-@Ignore
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ HttpServletRequest.class })
-public class HttpSessionProducerTest {
-
- private HttpSessionProducer producer;
-
- @Before
- public void before() {
- producer = new HttpSessionProducer();
- }
-
- @Test
- public void testCreate() {
- HttpServletRequest request = PowerMock.createMock(HttpServletRequest.class);
- EasyMock.expect(request.getSession()).andReturn(null);
- Assert.assertTrue(producer.create(request).getClass().equals(HttpSessionProxy.class));
- }
-
-}
diff --git a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/HttpSessionProxyTest.java b/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/HttpSessionProxyTest.java
deleted file mode 100644
index ec6dc9b..0000000
--- a/impl/extension/jsf/src/test/java/br/gov/frameworkdemoiselle/internal/proxy/HttpSessionProxyTest.java
+++ /dev/null
@@ -1,125 +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.proxy;
-
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.assertEquals;
-
-import java.util.Enumeration;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionContext;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.easymock.PowerMock;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-@SuppressWarnings("deprecation")
-@RunWith(PowerMockRunner.class)
-public class HttpSessionProxyTest {
-
- private HttpSessionProxy proxy;
-
- private ServletContext servletContext;
-
- private Enumeration enumeration;
-
- private HttpSession session;
-
- private HttpSessionContext sessionContext;
-
- @Before
- public void before() {
- session = PowerMock.createMock(HttpSession.class);
- servletContext = PowerMock.createMock(ServletContext.class);
- enumeration = PowerMock.createMock(Enumeration.class);
- sessionContext = PowerMock.createMock(HttpSessionContext.class);
-
- expect(session.getValueNames()).andReturn(new String[] { "abcdef" });
- expect(session.getValue("value")).andReturn("value");
- expect(session.getSessionContext()).andReturn(sessionContext);
- expect(session.getCreationTime()).andReturn(10L);
- expect(session.getId()).andReturn("ID");
- expect(session.getLastAccessedTime()).andReturn(1L);
- expect(session.getServletContext()).andReturn(servletContext);
- expect(session.getMaxInactiveInterval()).andReturn(2);
- expect(session.getAttribute("attribute")).andReturn("attribute-1");
- expect(session.getAttributeNames()).andReturn(enumeration);
- expect(session.isNew()).andReturn(true);
-
- session.removeValue("removeValue");
- session.putValue("put", "it");
- session.invalidate();
- session.removeAttribute("remove");
- session.setAttribute("name", "object");
- session.setMaxInactiveInterval(1);
-
- replay(session);
-
- proxy = new HttpSessionProxy(session);
- }
-
- @Test
- public void testDelegation() {
- assertEquals(sessionContext, proxy.getSessionContext());
- assertEquals("value", proxy.getValue("value"));
- assertEquals("abcdef", proxy.getValueNames()[0]);
- assertEquals(10L, proxy.getCreationTime());
- assertEquals("ID", proxy.getId());
- assertEquals(1L, proxy.getLastAccessedTime());
- assertEquals(servletContext, proxy.getServletContext());
- assertEquals(2, proxy.getMaxInactiveInterval());
- assertEquals("attribute-1", proxy.getAttribute("attribute"));
- assertEquals(enumeration, proxy.getAttributeNames());
- assertEquals(true, proxy.isNew());
-
- proxy.removeValue("removeValue");
- proxy.putValue("put", "it");
- proxy.invalidate();
- proxy.removeAttribute("remove");
- proxy.setAttribute("name", "object");
- proxy.setMaxInactiveInterval(1);
-
- verify(session);
- }
-}
diff --git a/impl/extension/servlet/pom.xml b/impl/extension/servlet/pom.xml
index e5271c7..cf5893c 100755
--- a/impl/extension/servlet/pom.xml
+++ b/impl/extension/servlet/pom.xml
@@ -69,7 +69,7 @@
javax.servlet
- servlet-api
+ javax.servlet-api
javax.el
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
index e00e570..3e9ac05 100644
--- 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
@@ -38,7 +38,6 @@ package br.gov.frameworkdemoiselle.util;
import java.io.IOException;
-import javax.security.auth.login.LoginContext;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -47,7 +46,6 @@ import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
import br.gov.frameworkdemoiselle.internal.producer.HttpServletRequestProducer;
import br.gov.frameworkdemoiselle.internal.producer.HttpServletResponseProducer;
@@ -65,11 +63,11 @@ public class ServletFilter implements Filter {
Beans.getReference(HttpServletRequestProducer.class).setDelegate((HttpServletRequest) request);
Beans.getReference(HttpServletResponseProducer.class).setDelegate((HttpServletResponse) response);
- LoginContext ctx = null;
- HttpSession sess = (HttpSession) ((HttpServletRequest) request).getSession(false);
- if (sess != null) {
- ctx = (LoginContext) sess.getAttribute("ctx");
- }
+ // LoginContext ctx = null;
+ // HttpSession sess = (HttpSession) ((HttpServletRequest) request).getSession(false);
+ // if (sess != null) {
+ // ctx = (LoginContext) sess.getAttribute("ctx");
+ // }
// System.out.println(ctx);
diff --git a/parent/bom/pom.xml b/parent/bom/pom.xml
index 072a278..987e9ed 100755
--- a/parent/bom/pom.xml
+++ b/parent/bom/pom.xml
@@ -218,6 +218,11 @@
javax.servlet
+ javax.servlet-api
+ 3.0.1
+
+
+ javax.servlet
jstl
1.2
diff --git a/parent/servlet/pom.xml b/parent/servlet/pom.xml
index c4e0e8f..d2d428d 100755
--- a/parent/servlet/pom.xml
+++ b/parent/servlet/pom.xml
@@ -84,16 +84,6 @@
-
-
-
- javax.servlet
- javax.servlet-api
- 3.0.1
-
-
-
-
br.gov.frameworkdemoiselle
@@ -102,7 +92,7 @@
javax.servlet
- servlet-api
+ javax.servlet-api
--
libgit2 0.21.2