Merge branch '2.4.0' of git@github.com:demoiselle/framework.git into 2.4.0

Luciano Borges
2 parents dec28f0e 5b263c7d
Showing 25 changed files with 365 additions and 12 deletions Show diff stats
impl/extension/jdbc/src/test/resources/.arquillian-glassfish-embedded.profile
impl/extension/jdbc/src/test/resources/.glassfish.profile
impl/extension/jmx/src/test/resources/.arquillian-weld-se-embedded.profile
impl/extension/jmx/src/test/resources/.weldse.profile
impl/extension/jpa/src/test/resources/.arquillian-glassfish-embedded.profile
impl/extension/jpa/src/test/resources/.glassfish.profile
impl/extension/jsf/src/test/java/test/Tests.java
impl/extension/jsf/src/test/java/xxxx/XServlet.java
impl/extension/jsf/src/test/java/xxxx/XTest.java
impl/extension/jsf/src/test/resources/.arquillian-drone.profile
impl/extension/jsf/src/test/resources/.arquillian-glassfish-embedded.profile
impl/extension/jsf/src/test/resources/.drone.profile
impl/extension/jsf/src/test/resources/.glassfish.profile
impl/extension/jsf/src/test/resources/arquillian.xml
impl/extension/jsf/src/test/resources/test/beans.xml
impl/extension/jsf/src/test/resources/xxx/web.xml
impl/extension/se/src/test/resources/.arquillian-weld-se-embedded.profile
impl/extension/se/src/test/resources/.weldse.profile
impl/extension/servlet/pom.xml
impl/extension/servlet/src/test/java/xxxx/XServlet.java
@@ -0,0 +1,84 @@
+/*
+ * 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.
+ */
+package test;
+
+import java.io.File;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.FileAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.resolver.api.maven.Maven;
+import org.junit.Ignore;
+
+@Ignore
+public final class Tests {
+
+	private Tests() {
+	}
+
+	public static WebArchive createDeployment(final Class<?> baseClass) {
+		return createDeployment().addPackages(true, baseClass.getPackage()).addClass(Tests.class);
+	}
+
+	public static WebArchive createDeployment() {
+		File[] libs = Maven.resolver().offline().loadPomFromFile("pom.xml", "arquillian-test")
+				.importCompileAndRuntimeDependencies().resolve().withTransitivity().asFile();
+
+		return ShrinkWrap
+				.create(WebArchive.class)
+				// .addClass(ServletAuthenticator.class)
+				// .addClass(ServletAuthorizer.class)
+				// .addClass(ServletFilter.class)
+				// .addClass(ServletListener.class)
+				// .addClass(HttpServletRequestProducer.class)
+				// .addClass(HttpServletResponseProducer.class)
+				// .addClass(HttpSessionProducer.class)
+				// .addClass(ServletLocaleProducer.class)
+				// .addClass(BasicAuthenticationFilter.class)
+				// .addClass(HttpServletRequestProducerFilter.class)
+				// .addClass(HttpServletResponseProducerFilter.class)
+				// .addClass(InternalProcessorFilterImpl.class)
+				.addAsResource(createFileAsset("src/main/resources/demoiselle-jsf-bundle.properties"),
+						"demoiselle-jsf-bundle.properties")
+				.addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml")
+				.addAsLibraries(libs);
+	}
+
+	public static FileAsset createFileAsset(final String pathname) {
+		return new FileAsset(new File(pathname));
+	}
+}
@@ -0,0 +1,35 @@
+package xxxx;
+
+import java.io.IOException;
+
+import javax.inject.Inject;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import br.gov.frameworkdemoiselle.security.Credentials;
+import br.gov.frameworkdemoiselle.security.SecurityContext;
+
+@WebServlet("/login")
+public class XServlet extends HttpServlet {
+
+	private static final long serialVersionUID = 1L;
+
+	@Inject
+	private SecurityContext securityContext;
+
+	@Inject
+	private Credentials credentials;
+
+	@Override
+	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+		super.doGet(request, response);
+
+		credentials.setUsername("admin");
+		credentials.setPassword("changeit");
+
+		securityContext.login();
+	}
+}
@@ -0,0 +1,46 @@
+package xxxx;
+
+import java.net.URL;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.drone.api.annotation.Drone;
+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 com.thoughtworks.selenium.DefaultSelenium;
+
+@RunWith(Arquillian.class)
+public class XTest {
+
+	private static final String PATH = "src/test/resources/xxx";
+
+	@Drone
+	private DefaultSelenium browser;
+
+	@ArquillianResource
+	private URL deploymentUrl;
+
+	@Deployment(testable = false)
+	public static WebArchive createDeployment() {
+		return Tests.createDeployment().addClass(XServlet.class)
+				.addAsWebInfResource(Tests.createFileAsset(PATH + "/web.xml"), "web.xml");
+	}
+
+	@Test
+	public void xxxx() {
+		browser.open(deploymentUrl + "login");
+
+		// browser.type("id=xxx-input", "demo");
+		// browser.waitForPageToLoad("15000");
+
+		// assertTrue("User should be logged in!",
+		// browser.isElementPresent("xpath=//li[contains(text(), 'Welcome')]"));
+		// assertTrue("Username should be shown!",
+		// browser.isElementPresent("xpath=//p[contains(text(), 'You are signed in as demo.')]"));
+	}
+}
@@ -0,0 +1,68 @@
+<!--
+ 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.
+-->
+<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+
+	<!--
+	-->
+	<engine>
+		<property name="deploymentExportPath">target/deployments</property>
+	</engine>
+
+	<!--
+	<extension qualifier="selenium">
+		<property name="browser">*googlechrome</property>
+	</extension>
+	-->
+
+	<!--
+	<container qualifier="glassfish" default="true">
+		<configuration>
+			<property name="autoDelete">true</property>
+		</configuration>
+	</container>
+	-->
+
+	<!--
+	<container qualifier="jbossas-managed" default="true">
+		<protocol type="Servlet 3.0" />
+		<configuration>
+			<property name="jbossHome">target/jboss-as-${jboss.as.version}</property>
+		</configuration>
+	</container>
+	-->
+</arquillian>
@@ -0,0 +1,47 @@
+<!--
+ 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.
+-->
+<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+
+	<interceptors>
+		<class>br.gov.frameworkdemoiselle.transaction.TransactionalInterceptor</class>
+		<class>br.gov.frameworkdemoiselle.security.RequiredPermissionInterceptor</class>
+		<class>br.gov.frameworkdemoiselle.security.RequiredRoleInterceptor</class>
+		<class>br.gov.frameworkdemoiselle.exception.ExceptionHandlerInterceptor</class>
+	</interceptors>
+
+</beans>
@@ -0,0 +1,52 @@
+<!--
+ 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-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"
+	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" version="3.0">
+
+	<listener>
+		<listener-class>br.gov.frameworkdemoiselle.util.ServletListener</listener-class>
+	</listener>
+	<filter>
+		<filter-name>Demoiselle Servlet Filter</filter-name>
+		<filter-class>br.gov.frameworkdemoiselle.util.ServletFilter</filter-class>
+	</filter>
+	<filter-mapping>
+		<filter-name>Demoiselle Servlet Filter</filter-name>
+		<url-pattern>/*</url-pattern>
+	</filter-mapping>
+
+</web-app>
 \ No newline at end of file
@@ -84,6 +84,12 @@
 			<scope>test</scope>
 		</dependency>
 		-->
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<version>3.1</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
  
 	<repositories>
@@ -26,6 +26,8 @@ public class XServlet extends HttpServlet {
 	@Override
 	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
 		super.doGet(request, response);
+		
+		System.out.println("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
  
 		credentials.setUsername("admin");
 		credentials.setPassword("changeit");
 package xxxx;
  
+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.drone.api.annotation.Drone;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -12,27 +15,37 @@ import org.junit.runner.RunWith;
  
 import test.Tests;
  
-import com.thoughtworks.selenium.DefaultSelenium;
-
 @RunWith(Arquillian.class)
 public class XTest {
  
 	private static final String PATH = "src/test/resources/xxx";
  
-	@Drone
-	private DefaultSelenium browser;
-
 	@ArquillianResource
 	private URL deploymentUrl;
  
 	@Deployment(testable = false)
 	public static WebArchive createDeployment() {
-		return Tests.createDeployment().addAsWebInfResource(Tests.createFileAsset(PATH + "/web.xml"), "web.xml");
+		return Tests.createDeployment().addClass(XServlet.class)
+				.addAsWebInfResource(Tests.createFileAsset(PATH + "/web.xml"), "web.xml");
 	}
  
 	@Test
 	public void xxxx() {
-		browser.open(deploymentUrl + "login");
+		HttpClient client = new HttpClient();
+		GetMethod method = new GetMethod(deploymentUrl + "login");
+
+		try {
+			int status = client.executeMethod(method);
+			System.out.println(status);
+
+		} catch (HttpException e) {
+			e.printStackTrace();
+
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+
+		// browser.open(deploymentUrl + "login");
  
 		// browser.type("id=xxx-input", "demo");
 		// browser.waitForPageToLoad("15000");
@@ -191,7 +191,7 @@
 			<id>arquillian-weld-se-embedded</id>
 			<activation>
 				<file>
-					<exists>src/test/resources/.weldse.profile</exists>
+					<exists>src/test/resources/.arquillian-weld-se-embedded.profile</exists>
 				</file>
 			</activation>
 			<dependencies>
@@ -210,7 +210,7 @@
 			<id>arquillian-glassfish-embedded</id>
 			<activation>
 				<file>
-					<exists>src/test/resources/.glassfish.profile</exists>
+					<exists>src/test/resources/.arquillian-glassfish-embedded.profile</exists>
 				</file>
 				<!--
 				<activeByDefault>true</activeByDefault>
@@ -235,7 +235,7 @@
 			<id>arquillian-jbossas7-managed</id>
 			<activation>
 				<file>
-					<exists>src/test/resources/.jbossas7.profile</exists>
+					<exists>src/test/resources/.arquillian-jbossas7-managed.profile</exists>
 				</file>
 			</activation>
 			<build>
@@ -321,7 +321,7 @@
 			<id>arquillian-drone</id>
 			<activation>
 				<file>
-					<exists>src/test/resources/.drone.profile</exists>
+					<exists>src/test/resources/.arquillian-drone.profile</exists>
 				</file>
 			</activation>
 			<dependencyManagement>
...	...	@@ -0,0 +1,84 @@
	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 test;
	38	+
	39	+import java.io.File;
	40	+
	41	+import org.jboss.shrinkwrap.api.ShrinkWrap;
	42	+import org.jboss.shrinkwrap.api.asset.FileAsset;
	43	+import org.jboss.shrinkwrap.api.spec.WebArchive;
	44	+import org.jboss.shrinkwrap.resolver.api.maven.Maven;
	45	+import org.junit.Ignore;
	46	+
	47	+@Ignore
	48	+public final class Tests {
	49	+
	50	+ private Tests() {
	51	+ }
	52	+
	53	+ public static WebArchive createDeployment(final Class<?> baseClass) {
	54	+ return createDeployment().addPackages(true, baseClass.getPackage()).addClass(Tests.class);
	55	+ }
	56	+
	57	+ public static WebArchive createDeployment() {
	58	+ File[] libs = Maven.resolver().offline().loadPomFromFile("pom.xml", "arquillian-test")
	59	+ .importCompileAndRuntimeDependencies().resolve().withTransitivity().asFile();
	60	+
	61	+ return ShrinkWrap
	62	+ .create(WebArchive.class)
	63	+ // .addClass(ServletAuthenticator.class)
	64	+ // .addClass(ServletAuthorizer.class)
	65	+ // .addClass(ServletFilter.class)
	66	+ // .addClass(ServletListener.class)
	67	+ // .addClass(HttpServletRequestProducer.class)
	68	+ // .addClass(HttpServletResponseProducer.class)
	69	+ // .addClass(HttpSessionProducer.class)
	70	+ // .addClass(ServletLocaleProducer.class)
	71	+ // .addClass(BasicAuthenticationFilter.class)
	72	+ // .addClass(HttpServletRequestProducerFilter.class)
	73	+ // .addClass(HttpServletResponseProducerFilter.class)
	74	+ // .addClass(InternalProcessorFilterImpl.class)
	75	+ .addAsResource(createFileAsset("src/main/resources/demoiselle-jsf-bundle.properties"),
	76	+ "demoiselle-jsf-bundle.properties")
	77	+ .addAsWebInfResource(createFileAsset("src/test/resources/test/beans.xml"), "beans.xml")
	78	+ .addAsLibraries(libs);
	79	+ }
	80	+
	81	+ public static FileAsset createFileAsset(final String pathname) {
	82	+ return new FileAsset(new File(pathname));
	83	+ }
	84	+}
...	...
...	...	@@ -0,0 +1,35 @@
	1	+package xxxx;
	2	+
	3	+import java.io.IOException;
	4	+
	5	+import javax.inject.Inject;
	6	+import javax.servlet.ServletException;
	7	+import javax.servlet.annotation.WebServlet;
	8	+import javax.servlet.http.HttpServlet;
	9	+import javax.servlet.http.HttpServletRequest;
	10	+import javax.servlet.http.HttpServletResponse;
	11	+
	12	+import br.gov.frameworkdemoiselle.security.Credentials;
	13	+import br.gov.frameworkdemoiselle.security.SecurityContext;
	14	+
	15	+@WebServlet("/login")
	16	+public class XServlet extends HttpServlet {
	17	+
	18	+ private static final long serialVersionUID = 1L;
	19	+
	20	+ @Inject
	21	+ private SecurityContext securityContext;
	22	+
	23	+ @Inject
	24	+ private Credentials credentials;
	25	+
	26	+ @Override
	27	+ protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
	28	+ super.doGet(request, response);
	29	+
	30	+ credentials.setUsername("admin");
	31	+ credentials.setPassword("changeit");
	32	+
	33	+ securityContext.login();
	34	+ }
	35	+}
...	...
...	...	@@ -0,0 +1,46 @@
	1	+package xxxx;
	2	+
	3	+import java.net.URL;
	4	+
	5	+import org.jboss.arquillian.container.test.api.Deployment;
	6	+import org.jboss.arquillian.drone.api.annotation.Drone;
	7	+import org.jboss.arquillian.junit.Arquillian;
	8	+import org.jboss.arquillian.test.api.ArquillianResource;
	9	+import org.jboss.shrinkwrap.api.spec.WebArchive;
	10	+import org.junit.Test;
	11	+import org.junit.runner.RunWith;
	12	+
	13	+import test.Tests;
	14	+
	15	+import com.thoughtworks.selenium.DefaultSelenium;
	16	+
	17	+@RunWith(Arquillian.class)
	18	+public class XTest {
	19	+
	20	+ private static final String PATH = "src/test/resources/xxx";
	21	+
	22	+ @Drone
	23	+ private DefaultSelenium browser;
	24	+
	25	+ @ArquillianResource
	26	+ private URL deploymentUrl;
	27	+
	28	+ @Deployment(testable = false)
	29	+ public static WebArchive createDeployment() {
	30	+ return Tests.createDeployment().addClass(XServlet.class)
	31	+ .addAsWebInfResource(Tests.createFileAsset(PATH + "/web.xml"), "web.xml");
	32	+ }
	33	+
	34	+ @Test
	35	+ public void xxxx() {
	36	+ browser.open(deploymentUrl + "login");
	37	+
	38	+ // browser.type("id=xxx-input", "demo");
	39	+ // browser.waitForPageToLoad("15000");
	40	+
	41	+ // assertTrue("User should be logged in!",
	42	+ // browser.isElementPresent("xpath=//li[contains(text(), 'Welcome')]"));
	43	+ // assertTrue("Username should be shown!",
	44	+ // browser.isElementPresent("xpath=//p[contains(text(), 'You are signed in as demo.')]"));
	45	+ }
	46	+}
...	...
...	...	@@ -0,0 +1,68 @@
	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	+<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	38	+ xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
	39	+
	40	+ <!--
	41	+ -->
	42	+ <engine>
	43	+ <property name="deploymentExportPath">target/deployments</property>
	44	+ </engine>
	45	+
	46	+ <!--
	47	+ <extension qualifier="selenium">
	48	+ <property name="browser">*googlechrome</property>
	49	+ </extension>
	50	+ -->
	51	+
	52	+ <!--
	53	+ <container qualifier="glassfish" default="true">
	54	+ <configuration>
	55	+ <property name="autoDelete">true</property>
	56	+ </configuration>
	57	+ </container>
	58	+ -->
	59	+
	60	+ <!--
	61	+ <container qualifier="jbossas-managed" default="true">
	62	+ <protocol type="Servlet 3.0" />
	63	+ <configuration>
	64	+ <property name="jbossHome">target/jboss-as-${jboss.as.version}</property>
	65	+ </configuration>
	66	+ </container>
	67	+ -->
	68	+</arquillian>
...	...
...	...	@@ -0,0 +1,47 @@
	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	+<beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	38	+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
	39	+
	40	+ <interceptors>
	41	+ <class>br.gov.frameworkdemoiselle.transaction.TransactionalInterceptor</class>
	42	+ <class>br.gov.frameworkdemoiselle.security.RequiredPermissionInterceptor</class>
	43	+ <class>br.gov.frameworkdemoiselle.security.RequiredRoleInterceptor</class>
	44	+ <class>br.gov.frameworkdemoiselle.exception.ExceptionHandlerInterceptor</class>
	45	+ </interceptors>
	46	+
	47	+</beans>
...	...
...	...	@@ -0,0 +1,52 @@
	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	+</web-app>
0	53	\ No newline at end of file
...	...
...	...	@@ -84,6 +84,12 @@
84	84	<scope>test</scope>
85	85	</dependency>
86	86	-->
	87	+ <dependency>
	88	+ <groupId>commons-httpclient</groupId>
	89	+ <artifactId>commons-httpclient</artifactId>
	90	+ <version>3.1</version>
	91	+ <scope>test</scope>
	92	+ </dependency>
87	93	</dependencies>
88	94
89	95	<repositories>
...	...
...	...	@@ -26,6 +26,8 @@ public class XServlet extends HttpServlet {
26	26	@Override
27	27	protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
28	28	super.doGet(request, response);
	29	+
	30	+ System.out.println("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx");
29	31
30	32	credentials.setUsername("admin");
31	33	credentials.setPassword("changeit");
...	...
1	1	package xxxx;
2	2
	3	+import java.io.IOException;
3	4	import java.net.URL;
4	5
	6	+import org.apache.commons.httpclient.HttpClient;
	7	+import org.apache.commons.httpclient.HttpException;
	8	+import org.apache.commons.httpclient.methods.GetMethod;
5	9	import org.jboss.arquillian.container.test.api.Deployment;
6		-import org.jboss.arquillian.drone.api.annotation.Drone;
7	10	import org.jboss.arquillian.junit.Arquillian;
8	11	import org.jboss.arquillian.test.api.ArquillianResource;
9	12	import org.jboss.shrinkwrap.api.spec.WebArchive;
...	...	@@ -12,27 +15,37 @@ import org.junit.runner.RunWith;
12	15
13	16	import test.Tests;
14	17
15		-import com.thoughtworks.selenium.DefaultSelenium;
16		-
17	18	@RunWith(Arquillian.class)
18	19	public class XTest {
19	20
20	21	private static final String PATH = "src/test/resources/xxx";
21	22
22		- @Drone
23		- private DefaultSelenium browser;
24		-
25	23	@ArquillianResource
26	24	private URL deploymentUrl;
27	25
28	26	@Deployment(testable = false)
29	27	public static WebArchive createDeployment() {
30		- return Tests.createDeployment().addAsWebInfResource(Tests.createFileAsset(PATH + "/web.xml"), "web.xml");
	28	+ return Tests.createDeployment().addClass(XServlet.class)
	29	+ .addAsWebInfResource(Tests.createFileAsset(PATH + "/web.xml"), "web.xml");
31	30	}
32	31
33	32	@Test
34	33	public void xxxx() {
35		- browser.open(deploymentUrl + "login");
	34	+ HttpClient client = new HttpClient();
	35	+ GetMethod method = new GetMethod(deploymentUrl + "login");
	36	+
	37	+ try {
	38	+ int status = client.executeMethod(method);
	39	+ System.out.println(status);
	40	+
	41	+ } catch (HttpException e) {
	42	+ e.printStackTrace();
	43	+
	44	+ } catch (IOException e) {
	45	+ e.printStackTrace();
	46	+ }
	47	+
	48	+ // browser.open(deploymentUrl + "login");
36	49
37	50	// browser.type("id=xxx-input", "demo");
38	51	// browser.waitForPageToLoad("15000");
...	...
...	...	@@ -191,7 +191,7 @@
191	191	<id>arquillian-weld-se-embedded</id>
192	192	<activation>
193	193	<file>
194		- <exists>src/test/resources/.weldse.profile</exists>
	194	+ <exists>src/test/resources/.arquillian-weld-se-embedded.profile</exists>
195	195	</file>
196	196	</activation>
197	197	<dependencies>
...	...	@@ -210,7 +210,7 @@
210	210	<id>arquillian-glassfish-embedded</id>
211	211	<activation>
212	212	<file>
213		- <exists>src/test/resources/.glassfish.profile</exists>
	213	+ <exists>src/test/resources/.arquillian-glassfish-embedded.profile</exists>
214	214	</file>
215	215	<!--
216	216	<activeByDefault>true</activeByDefault>
...	...	@@ -235,7 +235,7 @@
235	235	<id>arquillian-jbossas7-managed</id>
236	236	<activation>
237	237	<file>
238		- <exists>src/test/resources/.jbossas7.profile</exists>
	238	+ <exists>src/test/resources/.arquillian-jbossas7-managed.profile</exists>
239	239	</file>
240	240	</activation>
241	241	<build>
...	...	@@ -321,7 +321,7 @@
321	321	<id>arquillian-drone</id>
322	322	<activation>
323	323	<file>
324		- <exists>src/test/resources/.drone.profile</exists>
	324	+ <exists>src/test/resources/.arquillian-drone.profile</exists>
325	325	</file>
326	326	</activation>
327	327	<dependencyManagement>
...	...