diff --git a/examples/jsf/login/pom.xml b/examples/jsf/login/pom.xml index 602486b..42f73fa 100644 --- a/examples/jsf/login/pom.xml +++ b/examples/jsf/login/pom.xml @@ -90,6 +90,30 @@ + + + ftest-glassfish + + + + org.glassfish.maven.plugin + maven-glassfish-plugin + + + org.codehaus.mojo + selenium-maven-plugin + + + org.codehaus.mojo + failsafe-maven-plugin + + + org.apache.maven.plugins + maven-antrun-plugin + + + + diff --git a/examples/jsf/login/src/ftest/resources/glassfish3x.xml b/examples/jsf/login/src/ftest/resources/glassfish3x.xml new file mode 100644 index 0000000..9e1bef8 --- /dev/null +++ b/examples/jsf/login/src/ftest/resources/glassfish3x.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + diff --git a/examples/jsf/login/src/main/java/org/jboss/weld/examples/login/Credentials.java b/examples/jsf/login/src/main/java/org/jboss/weld/examples/login/Credentials.java index 4804260..00ced35 100644 --- a/examples/jsf/login/src/main/java/org/jboss/weld/examples/login/Credentials.java +++ b/examples/jsf/login/src/main/java/org/jboss/weld/examples/login/Credentials.java @@ -3,11 +3,12 @@ package org.jboss.weld.examples.login; import javax.enterprise.context.RequestScoped; import javax.enterprise.inject.Default; import javax.inject.Named; +import java.io.Serializable; @RequestScoped @Named @Default -public class Credentials +public class Credentials implements Serializable { private String username; diff --git a/examples/jsf/login/src/main/java/org/jboss/weld/examples/login/User.java b/examples/jsf/login/src/main/java/org/jboss/weld/examples/login/User.java index e4b6a03..cadec3c 100644 --- a/examples/jsf/login/src/main/java/org/jboss/weld/examples/login/User.java +++ b/examples/jsf/login/src/main/java/org/jboss/weld/examples/login/User.java @@ -2,8 +2,10 @@ package org.jboss.weld.examples.login; import javax.persistence.Entity; import javax.persistence.Id; +import javax.persistence.Table; @Entity +@Table(name = "USER_TABLE") public class User { @Id diff --git a/examples/jsf/login/src/main/resources/META-INF/persistence.xml b/examples/jsf/login/src/main/resources/META-INF/persistence.xml index 73db8fd..e381321 100644 --- a/examples/jsf/login/src/main/resources/META-INF/persistence.xml +++ b/examples/jsf/login/src/main/resources/META-INF/persistence.xml @@ -5,10 +5,12 @@ version="1.0"> org.hibernate.ejb.HibernatePersistence - java:/DefaultDS + jdbc/LoginDS + + diff --git a/examples/jsf/login/src/main/resources/import.sql b/examples/jsf/login/src/main/resources/import.sql index 2d10622..8ad7d39 100644 --- a/examples/jsf/login/src/main/resources/import.sql +++ b/examples/jsf/login/src/main/resources/import.sql @@ -1 +1 @@ -insert into User (username, name, password) values ('demo', 'Demo User', 'demo') \ No newline at end of file +insert into USER_TABLE (username, name, password) values ('demo', 'Demo User', 'demo') \ No newline at end of file diff --git a/examples/pom.xml b/examples/pom.xml index c07770d..a5a902b 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -1202,5 +1202,256 @@ + + + + ftest-glassfish + + glassfish3x.xml + + + + false + + profile + glassfish + + + + + + + org.seleniumhq.selenium.client-drivers + selenium-java-client-driver + test + + + org.jboss.test + richfaces-selenium + ${richfaces.selenium.version} + test + + + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + true + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-ftest-source + + add-test-source + + + + ${ftest.sources.directory} + + + + + + + + org.glassfish.maven.plugin + maven-glassfish-plugin + 2.1 + + O:/glassfishv3/pass.txt + + domain1 + 4848 + 8080 + 8443 + 3700 + 7676 + + O:\glassfishv3 + admin + + + ${project.build.finalName} + ${project.build.directory}/${project.build.finalName}.${project.packaging} + + + + + + + pre-integration-test + + redeploy + + + + + + + + + org.codehaus.mojo + selenium-maven-plugin + ${selenium.maven.plugin.version} + + + start-selenium + pre-integration-test + + start-server + + + true + ${selenium.server.port} + true + ${selenium.log.dir}/selenium-server.log + ${selenium.debug} + ${selenium.debug} + + + + + + + + org.codehaus.mojo + failsafe-maven-plugin + + + ${ftest.resources.directory}/${ftest.suite.xml} + + -Xmx748m + once + + + method + ${method} + + + browser + ${selenium.browser} + + + context.root + ${context.root} + + + context.path + ${context.path} + + + selenium.host + ${selenium.server.host} + + + selenium.port + ${selenium.server.port} + + + selenium.debug + ${selenium.debug} + + + selenium.maximize + ${selenium.maximize} + + + maven.resources.dir + ${resources.dir} + + + maven.project.build.directory + ${project.build.directory} + + + selenium.timeout.default + ${selenium.timeout.default} + + + selenium.timeout.gui + ${selenium.timeout.gui} + + + selenium.timeout.ajax + ${selenium.timeout.ajax} + + + selenium.timeout.model + ${selenium.timeout.model} + + + selenium.maximize + ${selenium.maximize} + + + maven.resources.dir + ${resources.dir} + + + maven.project.build.directory + ${project.build.directory} + + + + + + verify + verify + + verify + + + + integration-test + integration-test + + integration-test + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + + stop-selenium + post-integration-test + + + + + + + + run + + + + + + + + + + + + +