Author: tremes Date: 2013-06-04 07:52:59 -0400 (Tue, 04 Jun 2013) New Revision: 15544
Added: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/registration/ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/registration/test/ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/registration/test/Deployments.java branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/registration/test/RegisterTest.java branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/arquillian.xml branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/components.xml branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/ejb-jar.xml branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/index.html branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/jboss-deployment-structure.xml branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/persistence.xml branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/register.xhtml branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/registered.xhtml branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/seam.properties branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/web.xml Removed: branches/enterprise/WFK-2_1/examples/registration/registration-tests/pom.xml branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/java/org/jboss/seam/example/registration/test/RegisterTest.java branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/java/org/jboss/seam/example/registration/test/selenium/RegistrationTest.java branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-ftest/testng.xml branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-integration/arquillian.xml branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-integration/web.xml Modified: branches/enterprise/WFK-2_1/examples/registration/pom.xml branches/enterprise/WFK-2_1/examples/registration/registration-ear/pom.xml branches/enterprise/WFK-2_1/examples/registration/registration-ejb/pom.xml branches/enterprise/WFK-2_1/examples/registration/registration-web/pom.xml Log: Registration example migrated Modified: branches/enterprise/WFK-2_1/examples/registration/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/pom.xml 2013-06-04 10:29:19 UTC (rev 15543) +++ branches/enterprise/WFK-2_1/examples/registration/pom.xml 2013-06-04 11:52:59 UTC (rev 15544) @@ -1,48 +1,134 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <parent> - <artifactId>examples</artifactId> - <groupId>org.jboss.seam</groupId> - <version>2.3.1.Final-redhat-2</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>registration</artifactId> - <packaging>pom</packaging> - <name>Registration Example (EE6)</name> - - <modules> - <module>registration-ejb</module> - <module>registration-web</module> - <module>registration-ear</module> - <module>registration-tests</module> - </modules> +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.seam.examples</groupId> + <artifactId>registration</artifactId> + <version>2.3.1.Final-redhat-2</version> + <packaging>pom</packaging> + <name>Registration Example (EE6)</name> - <properties> - <example.name>registration</example.name> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples.registration</groupId> - <artifactId>registration-ejb</artifactId> - <version>${project.version}</version> - <type>ejb</type> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples.registration</groupId> - <artifactId>registration-web</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples.registration</groupId> - <artifactId>registration-ear</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </dependencyManagement> + <modules> + <module>registration-ejb</module> + <module>registration-web</module> + <module>registration-ear</module> + </modules> + <properties> + <example.name>registration</example.name> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.target>1.6</maven.compiler.target> + <maven.compiler.source>1.6</maven.compiler.source> + + <!-- To use jacoco, set jacoco.agent system property to something like + -javaagent:/path/to/jacocoagent.jar=append=true,destfile=/path/to/output/jacoco.exec --> + <jacoco.agent /> + + <!-- To use custom Maven settings and profiles, uncomment and customize + the following properties. This is necessary for the ShrinkWrap resolver to + function properly. --> + <!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings> --> + <!--<maven.profiles>custom,profile</maven.profiles> --> + + <version.commons.logging>1.1.1</version.commons.logging> + <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver> + + <!-- Plugin versions --> + <version.dependency.plugin>2.5.1</version.dependency.plugin> + <version.surefire.plugin>2.10</version.surefire.plugin> + <version.compiler.plugin>2.3.1</version.compiler.plugin> + <version.ear.plugin>2.6</version.ear.plugin> + <version.war.plugin>2.1.1</version.war.plugin> + <version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples.registration</groupId> + <artifactId>registration-ejb</artifactId> + <version>${project.version}</version> + <type>ejb</type> + </dependency> + + <dependency> + <groupId>org.jboss.seam.examples.registration</groupId> + <artifactId>registration-web</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + + <dependency> + <groupId>org.jboss.seam.examples.registration</groupId> + <artifactId>registration-ear</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${version.commons.logging}</version> + </dependency> + + <!-- BOMs --> + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-bom</artifactId> + <version>${version.shrinkwrap.resolver}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>bom</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </dependencyManagement> + + <build> + <pluginManagement> + <plugins> + <!-- Manage plugin versions for build stability --> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>${version.surefire.plugin}</version> + <configuration> + <systemPropertyVariables> + <org.apache.maven.user-settings>${maven.user.settings}</org.apache.maven.user-settings> + <maven.profiles>${maven.profiles}</maven.profiles> + </systemPropertyVariables> + </configuration> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>${version.dependency.plugin}</version> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>${version.compiler.plugin}</version> + <configuration> + <source>${maven.compiler.source}</source> + <target>${maven.compiler.target}</target> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + </project> Modified: branches/enterprise/WFK-2_1/examples/registration/registration-ear/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/registration-ear/pom.xml 2013-06-04 10:29:19 UTC (rev 15543) +++ branches/enterprise/WFK-2_1/examples/registration/registration-ear/pom.xml 2013-06-04 11:52:59 UTC (rev 15544) @@ -52,6 +52,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-ear-plugin</artifactId> + <version>${version.ear.plugin}</version> <configuration> <version>6</version> <defaultLibBundleDir>lib</defaultLibBundleDir> Modified: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/pom.xml 2013-06-04 10:29:19 UTC (rev 15543) +++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/pom.xml 2013-06-04 11:52:59 UTC (rev 15544) @@ -1,62 +1,179 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>registration</artifactId> - <groupId>org.jboss.seam.examples</groupId> - <version>2.3.1.Final-redhat-2</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples.registration</groupId> - <artifactId>registration-ejb</artifactId> - <packaging>ejb</packaging> - <name>Registration EJB Module (EE6)</name> - - <dependencies> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - <exclusions> - <exclusion> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - </exclusion> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - <exclusion> - <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.1_spec</artifactId> - </exclusion> - <exclusion> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.spec.javax.ejb</groupId> - <artifactId>jboss-ejb-api_3.1_spec</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.1_spec</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - +<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>registration</artifactId> + <groupId>org.jboss.seam.examples</groupId> + <version>2.3.1.Final-redhat-2</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples.registration</groupId> + <artifactId>registration-ejb</artifactId> + <packaging>ejb</packaging> + <name>Registration EJB Module (EE6)</name> + + <dependencies> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + <exclusion> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> + </exclusion> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.ejb</groupId> + <artifactId>jboss-ejb-api_3.1_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.1_spec</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> + <scope>test</scope> + </dependency> + + <!-- Test dependencies --> + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-depchain</artifactId> + <type>pom</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.arquillian.junit</groupId> + <artifactId>arquillian-junit-container</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.arquillian.protocol</groupId> + <artifactId>arquillian-protocol-servlet</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.spec.javax.el</groupId> + <artifactId>jboss-el-api_2.2_spec</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + + <profiles> + <profile> + <id>integration-tests</id> + <activation> + <property> + <name>arquillian</name> + </property> + </activation> + <properties> + <jndiPattern>java:app/seam-registration/#{ejbName}</jndiPattern> + <distributable>false</distributable> + </properties> + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>false</skip> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>arq-jbossas-7-managed</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-managed-7</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-arquillian-container-managed</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + + <profile> + <id>arq-jbossas-7-remote</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-remote-7</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-arquillian-container-remote</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + </profiles> + + <build> + <plugins> + <!-- Skip tests by default --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> </project> Added: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/registration/test/Deployments.java =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/registration/test/Deployments.java (rev 0) +++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/registration/test/Deployments.java 2013-06-04 11:52:59 UTC (rev 15544) @@ -0,0 +1,41 @@ +package org.jboss.seam.example.registration.test; + +import java.io.File; + +import org.jboss.seam.example.registration.RegisterAction; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.shrinkwrap.resolver.api.maven.Maven; + +public class Deployments +{ + + public static WebArchive registrationDeployment() { + + // use profiles defined in 'maven.profiles' property in pom.xml + String profilesString = System.getProperty("maven.profiles"); + String[] profiles = profilesString != null ? profilesString.split(", ?") : new String[0]; + + File[] libs = Maven.resolver().loadPomFromFile("pom.xml", profiles) + .importCompileAndRuntimeDependencies() + // force resolve jboss-seam, because it is provided-scoped in the pom, but we need it bundled in the WAR + .resolve("org.jboss.seam:jboss-seam").withTransitivity().asFile(); + + + + return ShrinkWrap.create(WebArchive.class, "seam-registration.war") + .addPackage(RegisterAction.class.getPackage()) + .addAsWebInfResource("META-INF/ejb-jar.xml", "ejb-jar.xml") + .addAsWebInfResource("components.xml", "components.xml") + .addAsWebInfResource("persistence.xml", "classes/META-INF/persistence.xml") + .addAsWebInfResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml") + .addAsWebInfResource("seam.properties", "classes/seam.properties") + .addAsWebInfResource("web.xml", "web.xml") + .addAsWebResource("index.html") + .addAsWebResource("register.xhtml") + .addAsWebResource("registered.xhtml") + .addAsLibraries(libs); + + } + +} Copied: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/registration/test/RegisterTest.java (from rev 15541, branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/java/org/jboss/seam/example/registration/test/RegisterTest.java) =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/registration/test/RegisterTest.java (rev 0) +++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/java/org/jboss/seam/example/registration/test/RegisterTest.java 2013-06-04 11:52:59 UTC (rev 15544) @@ -0,0 +1,120 @@ +//$Id: RegisterTest.java 10428 2009-04-15 21:54:38Z [email protected] $ +package org.jboss.seam.example.registration.test; + +import javax.faces.context.FacesContext; + +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.junit.Test; +import org.junit.runner.RunWith; + +@RunWith(Arquillian.class) +public class RegisterTest extends JUnitSeamTest +{ + @Deployment(name = "RegisterTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + + return Deployments.registrationDeployment(); + } + + @Test + public void testLogin() throws Exception + { + + new FacesRequest("/register.xhtml") + { + + @Override + protected void processValidations() throws Exception + { + validateValue("#{user.username}", "1ovthafew"); + validateValue("#{user.name}", "Gavin King"); + validateValue("#{user.password}", "secret"); + assert !isValidationFailure(); + } + + @Override + protected void updateModelValues() throws Exception + { + setValue("#{user.username}", "1ovthafew"); + setValue("#{user.name}", "Gavin King"); + setValue("#{user.password}", "secret"); + } + + @Override + protected void invokeApplication() + { + assert invokeMethod("#{register.register}").equals("/registered.xhtml"); + setOutcome("/registered.xhtml"); + } + + @Override + protected void afterRequest() + { + assert isInvokeApplicationComplete(); + assert !isRenderResponseBegun(); + } + + }.run(); + + new NonFacesRequest("/registered.xhtml") + { + + @Override + protected void renderResponse() + { + assert getValue("#{user.username}").equals("1ovthafew"); + assert getValue("#{user.password}").equals("secret"); + assert getValue("#{user.name}").equals("Gavin King"); + } + + }.run(); + + new FacesRequest("/register.xhtml") + { + + @Override + protected void processValidations() throws Exception + { + validateValue("#{user.username}", "1ovthafew"); + validateValue("#{user.name}", "Gavin A King"); + validateValue("#{user.password}", "password"); + } + + @Override + protected void updateModelValues() throws Exception + { + setValue("#{user.username}", "1ovthafew"); + setValue("#{user.name}", "Gavin A King"); + setValue("#{user.password}", "password"); + } + + @Override + protected void invokeApplication() + { + assert invokeMethod("#{register.register}") == null; + } + + @Override + protected void renderResponse() throws Exception + { + assert FacesContext.getCurrentInstance().getMessages().hasNext(); + } + + @Override + protected void afterRequest() + { + assert isInvokeApplicationComplete(); + assert isRenderResponseComplete(); + } + + }.run(); + + } + +} Added: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/arquillian.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/arquillian.xml (rev 0) +++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/arquillian.xml 2013-06-04 11:52:59 UTC (rev 15544) @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns="http://jboss.org/schema/arquillian"; + xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd";> + + <engine> + <property name="deploymentExportPath">target/</property> + </engine> + + <container qualifier="jboss" default="true"> + <configuration> + <!-- These properties are only valid for arquillian managed container, + but don't cause a problem for the remote container, so they can be left in. --> + <!-- To use jacoco, set jacoco.agent system property to something like + -javaagent:/path/to/jacocoagent.jar=append=true,destfile=/path/to/output/jacoco.exec --> + <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=1024m ${jacoco.agent}</property> + <property name="serverConfig">standalone.xml</property> + <!-- If jbossHome property is not set, the JBOSS_HOME environment variable + is used --> + <!--<property name="jbossHome">/path/to/jboss/as</property> --> + </configuration> + </container> + +</arquillian> Added: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/components.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/components.xml (rev 0) +++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/components.xml 2013-06-04 11:52:59 UTC (rev 15544) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.org/schema/seam/components"; + xmlns:core="http://jboss.org/schema/seam/core"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation= + "http://jboss.org/schema/seam/core http://jboss.org/schema/seam/core-2.3.xsd + http://jboss.org/schema/seam/components http://jboss.org/schema/seam/components-2.3.xsd";> + + <core:init jndi-pattern="${jndiPattern}"/> + +</components> Added: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/ejb-jar.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/ejb-jar.xml (rev 0) +++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/ejb-jar.xml 2013-06-04 11:52:59 UTC (rev 15544) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ejb-jar 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/ejb-jar_3_0.xsd"; + version="3.0"> + + <interceptors> + <interceptor> + <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> + </interceptor> + </interceptors> + + <assembly-descriptor> + <interceptor-binding> + <ejb-name>*</ejb-name> + <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> + </interceptor-binding> + </assembly-descriptor> + +</ejb-jar> Added: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/index.html =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/index.html (rev 0) +++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/index.html 2013-06-04 11:52:59 UTC (rev 15544) @@ -0,0 +1,5 @@ +<html> +<head> + <meta http-equiv="Refresh" content="0; URL=register.seam"> +</head> +</html> \ No newline at end of file Added: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/jboss-deployment-structure.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/jboss-deployment-structure.xml (rev 0) +++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/jboss-deployment-structure.xml 2013-06-04 11:52:59 UTC (rev 15544) @@ -0,0 +1,9 @@ +<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0"> + <deployment> + <dependencies> + <module name="org.dom4j" export="true"/> + <module name="org.apache.commons.collections" export="true"/> + <module name="javax.faces.api" export="true"/> + </dependencies> + </deployment> +</jboss-deployment-structure> Added: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/persistence.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/persistence.xml (rev 0) +++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/persistence.xml 2013-06-04 11:52:59 UTC (rev 15544) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<persistence xmlns="http://java.sun.com/xml/ns/persistence"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd"; + version="2.0"> + + <persistence-unit name="userDatabase"> + <provider>org.hibernate.ejb.HibernatePersistence</provider> + <jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source> + <properties> + <property name="hibernate.hbm2ddl.auto" value="create-drop"/> + </properties> + </persistence-unit> + +</persistence> Added: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/register.xhtml =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/register.xhtml (rev 0) +++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/register.xhtml 2013-06-04 11:52:59 UTC (rev 15544) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +<html xmlns="http://www.w3.org/1999/xhtml"; + xmlns:s="http://jboss.org/schema/seam/taglib"; + xmlns:h="http://java.sun.com/jsf/html"; + xmlns:f="http://java.sun.com/jsf/core";> + + <head> + <title>Register New User</title> + </head> + <body> + <f:view> + <h:form id="registration"> + <s:validateAll> + <h:panelGrid columns="2"> + Username: <h:inputText id="username" value="#{user.username}" required="true"/> + Real Name: <h:inputText id="name" value="#{user.name}" required="true"/> + Password: <h:inputSecret id="password" value="#{user.password}" required="true"/> + </h:panelGrid> + </s:validateAll> + <h:messages id="messages"/> + <h:commandButton id="register" value="Register" action="#{register.register}"/> + </h:form> + </f:view> + </body> + +</html> Added: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/registered.xhtml =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/registered.xhtml (rev 0) +++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/registered.xhtml 2013-06-04 11:52:59 UTC (rev 15544) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +<html xmlns="http://www.w3.org/1999/xhtml"; + xmlns:f="http://java.sun.com/jsf/core";> + + <head> + <title>Successfully Registered New User</title> + </head> + <body> + <f:view> + Welcome, #{user.name}, you are successfully registered as #{user.username}. + </f:view> + </body> + +</html> Added: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/seam.properties =================================================================== Copied: branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/web.xml (from rev 15541, branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-integration/web.xml) =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/web.xml (rev 0) +++ branches/enterprise/WFK-2_1/examples/registration/registration-ejb/src/test/resources/web.xml 2013-06-04 11:52:59 UTC (rev 15544) @@ -0,0 +1,12 @@ +<?xml version="1.0" ?> + +<web-app version="3.0" + 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/web-app_3_0.xsd";> + + <listener> + <listener-class>org.jboss.seam.mock.MockSeamListener</listener-class> + </listener> + +</web-app> Deleted: branches/enterprise/WFK-2_1/examples/registration/registration-tests/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/registration-tests/pom.xml 2013-06-04 10:29:19 UTC (rev 15543) +++ branches/enterprise/WFK-2_1/examples/registration/registration-tests/pom.xml 2013-06-04 11:52:59 UTC (rev 15544) @@ -1,163 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>registration</artifactId> - <groupId>org.jboss.seam.examples</groupId> - <version>2.3.1.Final-redhat-2</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples.registration</groupId> - <artifactId>registration-tests</artifactId> - <name>Registration Integration Tests Module (EE6)</name> - - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples.registration</groupId> - <artifactId>registration-ejb</artifactId> - <type>ejb</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.spec.javax.faces</groupId> - <artifactId>jboss-jsf-api_2.1_spec</artifactId> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-server</artifactId> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-java</artifactId> - </dependency> - - <dependency> - <groupId>org.jboss.arquillian.junit</groupId> - <artifactId>arquillian-junit-container</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.arquillian.protocol</groupId> - <artifactId>arquillian-protocol-servlet</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>functional-tests</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.jboss.spec.javax.el</groupId> - <artifactId>jboss-el-api_2.2_spec</artifactId> - </dependency> - - </dependencies> - - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - </testResource> - <testResource> - <directory>src/test/resources-integration</directory> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - - <profile> - <id>integration-tests</id> - <activation> - <property> - <name>arquillian</name> - </property> - </activation> - </profile> - - <profile> - <id>arq-jbossas-7-managed</id> - <activation> - <property> - <name>arquillian</name> - <value>jbossas-managed-7</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>arq-jbossas-7-remote</id> - <activation> - <property> - <name>arquillian</name> - <value>jbossas-remote-7</value> - </property> - </activation> - </profile> - - <profile> - <id>ftest-jbossas</id> - <properties> - <example.context.path>seam-registration</example.context.path> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>selenium-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>failsafe-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - </profiles> - -</project> Deleted: branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/java/org/jboss/seam/example/registration/test/RegisterTest.java =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/java/org/jboss/seam/example/registration/test/RegisterTest.java 2013-06-04 10:29:19 UTC (rev 15543) +++ branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/java/org/jboss/seam/example/registration/test/RegisterTest.java 2013-06-04 11:52:59 UTC (rev 15544) @@ -1,132 +0,0 @@ -//$Id: RegisterTest.java 10428 2009-04-15 21:54:38Z [email protected] $ -package org.jboss.seam.example.registration.test; - -import java.io.File; - -import javax.faces.context.FacesContext; - -import org.jboss.arquillian.container.test.api.Deployment; -import org.jboss.arquillian.container.test.api.OverProtocol; -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.seam.mock.JUnitSeamTest; -import org.jboss.shrinkwrap.api.Archive; -import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.importer.ZipImporter; -import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; -import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.junit.Test; -import org.junit.runner.RunWith; - -@RunWith(Arquillian.class) -public class RegisterTest extends JUnitSeamTest -{ - @Deployment(name="RegisterTest") - @OverProtocol("Servlet 3.0") - public static Archive<?> createDeployment() - { - EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-registration.ear").importFrom(new File("../registration-ear/target/seam-registration.ear")) - .as(EnterpriseArchive.class); - WebArchive web = er.getAsType(WebArchive.class, "registration-web.war"); - web.addClasses(RegisterTest.class); - - // Install org.jboss.seam.mock.MockSeamListener - web.delete("/WEB-INF/web.xml"); - web.addAsWebInfResource("web.xml"); - - return er; - } - - @Test - public void testLogin() throws Exception - { - - new FacesRequest("/register.xhtml") { - - @Override - protected void processValidations() throws Exception - { - validateValue("#{user.username}", "1ovthafew"); - validateValue("#{user.name}", "Gavin King"); - validateValue("#{user.password}", "secret"); - assert !isValidationFailure(); - } - - @Override - protected void updateModelValues() throws Exception - { - setValue("#{user.username}", "1ovthafew"); - setValue("#{user.name}", "Gavin King"); - setValue("#{user.password}", "secret"); - } - - @Override - protected void invokeApplication() - { - assert invokeMethod("#{register.register}").equals("/registered.xhtml"); - setOutcome("/registered.xhtml"); - } - - @Override - protected void afterRequest() - { - assert isInvokeApplicationComplete(); - assert !isRenderResponseBegun(); - } - - }.run(); - - new NonFacesRequest("/registered.xhtml") - { - - @Override - protected void renderResponse() - { - assert getValue("#{user.username}").equals("1ovthafew"); - assert getValue("#{user.password}").equals("secret"); - assert getValue("#{user.name}").equals("Gavin King"); - } - - }.run(); - - new FacesRequest("/register.xhtml") { - - @Override - protected void processValidations() throws Exception - { - validateValue("#{user.username}", "1ovthafew"); - validateValue("#{user.name}", "Gavin A King"); - validateValue("#{user.password}", "password"); - } - - @Override - protected void updateModelValues() throws Exception - { - setValue("#{user.username}", "1ovthafew"); - setValue("#{user.name}", "Gavin A King"); - setValue("#{user.password}", "password"); - } - - @Override - protected void invokeApplication() - { - assert invokeMethod("#{register.register}")==null; - } - - @Override - protected void renderResponse() throws Exception - { - assert FacesContext.getCurrentInstance().getMessages().hasNext(); - } - - @Override - protected void afterRequest() - { - assert isInvokeApplicationComplete(); - assert isRenderResponseComplete(); - } - - }.run(); - - } - -} Deleted: branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/java/org/jboss/seam/example/registration/test/selenium/RegistrationTest.java =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/java/org/jboss/seam/example/registration/test/selenium/RegistrationTest.java 2013-06-04 10:29:19 UTC (rev 15543) +++ branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/java/org/jboss/seam/example/registration/test/selenium/RegistrationTest.java 2013-06-04 11:52:59 UTC (rev 15544) @@ -1,96 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.seam.example.registration.test.selenium; - -import org.jboss.seam.example.common.test.selenium.SeamSeleniumTest; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; -import static org.testng.AssertJUnit.assertTrue; -import static org.testng.AssertJUnit.assertEquals; - -/** - * This class tests registration form functionality in registration example. - * - * @author Jozef Hartinger - * - */ -public class RegistrationTest extends SeamSeleniumTest -{ - protected static String REGISTRATION_URL = "/register.seam"; - protected static String REGISTRATION_USERNAME = "registration:username"; - protected static String REGISTRATION_NAME = "registration:name"; - protected static String REGISTRATION_PASSWORD = "registration:password"; - protected static String REGISTRATION_SUBMIT = "registration:register"; - protected static String REGISTRATION_MESSAGE = "registration:messages"; - protected static String REGISTRATION_MESSAGE_COUNT = "//ul[@id='registration:messages']/li"; - protected static String REGISTERED_URL = "/registered.seam"; - - @Override - @BeforeMethod - public void setUp() - { - super.setUp(); - browser.open(CONTEXT_PATH + REGISTRATION_URL); - } - - @Test - public void simpleRegistrationTest() - { - String username = "johny"; - String name = "John Doe"; - String password = "secretPassword"; - submitRegistrationForm(username, name, password); - assertTrue("After-registration page expected.", browser.getLocation().contains(REGISTERED_URL)); - assertTrue("Welcome message should contain username.", browser.isTextPresent(username)); - assertTrue("Welcome message should contain name.", browser.isTextPresent(name)); - } - - @Test(dependsOnMethods = { "simpleRegistrationTest" }) - public void duplicateUsernameTest() - { - String username = "jane"; - String name = "Jane Doe"; - String password = "secretPassword"; - submitRegistrationForm(username, name, password); - browser.goBackAndWait(); - submitRegistrationForm(username, name, password); - assertTrue("Registration page expected.", browser.getLocation().contains(REGISTRATION_URL)); - assertTrue("Error message did not appear.", browser.isElementPresent(REGISTRATION_MESSAGE)); - } - - @Test - public void emptyValuesTest() - { - submitRegistrationForm("", "", ""); - assertTrue("Registration page expected.", browser.getLocation().contains(REGISTRATION_URL)); - assertEquals("Unexpected number of error messages.", 3, browser.getXpathCount(REGISTRATION_MESSAGE_COUNT)); - } - - protected void submitRegistrationForm(String username, String name, String password) - { - browser.type(REGISTRATION_USERNAME, username); - browser.type(REGISTRATION_NAME, name); - browser.type(REGISTRATION_PASSWORD, password); - browser.clickAndWait(REGISTRATION_SUBMIT); - } - -} Deleted: branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-ftest/testng.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-ftest/testng.xml 2013-06-04 10:29:19 UTC (rev 15543) +++ branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-ftest/testng.xml 2013-06-04 11:52:59 UTC (rev 15544) @@ -1,27 +0,0 @@ - - <!-- - JBoss, Home of Professional Open Source Copyright 2008, Red Hat - Middleware LLC, and individual contributors by the @authors tag. See - the copyright.txt in the distribution for a full listing of individual - contributors. This is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. This software 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 Lesser General Public - License for more details. You should have received a copy of the GNU - Lesser General Public License along with this software; if not, write - to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, - Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org. - --> -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd"; > -<suite name="Registration example" verbose="2" parallel="false"> - <test name="registration_jboss5"> - <parameter name="PROPERTY_FILE" value="" /> - <classes> - <class - name="org.jboss.seam.example.registration.test.selenium.RegistrationTest" /> - </classes> - </test> -</suite> Deleted: branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-integration/arquillian.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-integration/arquillian.xml 2013-06-04 10:29:19 UTC (rev 15543) +++ branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-integration/arquillian.xml 2013-06-04 11:52:59 UTC (rev 15544) @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns="http://jboss.org/schema/arquillian"; - xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd";> - - <engine> - <property name="deploymentExportPath">target/</property> - </engine> - - <container qualifier="jboss" default="true"> - <configuration> - <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m ${jacoco.agent}</property> - </configuration> - </container> - -</arquillian> Deleted: branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-integration/web.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-integration/web.xml 2013-06-04 10:29:19 UTC (rev 15543) +++ branches/enterprise/WFK-2_1/examples/registration/registration-tests/src/test/resources-integration/web.xml 2013-06-04 11:52:59 UTC (rev 15544) @@ -1,12 +0,0 @@ -<?xml version="1.0" ?> - -<web-app version="3.0" - 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/web-app_3_0.xsd";> - - <listener> - <listener-class>org.jboss.seam.mock.MockSeamListener</listener-class> - </listener> - -</web-app> Modified: branches/enterprise/WFK-2_1/examples/registration/registration-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/registration/registration-web/pom.xml 2013-06-04 10:29:19 UTC (rev 15543) +++ branches/enterprise/WFK-2_1/examples/registration/registration-web/pom.xml 2013-06-04 11:52:59 UTC (rev 15544) @@ -4,7 +4,7 @@ <parent> <artifactId>registration</artifactId> <groupId>org.jboss.seam.examples</groupId> - <version>2.3.1.Final-redhat-2</version> + <version>2.3.1.Final-redhat-2</version> <relativePath>../pom.xml</relativePath> </parent> @@ -46,10 +46,6 @@ </exclusions> </dependency> <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> <groupId>org.jboss.spec.javax.faces</groupId> <artifactId>jboss-jsf-api_2.1_spec</artifactId> <scope>provided</scope> @@ -66,6 +62,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> + <version>${version.war.plugin}</version> <configuration> <webResources> <resource> _______________________________________________ seam-commits mailing list [email protected] https://lists.jboss.org/mailman/listinfo/seam-commits
