[seam-commits] Seam SVN: r14379 - in branches/community/Seam_2_3/examples-ee6: booking and 48 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Thu Mar 8 13:03:02 EST 2012
Author: dhinojosa
Date: 2012-03-08 13:03:00 -0500 (Thu, 08 Mar 2012)
New Revision: 14379
Added:
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/Deployments.java
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-ftest/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-ftest/testng-cluster.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-ftest/testng.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/arquillian.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/test-ds.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/testng.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/WEB-INF/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/WEB-INF/components.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/booking.properties
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/jboss-seam-booking-ds.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/seam.properties
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/MailTest.java
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/selenium/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/selenium/SeleniumMailTest.java
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-ftest/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-ftest/testng.xml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/arquillian.xml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/testng.xml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/WEB-INF/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/WEB-INF/components.xml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors1.xhtml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors2.xhtml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors3.xhtml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors4.xhtml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/sanitization.xhtml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/seam.properties
Removed:
branches/community/Seam_2_3/examples-ee6/booking/booking-arquillian/
branches/community/Seam_2_3/examples-ee6/booking/booking-seamtest/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/Deployments.java
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-ftest/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-ftest/testng-cluster.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-ftest/testng.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/arquillian.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/test-ds.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/testng.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/WEB-INF/
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/WEB-INF/components.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/booking.properties
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/jboss-seam-booking-ds.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/seam.properties
branches/community/Seam_2_3/examples-ee6/mail/mail-arquillian/
branches/community/Seam_2_3/examples-ee6/mail/mail-seamtest/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/MailTest.java
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/selenium/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/selenium/SeleniumMailTest.java
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-ftest/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-ftest/testng.xml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/arquillian.xml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/testng.xml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/WEB-INF/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/WEB-INF/components.xml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors1.xhtml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors2.xhtml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors3.xhtml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors4.xhtml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/sanitization.xhtml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/seam.properties
branches/community/Seam_2_3/examples-ee6/messages/messages-arquillian/
branches/community/Seam_2_3/examples-ee6/messages/messages-seamtest/
branches/community/Seam_2_3/examples-ee6/tasks/
Modified:
branches/community/Seam_2_3/examples-ee6/
branches/community/Seam_2_3/examples-ee6/booking/
branches/community/Seam_2_3/examples-ee6/booking/booking-ear/
branches/community/Seam_2_3/examples-ee6/booking/booking-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/booking/booking-ejb/
branches/community/Seam_2_3/examples-ee6/booking/booking-web/
branches/community/Seam_2_3/examples-ee6/booking/pom.xml
branches/community/Seam_2_3/examples-ee6/mail/
branches/community/Seam_2_3/examples-ee6/mail/mail-ear/
branches/community/Seam_2_3/examples-ee6/mail/mail-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/
branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/mail/mail-web/
branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml
branches/community/Seam_2_3/examples-ee6/mail/pom.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-web/pom.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-web/src/main/webapp/WEB-INF/web.xml
branches/community/Seam_2_3/examples-ee6/messages/messages-web/src/main/webapp/messages.jsp
branches/community/Seam_2_3/examples-ee6/messages/pom.xml
branches/community/Seam_2_3/examples-ee6/pom.xml
Log:
reverted -r 14374:14346
Property changes on: branches/community/Seam_2_3/examples-ee6
___________________________________________________________________
Deleted: svn:ignore
- target
*.iml
Property changes on: branches/community/Seam_2_3/examples-ee6/booking
___________________________________________________________________
Deleted: svn:ignore
- *.iml
Property changes on: branches/community/Seam_2_3/examples-ee6/booking/booking-ear
___________________________________________________________________
Deleted: svn:ignore
- target
*.iml
Modified: branches/community/Seam_2_3/examples-ee6/booking/booking-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-ear/pom.xml 2012-03-08 17:53:11 UTC (rev 14378)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-ear/pom.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,229 +1,222 @@
<?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>booking</artifactId>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+<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>booking</artifactId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <version>2.3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.jboss.seam.examples-ee6.booking</groupId>
+ <artifactId>booking-ear</artifactId>
+ <packaging>ear</packaging>
+ <name>Booking EAR Module</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6.booking</groupId>
+ <artifactId>booking-web</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6.booking</groupId>
+ <artifactId>booking-ejb</artifactId>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jsf2</artifactId>
+ <type>ejb</type>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>antlr</groupId>
+ <artifactId>antlr</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
- <groupId>org.jboss.seam.examples-ee6.booking</groupId>
- <artifactId>booking-ear</artifactId>
- <packaging>ear</packaging>
- <name>Booking EAR Module</name>
+ <build>
+ <finalName>seam-booking</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <version>2.6</version>
+ <configuration>
+ <defaultLibBundleDir>lib</defaultLibBundleDir>
+ <!-- Exclude eclipse generated application.xml and manually modified jboss-app.xml during mvn build -->
+ <earSourceExcludes>**/application.xml, **/jboss-app.xml</earSourceExcludes>
+ <!-- use maven generated application.xml instead -->
+ <generateApplicationXml>true</generateApplicationXml>
+ <filtering>true</filtering>
+ <modules>
+ <webModule>
+ <groupId>org.jboss.seam.examples-ee6.booking</groupId>
+ <artifactId>booking-web</artifactId>
+ <contextRoot>/seam-booking</contextRoot>
+ <bundleFileName>booking-web.war</bundleFileName>
+ </webModule>
+ <ejbModule>
+ <groupId>org.jboss.seam.examples-ee6.booking</groupId>
+ <artifactId>booking-ejb</artifactId>
+ <bundleFileName>booking-ejb.jar</bundleFileName>
+ </ejbModule>
+ <ejbModule>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jsf2</artifactId>
+ <bundleFileName>jboss-seam.jar</bundleFileName>
+ </ejbModule>
+ </modules>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.as.plugins</groupId>
+ <artifactId>jboss-as-maven-plugin</artifactId>
+ <version>7.1.0.CR1b</version>
+ <executions>
+ <!-- This requires to be enabled manually as <enabled>true</enabled> doesn't
+ work -->
+ <!-- <execution> -->
+ <!-- <id>add-datasource</id> -->
+ <!-- <phase>package</phase> -->
+ <!-- <configuration> -->
+ <!-- <address>subsystem=datasources,data-source=java:/bookingDatasource</address> -->
+ <!-- <properties> -->
+ <!-- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url> -->
+ <!-- <jndi-name>java:/bookingDatasource</jndi-name> -->
+ <!-- <enabled>true</enabled> -->
+ <!-- <pool-name>bookingDSPool</pool-name> -->
+ <!-- <user-name>sa</user-name> -->
+ <!-- <driver-name>h2</driver-name> -->
+ <!-- </properties> -->
+ <!-- </configuration> -->
+ <!-- <goals> -->
+ <!-- <goal>add-resource</goal> -->
+ <!-- </goals> -->
+ <!-- </execution> -->
+ <!-- Datasource has to be created before running deploy -->
+ <execution>
+ <phase></phase>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6.booking</groupId>
- <artifactId>booking-web</artifactId>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6.booking</groupId>
- <artifactId>booking-ejb</artifactId>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <version>2.3.0-SNAPSHOT</version>
- <type>ejb</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>antlr</groupId>
- <artifactId>antlr</artifactId>
- </exclusion>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
- </exclusion>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!--<dependency>-->
- <!--<groupId>org.slf4j</groupId>-->
- <!--<artifactId>slf4j-log4j12</artifactId>-->
- <!--<scope>provided</scope>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.slf4j</groupId>-->
- <!--<artifactId>slf4j-api</artifactId>-->
- <!--<scope>provided</scope>-->
- <!--</dependency>-->
- </dependencies>
-
- <build>
- <finalName>seam-booking</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <version>2.6</version>
- <configuration>
- <defaultLibBundleDir>lib</defaultLibBundleDir>
- <!-- Exclude eclipse generated application.xml and manually modified jboss-app.xml during mvn build -->
- <earSourceExcludes>**/application.xml, **/jboss-app.xml</earSourceExcludes>
- <!-- use maven generated application.xml instead -->
- <generateApplicationXml>true</generateApplicationXml>
- <filtering>true</filtering>
- <modules>
- <webModule>
- <groupId>org.jboss.seam.examples-ee6.booking</groupId>
- <artifactId>booking-web</artifactId>
- <contextRoot>/seam-booking</contextRoot>
- <bundleFileName>booking-web.war</bundleFileName>
- </webModule>
- <ejbModule>
- <groupId>org.jboss.seam.examples-ee6.booking</groupId>
- <artifactId>booking-ejb</artifactId>
- <bundleFileName>booking-ejb.jar</bundleFileName>
- </ejbModule>
- <ejbModule>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <bundleFileName>jboss-seam.jar</bundleFileName>
- </ejbModule>
- </modules>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.as.plugins</groupId>
- <artifactId>jboss-as-maven-plugin</artifactId>
- <version>7.1.0.CR1b</version>
- <executions>
- <!-- This requires to be enabled manually as <enabled>true</enabled> doesn't
- work -->
- <!-- <execution> -->
- <!-- <id>add-datasource</id> -->
- <!-- <phase>package</phase> -->
- <!-- <configuration> -->
- <!-- <address>subsystem=datasources,data-source=java:/bookingDatasource</address> -->
- <!-- <properties> -->
- <!-- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url> -->
- <!-- <jndi-name>java:/bookingDatasource</jndi-name> -->
- <!-- <enabled>true</enabled> -->
- <!-- <pool-name>bookingDSPool</pool-name> -->
- <!-- <user-name>sa</user-name> -->
- <!-- <driver-name>h2</driver-name> -->
- <!-- </properties> -->
- <!-- </configuration> -->
- <!-- <goals> -->
- <!-- <goal>add-resource</goal> -->
- <!-- </goals> -->
- <!-- </execution> -->
- <!-- Datasource has to be created before running deploy -->
- <execution>
- <phase></phase>
- <goals>
- <goal>deploy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>exploded</id>
- <properties>
- <example.name>booking</example.name>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.seam.examples-ee6.booking</groupId>
- <artifactId>booking-ear</artifactId>
- <type>ear</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear
- </outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.seam.examples-ee6.booking</groupId>
- <artifactId>booking-web</artifactId>
- <type>war</type>
- <overWrite>true</overWrite>
- <outputDirectory>
- ${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-web.war
- </outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.seam.examples-ee6.booking</groupId>
- <artifactId>booking-ejb</artifactId>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>
- ${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-ejb.jar
- </outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <profiles>
+ <profile>
+ <id>exploded</id>
+ <properties>
+ <example.name>booking</example.name>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.seam.examples-ee6.booking</groupId>
+ <artifactId>booking-ear</artifactId>
+ <type>ear</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.seam.examples-ee6.booking</groupId>
+ <artifactId>booking-web</artifactId>
+ <type>war</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-web.war</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.seam.examples-ee6.booking</groupId>
+ <artifactId>booking-ejb</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-ejb.jar</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Property changes on: branches/community/Seam_2_3/examples-ee6/booking/booking-ejb
___________________________________________________________________
Deleted: svn:ignore
- target
*.iml
Deleted: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,228 +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>booking</artifactId>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>org.jboss.seam.examples-ee6.booking</groupId>
- <artifactId>booking-tests</artifactId>
- <name>Booking Integration Tests Module</name>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6.booking</groupId>
- <artifactId>booking-ejb</artifactId>
- <type>ejb</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <type>ejb</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium.server</groupId>
- <artifactId>selenium-server</artifactId>
- <classifier>standalone</classifier>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>functional-tests</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-6.0</artifactId>
- <type>pom</type>
- <scope>provided</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.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-api-maven</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource> <!-- this takes datasource booking-ds.xml -->
- <directory>${basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource> <!-- this takes themes aka *.properties -->
- <directory>${basedir}/../booking-web/src/main/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-booking</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>
- <profile>
- <id>ftest-jbossas-cluster</id>
- <properties>
- <example.context.path>seam-booking</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>
- <profile>
- <id>ftest-tomcat</id>
- <properties>
- <example.context.path>jboss-seam-booking</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>
Copied: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml (from rev 14346, branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/pom.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,228 @@
+<?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>booking</artifactId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <version>2.3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.jboss.seam.examples-ee6.booking</groupId>
+ <artifactId>booking-tests</artifactId>
+ <name>Booking Integration Tests Module</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6.booking</groupId>
+ <artifactId>booking-ejb</artifactId>
+ <type>ejb</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jsf2</artifactId>
+ <type>ejb</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.seleniumhq.selenium.server</groupId>
+ <artifactId>selenium-server</artifactId>
+ <classifier>standalone</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.seleniumhq.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>functional-tests</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-6.0</artifactId>
+ <type>pom</type>
+ <scope>provided</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.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-api-maven</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ <testResource> <!-- this takes datasource booking-ds.xml -->
+ <directory>${basedir}/src/main/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ <testResource> <!-- this takes themes aka *.properties -->
+ <directory>${basedir}/../booking-web/src/main/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-booking</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>
+ <profile>
+ <id>ftest-jbossas-cluster</id>
+ <properties>
+ <example.context.path>seam-booking</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>
+ <profile>
+ <id>ftest-tomcat</id>
+ <properties>
+ <example.context.path>jboss-seam-booking</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/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,309 +0,0 @@
-//$Id: BookingTest.java 5810 2007-07-16 06:46:47Z gavin $
-package org.jboss.seam.example.booking.test;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Iterator;
-
-import javax.faces.application.FacesMessage;
-import javax.faces.context.FacesContext;
-import javax.faces.model.DataModel;
-import javax.faces.model.ListDataModel;
-
-import org.jboss.shrinkwrap.api.asset.Asset;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-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.contexts.Contexts;
-import org.jboss.seam.core.Manager;
-import org.jboss.seam.example.booking.Booking;
-import org.jboss.seam.example.booking.Hotel;
-import org.jboss.seam.example.booking.HotelBooking;
-import org.jboss.seam.example.booking.User;
-import org.jboss.seam.mock.JUnitSeamTest;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
- at RunWith(Arquillian.class)
-public class BookingTest extends JUnitSeamTest
-{
- @Deployment(name="BookingTest")
- @OverProtocol("Servlet 3.0")
- public static Archive<?> createDeployment()
- {
- EnterpriseArchive er = Deployments.bookingDeployment();
- WebArchive web = er.getAsType(WebArchive.class, "booking-web.war");
-
- web.addClasses(BookingTest.class);
-
- return er;
- }
-
- @Test
- public void testBookHotel() throws Exception
- {
-
- new FacesRequest() {
-
- @Override
- protected void invokeApplication() throws Exception
- {
- Contexts.getSessionContext().set("user", new User("Gavin King", "foobar", "gavin"));
- setValue("#{identity.username}", "gavin");
- setValue("#{identity.password}", "foobar");
- invokeAction("#{identity.login}");
- }
-
- }.run();
-
- new FacesRequest("/main.xhtml") {
-
- @Override
- protected void updateModelValues() throws Exception
- {
- setValue("#{hotelSearch.searchString}", "Union Square");
- }
-
- @Override
- protected void invokeApplication()
- {
- assert invokeAction("#{hotelSearch.find}")==null;
- }
-
- @Override
- protected void renderResponse()
- {
- DataModel hotels = (DataModel) Contexts.getSessionContext().get("hotels");
- assert hotels.getRowCount()==1;
- assert ( (Hotel) hotels.getRowData() ).getCity().equals("NY");
- assert getValue("#{hotelSearch.searchString}").equals("Union Square");
- assert !Manager.instance().isLongRunningConversation();
- }
-
- }.run();
-
- String id = new FacesRequest("/main.xhtml") {
-
- @Override
- protected void invokeApplication() throws Exception {
- HotelBooking hotelBooking = (HotelBooking) getInstance("hotelBooking");
- DataModel hotels = (DataModel) Contexts.getSessionContext().get("hotels");
- assert hotels.getRowCount()==1;
- hotelBooking.selectHotel( (Hotel) hotels.getRowData() );
- }
-
- @Override
- protected void renderResponse()
- {
- Hotel hotel = (Hotel) Contexts.getConversationContext().get("hotel");
- assert hotel.getCity().equals("NY");
- assert hotel.getZip().equals("10011");
- assert Manager.instance().isLongRunningConversation();
- }
-
- }.run();
-
- id = new FacesRequest("/hotel.xhtml", id) {
-
- @Override
- protected void invokeApplication()
- {
- invokeAction("#{hotelBooking.bookHotel}");
- }
-
- @Override
- protected void renderResponse()
- {
- assert getValue("#{booking.user}")!=null;
- assert getValue("#{booking.hotel}")!=null;
- assert getValue("#{booking.creditCard}")==null;
- assert getValue("#{booking.creditCardName}")==null;
- Booking booking = (Booking) Contexts.getConversationContext().get("booking");
- assert booking.getHotel()==Contexts.getConversationContext().get("hotel");
- assert booking.getUser()==Contexts.getSessionContext().get("user");
- assert Manager.instance().isLongRunningConversation();
- }
-
- }.run();
-
- new FacesRequest("/book.xhtml", id) {
-
- @Override
- protected void processValidations() throws Exception
- {
- validateValue("#{booking.creditCard}", "123");
- assert isValidationFailure();
- }
-
- @Override
- protected void renderResponse()
- {
- Iterator messages = FacesContext.getCurrentInstance().getMessages();
- assert messages.hasNext();
- assert ( (FacesMessage) messages.next() ).getSummary().equals("Credit card number must 16 digits long");
- assert !messages.hasNext();
- assert Manager.instance().isLongRunningConversation();
- }
-
- @Override
- protected void afterRequest()
- {
- assert !isInvokeApplicationBegun();
- }
-
- }.run();
-
- new FacesRequest("/book.xhtml", id) {
-
- @Override
- protected void processValidations() throws Exception
- {
- validateValue("#{booking.creditCardName}", "");
- assert isValidationFailure();
- }
-
- @Override
- protected void renderResponse()
- {
- Iterator messages = FacesContext.getCurrentInstance().getMessages();
- assert messages.hasNext();
- assert ( (FacesMessage) messages.next() ).getSummary().equals("Credit card name is required");
- assert !messages.hasNext();
- assert Manager.instance().isLongRunningConversation();
- }
-
- @Override
- protected void afterRequest()
- {
- assert !isInvokeApplicationBegun();
- }
-
- }.run();
-
- new FacesRequest("/book.xhtml", id) {
-
- @Override @SuppressWarnings("deprecation")
- protected void updateModelValues() throws Exception
- {
- setValue("#{booking.creditCard}", "1234567891021234");
- setValue("#{booking.creditCardName}", "GAVIN KING");
- setValue("#{booking.beds}", 2);
- Date now = new Date();
- setValue("#{booking.checkinDate}", now);
- setValue("#{booking.checkoutDate}", now);
- }
-
- @Override
- protected void invokeApplication()
- {
- assert invokeAction("#{hotelBooking.setBookingDetails}")==null;
- }
-
- @Override
- protected void renderResponse()
- {
- Iterator messages = FacesContext.getCurrentInstance().getMessages();
- assert messages.hasNext();
- FacesMessage message = (FacesMessage) messages.next();
- assert message.getSummary().equals("Check out date must be later than check in date");
- assert !messages.hasNext();
- assert Manager.instance().isLongRunningConversation();
- }
-
- @Override
- protected void afterRequest()
- {
- assert isInvokeApplicationComplete();
- }
-
- }.run();
-
- new FacesRequest("/book.xhtml", id) {
-
- @Override @SuppressWarnings("deprecation")
- protected void updateModelValues() throws Exception
- {
- Calendar cal = Calendar.getInstance();
- cal.add(Calendar.DAY_OF_MONTH, 2);
- setValue("#{booking.checkoutDate}", cal.getTime() );
- }
-
- @Override
- protected void invokeApplication()
- {
- invokeAction("#{hotelBooking.setBookingDetails}");
- }
-
- @Override
- protected void renderResponse()
- {
- assert Manager.instance().isLongRunningConversation();
- }
-
- @Override
- protected void afterRequest()
- {
- assert isInvokeApplicationComplete();
- }
-
- }.run();
-
- new FacesRequest("/confirm.xhtml", id) {
-
- @Override
- protected void invokeApplication()
- {
- invokeAction("#{hotelBooking.confirm}");
- }
-
- @Override
- protected void afterRequest()
- {
- assert isInvokeApplicationComplete();
- }
-
- }.run();
-
- new NonFacesRequest("/main.xhtml") {
-
- @Override
- protected void renderResponse()
- {
- ListDataModel bookings = (ListDataModel) getInstance("bookings");
- assert bookings.getRowCount()==1;
- bookings.setRowIndex(0);
- Booking booking = (Booking) bookings.getRowData();
- assert booking.getHotel().getCity().equals("NY");
- assert booking.getUser().getUsername().equals("gavin");
- assert !Manager.instance().isLongRunningConversation();
- }
-
- }.run();
-
- new FacesRequest("/main.xhtml") {
-
- @Override
- protected void invokeApplication()
- {
- ListDataModel bookings = (ListDataModel) Contexts.getSessionContext().get("bookings");
- bookings.setRowIndex(0);
- invokeAction("#{bookingList.cancel}");
- }
-
- @Override
- protected void renderResponse()
- {
- ListDataModel bookings = (ListDataModel) Contexts.getSessionContext().get("bookings");
- assert bookings.getRowCount()==0;
- assert !Manager.instance().isLongRunningConversation();
- }
-
- }.run();
-
- }
-
-}
Copied: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java (from rev 14346, branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/BookingTest.java 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,309 @@
+//$Id: BookingTest.java 5810 2007-07-16 06:46:47Z gavin $
+package org.jboss.seam.example.booking.test;
+
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Iterator;
+
+import javax.faces.application.FacesMessage;
+import javax.faces.context.FacesContext;
+import javax.faces.model.DataModel;
+import javax.faces.model.ListDataModel;
+
+import org.jboss.shrinkwrap.api.asset.Asset;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+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.contexts.Contexts;
+import org.jboss.seam.core.Manager;
+import org.jboss.seam.example.booking.Booking;
+import org.jboss.seam.example.booking.Hotel;
+import org.jboss.seam.example.booking.HotelBooking;
+import org.jboss.seam.example.booking.User;
+import org.jboss.seam.mock.JUnitSeamTest;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+ at RunWith(Arquillian.class)
+public class BookingTest extends JUnitSeamTest
+{
+ @Deployment(name="BookingTest")
+ @OverProtocol("Servlet 3.0")
+ public static Archive<?> createDeployment()
+ {
+ EnterpriseArchive er = Deployments.bookingDeployment();
+ WebArchive web = er.getAsType(WebArchive.class, "booking-web.war");
+
+ web.addClasses(BookingTest.class);
+
+ return er;
+ }
+
+ @Test
+ public void testBookHotel() throws Exception
+ {
+
+ new FacesRequest() {
+
+ @Override
+ protected void invokeApplication() throws Exception
+ {
+ Contexts.getSessionContext().set("user", new User("Gavin King", "foobar", "gavin"));
+ setValue("#{identity.username}", "gavin");
+ setValue("#{identity.password}", "foobar");
+ invokeAction("#{identity.login}");
+ }
+
+ }.run();
+
+ new FacesRequest("/main.xhtml") {
+
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+ setValue("#{hotelSearch.searchString}", "Union Square");
+ }
+
+ @Override
+ protected void invokeApplication()
+ {
+ assert invokeAction("#{hotelSearch.find}")==null;
+ }
+
+ @Override
+ protected void renderResponse()
+ {
+ DataModel hotels = (DataModel) Contexts.getSessionContext().get("hotels");
+ assert hotels.getRowCount()==1;
+ assert ( (Hotel) hotels.getRowData() ).getCity().equals("NY");
+ assert getValue("#{hotelSearch.searchString}").equals("Union Square");
+ assert !Manager.instance().isLongRunningConversation();
+ }
+
+ }.run();
+
+ String id = new FacesRequest("/main.xhtml") {
+
+ @Override
+ protected void invokeApplication() throws Exception {
+ HotelBooking hotelBooking = (HotelBooking) getInstance("hotelBooking");
+ DataModel hotels = (DataModel) Contexts.getSessionContext().get("hotels");
+ assert hotels.getRowCount()==1;
+ hotelBooking.selectHotel( (Hotel) hotels.getRowData() );
+ }
+
+ @Override
+ protected void renderResponse()
+ {
+ Hotel hotel = (Hotel) Contexts.getConversationContext().get("hotel");
+ assert hotel.getCity().equals("NY");
+ assert hotel.getZip().equals("10011");
+ assert Manager.instance().isLongRunningConversation();
+ }
+
+ }.run();
+
+ id = new FacesRequest("/hotel.xhtml", id) {
+
+ @Override
+ protected void invokeApplication()
+ {
+ invokeAction("#{hotelBooking.bookHotel}");
+ }
+
+ @Override
+ protected void renderResponse()
+ {
+ assert getValue("#{booking.user}")!=null;
+ assert getValue("#{booking.hotel}")!=null;
+ assert getValue("#{booking.creditCard}")==null;
+ assert getValue("#{booking.creditCardName}")==null;
+ Booking booking = (Booking) Contexts.getConversationContext().get("booking");
+ assert booking.getHotel()==Contexts.getConversationContext().get("hotel");
+ assert booking.getUser()==Contexts.getSessionContext().get("user");
+ assert Manager.instance().isLongRunningConversation();
+ }
+
+ }.run();
+
+ new FacesRequest("/book.xhtml", id) {
+
+ @Override
+ protected void processValidations() throws Exception
+ {
+ validateValue("#{booking.creditCard}", "123");
+ assert isValidationFailure();
+ }
+
+ @Override
+ protected void renderResponse()
+ {
+ Iterator messages = FacesContext.getCurrentInstance().getMessages();
+ assert messages.hasNext();
+ assert ( (FacesMessage) messages.next() ).getSummary().equals("Credit card number must 16 digits long");
+ assert !messages.hasNext();
+ assert Manager.instance().isLongRunningConversation();
+ }
+
+ @Override
+ protected void afterRequest()
+ {
+ assert !isInvokeApplicationBegun();
+ }
+
+ }.run();
+
+ new FacesRequest("/book.xhtml", id) {
+
+ @Override
+ protected void processValidations() throws Exception
+ {
+ validateValue("#{booking.creditCardName}", "");
+ assert isValidationFailure();
+ }
+
+ @Override
+ protected void renderResponse()
+ {
+ Iterator messages = FacesContext.getCurrentInstance().getMessages();
+ assert messages.hasNext();
+ assert ( (FacesMessage) messages.next() ).getSummary().equals("Credit card name is required");
+ assert !messages.hasNext();
+ assert Manager.instance().isLongRunningConversation();
+ }
+
+ @Override
+ protected void afterRequest()
+ {
+ assert !isInvokeApplicationBegun();
+ }
+
+ }.run();
+
+ new FacesRequest("/book.xhtml", id) {
+
+ @Override @SuppressWarnings("deprecation")
+ protected void updateModelValues() throws Exception
+ {
+ setValue("#{booking.creditCard}", "1234567891021234");
+ setValue("#{booking.creditCardName}", "GAVIN KING");
+ setValue("#{booking.beds}", 2);
+ Date now = new Date();
+ setValue("#{booking.checkinDate}", now);
+ setValue("#{booking.checkoutDate}", now);
+ }
+
+ @Override
+ protected void invokeApplication()
+ {
+ assert invokeAction("#{hotelBooking.setBookingDetails}")==null;
+ }
+
+ @Override
+ protected void renderResponse()
+ {
+ Iterator messages = FacesContext.getCurrentInstance().getMessages();
+ assert messages.hasNext();
+ FacesMessage message = (FacesMessage) messages.next();
+ assert message.getSummary().equals("Check out date must be later than check in date");
+ assert !messages.hasNext();
+ assert Manager.instance().isLongRunningConversation();
+ }
+
+ @Override
+ protected void afterRequest()
+ {
+ assert isInvokeApplicationComplete();
+ }
+
+ }.run();
+
+ new FacesRequest("/book.xhtml", id) {
+
+ @Override @SuppressWarnings("deprecation")
+ protected void updateModelValues() throws Exception
+ {
+ Calendar cal = Calendar.getInstance();
+ cal.add(Calendar.DAY_OF_MONTH, 2);
+ setValue("#{booking.checkoutDate}", cal.getTime() );
+ }
+
+ @Override
+ protected void invokeApplication()
+ {
+ invokeAction("#{hotelBooking.setBookingDetails}");
+ }
+
+ @Override
+ protected void renderResponse()
+ {
+ assert Manager.instance().isLongRunningConversation();
+ }
+
+ @Override
+ protected void afterRequest()
+ {
+ assert isInvokeApplicationComplete();
+ }
+
+ }.run();
+
+ new FacesRequest("/confirm.xhtml", id) {
+
+ @Override
+ protected void invokeApplication()
+ {
+ invokeAction("#{hotelBooking.confirm}");
+ }
+
+ @Override
+ protected void afterRequest()
+ {
+ assert isInvokeApplicationComplete();
+ }
+
+ }.run();
+
+ new NonFacesRequest("/main.xhtml") {
+
+ @Override
+ protected void renderResponse()
+ {
+ ListDataModel bookings = (ListDataModel) getInstance("bookings");
+ assert bookings.getRowCount()==1;
+ bookings.setRowIndex(0);
+ Booking booking = (Booking) bookings.getRowData();
+ assert booking.getHotel().getCity().equals("NY");
+ assert booking.getUser().getUsername().equals("gavin");
+ assert !Manager.instance().isLongRunningConversation();
+ }
+
+ }.run();
+
+ new FacesRequest("/main.xhtml") {
+
+ @Override
+ protected void invokeApplication()
+ {
+ ListDataModel bookings = (ListDataModel) Contexts.getSessionContext().get("bookings");
+ bookings.setRowIndex(0);
+ invokeAction("#{bookingList.cancel}");
+ }
+
+ @Override
+ protected void renderResponse()
+ {
+ ListDataModel bookings = (ListDataModel) Contexts.getSessionContext().get("bookings");
+ assert bookings.getRowCount()==0;
+ assert !Manager.instance().isLongRunningConversation();
+ }
+
+ }.run();
+
+ }
+
+}
Deleted: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,159 +0,0 @@
-//$Id: ChangePasswordTest.java 5810 2007-07-16 06:46:47Z gavin $
-package org.jboss.seam.example.booking.test;
-
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.asset.Asset;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-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.contexts.Contexts;
-import org.jboss.seam.core.Manager;
-import org.jboss.seam.example.booking.User;
-import org.jboss.seam.mock.JUnitSeamTest;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
- at RunWith(Arquillian.class)
-public class ChangePasswordTest extends JUnitSeamTest
-{
- @Deployment(name="ChangePasswordTest")
- @OverProtocol("Servlet 3.0")
- public static Archive<?> createDeployment()
- {
- EnterpriseArchive er = Deployments.bookingDeployment();
- WebArchive web = er.getAsType(WebArchive.class, "booking-web.war");
-
- web.addClasses(ChangePasswordTest.class);
-
- return er;
- }
-
- @Test
- public void testChangePassword() throws Exception
- {
-
- new FacesRequest() {
-
- @Override
- protected void invokeApplication() throws Exception
- {
- Contexts.getSessionContext().set("user", new User("Gavin King", "foobar", "gavin"));
- setValue("#{identity.username}", "gavin");
- setValue("#{identity.password}", "foobar");
- invokeMethod("#{identity.login}");
- }
-
- }.run();
-
- new FacesRequest() {
-
- @Override
- protected void processValidations() throws Exception
- {
- validateValue("#{user.password}", "xxx");
- assert isValidationFailure();
- }
-
- @Override
- protected void renderResponse()
- {
- assert getValue("#{user.name}").equals("Gavin King");
- assert getValue("#{user.username}").equals("gavin");
- assert getValue("#{user.password}").equals("foobar");
- assert !Manager.instance().isLongRunningConversation();
- assert getValue("#{identity.loggedIn}").equals(true);
-
- }
-
- }.run();
-
- new FacesRequest() {
-
- @Override
- protected void updateModelValues() throws Exception
- {
- setValue("#{user.password}", "xxxyyy");
- setValue("#{changePassword.verify}", "xxyyyx");
- }
-
- @Override
- protected void invokeApplication()
- {
- assert invokeAction("#{changePassword.changePassword}")==null;
- }
-
- @Override
- protected void renderResponse()
- {
- assert getValue("#{user.name}").equals("Gavin King");
- assert getValue("#{user.username}").equals("gavin");
- assert getValue("#{user.password}").equals("foobar");
- assert !Manager.instance().isLongRunningConversation();
- assert getValue("#{identity.loggedIn}").equals(true);
- }
-
- }.run();
-
- new FacesRequest() {
-
- @Override
- protected void updateModelValues() throws Exception
- {
- setValue("#{user.password}", "xxxyyy");
- setValue("#{changePassword.verify}", "xxxyyy");
- }
-
- @Override
- protected void invokeApplication()
- {
- invokeMethod("#{changePassword.changePassword}");
- }
-
- @Override
- protected void renderResponse()
- {
- assert getValue("#{user.name}").equals("Gavin King");
- assert getValue("#{user.username}").equals("gavin");
- assert getValue("#{user.password}").equals("xxxyyy");
- assert !Manager.instance().isLongRunningConversation();
- assert getValue("#{identity.loggedIn}").equals(true);
-
- }
-
- }.run();
-
- new FacesRequest() {
-
- @Override
- protected void updateModelValues() throws Exception
- {
- assert getValue("#{user.password}").equals("xxxyyy");
- setValue("#{user.password}", "foobar");
- setValue("#{changePassword.verify}", "foobar");
- }
-
- @Override
- protected void invokeApplication()
- {
- invokeMethod("#{changePassword.changePassword}");
- }
-
- @Override
- protected void renderResponse()
- {
- assert getValue("#{user.name}").equals("Gavin King");
- assert getValue("#{user.username}").equals("gavin");
- assert getValue("#{user.password}").equals("foobar");
- assert !Manager.instance().isLongRunningConversation();
- assert getValue("#{identity.loggedIn}").equals(true);
-
- }
-
- }.run();
-
- }
-
-}
Copied: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java (from rev 14346, branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/ChangePasswordTest.java 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,159 @@
+//$Id: ChangePasswordTest.java 5810 2007-07-16 06:46:47Z gavin $
+package org.jboss.seam.example.booking.test;
+
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.asset.Asset;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+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.contexts.Contexts;
+import org.jboss.seam.core.Manager;
+import org.jboss.seam.example.booking.User;
+import org.jboss.seam.mock.JUnitSeamTest;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+ at RunWith(Arquillian.class)
+public class ChangePasswordTest extends JUnitSeamTest
+{
+ @Deployment(name="ChangePasswordTest")
+ @OverProtocol("Servlet 3.0")
+ public static Archive<?> createDeployment()
+ {
+ EnterpriseArchive er = Deployments.bookingDeployment();
+ WebArchive web = er.getAsType(WebArchive.class, "booking-web.war");
+
+ web.addClasses(ChangePasswordTest.class);
+
+ return er;
+ }
+
+ @Test
+ public void testChangePassword() throws Exception
+ {
+
+ new FacesRequest() {
+
+ @Override
+ protected void invokeApplication() throws Exception
+ {
+ Contexts.getSessionContext().set("user", new User("Gavin King", "foobar", "gavin"));
+ setValue("#{identity.username}", "gavin");
+ setValue("#{identity.password}", "foobar");
+ invokeMethod("#{identity.login}");
+ }
+
+ }.run();
+
+ new FacesRequest() {
+
+ @Override
+ protected void processValidations() throws Exception
+ {
+ validateValue("#{user.password}", "xxx");
+ assert isValidationFailure();
+ }
+
+ @Override
+ protected void renderResponse()
+ {
+ assert getValue("#{user.name}").equals("Gavin King");
+ assert getValue("#{user.username}").equals("gavin");
+ assert getValue("#{user.password}").equals("foobar");
+ assert !Manager.instance().isLongRunningConversation();
+ assert getValue("#{identity.loggedIn}").equals(true);
+
+ }
+
+ }.run();
+
+ new FacesRequest() {
+
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+ setValue("#{user.password}", "xxxyyy");
+ setValue("#{changePassword.verify}", "xxyyyx");
+ }
+
+ @Override
+ protected void invokeApplication()
+ {
+ assert invokeAction("#{changePassword.changePassword}")==null;
+ }
+
+ @Override
+ protected void renderResponse()
+ {
+ assert getValue("#{user.name}").equals("Gavin King");
+ assert getValue("#{user.username}").equals("gavin");
+ assert getValue("#{user.password}").equals("foobar");
+ assert !Manager.instance().isLongRunningConversation();
+ assert getValue("#{identity.loggedIn}").equals(true);
+ }
+
+ }.run();
+
+ new FacesRequest() {
+
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+ setValue("#{user.password}", "xxxyyy");
+ setValue("#{changePassword.verify}", "xxxyyy");
+ }
+
+ @Override
+ protected void invokeApplication()
+ {
+ invokeMethod("#{changePassword.changePassword}");
+ }
+
+ @Override
+ protected void renderResponse()
+ {
+ assert getValue("#{user.name}").equals("Gavin King");
+ assert getValue("#{user.username}").equals("gavin");
+ assert getValue("#{user.password}").equals("xxxyyy");
+ assert !Manager.instance().isLongRunningConversation();
+ assert getValue("#{identity.loggedIn}").equals(true);
+
+ }
+
+ }.run();
+
+ new FacesRequest() {
+
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+ assert getValue("#{user.password}").equals("xxxyyy");
+ setValue("#{user.password}", "foobar");
+ setValue("#{changePassword.verify}", "foobar");
+ }
+
+ @Override
+ protected void invokeApplication()
+ {
+ invokeMethod("#{changePassword.changePassword}");
+ }
+
+ @Override
+ protected void renderResponse()
+ {
+ assert getValue("#{user.name}").equals("Gavin King");
+ assert getValue("#{user.username}").equals("gavin");
+ assert getValue("#{user.password}").equals("foobar");
+ assert !Manager.instance().isLongRunningConversation();
+ assert getValue("#{identity.loggedIn}").equals(true);
+
+ }
+
+ }.run();
+
+ }
+
+}
Deleted: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/Deployments.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/Deployments.java 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/Deployments.java 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,24 +0,0 @@
-package org.jboss.seam.example.booking.test;
-
-import java.io.File;
-
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.jboss.shrinkwrap.api.importer.ZipImporter;
-import org.jboss.seam.example.booking.Booking;
-
-import org.jboss.shrinkwrap.resolver.api.DependencyResolvers;
-import org.jboss.shrinkwrap.resolver.api.maven.MavenDependencyResolver;
-
-public class Deployments {
- public static EnterpriseArchive bookingDeployment() {
-
- return ShrinkWrap.create(ZipImporter.class, "seam-booking.ear").importFrom(new File("../booking-ear/target/seam-booking.ear"))
- .as(EnterpriseArchive.class)
- .addAsResource("test-ds.xml", "test-ds.xml");
- }
-}
Copied: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/Deployments.java (from rev 14346, branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/Deployments.java)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/Deployments.java (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/Deployments.java 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,24 @@
+package org.jboss.seam.example.booking.test;
+
+import java.io.File;
+
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.jboss.shrinkwrap.api.importer.ZipImporter;
+import org.jboss.seam.example.booking.Booking;
+
+import org.jboss.shrinkwrap.resolver.api.DependencyResolvers;
+import org.jboss.shrinkwrap.resolver.api.maven.MavenDependencyResolver;
+
+public class Deployments {
+ public static EnterpriseArchive bookingDeployment() {
+
+ return ShrinkWrap.create(ZipImporter.class, "seam-booking.ear").importFrom(new File("../booking-ear/target/seam-booking.ear"))
+ .as(EnterpriseArchive.class)
+ .addAsResource("test-ds.xml", "test-ds.xml");
+ }
+}
Deleted: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,137 +0,0 @@
-//$Id: LoginTest.java 5810 2007-07-16 06:46:47Z gavin $
-package org.jboss.seam.example.booking.test;
-
-import org.jboss.shrinkwrap.api.asset.Asset;
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-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.core.Manager;
-import org.jboss.seam.web.Session;
-import org.jboss.seam.mock.JUnitSeamTest;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
- at RunWith(Arquillian.class)
-public class LoginTest extends JUnitSeamTest
-{
- @Deployment(name="LoginTest")
- @OverProtocol("Servlet 3.0")
- public static Archive<?> createDeployment()
- {
- EnterpriseArchive er = Deployments.bookingDeployment();
- WebArchive web = er.getAsType(WebArchive.class, "booking-web.war");
-
- //
- web.addClasses(LoginTest.class);
-
- return er;
- }
-
- @Test
- public void testLoginComponent() throws Exception
- {
- new ComponentTest() {
-
- @Override
- protected void testComponents() throws Exception
- {
- assert getValue("#{identity.loggedIn}").equals(false);
- setValue("#{identity.username}", "gavin");
- setValue("#{identity.password}", "foobar");
- invokeMethod("#{identity.login}");
- assert getValue("#{user.name}").equals("Gavin King");
- assert getValue("#{user.username}").equals("gavin");
- assert getValue("#{user.password}").equals("foobar");
- assert getValue("#{identity.loggedIn}").equals(true);
- invokeMethod("#{identity.logout}");
- assert getValue("#{identity.loggedIn}").equals(false);
- setValue("#{identity.username}", "gavin");
- setValue("#{identity.password}", "tiger");
- invokeMethod("#{identity.login}");
- assert getValue("#{identity.loggedIn}").equals(false);
- }
-
- }.run();
- }
-
- @Test
- public void testLogin() throws Exception
- {
-
- new FacesRequest() {
-
- @Override
- protected void invokeApplication()
- {
- assert !isSessionInvalid();
- assert getValue("#{identity.loggedIn}").equals(false);
- }
-
- }.run();
-
- new FacesRequest() {
-
- @Override
- protected void updateModelValues() throws Exception
- {
- assert !isSessionInvalid();
- setValue("#{identity.username}", "gavin");
- setValue("#{identity.password}", "foobar");
- }
-
- @Override
- protected void invokeApplication()
- {
- invokeAction("#{identity.login}");
- }
-
- @Override
- protected void renderResponse()
- {
- assert getValue("#{user.name}").equals("Gavin King");
- assert getValue("#{user.username}").equals("gavin");
- assert getValue("#{user.password}").equals("foobar");
- assert !Manager.instance().isLongRunningConversation();
- assert getValue("#{identity.loggedIn}").equals(true);
- }
-
- }.run();
-
- new FacesRequest() {
-
- @Override
- protected void invokeApplication()
- {
- assert !isSessionInvalid();
- assert getValue("#{identity.loggedIn}").equals(true);
- }
-
- }.run();
-
- new FacesRequest() {
-
- @Override
- protected void invokeApplication()
- {
- assert !Manager.instance().isLongRunningConversation();
- assert !isSessionInvalid();
- invokeMethod("#{identity.logout}");
- assert Session.instance().isInvalid();
- }
-
- @Override
- protected void renderResponse()
- {
- assert getValue("#{identity.loggedIn}").equals(false);
- assert Session.instance().isInvalid();
- }
-
- }.run();
-
- }
-
-}
Copied: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java (from rev 14346, branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/java/org/jboss/seam/example/booking/test/LoginTest.java 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,137 @@
+//$Id: LoginTest.java 5810 2007-07-16 06:46:47Z gavin $
+package org.jboss.seam.example.booking.test;
+
+import org.jboss.shrinkwrap.api.asset.Asset;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+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.core.Manager;
+import org.jboss.seam.web.Session;
+import org.jboss.seam.mock.JUnitSeamTest;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+ at RunWith(Arquillian.class)
+public class LoginTest extends JUnitSeamTest
+{
+ @Deployment(name="LoginTest")
+ @OverProtocol("Servlet 3.0")
+ public static Archive<?> createDeployment()
+ {
+ EnterpriseArchive er = Deployments.bookingDeployment();
+ WebArchive web = er.getAsType(WebArchive.class, "booking-web.war");
+
+ //
+ web.addClasses(LoginTest.class);
+
+ return er;
+ }
+
+ @Test
+ public void testLoginComponent() throws Exception
+ {
+ new ComponentTest() {
+
+ @Override
+ protected void testComponents() throws Exception
+ {
+ assert getValue("#{identity.loggedIn}").equals(false);
+ setValue("#{identity.username}", "gavin");
+ setValue("#{identity.password}", "foobar");
+ invokeMethod("#{identity.login}");
+ assert getValue("#{user.name}").equals("Gavin King");
+ assert getValue("#{user.username}").equals("gavin");
+ assert getValue("#{user.password}").equals("foobar");
+ assert getValue("#{identity.loggedIn}").equals(true);
+ invokeMethod("#{identity.logout}");
+ assert getValue("#{identity.loggedIn}").equals(false);
+ setValue("#{identity.username}", "gavin");
+ setValue("#{identity.password}", "tiger");
+ invokeMethod("#{identity.login}");
+ assert getValue("#{identity.loggedIn}").equals(false);
+ }
+
+ }.run();
+ }
+
+ @Test
+ public void testLogin() throws Exception
+ {
+
+ new FacesRequest() {
+
+ @Override
+ protected void invokeApplication()
+ {
+ assert !isSessionInvalid();
+ assert getValue("#{identity.loggedIn}").equals(false);
+ }
+
+ }.run();
+
+ new FacesRequest() {
+
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+ assert !isSessionInvalid();
+ setValue("#{identity.username}", "gavin");
+ setValue("#{identity.password}", "foobar");
+ }
+
+ @Override
+ protected void invokeApplication()
+ {
+ invokeAction("#{identity.login}");
+ }
+
+ @Override
+ protected void renderResponse()
+ {
+ assert getValue("#{user.name}").equals("Gavin King");
+ assert getValue("#{user.username}").equals("gavin");
+ assert getValue("#{user.password}").equals("foobar");
+ assert !Manager.instance().isLongRunningConversation();
+ assert getValue("#{identity.loggedIn}").equals(true);
+ }
+
+ }.run();
+
+ new FacesRequest() {
+
+ @Override
+ protected void invokeApplication()
+ {
+ assert !isSessionInvalid();
+ assert getValue("#{identity.loggedIn}").equals(true);
+ }
+
+ }.run();
+
+ new FacesRequest() {
+
+ @Override
+ protected void invokeApplication()
+ {
+ assert !Manager.instance().isLongRunningConversation();
+ assert !isSessionInvalid();
+ invokeMethod("#{identity.logout}");
+ assert Session.instance().isInvalid();
+ }
+
+ @Override
+ protected void renderResponse()
+ {
+ assert getValue("#{identity.loggedIn}").equals(false);
+ assert Session.instance().isInvalid();
+ }
+
+ }.run();
+
+ }
+
+}
Deleted: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/WEB-INF/components.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/WEB-INF/components.xml 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/WEB-INF/components.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<components xmlns="http://jboss.com/products/seam/components"
- xmlns:core="http://jboss.com/products/seam/core"
- xmlns:security="http://jboss.com/products/seam/security"
- xmlns:transaction="http://jboss.com/products/seam/transaction"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation=
- "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.3.xsd
- http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.3.xsd
- http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.3.xsd
- http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd">
-
-<!-- <core:init jndi-pattern="@jndiPattern@" debug="true" distributable="@distributable@"/> -->
- <core:init jndi-pattern="#{ejbName}/local" debug="true" />
-
- <core:manager conversation-timeout="120000"
- concurrent-request-timeout="500"
- conversation-id-parameter="cid"/>
-
- <transaction:ejb-transaction/>
-
- <security:identity authenticate-method="#{authenticator.authenticate}"/>
-
-</components>
Copied: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/WEB-INF/components.xml (from rev 14346, branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/WEB-INF/components.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/WEB-INF/components.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/WEB-INF/components.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components xmlns="http://jboss.com/products/seam/components"
+ xmlns:core="http://jboss.com/products/seam/core"
+ xmlns:security="http://jboss.com/products/seam/security"
+ xmlns:transaction="http://jboss.com/products/seam/transaction"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation=
+ "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.3.xsd
+ http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.3.xsd
+ http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.3.xsd
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd">
+
+<!-- <core:init jndi-pattern="@jndiPattern@" debug="true" distributable="@distributable@"/> -->
+ <core:init jndi-pattern="#{ejbName}/local" debug="true" />
+
+ <core:manager conversation-timeout="120000"
+ concurrent-request-timeout="500"
+ conversation-id-parameter="cid"/>
+
+ <transaction:ejb-transaction/>
+
+ <security:identity authenticate-method="#{authenticator.authenticate}"/>
+
+</components>
Deleted: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/booking.properties
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/booking.properties 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/booking.properties 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,84 +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.
- #
-HOME_PAGE /home.seam
-MAIN_PAGE /main.seam
-PAGE_TITLE JBoss Suites: Seam Framework
-LOGIN_USERNAME_FIELD id=login:username
-LOGIN_PASSWORD_FIELD id=login:password
-LOGIN_SUBMIT id=login:login
-LOGOUT id=logout
-PASSWORD_UPDATED_MESSAGE Password updated
-PASSWORD_REENTER_MESSAGE Re-enter new password
-PASSWORD_VALUE_REQUIRED_MESSAGE //span[text() = 'value is required']
-PASSWORD_LENGTH_MESSAGE size must be between
-PASSWORD_PASSWORD id=setpassword:PasswordDecorate:password
-PASSWORD_VERIFY id=setpassword:VerifyDecorate:verify
-PASSWORD_SUBMIT id=setpassword:change
-SETTINGS id=settings
-SEARCH_STRING_FIELD id=searchCriteria:searchString
-SEARCH_SUBMIT id=searchCriteria:findHotels
-NO_HOTELS_FOUND id=NoHotelsFoundMessage
-SEARCH_RESULT_TABLE xpath=//table[@id = 'hotels']/tbody
-SEARCH_RESULT_TABLE_FIRST_ROW_LINK id=hotels:0:viewHotel
-BOOKING_BOOK id=hotel:bookHotel
-BOOKING_CANCEL id=hotel:cancel
-HOTEL_BED_FIELD id=booking:bedsDecorate:beds
-HOTEL_BED_FIELD_SELECT_CRITERIA value=
-HOTEL_CHECKIN_DATE_FIELD id=booking:checkinDateDecorate:checkinDateInputDate
-HOTEL_CHECKIN_DATE_MESSAGE id=booking:checkinDateDecorate:message
-HOTEL_CHECKOUT_DATE_FIELD id=booking:checkoutDateDecorate:checkoutDateInputDate
-HOTEL_CHECKOUT_DATE_MESSAGE id=booking:checkoutDateDecorate:message
-HOTEL_SMOKING_1 id=booking:smokingDecorate:smoking:0
-HOTEL_SMOKING_2 id=booking:smokingDecorate:smoking:1
-HOTEL_CREDIT_CARD id=booking:creditCardDecorate:creditCard
-HOTEL_CREDIT_CARD_NAME id=booking:creditCardNameDecorate:creditCardName
-HOTEL_PROCEED id=booking:proceed
-HOTEL_CANCEL id=booking:cancel
-HOTEL_CONFIRM id=confirm:confirm
-HOTEL_MESSAGE xpath=//ul[@id='messages']/li
-REGISTRATION id=login:register
-REGISTRATION_USERNAME id=registration:usernameDecorate:username
-REGISTRATION_USERNAME_MESSAGE id=registration:usernameDecorate:message
-REGISTRATION_NAME id=registration:nameDecorate:name
-REGISTRATION_NAME_MESSAGE id=registration:nameDecorate:message
-REGISTRATION_PASSWORD id=registration:passwordDecorate:password
-REGISTRATION_PASSWORD_MESSAGE id=registration:passwordDecorate:message
-REGISTRATION_VERIFY id=registration:verifyDecorate:verify
-REGISTRATION_VERIFY_MESSAGE id=registration:verifyDecorate:message
-REGISTRATION_SUBMIT id=registration:register
-REGISTRATION_REENTER_MESSAGE Re-enter your password
-REGISTRATION_LENGTH_MESSAGE size must be between
-REGISTRATION_SUCCESSFUL_MESSAGE Successfully registered as {0}
-REGISTRATION_USER_EXISTS_MESSAGE Username {0} already exists
-NOT_LOGGED_IN_MESSAGE Please log in first
-CONVERSATION_TIMEOUT_MESSAGE The conversation ended, timed out or was processing another request
-BOOKING_TABLE_ITEM xpath\=//table[@id\="bookings\:bookings"]/tbody/tr[normalize-space(td[6]/text()) \= "{0}"][normalize-space(td[1]/text()) \= "{1}"]
-BOOKING_TABLE_ITEM_LINK xpath\=//table[@id\="bookings\:bookings"]/tbody/tr[normalize-space(td[6]/text()) \= "{0}"][normalize-space(td[1]/text()) \= "{1}"]/td[7]/a
-BOOKING_CANCELLED_MESSAGE Booking cancelled for confirmation number {0}
-BOOKING_CONFIRMATION_MESSAGE Thank you, {0}, your confimation number for {1} is \\d+
-BOOKING_INVALID_DATE_MESSAGE1 Check out date must be later than check in date
-BOOKING_INVALID_DATE_MESSAGE2 Check in date must be a future date
-WORKSPACE_BOOKING_TEXT Book hotel: {0}
-WORKSPACE_VIEW_TEXT View hotel: {0}
-WORKSPACE_TABLE_LINK_BY_ID id=ConversationListForm:ConversationListDataTable:{0}:EntryDescriptionLink
-WORKSPACE_TABLE_ROW_COUNT = //table[@id='ConversationListForm:ConversationListDataTable']/tbody/tr
-SPINNER id\=searchCriteria\:SpinnerGif
Copied: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/booking.properties (from rev 14346, branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/booking.properties)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/booking.properties (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/booking.properties 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,84 @@
+ #
+ # 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.
+ #
+HOME_PAGE /home.seam
+MAIN_PAGE /main.seam
+PAGE_TITLE JBoss Suites: Seam Framework
+LOGIN_USERNAME_FIELD id=login:username
+LOGIN_PASSWORD_FIELD id=login:password
+LOGIN_SUBMIT id=login:login
+LOGOUT id=logout
+PASSWORD_UPDATED_MESSAGE Password updated
+PASSWORD_REENTER_MESSAGE Re-enter new password
+PASSWORD_VALUE_REQUIRED_MESSAGE //span[text() = 'value is required']
+PASSWORD_LENGTH_MESSAGE size must be between
+PASSWORD_PASSWORD id=setpassword:PasswordDecorate:password
+PASSWORD_VERIFY id=setpassword:VerifyDecorate:verify
+PASSWORD_SUBMIT id=setpassword:change
+SETTINGS id=settings
+SEARCH_STRING_FIELD id=searchCriteria:searchString
+SEARCH_SUBMIT id=searchCriteria:findHotels
+NO_HOTELS_FOUND id=NoHotelsFoundMessage
+SEARCH_RESULT_TABLE xpath=//table[@id = 'hotels']/tbody
+SEARCH_RESULT_TABLE_FIRST_ROW_LINK id=hotels:0:viewHotel
+BOOKING_BOOK id=hotel:bookHotel
+BOOKING_CANCEL id=hotel:cancel
+HOTEL_BED_FIELD id=booking:bedsDecorate:beds
+HOTEL_BED_FIELD_SELECT_CRITERIA value=
+HOTEL_CHECKIN_DATE_FIELD id=booking:checkinDateDecorate:checkinDateInputDate
+HOTEL_CHECKIN_DATE_MESSAGE id=booking:checkinDateDecorate:message
+HOTEL_CHECKOUT_DATE_FIELD id=booking:checkoutDateDecorate:checkoutDateInputDate
+HOTEL_CHECKOUT_DATE_MESSAGE id=booking:checkoutDateDecorate:message
+HOTEL_SMOKING_1 id=booking:smokingDecorate:smoking:0
+HOTEL_SMOKING_2 id=booking:smokingDecorate:smoking:1
+HOTEL_CREDIT_CARD id=booking:creditCardDecorate:creditCard
+HOTEL_CREDIT_CARD_NAME id=booking:creditCardNameDecorate:creditCardName
+HOTEL_PROCEED id=booking:proceed
+HOTEL_CANCEL id=booking:cancel
+HOTEL_CONFIRM id=confirm:confirm
+HOTEL_MESSAGE xpath=//ul[@id='messages']/li
+REGISTRATION id=login:register
+REGISTRATION_USERNAME id=registration:usernameDecorate:username
+REGISTRATION_USERNAME_MESSAGE id=registration:usernameDecorate:message
+REGISTRATION_NAME id=registration:nameDecorate:name
+REGISTRATION_NAME_MESSAGE id=registration:nameDecorate:message
+REGISTRATION_PASSWORD id=registration:passwordDecorate:password
+REGISTRATION_PASSWORD_MESSAGE id=registration:passwordDecorate:message
+REGISTRATION_VERIFY id=registration:verifyDecorate:verify
+REGISTRATION_VERIFY_MESSAGE id=registration:verifyDecorate:message
+REGISTRATION_SUBMIT id=registration:register
+REGISTRATION_REENTER_MESSAGE Re-enter your password
+REGISTRATION_LENGTH_MESSAGE size must be between
+REGISTRATION_SUCCESSFUL_MESSAGE Successfully registered as {0}
+REGISTRATION_USER_EXISTS_MESSAGE Username {0} already exists
+NOT_LOGGED_IN_MESSAGE Please log in first
+CONVERSATION_TIMEOUT_MESSAGE The conversation ended, timed out or was processing another request
+BOOKING_TABLE_ITEM xpath\=//table[@id\="bookings\:bookings"]/tbody/tr[normalize-space(td[6]/text()) \= "{0}"][normalize-space(td[1]/text()) \= "{1}"]
+BOOKING_TABLE_ITEM_LINK xpath\=//table[@id\="bookings\:bookings"]/tbody/tr[normalize-space(td[6]/text()) \= "{0}"][normalize-space(td[1]/text()) \= "{1}"]/td[7]/a
+BOOKING_CANCELLED_MESSAGE Booking cancelled for confirmation number {0}
+BOOKING_CONFIRMATION_MESSAGE Thank you, {0}, your confimation number for {1} is \\d+
+BOOKING_INVALID_DATE_MESSAGE1 Check out date must be later than check in date
+BOOKING_INVALID_DATE_MESSAGE2 Check in date must be a future date
+WORKSPACE_BOOKING_TEXT Book hotel: {0}
+WORKSPACE_VIEW_TEXT View hotel: {0}
+WORKSPACE_TABLE_LINK_BY_ID id=ConversationListForm:ConversationListDataTable:{0}:EntryDescriptionLink
+WORKSPACE_TABLE_ROW_COUNT = //table[@id='ConversationListForm:ConversationListDataTable']/tbody/tr
+SPINNER id\=searchCriteria\:SpinnerGif
Deleted: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/jboss-seam-booking-ds.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/jboss-seam-booking-ds.xml 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/jboss-seam-booking-ds.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE datasources
- PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd">
-
-<datasources>
- <local-tx-datasource>
- <jndi-name>bookingDatasource</jndi-name>
- <connection-url>jdbc:hsqldb:.</connection-url>
- <driver-class>org.hsqldb.jdbcDriver</driver-class>
- <user-name>sa</user-name>
- <password></password>
- </local-tx-datasource>
-</datasources>
-
Copied: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/jboss-seam-booking-ds.xml (from rev 14346, branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/jboss-seam-booking-ds.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/jboss-seam-booking-ds.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/jboss-seam-booking-ds.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE datasources
+ PUBLIC "-//JBoss//DTD JBOSS JCA Config 1.5//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-ds_1_5.dtd">
+
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>bookingDatasource</jndi-name>
+ <connection-url>jdbc:hsqldb:.</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ <user-name>sa</user-name>
+ <password></password>
+ </local-tx-datasource>
+</datasources>
+
Deleted: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/seam.properties
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/seam.properties 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/seam.properties 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,3 +0,0 @@
-#debug is explicitly disabled in test to avoid JBIDE-3623
-#Thu Dec 31 16:24:37 CET 2009
-org.jboss.seam.core.init.debug=false
\ No newline at end of file
Copied: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/seam.properties (from rev 14346, branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/seam.properties)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/seam.properties (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources/seam.properties 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,3 @@
+#debug is explicitly disabled in test to avoid JBIDE-3623
+#Thu Dec 31 16:24:37 CET 2009
+org.jboss.seam.core.init.debug=false
\ No newline at end of file
Deleted: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-ftest/testng-cluster.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-ftest/testng-cluster.xml 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-ftest/testng-cluster.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,26 +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="Booking example" verbose="2" parallel="false">
- <test name="booking_tests_cluster">
- <parameter name="PROPERTY_FILE"
- value="/booking.properties" />
- <classes>
- <class name="org.jboss.seam.example.common.test.booking.cluster.selenium.FailoverTest" />
- </classes>
- </test>
-</suite>
Copied: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-ftest/testng-cluster.xml (from rev 14346, branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-ftest/testng-cluster.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-ftest/testng-cluster.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-ftest/testng-cluster.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,26 @@
+<!--
+ 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="Booking example" verbose="2" parallel="false">
+ <test name="booking_tests_cluster">
+ <parameter name="PROPERTY_FILE"
+ value="/booking.properties" />
+ <classes>
+ <class name="org.jboss.seam.example.common.test.booking.cluster.selenium.FailoverTest" />
+ </classes>
+ </test>
+</suite>
Deleted: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-ftest/testng.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-ftest/testng.xml 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-ftest/testng.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,36 +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="Booking example" verbose="2" parallel="false">
- <test name="booking_jboss5">
- <parameter name="PROPERTY_FILE"
- value="/booking.properties" />
- <classes>
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" />
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" />
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" />
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" />
- <class
- name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" />
- </classes>
- </test>
-</suite>
\ No newline at end of file
Copied: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-ftest/testng.xml (from rev 14346, branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-ftest/testng.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-ftest/testng.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-ftest/testng.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,36 @@
+
+ <!--
+ 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="Booking example" verbose="2" parallel="false">
+ <test name="booking_jboss5">
+ <parameter name="PROPERTY_FILE"
+ value="/booking.properties" />
+ <classes>
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.RegistrationTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.ChangePasswordTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.BackButtonTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.SimpleBookingTest" />
+ <class
+ name="org.jboss.seam.example.common.test.booking.selenium.ConversationTest" />
+ </classes>
+ </test>
+</suite>
\ No newline at end of file
Deleted: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/arquillian.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/arquillian.xml 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/arquillian.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,17 +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</property>
- <property name="jbossHome">target/jboss-as-${version.jbossas7}</property>
- </configuration>
- </container>
-
-</arquillian>
Copied: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/arquillian.xml (from rev 14346, branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/arquillian.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/arquillian.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/arquillian.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,17 @@
+<?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</property>
+ <property name="jbossHome">target/jboss-as-${version.jbossas7}</property>
+ </configuration>
+ </container>
+
+</arquillian>
Deleted: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/test-ds.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/test-ds.xml 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/test-ds.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
- <datasource jndi-name="java:/bookingDatasource" enabled="true" use-java-context="true"
- pool-name="BookingDS_pool">
- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
- <driver>h2</driver>
- <security>
- <user-name>sa</user-name>
- <password>sa</password>
- </security>
- </datasource>
-</datasources>
Copied: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/test-ds.xml (from rev 14346, branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/test-ds.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/test-ds.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/test-ds.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<datasources>
+ <datasource jndi-name="java:/bookingDatasource" enabled="true" use-java-context="true"
+ pool-name="BookingDS_pool">
+ <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
+ <driver>h2</driver>
+ <security>
+ <user-name>sa</user-name>
+ <password>sa</password>
+ </security>
+ </datasource>
+</datasources>
Deleted: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/testng.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/testng.xml 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/testng.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,13 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
-
-<suite name="Hotel Booking" verbose="2" parallel="false">
-
- <test name="Hotel Booking">
- <classes>
- <class name="org.jboss.seam.example.booking.test.LoginTest"/>
- <class name="org.jboss.seam.example.booking.test.BookingTest"/>
- <class name="org.jboss.seam.example.booking.test.ChangePasswordTest"/>
- </classes>
- </test>
-
-</suite>
\ No newline at end of file
Copied: branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/testng.xml (from rev 14346, branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/testng.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/testng.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/booking/booking-tests/src/test/resources-integration/testng.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,13 @@
+<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
+
+<suite name="Hotel Booking" verbose="2" parallel="false">
+
+ <test name="Hotel Booking">
+ <classes>
+ <class name="org.jboss.seam.example.booking.test.LoginTest"/>
+ <class name="org.jboss.seam.example.booking.test.BookingTest"/>
+ <class name="org.jboss.seam.example.booking.test.ChangePasswordTest"/>
+ </classes>
+ </test>
+
+</suite>
\ No newline at end of file
Property changes on: branches/community/Seam_2_3/examples-ee6/booking/booking-web
___________________________________________________________________
Deleted: svn:ignore
- target
*.iml
Modified: branches/community/Seam_2_3/examples-ee6/booking/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/booking/pom.xml 2012-03-08 17:53:11 UTC (rev 14378)
+++ branches/community/Seam_2_3/examples-ee6/booking/pom.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,50 +1,68 @@
<?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>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>booking</artifactId>
- <parent>
- <groupId>org.jboss.seam</groupId>
- <artifactId>examples-ee6</artifactId>
- <version>2.3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <packaging>pom</packaging>
- <name>Booking Example (EE6)</name>
-
- <properties>
- <example.name>booking</example.name>
- </properties>
-
- <modules>
- <module>booking-ear</module>
- <module>booking-ejb</module>
- <module>booking-web</module>
- <module>booking-seamtest</module>
- <module>booking-arquillian</module>
- </modules>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6.booking</groupId>
- <artifactId>booking-ejb</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6.booking</groupId>
- <artifactId>booking-web</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6.booking</groupId>
- <artifactId>booking-ear</artifactId>
- <version>${project.version}</version>
- <type>ear</type>
- </dependency>
- </dependencies>
- </dependencyManagement>
+<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-ee6</groupId>
+ <artifactId>booking</artifactId>
+ <parent>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>examples-ee6</artifactId>
+ <version>2.3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <packaging>pom</packaging>
+ <name>Booking Example (EE6)</name>
+
+ <properties>
+ <example.name>booking</example.name>
+ </properties>
+
+ <modules>
+ <module>booking-ear</module>
+ <module>booking-ejb</module>
+ <module>booking-web</module>
+ <module>booking-tests</module>
+ </modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6.booking</groupId>
+ <artifactId>booking-ejb</artifactId>
+ <version>${project.version}</version>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6.booking</groupId>
+ <artifactId>booking-web</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6.booking</groupId>
+ <artifactId>booking-ear</artifactId>
+ <version>${project.version}</version>
+ <type>ear</type>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>4.2.0.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>4.0.1.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
Property changes on: branches/community/Seam_2_3/examples-ee6/mail
___________________________________________________________________
Deleted: svn:ignore
- target
*.iml
Property changes on: branches/community/Seam_2_3/examples-ee6/mail/mail-ear
___________________________________________________________________
Deleted: svn:ignore
- target
*.iml
Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-ear/pom.xml 2012-03-08 17:53:11 UTC (rev 14378)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-ear/pom.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,192 +1,186 @@
<?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>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>mail</artifactId>
- <version>2.3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+<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>mail</artifactId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <version>2.3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.jboss.seam.examples-ee6.mail</groupId>
+ <artifactId>mail-ear</artifactId>
+ <packaging>ear</packaging>
+ <name>Mail EAR Module (EE6)</name>
+
+ <properties>
+ <jboss.home>${env.JBOSS_HOME}</jboss.home>
+ <jboss.domain>default</jboss.domain>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6.mail</groupId>
+ <artifactId>mail-web</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6.mail</groupId>
+ <artifactId>mail-ejb</artifactId>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jsf2</artifactId>
+ <type>ejb</type>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jfree</groupId>
+ <artifactId>jfreechart</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ </dependency>
+ </dependencies>
- <groupId>org.jboss.seam.examples-ee6.mail</groupId>
- <artifactId>mail-ear</artifactId>
- <packaging>ear</packaging>
- <name>Mail EAR Module (EE6)</name>
-
- <properties>
- <jboss.home>${env.JBOSS_HOME}</jboss.home>
- <jboss.domain>default</jboss.domain>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6.mail</groupId>
- <artifactId>mail-web</artifactId>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6.mail</groupId>
- <artifactId>mail-ejb</artifactId>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <type>ejb</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>jfree</groupId>
- <artifactId>jfreechart</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>seam-mail</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <version>5</version>
- <defaultLibBundleDir>lib</defaultLibBundleDir>
- <!-- Exclude eclipse generated application.xml and manually modified jboss-app.xml during mvn build -->
- <earSourceExcludes>**/application.xml, **/jboss-app.xml</earSourceExcludes>
- <!-- use maven generated application.xml instead -->
- <generateApplicationXml>true</generateApplicationXml>
- <filtering>true</filtering>
- <!-- <jboss>
- <version>4.2</version>
- <loader-repository>seam.jboss.org:loader=seam-mail</loader-repository>
- </jboss>-->
- <modules>
- <ejbModule>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <bundleFileName>jboss-seam.jar</bundleFileName>
- </ejbModule>
- <webModule>
- <groupId>org.jboss.seam.examples-ee6.mail</groupId>
- <artifactId>mail-web</artifactId>
- <contextRoot>/seam-mail</contextRoot>
- <bundleFileName>mail-web.war</bundleFileName>
- </webModule>
- <ejbModule>
- <groupId>org.jboss.seam.examples-ee6.mail</groupId>
- <artifactId>mail-ejb</artifactId>
- <bundleFileName>mail-ejb.jar</bundleFileName>
- </ejbModule>
- </modules>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-greenmail-service</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>com.icegreen</groupId>
- <artifactId>greenmail-jboss-service</artifactId>
- <version>1.3.1b</version>
- <type>sar</type>
- <overWrite>false</overWrite>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <destFileName>greenmail-jboss-service.sar</destFileName>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>exploded</id>
- <properties>
- <example.name>mail</example.name>
- </properties>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>package</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
+ <build>
+ <finalName>seam-mail</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <version>5</version>
+ <defaultLibBundleDir>lib</defaultLibBundleDir>
+ <!-- Exclude eclipse generated application.xml and manually modified jboss-app.xml during mvn build -->
+ <earSourceExcludes>**/application.xml, **/jboss-app.xml</earSourceExcludes>
+ <!-- use maven generated application.xml instead -->
+ <generateApplicationXml>true</generateApplicationXml>
+ <filtering>true</filtering>
+<!-- <jboss>
+ <version>4.2</version>
+ <loader-repository>seam.jboss.org:loader=seam-mail</loader-repository>
+ </jboss>-->
+ <modules>
+ <ejbModule>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jsf2</artifactId>
+ <bundleFileName>jboss-seam.jar</bundleFileName>
+ </ejbModule>
+ <webModule>
+ <groupId>org.jboss.seam.examples-ee6.mail</groupId>
+ <artifactId>mail-web</artifactId>
+ <contextRoot>/seam-mail</contextRoot>
+ <bundleFileName>mail-web.war</bundleFileName>
+ </webModule>
+ <ejbModule>
+ <groupId>org.jboss.seam.examples-ee6.mail</groupId>
+ <artifactId>mail-ejb</artifactId>
+ <bundleFileName>mail-ejb.jar</bundleFileName>
+ </ejbModule>
+ </modules>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-greenmail-service</id>
+ <phase>package</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
<artifactItem>
- <groupId>org.jboss.seam.examples-ee6.mail</groupId>
- <artifactId>mail-ear</artifactId>
- <type>ear</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear
- </outputDirectory>
+ <groupId>com.icegreen</groupId>
+ <artifactId>greenmail-jboss-service</artifactId>
+ <version>1.3.1b</version>
+ <type>sar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <destFileName>greenmail-jboss-service.sar</destFileName>
</artifactItem>
- <artifactItem>
- <groupId>org.jboss.seam.examples-ee6.mail</groupId>
- <artifactId>mail-web</artifactId>
- <type>war</type>
- <overWrite>true</overWrite>
- <outputDirectory>
- ${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-web.war
- </outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.seam.examples-ee6.mail</groupId>
- <artifactId>mail-ejb</artifactId>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>
- ${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-ejb.jar
- </outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
- </profiles>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>3.1.0.GA</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <profiles>
+ <profile>
+ <id>exploded</id>
+ <properties>
+ <example.name>mail</example.name>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.seam.examples-ee6.mail</groupId>
+ <artifactId>mail-ear</artifactId>
+ <type>ear</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.seam.examples-ee6.mail</groupId>
+ <artifactId>mail-web</artifactId>
+ <type>war</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-web.war</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.seam.examples-ee6.mail</groupId>
+ <artifactId>mail-ejb</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-ejb.jar</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>3.1.0.GA</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
Property changes on: branches/community/Seam_2_3/examples-ee6/mail/mail-ejb
___________________________________________________________________
Deleted: svn:ignore
- target
*.iml
Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml 2012-03-08 17:53:11 UTC (rev 14378)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-ejb/pom.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,34 +1,43 @@
<?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>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>mail</artifactId>
- <version>2.3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+<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>mail</artifactId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <version>2.3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
- <groupId>org.jboss.seam.examples-ee6.mail</groupId>
- <artifactId>mail-ejb</artifactId>
- <packaging>ejb</packaging>
- <name>Mail EJB Module (EE6)</name>
+ <groupId>org.jboss.seam.examples-ee6.mail</groupId>
+ <artifactId>mail-ejb</artifactId>
+ <packaging>ejb</packaging>
+ <name>Mail EJB Module (EE6)</name>
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <version>2.3.0-SNAPSHOT</version>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.faces</groupId>
- <artifactId>jboss-jsf-api_2.0_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jsf2</artifactId>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>
Deleted: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,230 +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>mail</artifactId>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <groupId>org.jboss.seam.examples-ee6.mail</groupId>
- <artifactId>mail-tests</artifactId>
- <name>Mail Integration Tests Module (EE6)</name>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6.mail</groupId>
- <artifactId>mail-ejb</artifactId>
- <type>ejb</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <type>ejb</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-mail</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-pdf</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-excel</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui-jsf2</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium.server</groupId>
- <artifactId>selenium-server</artifactId>
- <classifier>standalone</classifier>
- </dependency>
- <dependency>
- <groupId>org.seleniumhq.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- </dependency>
- <dependency>
- <groupId>org.subethamail</groupId>
- <artifactId>subethasmtp-wiser</artifactId>
- <version>1.2</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.spec</groupId>
- <artifactId>jboss-javaee-6.0</artifactId>
- <type>pom</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>functional-tests</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <classifier>jdk15</classifier>
- </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.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-api-maven</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <testResources>
- <testResource>
- <directory>src/test/resources</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource> <!-- this takes datasource mail-ds.xml -->
- <directory>${basedir}/../mail-ear/src/main/resources</directory>
- <filtering>true</filtering>
- </testResource>
- <testResource> <!-- this takes themes aka *.properties -->
- <directory>${basedir}/../mail-web/src/main/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-mail</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>
- <profile>
- <id>ftest-tomcat</id>
- <properties>
- <example.context.path>jboss-seam-mail</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>
Copied: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml (from rev 14346, branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,230 @@
+<?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>mail</artifactId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <version>2.3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.jboss.seam.examples-ee6.mail</groupId>
+ <artifactId>mail-tests</artifactId>
+ <name>Mail Integration Tests Module (EE6)</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6.mail</groupId>
+ <artifactId>mail-ejb</artifactId>
+ <type>ejb</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jsf2</artifactId>
+ <type>ejb</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-mail</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-pdf</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-excel</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui-jsf2</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.seleniumhq.selenium.server</groupId>
+ <artifactId>selenium-server</artifactId>
+ <classifier>standalone</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.seleniumhq.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.subethamail</groupId>
+ <artifactId>subethasmtp-wiser</artifactId>
+ <version>1.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.spec</groupId>
+ <artifactId>jboss-javaee-6.0</artifactId>
+ <type>pom</type>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>functional-tests</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <classifier>jdk15</classifier>
+ </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.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-api-maven</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.shrinkwrap.resolver</groupId>
+ <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ <testResource> <!-- this takes datasource mail-ds.xml -->
+ <directory>${basedir}/../mail-ear/src/main/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ <testResource> <!-- this takes themes aka *.properties -->
+ <directory>${basedir}/../mail-web/src/main/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-mail</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>
+ <profile>
+ <id>ftest-tomcat</id>
+ <properties>
+ <example.context.path>jboss-seam-mail</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/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/MailTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/MailTest.java 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/MailTest.java 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,668 +0,0 @@
-package org.jboss.seam.example.mail.test;
-
-import static javax.mail.Message.RecipientType.BCC;
-import static javax.mail.Message.RecipientType.CC;
-
-import java.io.File;
-import java.io.InputStream;
-
-import javax.faces.FacesException;
-import javax.faces.context.FacesContext;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeBodyPart;
-import javax.mail.internet.MimeMessage;
-import javax.mail.internet.MimeMultipart;
-
-import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.Asset;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
-import org.jboss.shrinkwrap.api.importer.ZipImporter;
-import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-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.contexts.Contexts;
-import org.jboss.seam.document.ByteArrayDocumentData;
-import org.jboss.seam.document.DocumentData;
-import org.jboss.seam.example.mail.Person;
-import org.jboss.seam.mail.MailSession;
-import org.jboss.seam.mail.ui.UIAttachment;
-import org.jboss.seam.mail.ui.UIMessage;
-import org.jboss.seam.mock.MockTransport;
-import org.jboss.seam.mock.JUnitSeamTest;
-
-
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.Assert;
-import org.junit.runner.RunWith;
-
-/**
- * @author Pete Muir
- *
- */
- at RunWith(Arquillian.class)
-public class MailTest extends JUnitSeamTest
-{
- @Deployment(name="MailTest")
- @OverProtocol("Servlet 3.0")
- public static Archive<?> createDeployment()
- {
- EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-mail.ear").importFrom(new File("../mail-ear/target/seam-mail.ear"))
- .as(EnterpriseArchive.class);
- WebArchive web = er.getAsType(WebArchive.class, "mail-web.war");
- web.addClasses(MailTest.class);
- //web.addAsWebInfResource(new StringAsset("org.jboss.seam.mock.MockApplicationFactory"), "classes/META-INF/services/javax.faces.application.ApplicationFactory");
- web.addAsWebInfResource(new StringAsset("org.jboss.seam.mock.MockFacesContextFactory"), "classes/META-INF/services/javax.faces.context.FacesContextFactory");
- web.addAsWebResource("org/jboss/seam/example/mail/test/errors1.xhtml", "org/jboss/seam/example/mail/test/errors1.xhtml");
- web.addAsWebResource("org/jboss/seam/example/mail/test/errors2.xhtml", "org/jboss/seam/example/mail/test/errors2.xhtml");
- web.addAsWebResource("org/jboss/seam/example/mail/test/errors3.xhtml", "org/jboss/seam/example/mail/test/errors3.xhtml");
- web.addAsWebResource("org/jboss/seam/example/mail/test/errors4.xhtml", "org/jboss/seam/example/mail/test/errors4.xhtml");
- web.addAsWebResource("org/jboss/seam/example/mail/test/sanitization.xhtml", "org/jboss/seam/example/mail/test/sanitization.xhtml");
-
- return er;
- }
-
- @Test
- public void testSimple() throws Exception
- {
-
- new FacesRequest()
- {
-
- @Override
- protected void updateModelValues() throws Exception
- {
- setValue("#{person.firstname}", "Pete");
- setValue("#{person.lastname}", "Muir");
- setValue("#{person.address}", "test at example.com");
- }
-
- @Override
- protected void invokeApplication() throws Exception
- {
- MimeMessage renderedMessage = getRenderedMailMessage("/simple.xhtml");
-
- Assert.assertTrue(MailSession.instance().getTransport() instanceof MockTransport);
-
- // Test the headers
-
- Assert.assertNotNull(renderedMessage);
- Assert.assertEquals(renderedMessage.getAllRecipients().length, 1);
- Assert.assertTrue(renderedMessage.getAllRecipients()[0] instanceof InternetAddress);
- InternetAddress to = (InternetAddress) renderedMessage.getAllRecipients()[0];
- Assert.assertEquals(to.getAddress(), "test at example.com");
- Assert.assertEquals(to.getPersonal(), "Pete Muir");
- Assert.assertEquals(renderedMessage.getFrom().length, 1);
- Assert.assertTrue(renderedMessage.getFrom()[0] instanceof InternetAddress);
- InternetAddress from = (InternetAddress) renderedMessage.getFrom()[0];
- Assert.assertEquals(from.getAddress(), "peter at example.com");
- Assert.assertEquals(from.getPersonal(), "Peter");
- Assert.assertEquals(renderedMessage.getSubject(), "Try out Seam!");
- Assert.assertNull(renderedMessage.getHeader("Precedence"));
- Assert.assertNull(renderedMessage.getHeader("X-Priority"));
- Assert.assertNull(renderedMessage.getHeader("Priority"));
- Assert.assertNull(renderedMessage.getHeader("Importance"));
- Assert.assertNull(renderedMessage.getHeader("Disposition-Notification-To"));
-
- // Check the body
-
- Assert.assertNotNull(renderedMessage.getContent());
- Assert.assertTrue(renderedMessage.getContent() instanceof MimeMultipart);
- MimeMultipart body = (MimeMultipart) renderedMessage.getContent();
- Assert.assertEquals(body.getCount(), 1);
- Assert.assertNotNull(body.getBodyPart(0));
- Assert.assertTrue(body.getBodyPart(0) instanceof MimeBodyPart);
- MimeBodyPart bodyPart = (MimeBodyPart) body.getBodyPart(0);
- Assert.assertNotNull(bodyPart.getContent());
- Assert.assertEquals(bodyPart.getDisposition(), "inline");
- Assert.assertTrue(bodyPart.isMimeType("text/html"));
- }
- }.run();
-
- }
-
- @Ignore
- @Test
- public void testAttachment() throws Exception
- {
-
- new FacesRequest()
- {
-
- @Override
- protected void updateModelValues() throws Exception
- {
- setValue("#{person.firstname}", "Gavin");
- setValue("#{person.lastname}", "King");
- setValue("#{person.address}", "gavin at king.com");
- }
-
- @Override
- protected void invokeApplication() throws Exception
- {
- MimeMessage renderedMessage = getRenderedMailMessage("/attachment.xhtml");
-
- // Test the headers
-
- InternetAddress to = (InternetAddress) renderedMessage.getAllRecipients()[0];
- Assert.assertEquals(to.getAddress(), "gavin at king.com");
- Assert.assertEquals(to.getPersonal(), "Gavin King");
- InternetAddress from = (InternetAddress) renderedMessage.getFrom()[0];
- Assert.assertEquals(from.getAddress(), "do-not-reply at jboss.com");
- Assert.assertEquals(from.getPersonal(), "Seam");
- Assert.assertEquals(renderedMessage.getSubject(), "Try out Seam!");
- MimeMultipart body = (MimeMultipart) renderedMessage.getContent();
-
- Assert.assertEquals(body.getCount(), 6); //3 Attachments and 1 MimeMultipart
-
- // The root multipart/related
- Assert.assertNotNull(body.getBodyPart(0));
- Assert.assertTrue(body.getBodyPart(0) instanceof MimeBodyPart);
- MimeBodyPart bodyPart = (MimeBodyPart) body.getBodyPart(0);
- Assert.assertNotNull(bodyPart.getContent());
- Assert.assertTrue(bodyPart.getContent() instanceof MimeMultipart);
- Assert.assertTrue(bodyPart.isMimeType("multipart/related"));
-
- MimeMultipart attachments = (MimeMultipart) bodyPart.getContent();
-
- Assert.assertEquals(attachments.getCount(), 3); //2 Attachments and 1 MimeMultipart
-
- // Attachment 0 (the actual message)
- Assert.assertNotNull(attachments.getBodyPart(0));
- Assert.assertTrue(attachments.getBodyPart(0) instanceof MimeBodyPart);
- bodyPart = (MimeBodyPart) attachments.getBodyPart(0);
- Assert.assertNotNull(bodyPart.getContent());
- Assert.assertNotNull(bodyPart.getContent());
- Assert.assertTrue(bodyPart.isMimeType("text/html"));
- Assert.assertEquals(bodyPart.getDisposition(), "inline");
-
- // Inline Attachment 1 // Attachment Jboss Logo
- Assert.assertNotNull(attachments.getBodyPart(1));
- Assert.assertTrue(attachments.getBodyPart(1) instanceof MimeBodyPart);
- bodyPart = (MimeBodyPart) attachments.getBodyPart(1);
- Assert.assertNotNull(bodyPart.getContent());
- Assert.assertTrue(bodyPart.getContent() instanceof InputStream);
- Assert.assertEquals(bodyPart.getFileName(), "jboss.jpg");
-
- Assert.assertTrue(bodyPart.isMimeType("image/jpeg"));
- Assert.assertEquals(bodyPart.getDisposition(), "inline");
- Assert.assertNotNull(bodyPart.getContentID());
-
- // Inline Attachment 1 // Attachment Gavin Pic
- Assert.assertNotNull(attachments.getBodyPart(2));
- Assert.assertTrue(attachments.getBodyPart(2) instanceof MimeBodyPart);
- bodyPart = (MimeBodyPart) attachments.getBodyPart(2);
- Assert.assertNotNull(bodyPart.getContent());
- Assert.assertTrue(bodyPart.getContent() instanceof InputStream);
- Assert.assertEquals(bodyPart.getFileName(), "Gavin_King.jpg");
- Assert.assertTrue(bodyPart.isMimeType("image/png"));
- Assert.assertEquals(bodyPart.getDisposition(), "inline");
- Assert.assertNotNull(bodyPart.getContentID());
-
- // Root Attachment 0
- Assert.assertNotNull(body.getBodyPart(1));
- Assert.assertTrue(body.getBodyPart(1) instanceof MimeBodyPart);
- bodyPart = (MimeBodyPart) body.getBodyPart(1);
- Assert.assertNotNull(bodyPart.getContent());
- Assert.assertTrue( bodyPart.getContent() instanceof InputStream);
- Assert.assertEquals(bodyPart.getFileName(), "numbers.csv");
- Assert.assertTrue(bodyPart.isMimeType("content/unknown"));
- Assert.assertEquals(bodyPart.getDisposition(), "attachment");
- Assert.assertNull(bodyPart.getContentID());
-
- // Root Attachment 1
- Assert.assertNotNull(body.getBodyPart(2));
- Assert.assertTrue(body.getBodyPart(2) instanceof MimeBodyPart);
- bodyPart = (MimeBodyPart) body.getBodyPart(2);
- Assert.assertNotNull(bodyPart.getContent());
- Assert.assertTrue(bodyPart.getContent() instanceof String);
- Assert.assertEquals(bodyPart.getFileName(), "whyseam.pdf");
- Assert.assertEquals(bodyPart.getDisposition(), "attachment");
- Assert.assertNull(bodyPart.getContentID());
-
- // Root Attachment 3
- Assert.assertNotNull(body.getBodyPart(3));
- Assert.assertTrue(body.getBodyPart(3) instanceof MimeBodyPart);
- bodyPart = (MimeBodyPart) body.getBodyPart(3);
- Assert.assertNotNull(bodyPart.getContent());
- Assert.assertEquals(bodyPart.getFileName(), "excel.xls");
- Assert.assertTrue(bodyPart.isMimeType("application/vnd.ms-excel"));
- Assert.assertEquals(bodyPart.getDisposition(), "attachment");
- Assert.assertNull(bodyPart.getContentID());
-
- }
- }.run();
-
- }
-
- /**
- * This test is needed since the PDF is not rendered in the attachment test.
- * If PDF rendering is supported in a test environment, then this test can be
- * removed.
- */
- @Test
- public void testPdfAttachment() throws Exception
- {
- new FacesRequest()
- {
- @Override
- protected void invokeApplication() throws Exception
- {
- UIAttachment attachment = new UIAttachment();
- attachment.setFileName("filename.pdf");
- UIMessage message = new UIMessage();
- attachment.setParent(message);
- message.setMailSession(MailSession.instance());
- DocumentData doc = new ByteArrayDocumentData("filename", new DocumentData.DocumentType("pdf", "application/pdf"), new byte[] {});
- attachment.setValue(doc);
- attachment.encodeEnd(FacesContext.getCurrentInstance());
-
- // verify we built the message
- Assert.assertEquals(message.getAttachments().size(), 1);
- MimeBodyPart bodyPart = message.getAttachments().get(0);
- Assert.assertEquals(bodyPart.getFileName(), "filename.pdf");
- Assert.assertEquals(bodyPart.getDisposition(),"attachment");
- }
- }.run();
- }
-
- @Test
- public void testHtml() throws Exception
- {
-
- new FacesRequest()
- {
-
- @Override
- protected void updateModelValues() throws Exception
- {
- setValue("#{person.firstname}", "Pete");
- setValue("#{person.lastname}", "Muir");
- setValue("#{person.address}", "test at example.com");
- }
-
- @Override
- protected void invokeApplication() throws Exception
- {
- MimeMessage renderedMessage = getRenderedMailMessage("/html.xhtml");
-
- // Test the standard headers
-
- InternetAddress to = (InternetAddress) renderedMessage.getAllRecipients()[0];
- Assert.assertEquals(to.getAddress(), "test at example.com");
- Assert.assertEquals(to.getPersonal(), "Pete Muir");
- InternetAddress from = (InternetAddress) renderedMessage.getFrom()[0];
- Assert.assertEquals(from.getAddress(), "do-not-reply at jboss.com");
- Assert.assertEquals(from.getPersonal(), "Seam");
- Assert.assertEquals(renderedMessage.getSubject(), "Seam Mail");
-
- // Test the extra headers
-
- // Importance
- Assert.assertNotNull(renderedMessage.getHeader("X-Priority"));
- Assert.assertNotNull(renderedMessage.getHeader("Priority"));
- Assert.assertNotNull(renderedMessage.getHeader("Importance"));
- Assert.assertEquals(renderedMessage.getHeader("X-Priority").length, 1);
- Assert.assertEquals(renderedMessage.getHeader("Priority").length, 1);
- Assert.assertEquals(renderedMessage.getHeader("Importance").length, 1);
- Assert.assertEquals(renderedMessage.getHeader("X-Priority")[0], "5");
- Assert.assertEquals(renderedMessage.getHeader("Priority")[0], "Non-urgent");
- Assert.assertEquals(renderedMessage.getHeader("Importance")[0], "low");
-
- // read receipt
- Assert.assertNotNull(renderedMessage.getHeader("Disposition-Notification-To"));
- Assert.assertEquals(renderedMessage.getHeader("Disposition-Notification-To").length, 1);
- Assert.assertEquals(renderedMessage.getHeader("Disposition-Notification-To")[0], "Seam <do-not-reply at jboss.com>");
-
- // m:header
- Assert.assertNotNull(renderedMessage.getHeader("X-Sent-From"));
- Assert.assertEquals(renderedMessage.getHeader("X-Sent-From").length, 1);
- Assert.assertEquals(renderedMessage.getHeader("X-Sent-From")[0], "Seam");
-
- MimeMultipart body = (MimeMultipart) renderedMessage.getContent();
-
- // Check the alternative facet
- Assert.assertTrue(renderedMessage.getContentType().startsWith("multipart/mixed"));
- Assert.assertEquals(body.getCount(), 1);
- MimeBodyPart bodyPart = (MimeBodyPart) body.getBodyPart(0);
- Assert.assertTrue(bodyPart.getContentType().startsWith("multipart/alternative"));
- Assert.assertTrue(bodyPart.getContent() instanceof MimeMultipart);
- MimeMultipart bodyParts = (MimeMultipart) bodyPart.getContent();
- Assert.assertEquals(bodyParts.getCount(), 2);
- Assert.assertTrue(bodyParts.getBodyPart(0) instanceof MimeBodyPart);
- Assert.assertTrue(bodyParts.getBodyPart(1) instanceof MimeBodyPart);
- MimeBodyPart alternative = (MimeBodyPart) bodyParts.getBodyPart(0);
- MimeBodyPart html = (MimeBodyPart) bodyParts.getBodyPart(1);
- Assert.assertTrue(alternative.isMimeType("text/plain"));
- Assert.assertEquals(alternative.getDisposition(), "inline");
- Assert.assertTrue(html.isMimeType("text/html"));
- Assert.assertEquals(html.getDisposition(), "inline");
-
- }
- }.run();
-
- }
-
-
- @Test
- public void testPlain() throws Exception
- {
-
- new FacesRequest()
- {
-
- @Override
- protected void updateModelValues() throws Exception
- {
- setValue("#{person.firstname}", "Pete");
- setValue("#{person.lastname}", "Muir");
- setValue("#{person.address}", "test at example.com");
- }
-
- @Override
- protected void invokeApplication() throws Exception
- {
- MimeMessage renderedMessage = getRenderedMailMessage("/plain.xhtml");
-
- // Test the standard headers
-
- InternetAddress to = (InternetAddress) renderedMessage.getAllRecipients()[0];
- Assert.assertEquals(to.getAddress(), "test at example.com");
- Assert.assertEquals(to.getPersonal(), "Pete Muir");
- InternetAddress from = (InternetAddress) renderedMessage.getFrom()[0];
- Assert.assertEquals(from.getAddress(), "do-not-reply at jboss.com");
- Assert.assertEquals(from.getPersonal(), "Seam");
- Assert.assertEquals(renderedMessage.getReplyTo().length, 1);
- Assert.assertTrue(renderedMessage.getReplyTo()[0] instanceof InternetAddress);
- InternetAddress replyTo = (InternetAddress) renderedMessage.getReplyTo()[0];
- Assert.assertEquals(replyTo.getAddress(), "another.address at jboss.org");
- Assert.assertEquals(replyTo.getPersonal(), "JBoss");
- Assert.assertEquals(renderedMessage.getRecipients(CC).length, 1);
- Assert.assertTrue(renderedMessage.getRecipients(CC)[0] instanceof InternetAddress);
- InternetAddress cc = (InternetAddress) renderedMessage.getRecipients(CC)[0];
- Assert.assertEquals(cc.getAddress(), "test at example.com");
- Assert.assertEquals(cc.getPersonal(), "Pete Muir");
- Assert.assertEquals(renderedMessage.getRecipients(BCC).length, 1);
- Assert.assertTrue(renderedMessage.getRecipients(BCC)[0] instanceof InternetAddress);
- InternetAddress bcc = (InternetAddress) renderedMessage.getRecipients(CC)[0];
- Assert.assertEquals(bcc.getAddress(), "test at example.com");
- Assert.assertEquals(bcc.getPersonal(), "Pete Muir");
- Assert.assertEquals(renderedMessage.getHeader("Precedence")[0], "bulk");
- // Importance
- Assert.assertNotNull(renderedMessage.getHeader("X-Priority"));
- Assert.assertNotNull(renderedMessage.getHeader("Priority"));
- Assert.assertNotNull(renderedMessage.getHeader("Importance"));
- Assert.assertEquals(renderedMessage.getHeader("X-Priority").length, 1);
- Assert.assertEquals(renderedMessage.getHeader("Priority").length, 1);
- Assert.assertEquals(renderedMessage.getHeader("Importance").length, 1);
- Assert.assertEquals(renderedMessage.getHeader("X-Priority")[0], "1");
- Assert.assertEquals(renderedMessage.getHeader("Priority")[0], "Urgent");
- Assert.assertEquals(renderedMessage.getHeader("Importance")[0], "high");
- Assert.assertEquals(renderedMessage.getSubject(), "Plain text email sent by Seam");
-
- // Check the body
-
- Assert.assertNotNull(renderedMessage.getContent());
- MimeMultipart body = (MimeMultipart) renderedMessage.getContent();
- Assert.assertEquals(body.getCount(), 1);
- MimeBodyPart bodyPart = (MimeBodyPart) body.getBodyPart(0);
- Assert.assertNotNull(bodyPart.getContent());
- Assert.assertEquals(bodyPart.getDisposition(), "inline");
- Assert.assertTrue(bodyPart.isMimeType("text/plain"));
- }
- }.run();
- }
-
- @Test
- public void testAttachmentErrors() throws Exception
- {
-
- new FacesRequest()
- {
-
- @Override
- protected void updateModelValues() throws Exception
- {
-
- }
-
- @Override
- protected void invokeApplication() throws Exception
- {
- Person person = (Person) getValue("#{person}");
-
- person.setFirstname("Pete");
- person.setLastname("Muir");
- person.setAddress("test at example.com");
-
- // Test for an unavailable attachment
-
- Contexts.getEventContext().set("attachment", "/foo.pdf");
-
- }
- }.run();
- }
-
- @Test
- public void testAddressValidation() throws Exception
- {
-
- new FacesRequest()
- {
-
- @Override
- protected void updateModelValues() throws Exception
- {
-
- }
-
- @Override
- protected void invokeApplication() throws Exception
- {
- Person person = (Person) getValue("#{person}");
-
- person.setFirstname("Pete");
- person.setLastname("Muir");
- boolean exceptionThrown = false;
-
- person.setAddress("testexample.com");
-
- try
- {
- getRenderedMailMessage("/org/jboss/seam/example/mail/test/errors2.xhtml");
- }
- catch (FacesException e)
- {
- Assert.assertTrue(e.getCause() instanceof AddressException);
- AddressException ae = (AddressException) e.getCause();
- Assert.assertTrue(ae.getMessage().startsWith("Missing final '@domain'"));
- exceptionThrown = true;
- }
- Assert.assertTrue(exceptionThrown);
-
- }
- }.run();
- }
-
- //JBSEAM-2109
- //@Test
- public void testReplyToErrors() throws Exception
- {
-
- new FacesRequest()
- {
-
- @Override
- protected void updateModelValues() throws Exception
- {
-
- }
-
- @Override
- protected void invokeApplication() throws Exception
- {
- Person person = (Person) getValue("#{person}");
-
- person.setFirstname("Pete");
- person.setLastname("Muir");
- person.setAddress("test at example.com");
-
- boolean exceptionThrown = false;
-
-
-
- try
- {
- getRenderedMailMessage("/org/jboss/seam/example/mail/test/errors3.xhtml");
- }
- catch (Exception e)
- {
- Assert.assertTrue(e.getCause() instanceof AddressException);
- AddressException ae = (AddressException) e.getCause();
- System.out.println(ae.getMessage());
- Assert.assertTrue(ae.getMessage().startsWith("Email cannot have more than one Reply-to address"));
- exceptionThrown = true;
- }
- Assert.assertTrue(exceptionThrown);
-
- }
- }.run();
- }
-
- @Test
- public void testFromErrors() throws Exception
- {
-
- new FacesRequest()
- {
-
- @Override
- protected void updateModelValues() throws Exception
- {
-
- }
-
- @Override
- protected void invokeApplication() throws Exception
- {
- Person person = (Person) getValue("#{person}");
-
- person.setFirstname("Pete");
- person.setLastname("Muir");
- person.setAddress("test at example.com");
-
- boolean exceptionThrown = false;
-
- try
- {
- getRenderedMailMessage("/org/jboss/seam/example/mail/test/errors4.xhtml");
- }
- catch (FacesException e)
- {
- Assert.assertTrue(e.getCause() instanceof AddressException);
- AddressException ae = (AddressException) e.getCause();
- Assert.assertTrue(ae.getMessage().startsWith("Email cannot have more than one from address"));
- exceptionThrown = true;
- }
- Assert.assertTrue(exceptionThrown);
-
- }
- }.run();
- }
-
- @Test
- public void testSanitization() throws Exception
- {
-
- new FacesRequest()
- {
-
- @Override
- protected void updateModelValues() throws Exception
- {
-
- }
-
- @Override
- protected void invokeApplication() throws Exception
- {
- Contexts.getEventContext().set("name", "Pete\nMuir");
- MimeMessage renderedMessage = getRenderedMailMessage("/org/jboss/seam/example/mail/test/sanitization.xhtml");
- Assert.assertEquals(renderedMessage.getSubject(), "Try out Seam!");
- InternetAddress to = (InternetAddress) renderedMessage.getAllRecipients()[0];
- Assert.assertEquals(to.getAddress(), "peter at email.tld");
- Assert.assertEquals(to.getPersonal(), "Pete");
- Assert.assertEquals(renderedMessage.getFrom().length, 1);
- Assert.assertTrue(renderedMessage.getFrom()[0] instanceof InternetAddress);
- InternetAddress from = (InternetAddress) renderedMessage.getFrom()[0];
- Assert.assertEquals(from.getAddress(), "peter at example.com");
- Assert.assertEquals(from.getPersonal(), "Pete");
- Assert.assertNotNull(renderedMessage.getHeader("Pete"));
- Assert.assertEquals(renderedMessage.getHeader("Pete").length, 1);
- Assert.assertEquals(renderedMessage.getHeader("Pete")[0], "roll over");
- }
- }.run();
- }
-
- @Test
- public void testTemplating() throws Exception
- {
-
- new FacesRequest()
- {
-
- @Override
- protected void updateModelValues() throws Exception
- {
- setValue("#{person.firstname}", "Pete");
- setValue("#{person.lastname}", "Muir");
- setValue("#{person.address}", "test at example.com");
- }
-
- @Override
- protected void invokeApplication() throws Exception
- {
- MimeMessage renderedMessage = getRenderedMailMessage("/templating.xhtml");
-
- // Test the standard headers
-
- InternetAddress to = (InternetAddress) renderedMessage.getAllRecipients()[0];
- Assert.assertEquals(to.getAddress(), "test at example.com");
- Assert.assertEquals(to.getPersonal(), "Pete Muir");
- InternetAddress from = (InternetAddress) renderedMessage.getFrom()[0];
- Assert.assertEquals(from.getAddress(), "do-not-reply at jboss.com");
- Assert.assertEquals(from.getPersonal(), "Seam");
- Assert.assertEquals(renderedMessage.getSubject(), "Templating with Seam Mail");
- Assert.assertNull(renderedMessage.getHeader("X-Priority"));
- Assert.assertNull(renderedMessage.getHeader("Priority"));
- Assert.assertNull(renderedMessage.getHeader("Importance"));
-
- // Check the body
-
- MimeMultipart body = (MimeMultipart) renderedMessage.getContent();
-
- // Check the alternative facet
- Assert.assertTrue(renderedMessage.getContentType().startsWith("multipart/mixed"));
- Assert.assertEquals(body.getCount(), 1);
- MimeBodyPart bodyPart = (MimeBodyPart) body.getBodyPart(0);
- Assert.assertTrue(bodyPart.getContentType().startsWith("multipart/alternative"));
- Assert.assertTrue(bodyPart.getContent() instanceof MimeMultipart);
- MimeMultipart bodyParts = (MimeMultipart) bodyPart.getContent();
- Assert.assertEquals(bodyParts.getCount(), 2);
- Assert.assertTrue(bodyParts.getBodyPart(0) instanceof MimeBodyPart);
- Assert.assertTrue(bodyParts.getBodyPart(1) instanceof MimeBodyPart);
- MimeBodyPart alternative = (MimeBodyPart) bodyParts.getBodyPart(0);
- MimeBodyPart html = (MimeBodyPart) bodyParts.getBodyPart(1);
- Assert.assertTrue(alternative.isMimeType("text/plain"));
- Assert.assertEquals(alternative.getDisposition(), "inline");
- Assert.assertTrue(html.isMimeType("text/html"));
- Assert.assertEquals(html.getDisposition(), "inline");
- }
- }.run();
- }
-}
Copied: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/MailTest.java (from rev 14346, branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/MailTest.java)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/MailTest.java (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/MailTest.java 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,668 @@
+package org.jboss.seam.example.mail.test;
+
+import static javax.mail.Message.RecipientType.BCC;
+import static javax.mail.Message.RecipientType.CC;
+
+import java.io.File;
+import java.io.InputStream;
+
+import javax.faces.FacesException;
+import javax.faces.context.FacesContext;
+import javax.mail.internet.AddressException;
+import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeBodyPart;
+import javax.mail.internet.MimeMessage;
+import javax.mail.internet.MimeMultipart;
+
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.Asset;
+import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.jboss.shrinkwrap.api.importer.ZipImporter;
+import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+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.contexts.Contexts;
+import org.jboss.seam.document.ByteArrayDocumentData;
+import org.jboss.seam.document.DocumentData;
+import org.jboss.seam.example.mail.Person;
+import org.jboss.seam.mail.MailSession;
+import org.jboss.seam.mail.ui.UIAttachment;
+import org.jboss.seam.mail.ui.UIMessage;
+import org.jboss.seam.mock.MockTransport;
+import org.jboss.seam.mock.JUnitSeamTest;
+
+
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.Assert;
+import org.junit.runner.RunWith;
+
+/**
+ * @author Pete Muir
+ *
+ */
+ at RunWith(Arquillian.class)
+public class MailTest extends JUnitSeamTest
+{
+ @Deployment(name="MailTest")
+ @OverProtocol("Servlet 3.0")
+ public static Archive<?> createDeployment()
+ {
+ EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-mail.ear").importFrom(new File("../mail-ear/target/seam-mail.ear"))
+ .as(EnterpriseArchive.class);
+ WebArchive web = er.getAsType(WebArchive.class, "mail-web.war");
+ web.addClasses(MailTest.class);
+ //web.addAsWebInfResource(new StringAsset("org.jboss.seam.mock.MockApplicationFactory"), "classes/META-INF/services/javax.faces.application.ApplicationFactory");
+ web.addAsWebInfResource(new StringAsset("org.jboss.seam.mock.MockFacesContextFactory"), "classes/META-INF/services/javax.faces.context.FacesContextFactory");
+ web.addAsWebResource("org/jboss/seam/example/mail/test/errors1.xhtml", "org/jboss/seam/example/mail/test/errors1.xhtml");
+ web.addAsWebResource("org/jboss/seam/example/mail/test/errors2.xhtml", "org/jboss/seam/example/mail/test/errors2.xhtml");
+ web.addAsWebResource("org/jboss/seam/example/mail/test/errors3.xhtml", "org/jboss/seam/example/mail/test/errors3.xhtml");
+ web.addAsWebResource("org/jboss/seam/example/mail/test/errors4.xhtml", "org/jboss/seam/example/mail/test/errors4.xhtml");
+ web.addAsWebResource("org/jboss/seam/example/mail/test/sanitization.xhtml", "org/jboss/seam/example/mail/test/sanitization.xhtml");
+
+ return er;
+ }
+
+ @Test
+ public void testSimple() throws Exception
+ {
+
+ new FacesRequest()
+ {
+
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+ setValue("#{person.firstname}", "Pete");
+ setValue("#{person.lastname}", "Muir");
+ setValue("#{person.address}", "test at example.com");
+ }
+
+ @Override
+ protected void invokeApplication() throws Exception
+ {
+ MimeMessage renderedMessage = getRenderedMailMessage("/simple.xhtml");
+
+ Assert.assertTrue(MailSession.instance().getTransport() instanceof MockTransport);
+
+ // Test the headers
+
+ Assert.assertNotNull(renderedMessage);
+ Assert.assertEquals(renderedMessage.getAllRecipients().length, 1);
+ Assert.assertTrue(renderedMessage.getAllRecipients()[0] instanceof InternetAddress);
+ InternetAddress to = (InternetAddress) renderedMessage.getAllRecipients()[0];
+ Assert.assertEquals(to.getAddress(), "test at example.com");
+ Assert.assertEquals(to.getPersonal(), "Pete Muir");
+ Assert.assertEquals(renderedMessage.getFrom().length, 1);
+ Assert.assertTrue(renderedMessage.getFrom()[0] instanceof InternetAddress);
+ InternetAddress from = (InternetAddress) renderedMessage.getFrom()[0];
+ Assert.assertEquals(from.getAddress(), "peter at example.com");
+ Assert.assertEquals(from.getPersonal(), "Peter");
+ Assert.assertEquals(renderedMessage.getSubject(), "Try out Seam!");
+ Assert.assertNull(renderedMessage.getHeader("Precedence"));
+ Assert.assertNull(renderedMessage.getHeader("X-Priority"));
+ Assert.assertNull(renderedMessage.getHeader("Priority"));
+ Assert.assertNull(renderedMessage.getHeader("Importance"));
+ Assert.assertNull(renderedMessage.getHeader("Disposition-Notification-To"));
+
+ // Check the body
+
+ Assert.assertNotNull(renderedMessage.getContent());
+ Assert.assertTrue(renderedMessage.getContent() instanceof MimeMultipart);
+ MimeMultipart body = (MimeMultipart) renderedMessage.getContent();
+ Assert.assertEquals(body.getCount(), 1);
+ Assert.assertNotNull(body.getBodyPart(0));
+ Assert.assertTrue(body.getBodyPart(0) instanceof MimeBodyPart);
+ MimeBodyPart bodyPart = (MimeBodyPart) body.getBodyPart(0);
+ Assert.assertNotNull(bodyPart.getContent());
+ Assert.assertEquals(bodyPart.getDisposition(), "inline");
+ Assert.assertTrue(bodyPart.isMimeType("text/html"));
+ }
+ }.run();
+
+ }
+
+ @Ignore
+ @Test
+ public void testAttachment() throws Exception
+ {
+
+ new FacesRequest()
+ {
+
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+ setValue("#{person.firstname}", "Gavin");
+ setValue("#{person.lastname}", "King");
+ setValue("#{person.address}", "gavin at king.com");
+ }
+
+ @Override
+ protected void invokeApplication() throws Exception
+ {
+ MimeMessage renderedMessage = getRenderedMailMessage("/attachment.xhtml");
+
+ // Test the headers
+
+ InternetAddress to = (InternetAddress) renderedMessage.getAllRecipients()[0];
+ Assert.assertEquals(to.getAddress(), "gavin at king.com");
+ Assert.assertEquals(to.getPersonal(), "Gavin King");
+ InternetAddress from = (InternetAddress) renderedMessage.getFrom()[0];
+ Assert.assertEquals(from.getAddress(), "do-not-reply at jboss.com");
+ Assert.assertEquals(from.getPersonal(), "Seam");
+ Assert.assertEquals(renderedMessage.getSubject(), "Try out Seam!");
+ MimeMultipart body = (MimeMultipart) renderedMessage.getContent();
+
+ Assert.assertEquals(body.getCount(), 6); //3 Attachments and 1 MimeMultipart
+
+ // The root multipart/related
+ Assert.assertNotNull(body.getBodyPart(0));
+ Assert.assertTrue(body.getBodyPart(0) instanceof MimeBodyPart);
+ MimeBodyPart bodyPart = (MimeBodyPart) body.getBodyPart(0);
+ Assert.assertNotNull(bodyPart.getContent());
+ Assert.assertTrue(bodyPart.getContent() instanceof MimeMultipart);
+ Assert.assertTrue(bodyPart.isMimeType("multipart/related"));
+
+ MimeMultipart attachments = (MimeMultipart) bodyPart.getContent();
+
+ Assert.assertEquals(attachments.getCount(), 3); //2 Attachments and 1 MimeMultipart
+
+ // Attachment 0 (the actual message)
+ Assert.assertNotNull(attachments.getBodyPart(0));
+ Assert.assertTrue(attachments.getBodyPart(0) instanceof MimeBodyPart);
+ bodyPart = (MimeBodyPart) attachments.getBodyPart(0);
+ Assert.assertNotNull(bodyPart.getContent());
+ Assert.assertNotNull(bodyPart.getContent());
+ Assert.assertTrue(bodyPart.isMimeType("text/html"));
+ Assert.assertEquals(bodyPart.getDisposition(), "inline");
+
+ // Inline Attachment 1 // Attachment Jboss Logo
+ Assert.assertNotNull(attachments.getBodyPart(1));
+ Assert.assertTrue(attachments.getBodyPart(1) instanceof MimeBodyPart);
+ bodyPart = (MimeBodyPart) attachments.getBodyPart(1);
+ Assert.assertNotNull(bodyPart.getContent());
+ Assert.assertTrue(bodyPart.getContent() instanceof InputStream);
+ Assert.assertEquals(bodyPart.getFileName(), "jboss.jpg");
+
+ Assert.assertTrue(bodyPart.isMimeType("image/jpeg"));
+ Assert.assertEquals(bodyPart.getDisposition(), "inline");
+ Assert.assertNotNull(bodyPart.getContentID());
+
+ // Inline Attachment 1 // Attachment Gavin Pic
+ Assert.assertNotNull(attachments.getBodyPart(2));
+ Assert.assertTrue(attachments.getBodyPart(2) instanceof MimeBodyPart);
+ bodyPart = (MimeBodyPart) attachments.getBodyPart(2);
+ Assert.assertNotNull(bodyPart.getContent());
+ Assert.assertTrue(bodyPart.getContent() instanceof InputStream);
+ Assert.assertEquals(bodyPart.getFileName(), "Gavin_King.jpg");
+ Assert.assertTrue(bodyPart.isMimeType("image/png"));
+ Assert.assertEquals(bodyPart.getDisposition(), "inline");
+ Assert.assertNotNull(bodyPart.getContentID());
+
+ // Root Attachment 0
+ Assert.assertNotNull(body.getBodyPart(1));
+ Assert.assertTrue(body.getBodyPart(1) instanceof MimeBodyPart);
+ bodyPart = (MimeBodyPart) body.getBodyPart(1);
+ Assert.assertNotNull(bodyPart.getContent());
+ Assert.assertTrue( bodyPart.getContent() instanceof InputStream);
+ Assert.assertEquals(bodyPart.getFileName(), "numbers.csv");
+ Assert.assertTrue(bodyPart.isMimeType("content/unknown"));
+ Assert.assertEquals(bodyPart.getDisposition(), "attachment");
+ Assert.assertNull(bodyPart.getContentID());
+
+ // Root Attachment 1
+ Assert.assertNotNull(body.getBodyPart(2));
+ Assert.assertTrue(body.getBodyPart(2) instanceof MimeBodyPart);
+ bodyPart = (MimeBodyPart) body.getBodyPart(2);
+ Assert.assertNotNull(bodyPart.getContent());
+ Assert.assertTrue(bodyPart.getContent() instanceof String);
+ Assert.assertEquals(bodyPart.getFileName(), "whyseam.pdf");
+ Assert.assertEquals(bodyPart.getDisposition(), "attachment");
+ Assert.assertNull(bodyPart.getContentID());
+
+ // Root Attachment 3
+ Assert.assertNotNull(body.getBodyPart(3));
+ Assert.assertTrue(body.getBodyPart(3) instanceof MimeBodyPart);
+ bodyPart = (MimeBodyPart) body.getBodyPart(3);
+ Assert.assertNotNull(bodyPart.getContent());
+ Assert.assertEquals(bodyPart.getFileName(), "excel.xls");
+ Assert.assertTrue(bodyPart.isMimeType("application/vnd.ms-excel"));
+ Assert.assertEquals(bodyPart.getDisposition(), "attachment");
+ Assert.assertNull(bodyPart.getContentID());
+
+ }
+ }.run();
+
+ }
+
+ /**
+ * This test is needed since the PDF is not rendered in the attachment test.
+ * If PDF rendering is supported in a test environment, then this test can be
+ * removed.
+ */
+ @Test
+ public void testPdfAttachment() throws Exception
+ {
+ new FacesRequest()
+ {
+ @Override
+ protected void invokeApplication() throws Exception
+ {
+ UIAttachment attachment = new UIAttachment();
+ attachment.setFileName("filename.pdf");
+ UIMessage message = new UIMessage();
+ attachment.setParent(message);
+ message.setMailSession(MailSession.instance());
+ DocumentData doc = new ByteArrayDocumentData("filename", new DocumentData.DocumentType("pdf", "application/pdf"), new byte[] {});
+ attachment.setValue(doc);
+ attachment.encodeEnd(FacesContext.getCurrentInstance());
+
+ // verify we built the message
+ Assert.assertEquals(message.getAttachments().size(), 1);
+ MimeBodyPart bodyPart = message.getAttachments().get(0);
+ Assert.assertEquals(bodyPart.getFileName(), "filename.pdf");
+ Assert.assertEquals(bodyPart.getDisposition(),"attachment");
+ }
+ }.run();
+ }
+
+ @Test
+ public void testHtml() throws Exception
+ {
+
+ new FacesRequest()
+ {
+
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+ setValue("#{person.firstname}", "Pete");
+ setValue("#{person.lastname}", "Muir");
+ setValue("#{person.address}", "test at example.com");
+ }
+
+ @Override
+ protected void invokeApplication() throws Exception
+ {
+ MimeMessage renderedMessage = getRenderedMailMessage("/html.xhtml");
+
+ // Test the standard headers
+
+ InternetAddress to = (InternetAddress) renderedMessage.getAllRecipients()[0];
+ Assert.assertEquals(to.getAddress(), "test at example.com");
+ Assert.assertEquals(to.getPersonal(), "Pete Muir");
+ InternetAddress from = (InternetAddress) renderedMessage.getFrom()[0];
+ Assert.assertEquals(from.getAddress(), "do-not-reply at jboss.com");
+ Assert.assertEquals(from.getPersonal(), "Seam");
+ Assert.assertEquals(renderedMessage.getSubject(), "Seam Mail");
+
+ // Test the extra headers
+
+ // Importance
+ Assert.assertNotNull(renderedMessage.getHeader("X-Priority"));
+ Assert.assertNotNull(renderedMessage.getHeader("Priority"));
+ Assert.assertNotNull(renderedMessage.getHeader("Importance"));
+ Assert.assertEquals(renderedMessage.getHeader("X-Priority").length, 1);
+ Assert.assertEquals(renderedMessage.getHeader("Priority").length, 1);
+ Assert.assertEquals(renderedMessage.getHeader("Importance").length, 1);
+ Assert.assertEquals(renderedMessage.getHeader("X-Priority")[0], "5");
+ Assert.assertEquals(renderedMessage.getHeader("Priority")[0], "Non-urgent");
+ Assert.assertEquals(renderedMessage.getHeader("Importance")[0], "low");
+
+ // read receipt
+ Assert.assertNotNull(renderedMessage.getHeader("Disposition-Notification-To"));
+ Assert.assertEquals(renderedMessage.getHeader("Disposition-Notification-To").length, 1);
+ Assert.assertEquals(renderedMessage.getHeader("Disposition-Notification-To")[0], "Seam <do-not-reply at jboss.com>");
+
+ // m:header
+ Assert.assertNotNull(renderedMessage.getHeader("X-Sent-From"));
+ Assert.assertEquals(renderedMessage.getHeader("X-Sent-From").length, 1);
+ Assert.assertEquals(renderedMessage.getHeader("X-Sent-From")[0], "Seam");
+
+ MimeMultipart body = (MimeMultipart) renderedMessage.getContent();
+
+ // Check the alternative facet
+ Assert.assertTrue(renderedMessage.getContentType().startsWith("multipart/mixed"));
+ Assert.assertEquals(body.getCount(), 1);
+ MimeBodyPart bodyPart = (MimeBodyPart) body.getBodyPart(0);
+ Assert.assertTrue(bodyPart.getContentType().startsWith("multipart/alternative"));
+ Assert.assertTrue(bodyPart.getContent() instanceof MimeMultipart);
+ MimeMultipart bodyParts = (MimeMultipart) bodyPart.getContent();
+ Assert.assertEquals(bodyParts.getCount(), 2);
+ Assert.assertTrue(bodyParts.getBodyPart(0) instanceof MimeBodyPart);
+ Assert.assertTrue(bodyParts.getBodyPart(1) instanceof MimeBodyPart);
+ MimeBodyPart alternative = (MimeBodyPart) bodyParts.getBodyPart(0);
+ MimeBodyPart html = (MimeBodyPart) bodyParts.getBodyPart(1);
+ Assert.assertTrue(alternative.isMimeType("text/plain"));
+ Assert.assertEquals(alternative.getDisposition(), "inline");
+ Assert.assertTrue(html.isMimeType("text/html"));
+ Assert.assertEquals(html.getDisposition(), "inline");
+
+ }
+ }.run();
+
+ }
+
+
+ @Test
+ public void testPlain() throws Exception
+ {
+
+ new FacesRequest()
+ {
+
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+ setValue("#{person.firstname}", "Pete");
+ setValue("#{person.lastname}", "Muir");
+ setValue("#{person.address}", "test at example.com");
+ }
+
+ @Override
+ protected void invokeApplication() throws Exception
+ {
+ MimeMessage renderedMessage = getRenderedMailMessage("/plain.xhtml");
+
+ // Test the standard headers
+
+ InternetAddress to = (InternetAddress) renderedMessage.getAllRecipients()[0];
+ Assert.assertEquals(to.getAddress(), "test at example.com");
+ Assert.assertEquals(to.getPersonal(), "Pete Muir");
+ InternetAddress from = (InternetAddress) renderedMessage.getFrom()[0];
+ Assert.assertEquals(from.getAddress(), "do-not-reply at jboss.com");
+ Assert.assertEquals(from.getPersonal(), "Seam");
+ Assert.assertEquals(renderedMessage.getReplyTo().length, 1);
+ Assert.assertTrue(renderedMessage.getReplyTo()[0] instanceof InternetAddress);
+ InternetAddress replyTo = (InternetAddress) renderedMessage.getReplyTo()[0];
+ Assert.assertEquals(replyTo.getAddress(), "another.address at jboss.org");
+ Assert.assertEquals(replyTo.getPersonal(), "JBoss");
+ Assert.assertEquals(renderedMessage.getRecipients(CC).length, 1);
+ Assert.assertTrue(renderedMessage.getRecipients(CC)[0] instanceof InternetAddress);
+ InternetAddress cc = (InternetAddress) renderedMessage.getRecipients(CC)[0];
+ Assert.assertEquals(cc.getAddress(), "test at example.com");
+ Assert.assertEquals(cc.getPersonal(), "Pete Muir");
+ Assert.assertEquals(renderedMessage.getRecipients(BCC).length, 1);
+ Assert.assertTrue(renderedMessage.getRecipients(BCC)[0] instanceof InternetAddress);
+ InternetAddress bcc = (InternetAddress) renderedMessage.getRecipients(CC)[0];
+ Assert.assertEquals(bcc.getAddress(), "test at example.com");
+ Assert.assertEquals(bcc.getPersonal(), "Pete Muir");
+ Assert.assertEquals(renderedMessage.getHeader("Precedence")[0], "bulk");
+ // Importance
+ Assert.assertNotNull(renderedMessage.getHeader("X-Priority"));
+ Assert.assertNotNull(renderedMessage.getHeader("Priority"));
+ Assert.assertNotNull(renderedMessage.getHeader("Importance"));
+ Assert.assertEquals(renderedMessage.getHeader("X-Priority").length, 1);
+ Assert.assertEquals(renderedMessage.getHeader("Priority").length, 1);
+ Assert.assertEquals(renderedMessage.getHeader("Importance").length, 1);
+ Assert.assertEquals(renderedMessage.getHeader("X-Priority")[0], "1");
+ Assert.assertEquals(renderedMessage.getHeader("Priority")[0], "Urgent");
+ Assert.assertEquals(renderedMessage.getHeader("Importance")[0], "high");
+ Assert.assertEquals(renderedMessage.getSubject(), "Plain text email sent by Seam");
+
+ // Check the body
+
+ Assert.assertNotNull(renderedMessage.getContent());
+ MimeMultipart body = (MimeMultipart) renderedMessage.getContent();
+ Assert.assertEquals(body.getCount(), 1);
+ MimeBodyPart bodyPart = (MimeBodyPart) body.getBodyPart(0);
+ Assert.assertNotNull(bodyPart.getContent());
+ Assert.assertEquals(bodyPart.getDisposition(), "inline");
+ Assert.assertTrue(bodyPart.isMimeType("text/plain"));
+ }
+ }.run();
+ }
+
+ @Test
+ public void testAttachmentErrors() throws Exception
+ {
+
+ new FacesRequest()
+ {
+
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+
+ }
+
+ @Override
+ protected void invokeApplication() throws Exception
+ {
+ Person person = (Person) getValue("#{person}");
+
+ person.setFirstname("Pete");
+ person.setLastname("Muir");
+ person.setAddress("test at example.com");
+
+ // Test for an unavailable attachment
+
+ Contexts.getEventContext().set("attachment", "/foo.pdf");
+
+ }
+ }.run();
+ }
+
+ @Test
+ public void testAddressValidation() throws Exception
+ {
+
+ new FacesRequest()
+ {
+
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+
+ }
+
+ @Override
+ protected void invokeApplication() throws Exception
+ {
+ Person person = (Person) getValue("#{person}");
+
+ person.setFirstname("Pete");
+ person.setLastname("Muir");
+ boolean exceptionThrown = false;
+
+ person.setAddress("testexample.com");
+
+ try
+ {
+ getRenderedMailMessage("/org/jboss/seam/example/mail/test/errors2.xhtml");
+ }
+ catch (FacesException e)
+ {
+ Assert.assertTrue(e.getCause() instanceof AddressException);
+ AddressException ae = (AddressException) e.getCause();
+ Assert.assertTrue(ae.getMessage().startsWith("Missing final '@domain'"));
+ exceptionThrown = true;
+ }
+ Assert.assertTrue(exceptionThrown);
+
+ }
+ }.run();
+ }
+
+ //JBSEAM-2109
+ //@Test
+ public void testReplyToErrors() throws Exception
+ {
+
+ new FacesRequest()
+ {
+
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+
+ }
+
+ @Override
+ protected void invokeApplication() throws Exception
+ {
+ Person person = (Person) getValue("#{person}");
+
+ person.setFirstname("Pete");
+ person.setLastname("Muir");
+ person.setAddress("test at example.com");
+
+ boolean exceptionThrown = false;
+
+
+
+ try
+ {
+ getRenderedMailMessage("/org/jboss/seam/example/mail/test/errors3.xhtml");
+ }
+ catch (Exception e)
+ {
+ Assert.assertTrue(e.getCause() instanceof AddressException);
+ AddressException ae = (AddressException) e.getCause();
+ System.out.println(ae.getMessage());
+ Assert.assertTrue(ae.getMessage().startsWith("Email cannot have more than one Reply-to address"));
+ exceptionThrown = true;
+ }
+ Assert.assertTrue(exceptionThrown);
+
+ }
+ }.run();
+ }
+
+ @Test
+ public void testFromErrors() throws Exception
+ {
+
+ new FacesRequest()
+ {
+
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+
+ }
+
+ @Override
+ protected void invokeApplication() throws Exception
+ {
+ Person person = (Person) getValue("#{person}");
+
+ person.setFirstname("Pete");
+ person.setLastname("Muir");
+ person.setAddress("test at example.com");
+
+ boolean exceptionThrown = false;
+
+ try
+ {
+ getRenderedMailMessage("/org/jboss/seam/example/mail/test/errors4.xhtml");
+ }
+ catch (FacesException e)
+ {
+ Assert.assertTrue(e.getCause() instanceof AddressException);
+ AddressException ae = (AddressException) e.getCause();
+ Assert.assertTrue(ae.getMessage().startsWith("Email cannot have more than one from address"));
+ exceptionThrown = true;
+ }
+ Assert.assertTrue(exceptionThrown);
+
+ }
+ }.run();
+ }
+
+ @Test
+ public void testSanitization() throws Exception
+ {
+
+ new FacesRequest()
+ {
+
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+
+ }
+
+ @Override
+ protected void invokeApplication() throws Exception
+ {
+ Contexts.getEventContext().set("name", "Pete\nMuir");
+ MimeMessage renderedMessage = getRenderedMailMessage("/org/jboss/seam/example/mail/test/sanitization.xhtml");
+ Assert.assertEquals(renderedMessage.getSubject(), "Try out Seam!");
+ InternetAddress to = (InternetAddress) renderedMessage.getAllRecipients()[0];
+ Assert.assertEquals(to.getAddress(), "peter at email.tld");
+ Assert.assertEquals(to.getPersonal(), "Pete");
+ Assert.assertEquals(renderedMessage.getFrom().length, 1);
+ Assert.assertTrue(renderedMessage.getFrom()[0] instanceof InternetAddress);
+ InternetAddress from = (InternetAddress) renderedMessage.getFrom()[0];
+ Assert.assertEquals(from.getAddress(), "peter at example.com");
+ Assert.assertEquals(from.getPersonal(), "Pete");
+ Assert.assertNotNull(renderedMessage.getHeader("Pete"));
+ Assert.assertEquals(renderedMessage.getHeader("Pete").length, 1);
+ Assert.assertEquals(renderedMessage.getHeader("Pete")[0], "roll over");
+ }
+ }.run();
+ }
+
+ @Test
+ public void testTemplating() throws Exception
+ {
+
+ new FacesRequest()
+ {
+
+ @Override
+ protected void updateModelValues() throws Exception
+ {
+ setValue("#{person.firstname}", "Pete");
+ setValue("#{person.lastname}", "Muir");
+ setValue("#{person.address}", "test at example.com");
+ }
+
+ @Override
+ protected void invokeApplication() throws Exception
+ {
+ MimeMessage renderedMessage = getRenderedMailMessage("/templating.xhtml");
+
+ // Test the standard headers
+
+ InternetAddress to = (InternetAddress) renderedMessage.getAllRecipients()[0];
+ Assert.assertEquals(to.getAddress(), "test at example.com");
+ Assert.assertEquals(to.getPersonal(), "Pete Muir");
+ InternetAddress from = (InternetAddress) renderedMessage.getFrom()[0];
+ Assert.assertEquals(from.getAddress(), "do-not-reply at jboss.com");
+ Assert.assertEquals(from.getPersonal(), "Seam");
+ Assert.assertEquals(renderedMessage.getSubject(), "Templating with Seam Mail");
+ Assert.assertNull(renderedMessage.getHeader("X-Priority"));
+ Assert.assertNull(renderedMessage.getHeader("Priority"));
+ Assert.assertNull(renderedMessage.getHeader("Importance"));
+
+ // Check the body
+
+ MimeMultipart body = (MimeMultipart) renderedMessage.getContent();
+
+ // Check the alternative facet
+ Assert.assertTrue(renderedMessage.getContentType().startsWith("multipart/mixed"));
+ Assert.assertEquals(body.getCount(), 1);
+ MimeBodyPart bodyPart = (MimeBodyPart) body.getBodyPart(0);
+ Assert.assertTrue(bodyPart.getContentType().startsWith("multipart/alternative"));
+ Assert.assertTrue(bodyPart.getContent() instanceof MimeMultipart);
+ MimeMultipart bodyParts = (MimeMultipart) bodyPart.getContent();
+ Assert.assertEquals(bodyParts.getCount(), 2);
+ Assert.assertTrue(bodyParts.getBodyPart(0) instanceof MimeBodyPart);
+ Assert.assertTrue(bodyParts.getBodyPart(1) instanceof MimeBodyPart);
+ MimeBodyPart alternative = (MimeBodyPart) bodyParts.getBodyPart(0);
+ MimeBodyPart html = (MimeBodyPart) bodyParts.getBodyPart(1);
+ Assert.assertTrue(alternative.isMimeType("text/plain"));
+ Assert.assertEquals(alternative.getDisposition(), "inline");
+ Assert.assertTrue(html.isMimeType("text/html"));
+ Assert.assertEquals(html.getDisposition(), "inline");
+ }
+ }.run();
+ }
+}
Deleted: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/selenium/SeleniumMailTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/selenium/SeleniumMailTest.java 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/selenium/SeleniumMailTest.java 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,148 +0,0 @@
-package org.jboss.seam.example.mail.test.selenium;
-
-import org.jboss.seam.example.common.test.selenium.SeamSeleniumTest;
-import org.subethamail.wiser.Wiser;
-import org.subethamail.wiser.WiserMessage;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.DataProvider;
-import org.testng.annotations.Test;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertTrue;
-import static org.testng.AssertJUnit.assertFalse;
-
-public class SeleniumMailTest extends SeamSeleniumTest
-{
- public static final String HOME_PAGE = "/index.seam";
- public static final String HOME_PAGE_TITLE = "Seam Mail";
- public static final String ENVELOPE_SENDER = "peter at example.com|do-not-reply at jboss.com";
-
- public static final String FIRSTNAME_INPUT = "id=emailform:firstname";
- public static final String FIRSTNAME = "John";
- public static final String LASTNAME_INPUT = "id=emailform:lastname";
- public static final String LASTNAME = "Smith";
- public static final String ADDRESS_INPUT = "id=emailform:address";
- public static final String ADDRESS = "john.smith at localhost";
- public static final String SERVLET_NAME_INPUT = "id=name";
- public static final String SERVLET_ADDRESS_INPUT = "id=email";
-
- public static final String SEND_SIMPLE_BUTTON = "id=emailform:sendSimple";
- public static final String SEND_PLAIN_BUTTON = "id=emailform:sendPlain";
- public static final String SEND_HTML_BUTTON = "id=emailform:sendHtml";
- public static final String SEND_ATTACHMENT_BUTTON = "id=emailform:sendAttachment";
- public static final String SEND_ASYNCHRONOUS_BUTTON = "id=emailform:sendAsynchronous";
- public static final String SEND_TEMPLATE_BUTTON = "id=emailform:sendTemplate";
- public static final String SEND_SERVLET_BUTTON = "id=sendServlet";
-
- protected Wiser wiser;
-
- @BeforeMethod
- @Override
- public void setUp()
- {
- super.setUp();
- browser.open(CONTEXT_PATH + HOME_PAGE);
- }
-
- /**
- * We restart SMTP after each Method, because Wiser doesn't have mechanism to flush recieved emails.
- */
- @BeforeMethod
- public void startSMTP()
- {
- wiser = new Wiser();
- wiser.setPort(2525);
- wiser.start();
- }
-
- @AfterMethod
- public void stopSMTP()
- {
- wiser.stop();
- }
-
- /**
- * Place holder - just verifies that example deploys
- */
- @Test
- public void homePageLoadTest()
- {
- assertEquals("Unexpected page title.", HOME_PAGE_TITLE, browser.getTitle());
- }
-
- @DataProvider(name = "sendMethods")
- public Object[][] mailTest() {
- return new Object[][] {
- {SEND_SIMPLE_BUTTON, new String[] {"Content-Type: text/html; charset=ISO-8859-1", "Content-Disposition: inline", "<p>Dear " + FIRSTNAME + ",</p>"}},
- {SEND_PLAIN_BUTTON, new String[] {"This is a plain text, email."}},
- {SEND_HTML_BUTTON, new String[] {"Subject: Seam Mail", "Content-Type: multipart/mixed;", "Content-Type: multipart/alternative;", "Content-Type: text/plain; charset=ISO-8859-1", "This is the alternative text body for mail readers that don't support html", "Content-Type: text/html; charset=ISO-8859-1", "<p>This is an example <i>HTML</i> email sent by Seam.</p>"}},
- {SEND_ATTACHMENT_BUTTON, new String[] {"Content-Type: multipart/mixed;","Content-Type: application/octet-stream; name=jboss.jpg", "/9j/4AAQSkZJRgABA"/*jpeg start*/, "Content-Type: application/octet-stream; name=numbers.csv", "3,Three,treis,trois", "Content-Type: image/png; name=" + FIRSTNAME + "_" + LASTNAME + ".jpg", "iVBORw0KGgo" /*png start*/ }},
- {SEND_ASYNCHRONOUS_BUTTON, new String[] {"Content-Type: multipart/mixed;", "Content-Type: text/html; charset=ISO-8859-1", "Content-Disposition: inline", "<p>Dear " + FIRSTNAME + ",</p>"}},
- {SEND_TEMPLATE_BUTTON, new String[] {"Subject: Templating with Seam Mail", "Content-Type: multipart/mixed;", "Content-Type: multipart/alternative;", "Content-Type: text/plain; charset=ISO-8859-1", "Sorry, your mail reader doesn't support html.", "Content-Type: text/html; charset=ISO-8859-1", "<p>Here's a dataTable</p><table>", "<td>Saturday</td>"}},
- {SEND_SERVLET_BUTTON, new String[] {"Content-Type: multipart/mixed;", "Content-Disposition: inline", "Dear John Smith,", "This is a plain text, email."}}
- };
- }
-
- /**
- * Sends a mail and verifies it was delivered
- */
- @Test(dataProvider = "sendMethods")
- public void mailTest(String buttonToClick, String[] expectedMessageContents) {
- fillInInputs();
- sendEmail(buttonToClick);
- checkDelivered(expectedMessageContents);
- }
-
- /**
- * Fills in html text inputs.
- */
- private void fillInInputs()
- {
- browser.type(FIRSTNAME_INPUT, FIRSTNAME);
- browser.type(LASTNAME_INPUT, LASTNAME);
- browser.type(ADDRESS_INPUT, ADDRESS);
- browser.type(SERVLET_NAME_INPUT, FIRSTNAME + " " + LASTNAME);
- browser.type(SERVLET_ADDRESS_INPUT, ADDRESS);
- }
-
- /**
- * Sends an email by clicking on specified button. If the send method is asynchronous,
- * waits for the associated action to take place. It assures that the email was sent
- * by verifying appropriate message.
- * @param buttonToClick
- */
- private void sendEmail(String buttonToClick)
- {
- browser.clickAndWait(buttonToClick);
- if (buttonToClick.equals(SEND_ASYNCHRONOUS_BUTTON)) {
- assertTrue(browser.isTextPresent("Seam Email")); // asynchronous email send produces no message, so we just check that we didn't end up on a debug page
- try
- {
- Thread.sleep(4000);
- }
- catch (InterruptedException e)
- {
- e.printStackTrace();
- }
- } else {
- assertTrue("Expected message about successfuly sent mail. See also JBSEAM-3769.", browser.isTextPresent("Email sent successfully"));
- }
- }
-
- /**
- * Checks that the expected email was delivered.
- * @param expectedMessageContents
- */
- private void checkDelivered(String[] expectedMessageContents)
- {
- assertFalse("Expected a message", wiser.getMessages().isEmpty());
- WiserMessage message = wiser.getMessages().get(0); // although "send plain text" example sends 3 mails (To:, CC:, Bcc:) Wiser cannot distinquish between them so we just check the first mail.
- assertEquals(ADDRESS, message.getEnvelopeReceiver());
- assertTrue("Envelope sender (" + message.getEnvelopeSender() + ") doesn't match expected one (" + ENVELOPE_SENDER + ")", message.getEnvelopeSender().matches(ENVELOPE_SENDER));
-
- for (String expectedMessageContent: expectedMessageContents) {
- assertTrue("Didn't find expected text (" + expectedMessageContent + ") in the received email.", new String(message.getData()).contains(expectedMessageContent));
- }
- }
-
-}
Copied: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/selenium/SeleniumMailTest.java (from rev 14346, branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/selenium/SeleniumMailTest.java)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/selenium/SeleniumMailTest.java (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/selenium/SeleniumMailTest.java 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,148 @@
+package org.jboss.seam.example.mail.test.selenium;
+
+import org.jboss.seam.example.common.test.selenium.SeamSeleniumTest;
+import org.subethamail.wiser.Wiser;
+import org.subethamail.wiser.WiserMessage;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+import static org.testng.AssertJUnit.assertFalse;
+
+public class SeleniumMailTest extends SeamSeleniumTest
+{
+ public static final String HOME_PAGE = "/index.seam";
+ public static final String HOME_PAGE_TITLE = "Seam Mail";
+ public static final String ENVELOPE_SENDER = "peter at example.com|do-not-reply at jboss.com";
+
+ public static final String FIRSTNAME_INPUT = "id=emailform:firstname";
+ public static final String FIRSTNAME = "John";
+ public static final String LASTNAME_INPUT = "id=emailform:lastname";
+ public static final String LASTNAME = "Smith";
+ public static final String ADDRESS_INPUT = "id=emailform:address";
+ public static final String ADDRESS = "john.smith at localhost";
+ public static final String SERVLET_NAME_INPUT = "id=name";
+ public static final String SERVLET_ADDRESS_INPUT = "id=email";
+
+ public static final String SEND_SIMPLE_BUTTON = "id=emailform:sendSimple";
+ public static final String SEND_PLAIN_BUTTON = "id=emailform:sendPlain";
+ public static final String SEND_HTML_BUTTON = "id=emailform:sendHtml";
+ public static final String SEND_ATTACHMENT_BUTTON = "id=emailform:sendAttachment";
+ public static final String SEND_ASYNCHRONOUS_BUTTON = "id=emailform:sendAsynchronous";
+ public static final String SEND_TEMPLATE_BUTTON = "id=emailform:sendTemplate";
+ public static final String SEND_SERVLET_BUTTON = "id=sendServlet";
+
+ protected Wiser wiser;
+
+ @BeforeMethod
+ @Override
+ public void setUp()
+ {
+ super.setUp();
+ browser.open(CONTEXT_PATH + HOME_PAGE);
+ }
+
+ /**
+ * We restart SMTP after each Method, because Wiser doesn't have mechanism to flush recieved emails.
+ */
+ @BeforeMethod
+ public void startSMTP()
+ {
+ wiser = new Wiser();
+ wiser.setPort(2525);
+ wiser.start();
+ }
+
+ @AfterMethod
+ public void stopSMTP()
+ {
+ wiser.stop();
+ }
+
+ /**
+ * Place holder - just verifies that example deploys
+ */
+ @Test
+ public void homePageLoadTest()
+ {
+ assertEquals("Unexpected page title.", HOME_PAGE_TITLE, browser.getTitle());
+ }
+
+ @DataProvider(name = "sendMethods")
+ public Object[][] mailTest() {
+ return new Object[][] {
+ {SEND_SIMPLE_BUTTON, new String[] {"Content-Type: text/html; charset=ISO-8859-1", "Content-Disposition: inline", "<p>Dear " + FIRSTNAME + ",</p>"}},
+ {SEND_PLAIN_BUTTON, new String[] {"This is a plain text, email."}},
+ {SEND_HTML_BUTTON, new String[] {"Subject: Seam Mail", "Content-Type: multipart/mixed;", "Content-Type: multipart/alternative;", "Content-Type: text/plain; charset=ISO-8859-1", "This is the alternative text body for mail readers that don't support html", "Content-Type: text/html; charset=ISO-8859-1", "<p>This is an example <i>HTML</i> email sent by Seam.</p>"}},
+ {SEND_ATTACHMENT_BUTTON, new String[] {"Content-Type: multipart/mixed;","Content-Type: application/octet-stream; name=jboss.jpg", "/9j/4AAQSkZJRgABA"/*jpeg start*/, "Content-Type: application/octet-stream; name=numbers.csv", "3,Three,treis,trois", "Content-Type: image/png; name=" + FIRSTNAME + "_" + LASTNAME + ".jpg", "iVBORw0KGgo" /*png start*/ }},
+ {SEND_ASYNCHRONOUS_BUTTON, new String[] {"Content-Type: multipart/mixed;", "Content-Type: text/html; charset=ISO-8859-1", "Content-Disposition: inline", "<p>Dear " + FIRSTNAME + ",</p>"}},
+ {SEND_TEMPLATE_BUTTON, new String[] {"Subject: Templating with Seam Mail", "Content-Type: multipart/mixed;", "Content-Type: multipart/alternative;", "Content-Type: text/plain; charset=ISO-8859-1", "Sorry, your mail reader doesn't support html.", "Content-Type: text/html; charset=ISO-8859-1", "<p>Here's a dataTable</p><table>", "<td>Saturday</td>"}},
+ {SEND_SERVLET_BUTTON, new String[] {"Content-Type: multipart/mixed;", "Content-Disposition: inline", "Dear John Smith,", "This is a plain text, email."}}
+ };
+ }
+
+ /**
+ * Sends a mail and verifies it was delivered
+ */
+ @Test(dataProvider = "sendMethods")
+ public void mailTest(String buttonToClick, String[] expectedMessageContents) {
+ fillInInputs();
+ sendEmail(buttonToClick);
+ checkDelivered(expectedMessageContents);
+ }
+
+ /**
+ * Fills in html text inputs.
+ */
+ private void fillInInputs()
+ {
+ browser.type(FIRSTNAME_INPUT, FIRSTNAME);
+ browser.type(LASTNAME_INPUT, LASTNAME);
+ browser.type(ADDRESS_INPUT, ADDRESS);
+ browser.type(SERVLET_NAME_INPUT, FIRSTNAME + " " + LASTNAME);
+ browser.type(SERVLET_ADDRESS_INPUT, ADDRESS);
+ }
+
+ /**
+ * Sends an email by clicking on specified button. If the send method is asynchronous,
+ * waits for the associated action to take place. It assures that the email was sent
+ * by verifying appropriate message.
+ * @param buttonToClick
+ */
+ private void sendEmail(String buttonToClick)
+ {
+ browser.clickAndWait(buttonToClick);
+ if (buttonToClick.equals(SEND_ASYNCHRONOUS_BUTTON)) {
+ assertTrue(browser.isTextPresent("Seam Email")); // asynchronous email send produces no message, so we just check that we didn't end up on a debug page
+ try
+ {
+ Thread.sleep(4000);
+ }
+ catch (InterruptedException e)
+ {
+ e.printStackTrace();
+ }
+ } else {
+ assertTrue("Expected message about successfuly sent mail. See also JBSEAM-3769.", browser.isTextPresent("Email sent successfully"));
+ }
+ }
+
+ /**
+ * Checks that the expected email was delivered.
+ * @param expectedMessageContents
+ */
+ private void checkDelivered(String[] expectedMessageContents)
+ {
+ assertFalse("Expected a message", wiser.getMessages().isEmpty());
+ WiserMessage message = wiser.getMessages().get(0); // although "send plain text" example sends 3 mails (To:, CC:, Bcc:) Wiser cannot distinquish between them so we just check the first mail.
+ assertEquals(ADDRESS, message.getEnvelopeReceiver());
+ assertTrue("Envelope sender (" + message.getEnvelopeSender() + ") doesn't match expected one (" + ENVELOPE_SENDER + ")", message.getEnvelopeSender().matches(ENVELOPE_SENDER));
+
+ for (String expectedMessageContent: expectedMessageContents) {
+ assertTrue("Didn't find expected text (" + expectedMessageContent + ") in the received email.", new String(message.getData()).contains(expectedMessageContent));
+ }
+ }
+
+}
Deleted: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/WEB-INF/components.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/WEB-INF/components.xml 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/WEB-INF/components.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,21 +0,0 @@
-<components xmlns="http://jboss.com/products/seam/components"
- xmlns:core="http://jboss.com/products/seam/core"
- xmlns:async="http://jboss.com/products/seam/async"
- xmlns:mail="http://jboss.com/products/seam/mail"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation=
- "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.3.xsd
- http://jboss.com/products/seam/async http://jboss.com/products/seam/async-2.3.xsd
- http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.3.xsd
- http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd">
-
-
- <core:init debug="true" jndi-pattern="#{ejbName}/local" />
-
- <!-- If you need to alter the SMTP gateway, comment out this mail-session, -->
- <!--<mail:mail-session host="localhost" port="2525" /> -->
-
- <!-- uncomment this one and set the host attribute to the name or IP address of your SMTP gateway-->
- <mail:mail-session host="localhost" tls="false" port="2525" ssl="false" />
-
-</components>
Copied: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/WEB-INF/components.xml (from rev 14346, branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/WEB-INF/components.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/WEB-INF/components.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/WEB-INF/components.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,21 @@
+<components xmlns="http://jboss.com/products/seam/components"
+ xmlns:core="http://jboss.com/products/seam/core"
+ xmlns:async="http://jboss.com/products/seam/async"
+ xmlns:mail="http://jboss.com/products/seam/mail"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation=
+ "http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.3.xsd
+ http://jboss.com/products/seam/async http://jboss.com/products/seam/async-2.3.xsd
+ http://jboss.com/products/seam/mail http://jboss.com/products/seam/mail-2.3.xsd
+ http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd">
+
+
+ <core:init debug="true" jndi-pattern="#{ejbName}/local" />
+
+ <!-- If you need to alter the SMTP gateway, comment out this mail-session, -->
+ <!--<mail:mail-session host="localhost" port="2525" /> -->
+
+ <!-- uncomment this one and set the host attribute to the name or IP address of your SMTP gateway-->
+ <mail:mail-session host="localhost" tls="false" port="2525" ssl="false" />
+
+</components>
Deleted: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors1.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors1.xhtml 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors1.xhtml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,10 +0,0 @@
-<m:message xmlns="http://www.w3.org/1999/xhtml"
- xmlns:m="http://jboss.com/products/seam/mail"
- xmlns:h="http://java.sun.com/jsf/html">
-
- <m:from name="Peter">peter at example.com</m:from>
- <m:to name="Peter">peter at email.tld</m:to>
- <m:subject>Try out Seam!</m:subject>
- <m:attachment value="#{attachment}" />
- <m:body>A mail message to test exception handling</m:body>
-</m:message>
\ No newline at end of file
Copied: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors1.xhtml (from rev 14346, branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors1.xhtml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors1.xhtml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors1.xhtml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,10 @@
+<m:message xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:m="http://jboss.com/products/seam/mail"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <m:from name="Peter">peter at example.com</m:from>
+ <m:to name="Peter">peter at email.tld</m:to>
+ <m:subject>Try out Seam!</m:subject>
+ <m:attachment value="#{attachment}" />
+ <m:body>A mail message to test exception handling</m:body>
+</m:message>
\ No newline at end of file
Deleted: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors2.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors2.xhtml 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors2.xhtml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,9 +0,0 @@
-<m:message xmlns="http://www.w3.org/1999/xhtml"
- xmlns:m="http://jboss.com/products/seam/mail"
- xmlns:h="http://java.sun.com/jsf/html">
-
- <m:from name="Peter" address="peter at example.com" />
- <m:to name="#{person.firstname} #{person.lastname}">#{person.address}</m:to>
- <m:subject>Try out Seam!</m:subject>
- <m:body>A mail message to test exception handling</m:body>
-</m:message>
\ No newline at end of file
Copied: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors2.xhtml (from rev 14346, branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors2.xhtml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors2.xhtml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors2.xhtml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,9 @@
+<m:message xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:m="http://jboss.com/products/seam/mail"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <m:from name="Peter" address="peter at example.com" />
+ <m:to name="#{person.firstname} #{person.lastname}">#{person.address}</m:to>
+ <m:subject>Try out Seam!</m:subject>
+ <m:body>A mail message to test exception handling</m:body>
+</m:message>
\ No newline at end of file
Deleted: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors3.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors3.xhtml 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors3.xhtml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,11 +0,0 @@
-<m:message xmlns="http://www.w3.org/1999/xhtml"
- xmlns:m="http://jboss.com/products/seam/mail"
- xmlns:h="http://java.sun.com/jsf/html">
-
- <m:replyTo address="foo at bar.com" />
- <m:replyTo address="bar at bar.com" />
- <m:from name="Peter" address="peter at example.com" />
- <m:to name="#{person.firstname} #{person.lastname}">#{person.address}</m:to>
- <m:subject>Try out Seam!</m:subject>
- <m:body>A mail message to test exception handling</m:body>
-</m:message>
\ No newline at end of file
Copied: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors3.xhtml (from rev 14346, branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors3.xhtml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors3.xhtml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors3.xhtml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,11 @@
+<m:message xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:m="http://jboss.com/products/seam/mail"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <m:replyTo address="foo at bar.com" />
+ <m:replyTo address="bar at bar.com" />
+ <m:from name="Peter" address="peter at example.com" />
+ <m:to name="#{person.firstname} #{person.lastname}">#{person.address}</m:to>
+ <m:subject>Try out Seam!</m:subject>
+ <m:body>A mail message to test exception handling</m:body>
+</m:message>
\ No newline at end of file
Deleted: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors4.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors4.xhtml 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors4.xhtml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,10 +0,0 @@
-<m:message xmlns="http://www.w3.org/1999/xhtml"
- xmlns:m="http://jboss.com/products/seam/mail"
- xmlns:h="http://java.sun.com/jsf/html">
-
- <m:from address="bar at bar.com" />
- <m:from name="Peter" address="peter at example.com" />
- <m:to name="#{person.firstname} #{person.lastname}">#{person.address}</m:to>
- <m:subject>Try out Seam!</m:subject>
- <m:body>A mail message to test exception handling</m:body>
-</m:message>
\ No newline at end of file
Copied: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors4.xhtml (from rev 14346, branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors4.xhtml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors4.xhtml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/errors4.xhtml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,10 @@
+<m:message xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:m="http://jboss.com/products/seam/mail"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <m:from address="bar at bar.com" />
+ <m:from name="Peter" address="peter at example.com" />
+ <m:to name="#{person.firstname} #{person.lastname}">#{person.address}</m:to>
+ <m:subject>Try out Seam!</m:subject>
+ <m:body>A mail message to test exception handling</m:body>
+</m:message>
\ No newline at end of file
Deleted: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/sanitization.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/sanitization.xhtml 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/sanitization.xhtml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,14 +0,0 @@
-<m:message xmlns="http://www.w3.org/1999/xhtml"
- xmlns:m="http://jboss.com/products/seam/mail"
- xmlns:h="http://java.sun.com/jsf/html">
-
- <m:from name="#{name}">peter at example.com
-foo</m:from>
- <m:to name="#{name}">peter at email.tld
-bar</m:to>
- <m:subject>Try out
- Seam!</m:subject>
- <m:header name="#{name}">roll
- over</m:header>
- <m:body>A mail message to test sanitization</m:body>
-</m:message>
\ No newline at end of file
Copied: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/sanitization.xhtml (from rev 14346, branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/sanitization.xhtml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/sanitization.xhtml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/org/jboss/seam/example/mail/test/sanitization.xhtml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,14 @@
+<m:message xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:m="http://jboss.com/products/seam/mail"
+ xmlns:h="http://java.sun.com/jsf/html">
+
+ <m:from name="#{name}">peter at example.com
+foo</m:from>
+ <m:to name="#{name}">peter at email.tld
+bar</m:to>
+ <m:subject>Try out
+ Seam!</m:subject>
+ <m:header name="#{name}">roll
+ over</m:header>
+ <m:body>A mail message to test sanitization</m:body>
+</m:message>
\ No newline at end of file
Deleted: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/seam.properties
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/seam.properties 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/seam.properties 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,3 +0,0 @@
-#debug is explicitly disabled in test to avoid JBIDE-3623
-#Thu Dec 31 16:24:37 CET 2009
-org.jboss.seam.core.init.debug=false
\ No newline at end of file
Copied: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/seam.properties (from rev 14346, branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/seam.properties)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/seam.properties (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources/seam.properties 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,3 @@
+#debug is explicitly disabled in test to avoid JBIDE-3623
+#Thu Dec 31 16:24:37 CET 2009
+org.jboss.seam.core.init.debug=false
\ No newline at end of file
Deleted: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-ftest/testng.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-ftest/testng.xml 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-ftest/testng.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,26 +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="Mail example" verbose="2" parallel="false">
- <test name="mail_jboss">
- <parameter name="PROPERTY_FILE" value="" />
- <classes>
- <class name="org.jboss.seam.example.mail.test.selenium.SeleniumMailTest" />
- </classes>
- </test>
-</suite>
Copied: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-ftest/testng.xml (from rev 14346, branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-ftest/testng.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-ftest/testng.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-ftest/testng.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,26 @@
+
+ <!--
+ 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="Mail example" verbose="2" parallel="false">
+ <test name="mail_jboss">
+ <parameter name="PROPERTY_FILE" value="" />
+ <classes>
+ <class name="org.jboss.seam.example.mail.test.selenium.SeleniumMailTest" />
+ </classes>
+ </test>
+</suite>
Deleted: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/arquillian.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/arquillian.xml 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/arquillian.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,17 +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</property>
- <property name="jbossHome">target/jboss-as-${version.jbossas7}</property>
- </configuration>
- </container>
-
-</arquillian>
Copied: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/arquillian.xml (from rev 14346, branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/arquillian.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/arquillian.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/arquillian.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,17 @@
+<?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</property>
+ <property name="jbossHome">target/jboss-as-${version.jbossas7}</property>
+ </configuration>
+ </container>
+
+</arquillian>
Deleted: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/testng.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/testng.xml 2012-03-06 18:49:11 UTC (rev 14346)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/testng.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,12 +0,0 @@
-<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
-
-<suite name="Seam Mail Tests" verbose="2" parallel="false">
-
- <test name="Seam Mail Tests">
- <parameter name="PROPERTY_FILE" value="" />
- <classes>
- <class name="org.jboss.seam.example.mail.test.MailTest" />
- </classes>
- </test>
-
-</suite>
\ No newline at end of file
Copied: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/testng.xml (from rev 14346, branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/testng.xml)
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/testng.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/testng.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -0,0 +1,12 @@
+<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
+
+<suite name="Seam Mail Tests" verbose="2" parallel="false">
+
+ <test name="Seam Mail Tests">
+ <parameter name="PROPERTY_FILE" value="" />
+ <classes>
+ <class name="org.jboss.seam.example.mail.test.MailTest" />
+ </classes>
+ </test>
+
+</suite>
\ No newline at end of file
Property changes on: branches/community/Seam_2_3/examples-ee6/mail/mail-web
___________________________________________________________________
Deleted: svn:ignore
- target
*.iml
Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml 2012-03-08 17:53:11 UTC (rev 14378)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-web/pom.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,209 +1,208 @@
<?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>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>mail</artifactId>
- <version>2.3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+<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>mail</artifactId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <version>2.3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.jboss.seam.examples-ee6.mail</groupId>
+ <artifactId>mail-web</artifactId>
+ <packaging>war</packaging>
+ <name>Mail Web Module (EE6)</name>
+
+ <properties>
+ <!-- filtering property for components.xml -->
+ <jndiPattern>seam-mail/#{ejbName}/local</jndiPattern>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6.mail</groupId>
+ <artifactId>mail-ejb</artifactId>
+ <type>ejb</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jsf2</artifactId>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-mail</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>jboss-seam-ui</artifactId>
+ <groupId>org.jboss.seam</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jsf-facelets</artifactId>
+ <groupId>com.sun.facelets</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-seam</artifactId>
+ <groupId>org.jboss.seam</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui-jsf2</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jul</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-debug-jsf2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-pdf</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>jboss-seam-ui</artifactId>
+ <groupId>org.jboss.seam</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jsf-facelets</artifactId>
+ <groupId>com.sun.facelets</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-seam</artifactId>
+ <groupId>org.jboss.seam</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-excel</artifactId>
+ <exclusions>
+ <exclusion>
+ <artifactId>jboss-seam-ui</artifactId>
+ <groupId>org.jboss.seam</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jsf-facelets</artifactId>
+ <groupId>com.sun.facelets</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-seam</artifactId>
+ <groupId>org.jboss.seam</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+<!-- <dependency> -->
+<!-- <groupId>com.sun.facelets</groupId> -->
+<!-- <artifactId>jsf-facelets</artifactId> -->
+<!-- </dependency> -->
- <groupId>org.jboss.seam.examples-ee6.mail</groupId>
- <artifactId>mail-web</artifactId>
- <packaging>war</packaging>
- <name>Mail Web Module (EE6)</name>
-
- <properties>
- <!-- filtering property for components.xml -->
- <jndiPattern>seam-mail/#{ejbName}/local</jndiPattern>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6.mail</groupId>
- <artifactId>mail-ejb</artifactId>
- <type>ejb</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-mail</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>jboss-seam-ui</artifactId>
- <groupId>org.jboss.seam</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jsf-facelets</artifactId>
- <groupId>com.sun.facelets</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jboss-seam</artifactId>
- <groupId>org.jboss.seam</groupId>
- </exclusion>
- <exclusion>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui-jsf2</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jul</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-debug-jsf2</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-pdf</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>jboss-seam-ui</artifactId>
- <groupId>org.jboss.seam</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jsf-facelets</artifactId>
- <groupId>com.sun.facelets</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jboss-seam</artifactId>
- <groupId>org.jboss.seam</groupId>
- </exclusion>
- <exclusion>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-excel</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>jboss-seam-ui</artifactId>
- <groupId>org.jboss.seam</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jsf-facelets</artifactId>
- <groupId>com.sun.facelets</groupId>
- </exclusion>
- <exclusion>
- <artifactId>jboss-seam</artifactId>
- <groupId>org.jboss.seam</groupId>
- </exclusion>
- <exclusion>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <!-- <dependency> -->
- <!-- <groupId>com.sun.facelets</groupId> -->
- <!-- <artifactId>jsf-facelets</artifactId> -->
- <!-- </dependency> -->
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources>
- <resource>
- <directory>src/main/webapp</directory>
- <filtering>true</filtering>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>tomcat</id>
- <properties>
- <!-- filtering property for components.xml -->
- <jndiPattern>#{ejbName}/local</jndiPattern>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6.mail</groupId>
- <artifactId>mail-ejb</artifactId>
- <type>ejb</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <type>ejb</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- <build>
- <finalName>jboss-seam-mail</finalName>
- <plugins>
- <plugin>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-resources</id>
- <phase>validate</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/classes</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/../mail-ear/src/main/resources</directory>
- <includes>
- <include>jboss-seam-mail-ds.xml</include>
- </includes>
- </resource>
- </resources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>src/main/webapp</directory>
+ <filtering>true</filtering>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>tomcat</id>
+ <properties>
+ <!-- filtering property for components.xml -->
+ <jndiPattern>#{ejbName}/local</jndiPattern>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6.mail</groupId>
+ <artifactId>mail-ejb</artifactId>
+ <type>ejb</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jsf2</artifactId>
+ <type>ejb</type>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>jboss-seam-mail</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-resources</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>copy-resources</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${basedir}/target/classes</outputDirectory>
+ <resources>
+ <resource>
+ <directory>${basedir}/../mail-ear/src/main/resources</directory>
+ <includes>
+ <include>jboss-seam-mail-ds.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: branches/community/Seam_2_3/examples-ee6/mail/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/pom.xml 2012-03-08 17:53:11 UTC (rev 14378)
+++ branches/community/Seam_2_3/examples-ee6/mail/pom.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,51 +1,47 @@
<?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>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>mail</artifactId>
-
- <parent>
- <groupId>org.jboss.seam</groupId>
- <artifactId>examples-ee6</artifactId>
- <version>2.3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <packaging>pom</packaging>
- <name>Seam Mail Example (EE6)</name>
-
- <properties>
- <example.name>mail</example.name>
- </properties>
-
- <modules>
- <module>mail-ear</module>
- <module>mail-ejb</module>
- <module>mail-web</module>
- <module>mail-seamtest</module>
- <module>mail-arquillian</module>
- </modules>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6.mail</groupId>
- <artifactId>mail-ejb</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6.mail</groupId>
- <artifactId>mail-web</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6.mail</groupId>
- <artifactId>mail-ear</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
+<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-ee6</groupId>
+ <artifactId>mail</artifactId>
+ <parent>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>examples-ee6</artifactId>
+ <version>2.3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <packaging>pom</packaging>
+ <name>Seam Mail Example (EE6)</name>
+
+ <properties>
+ <example.name>mail</example.name>
+ </properties>
+
+ <modules>
+ <module>mail-ear</module>
+ <module>mail-ejb</module>
+ <module>mail-web</module>
+ <module>mail-tests</module>
+ </modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6.mail</groupId>
+ <artifactId>mail-ejb</artifactId>
+ <version>${project.version}</version>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6.mail</groupId>
+ <artifactId>mail-web</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6.mail</groupId>
+ <artifactId>mail-ear</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
Modified: branches/community/Seam_2_3/examples-ee6/messages/messages-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-ear/pom.xml 2012-03-08 17:53:11 UTC (rev 14378)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-ear/pom.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,185 +1,178 @@
<?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>messages</artifactId>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+<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>messages</artifactId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <version>2.3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>messages-ear</artifactId>
+ <packaging>ear</packaging>
+ <name>Messages EAR Module (EE6)</name>
+
+ <properties>
+ <jboss.home>${env.JBOSS_HOME}</jboss.home>
+ <jboss.domain>default</jboss.domain>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <artifactId>messages-web</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <artifactId>messages-ejb</artifactId>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jsf2</artifactId>
+ <type>ejb</type>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
- <artifactId>messages-ear</artifactId>
- <packaging>ear</packaging>
- <name>Messages EAR Module (EE6)</name>
-
- <properties>
- <jboss.home>${env.JBOSS_HOME}</jboss.home>
- <jboss.domain>default</jboss.domain>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>messages-web</artifactId>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>messages-ejb</artifactId>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>seam-messages</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <version>6</version>
- <defaultLibBundleDir>lib</defaultLibBundleDir>
- <!-- Exclude eclipse generated application.xml and manually modified jboss-app.xml during mvn build -->
- <earSourceExcludes>**/application.xml, **/jboss-app.xml</earSourceExcludes>
- <!-- use maven generated application.xml instead -->
- <generateApplicationXml>true</generateApplicationXml>
- <filtering>true</filtering>
- <modules>
- <webModule>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>messages-web</artifactId>
- <contextRoot>/seam-messages</contextRoot>
- <bundleFileName>messages-web.war</bundleFileName>
- </webModule>
- <ejbModule>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>messages-ejb</artifactId>
- <bundleFileName>messages-ejb.jar</bundleFileName>
- </ejbModule>
- <ejbModule>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <bundleFileName>jboss-seam.jar</bundleFileName>
- </ejbModule>
- </modules>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jboss.as.plugins</groupId>
- <artifactId>jboss-as-maven-plugin</artifactId>
- <version>7.1.0.CR1b</version>
- <executions>
- <!-- This requires to be enabled manually as <enabled>true</enabled> doesn't
- work -->
- <!-- <execution> -->
- <!-- <id>add-datasource</id> -->
- <!-- <phase>package</phase> -->
- <!-- <configuration> -->
- <!-- <address>subsystem=datasources,data-source=java:/bookingDatasource</address> -->
- <!-- <properties> -->
- <!-- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url> -->
- <!-- <jndi-name>java:/bookingDatasource</jndi-name> -->
- <!-- <enabled>true</enabled> -->
- <!-- <pool-name>bookingDSPool</pool-name> -->
- <!-- <user-name>sa</user-name> -->
- <!-- <driver-name>h2</driver-name> -->
- <!-- </properties> -->
- <!-- </configuration> -->
- <!-- <goals> -->
- <!-- <goal>add-resource</goal> -->
- <!-- </goals> -->
- <!-- </execution> -->
- <!-- Datasource has to be created before running deploy -->
- <execution>
- <phase></phase>
- <goals>
- <goal>deploy</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>exploded</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>package</phase>
+ <build>
+ <finalName>seam-messages</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <version>6</version>
+ <defaultLibBundleDir>lib</defaultLibBundleDir>
+ <!-- Exclude eclipse generated application.xml and manually modified jboss-app.xml during mvn build -->
+ <earSourceExcludes>**/application.xml, **/jboss-app.xml</earSourceExcludes>
+ <!-- use maven generated application.xml instead -->
+ <generateApplicationXml>true</generateApplicationXml>
+ <filtering>true</filtering>
+ <modules>
+ <webModule>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <artifactId>messages-web</artifactId>
+ <contextRoot>/seam-messages</contextRoot>
+ <bundleFileName>messages-web.war</bundleFileName>
+ </webModule>
+ <ejbModule>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <artifactId>messages-ejb</artifactId>
+ <bundleFileName>messages-ejb.jar</bundleFileName>
+ </ejbModule>
+ <ejbModule>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jsf2</artifactId>
+ <bundleFileName>jboss-seam.jar</bundleFileName>
+ </ejbModule>
+ </modules>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.as.plugins</groupId>
+ <artifactId>jboss-as-maven-plugin</artifactId>
+ <version>7.1.0.CR1b</version>
+ <executions>
+ <!-- This requires to be enabled manually as <enabled>true</enabled> doesn't
+ work -->
+ <!-- <execution> -->
+ <!-- <id>add-datasource</id> -->
+ <!-- <phase>package</phase> -->
+ <!-- <configuration> -->
+ <!-- <address>subsystem=datasources,data-source=java:/bookingDatasource</address> -->
+ <!-- <properties> -->
+ <!-- <connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url> -->
+ <!-- <jndi-name>java:/bookingDatasource</jndi-name> -->
+ <!-- <enabled>true</enabled> -->
+ <!-- <pool-name>bookingDSPool</pool-name> -->
+ <!-- <user-name>sa</user-name> -->
+ <!-- <driver-name>h2</driver-name> -->
+ <!-- </properties> -->
+ <!-- </configuration> -->
+ <!-- <goals> -->
+ <!-- <goal>add-resource</goal> -->
+ <!-- </goals> -->
+ <!-- </execution> -->
+ <!-- Datasource has to be created before running deploy -->
+ <execution>
+ <phase></phase>
<goals>
- <goal>unpack</goal>
+ <goal>deploy</goal>
</goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>exploded</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>package</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <artifactId>messages-ear</artifactId>
+ <type>ear</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <artifactId>messages-web</artifactId>
+ <type>war</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-web.war</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <artifactId>messages-ejb</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-ejb.jar</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jboss-maven-plugin</artifactId>
<configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>messages-ear</artifactId>
- <type>ear</type>
- <overWrite>true</overWrite>
- <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear
- </outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>messages-web</artifactId>
- <type>war</type>
- <overWrite>true</overWrite>
- <outputDirectory>
- ${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-web.war
- </outputDirectory>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>messages-ejb</artifactId>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>
- ${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear/${example.name}-ejb.jar
- </outputDirectory>
- </artifactItem>
- </artifactItems>
+ <jbossHome>${jboss.home}</jbossHome>
+ <serverName>${jboss.domain}</serverName>
+ <fileNames>
+ <directory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear</directory>
+ </fileNames>
</configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jboss-maven-plugin</artifactId>
- <configuration>
- <jbossHome>${jboss.home}</jbossHome>
- <serverName>${jboss.domain}</serverName>
- <fileNames>
- <directory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.ear</directory>
- </fileNames>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
Modified: branches/community/Seam_2_3/examples-ee6/messages/messages-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-ejb/pom.xml 2012-03-08 17:53:11 UTC (rev 14378)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-ejb/pom.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,49 +1,48 @@
<?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>messages</artifactId>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>messages-ejb</artifactId>
- <packaging>ejb</packaging>
- <name>Messages EJB Module (EE6)</name>
-
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jsf2</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>org.hibernate.javax.persistence</groupId>
- <artifactId>hibernate-jpa-2.0-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.servlet</groupId>
- <artifactId>jboss-servlet-api_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.ejb</groupId>
- <artifactId>jboss-ejb-api_3.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
- <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>messages</artifactId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <version>2.3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>messages-ejb</artifactId>
+ <packaging>ejb</packaging>
+ <name>Messages EJB Module (EE6)</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jsf2</artifactId>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: branches/community/Seam_2_3/examples-ee6/messages/messages-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-web/pom.xml 2012-03-08 17:53:11 UTC (rev 14378)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-web/pom.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,117 +1,117 @@
<?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>messages</artifactId>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <version>2.3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+<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>messages</artifactId>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <version>2.3.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
+ <artifactId>messages-web</artifactId>
+ <packaging>war</packaging>
+ <name>Messages Web Module (EE6)</name>
- <artifactId>messages-web</artifactId>
- <packaging>war</packaging>
- <name>Messages Web Module (EE6)</name>
+ <properties>
+ <!-- filtering property for components.xml -->
+ <jndiPattern>java:app/messages-ejb/#{ejbName}</jndiPattern>
+ </properties>
- <properties>
- <!-- filtering property for components.xml -->
- <jndiPattern>java:app/messages-ejb/#{ejbName}</jndiPattern>
- </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <artifactId>messages-ejb</artifactId>
+ <type>ejb</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-ui-jsf2</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jul</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+ </dependencies>
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>messages-ejb</artifactId>
- <type>ejb</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-ui-jsf2</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-jul</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>20030211.134440</version>
- <exclusions>
- <exclusion>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.spec.javax.servlet.jstl</groupId>
- <artifactId>jboss-jstl-api_1.2_spec</artifactId>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources>
- <resource>
- <directory>src/main/webapp</directory>
- <filtering>true</filtering>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>src/main/webapp</directory>
+ <filtering>true</filtering>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>tomcat</id>
+ <properties>
+ <!-- filtering property for components.xml -->
+ <jndiPattern>#{ejbName}/local</jndiPattern>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <artifactId>messages-ejb</artifactId>
+ <type>ejb</type>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <type>ejb</type>
+ <scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>jboss-seam-messages</finalName>
+ </build>
+ </profile>
+ </profiles>
- <profiles>
- <profile>
- <id>tomcat</id>
- <properties>
- <!-- filtering property for components.xml -->
- <jndiPattern>#{ejbName}/local</jndiPattern>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>messages-ejb</artifactId>
- <type>ejb</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam</artifactId>
- <type>ejb</type>
- <scope>compile</scope>
- <exclusions>
- <exclusion>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xpp3</groupId>
- <artifactId>xpp3_min</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>javax.faces</groupId>
- <artifactId>jsf-impl</artifactId>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- <build>
- <finalName>jboss-seam-messages</finalName>
- </build>
- </profile>
- </profiles>
</project>
Modified: branches/community/Seam_2_3/examples-ee6/messages/messages-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-web/src/main/webapp/WEB-INF/web.xml 2012-03-08 17:53:11 UTC (rev 14378)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-web/src/main/webapp/WEB-INF/web.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -24,6 +24,6 @@
<session-config>
<session-timeout>10</session-timeout>
- </session-config>
+ </session-config>
</web-app>
Modified: branches/community/Seam_2_3/examples-ee6/messages/messages-web/src/main/webapp/messages.jsp
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/messages-web/src/main/webapp/messages.jsp 2012-03-08 17:53:11 UTC (rev 14378)
+++ branches/community/Seam_2_3/examples-ee6/messages/messages-web/src/main/webapp/messages.jsp 2012-03-08 18:03:00 UTC (rev 14379)
@@ -20,7 +20,7 @@
<f:facet name="header">
<h:outputText value="Title"/>
</f:facet>
- <s:link id="link" value="#{msg.title}" action="#{messageManager.select}" />
+ <s:link id="link" value="#{msg.title}" action="#{messageManager.select}"/>
</h:column>
<h:column>
<f:facet name="header">
Modified: branches/community/Seam_2_3/examples-ee6/messages/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/messages/pom.xml 2012-03-08 17:53:11 UTC (rev 14378)
+++ branches/community/Seam_2_3/examples-ee6/messages/pom.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,69 +1,47 @@
<?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-ee6</artifactId>
- <groupId>org.jboss.seam</groupId>
- <version>2.3.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>messages</artifactId>
- <packaging>pom</packaging>
- <name>Messages Example (EE6)</name>
-
- <modules>
- <module>messages-ejb</module>
- <module>messages-web</module>
- <module>messages-ear</module>
- <module>messages-seamtest</module>
- <module>messages-arquillian</module>
- </modules>
-
- <properties>
- <example.name>messages</example.name>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>messages-ejb</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>messages-web</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.seam.examples-ee6</groupId>
- <artifactId>messages-ear</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>4.2.0.Final</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>4.0.1.Final</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.6.1</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
+<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-ee6</artifactId>
+ <groupId>org.jboss.seam</groupId>
+ <version>2.3.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <artifactId>messages</artifactId>
+ <packaging>pom</packaging>
+ <name>Messages Example (EE6)</name>
+
+ <modules>
+ <module>messages-ejb</module>
+ <module>messages-web</module>
+ <module>messages-ear</module>
+ <module>messages-tests</module>
+ </modules>
+
+ <properties>
+ <example.name>messages</example.name>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <artifactId>messages-ejb</artifactId>
+ <version>${project.version}</version>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <artifactId>messages-web</artifactId>
+ <version>${project.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam.examples-ee6</groupId>
+ <artifactId>messages-ear</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
Modified: branches/community/Seam_2_3/examples-ee6/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-03-08 17:53:11 UTC (rev 14378)
+++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-03-08 18:03:00 UTC (rev 14379)
@@ -1,813 +1,968 @@
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.jboss.seam</groupId>
- <artifactId>jboss-seam-parent</artifactId>
- <version>2.3.0-SNAPSHOT</version>
- <relativePath>../jboss-seam-parent/pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-parent</artifactId>
+ <version>2.3.0-SNAPSHOT</version>
+ <relativePath>../jboss-seam-parent/pom.xml</relativePath>
+ </parent>
- <groupId>org.jboss.seam</groupId>
- <artifactId>examples-ee6</artifactId>
- <packaging>pom</packaging>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>examples-ee6</artifactId>
+ <packaging>pom</packaging>
- <name>Seam 2 EE 6 examples</name>
- <description>Examples for Seam 2 Framework in Java EE6 enviroment</description>
+ <name>Seam 2 EE 6 examples</name>
+ <description>Examples for Seam 2 Framework in Java EE6 enviroment</description>
- <modules>
- <module>booking</module>
- <module>mail</module>
- <module>messages</module>
- <module>tasks</module>
- </modules>
+ <modules>
+ <module>booking</module>
+ <module>mail</module>
+ <module>messages</module>
+ </modules>
- <build>
- <finalName>examples-ee6</finalName>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludedGroups>${tests.excludedGroups}</excludedGroups>
- </configuration>
- </plugin>
- <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <versionRange>[1.0,)</versionRange>
- <goals>
- <goal>unpack</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute>
- <runOnIncremental>false</runOnIncremental>
- </execute>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <dependencyManagement>
- <dependencies>
- <!-- common provided scope dependencies -->
- <dependency>
- <groupId>org.jboss.bom</groupId>
- <artifactId>jboss-javaee-6.0-with-hibernate</artifactId>
- <version>1.0.0.M3</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <profiles>
- <profile>
- <id>distribution</id>
- <build>
+ <build>
+ <pluginManagement>
<plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>distribution</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptorRefs>
- <descriptorRef>project</descriptorRef>
- </descriptorRefs>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludedGroups>${tests.excludedGroups}</excludedGroups>
+ </configuration>
+ </plugin>
+ <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute><runOnIncremental>false</runOnIncremental></execute>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
</plugins>
- </build>
- </profile>
+ </pluginManagement>
+ </build>
- <profile>
- <id>arq-jbossas-7-remote</id>
- <activation>
- <property>
- <name>arquillian</name>
- <value>jbossas-remote-7</value>
- </property>
- </activation>
- <dependencies>
+ <dependencyManagement>
+ <dependencies>
+ <!-- common provided scope dependencies -->
<dependency>
- <groupId>org.jboss.as</groupId>
- <artifactId>jboss-as-arquillian-container-remote</artifactId>
- <scope>test</scope>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ <scope>provided</scope>
</dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>ftest-jbossas</id>
- <properties>
- <testng.suite>testng.xml</testng.suite>
- <container>jbossas7</container>
- </properties>
- <dependencies>
<dependency>
- <groupId>org.seleniumhq.selenium.server</groupId>
- <artifactId>selenium-server</artifactId>
- <classifier>standalone</classifier>
- <scope>test</scope>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.seleniumhq.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- <scope>test</scope>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ <version>3.0</version>
+ <type>jar</type>
+ <scope>provided</scope>
</dependency>
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <!-- skip unit tests when running functional tests -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>start-selenium</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start-server</goal>
- </goals>
- <configuration>
- <background>true</background>
- <port>${selenium.server.port}</port>
- <logOutput>true</logOutput>
- <logFile>${selenium.log.dir}/selenium-server.log</logFile>
- <browserSideLog>${selenium.debug}</browserSideLog>
- <debug>${selenium.debug}</debug>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>failsafe-maven-plugin</artifactId>
- <version>2.4.3-alpha-1</version>
- <configuration>
- <junitArtifactName>none:node</junitArtifactName>
- <suiteXmlFiles>
- <suiteXmlFile>${ftest.resources.dir}/${testng.suite}</suiteXmlFile>
- </suiteXmlFiles>
- <argLine>-Xmx748m</argLine>
- <forkMode>once</forkMode>
- <properties>
- <property>
- <name>listener</name>
- <value>org.jboss.seam.example.common.test.selenium.SeleniumFunctionalTestListener</value>
- </property>
- </properties>
- <systemProperties>
- <property>
- <name>selenium.browser</name>
- <value>${selenium.browser}</value>
- </property>
- <property>
- <name>selenium.browser.url</name>
- <value>${selenium.browser.url}</value>
- </property>
- <property>
- <name>example.context.path</name>
- <value>${example.context.path}</value>
- </property>
- <property>
- <name>selenium.host</name>
- <value>${selenium.server.host}</value>
- </property>
- <property>
- <name>selenium.server.port</name>
- <value>${selenium.server.port}</value>
- </property>
- <property>
- <name>selenium.speed</name>
- <value>${selenium.speed}</value>
- </property>
- <property>
- <name>selenium.timeout</name>
- <value>${selenium.timeout}</value>
- </property>
- <property>
- <name>selenium.output.dir</name>
- <value>${selenium.output.dir}</value>
- </property>
- <property>
- <name>jboss.home</name>
- <value>${jboss.home}</value>
- </property>
- <property>
- <name>container</name>
- <value>${container}</value>
- </property>
- <property>
- <name>openid.account</name>
- <value>${openid.account}</value>
- </property>
- <property>
- <name>openid.password</name>
- <value>${openid.password}</value>
- </property>
- <property>
- <name>xml.namespace.aware</name>
- <value>${xml.namespace.aware}</value>
- </property>
- <!-- WebDriver specific properties -->
- <property>
- <name>browser</name>
- <value>${selenium.browser}</value>
- </property>
- <property>
- <name>server.url</name>
- <value>${selenium.browser.url}</value>
- </property>
- <property>
- <name>context.path</name>
- <value>${example.context.path}</value>
- </property>
- </systemProperties>
- </configuration>
- <executions>
- <execution>
- <id>verify</id>
- <phase>verify</phase>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <!-- this ant script runs testng natively -->
- <id>wait-for-application</id>
- <phase>pre-integration-test</phase>
- <configuration>
- <tasks>
- <echo message="Waiting for ${selenium.browser.url}/${example.context.path}"/>
- <waitfor maxwait="1" maxwaitunit="minute" checkevery="5000">
- <http url="${selenium.browser.url}/${example.context.path}" errorsBeginAt="404"/>
- </waitfor>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <!-- this ant script runs testng natively -->
- <id>stop-selenium</id>
- <phase>post-integration-test</phase>
- <configuration>
- <tasks>
- <echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected"/>
- <get taskname="selenium-shutdown"
- src="http://${selenium.server.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer"
- ignoreerrors="true" dest="${selenium.log.dir}/selenium.stop.msg"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <!-- undeploy the example now in the event of being a directory (exploded) -->
- <id>undeploy-exploded</id>
- <phase>post-integration-test</phase>
- <configuration>
- <tasks>
- <delete dir="${jboss.home}/server/${jboss.domain}/deploy/${example.context.path}.war" failonerror="false"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- <profile>
- <id>ftest-tomcat</id>
- <properties>
- <testng.suite>testng.xml</testng.suite>
- <container>jboss5</container>
- </properties>
- <dependencies>
<dependency>
- <groupId>org.seleniumhq.selenium.server</groupId>
- <artifactId>selenium-server</artifactId>
- <classifier>standalone</classifier>
- <scope>test</scope>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-jsf2</artifactId>
+ <version>${project.version}</version>
+ <type>ejb</type>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>javassist</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.seleniumhq.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- <scope>test</scope>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>${version.jsf2}</version>
+ <scope>provided</scope>
</dependency>
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <!-- skip unit tests when running functional tests -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>start-selenium</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start-server</goal>
- </goals>
- <configuration>
- <background>true</background>
- <port>${selenium.server.port}</port>
- <logOutput>true</logOutput>
- <logFile>${selenium.log.dir}/selenium-server.log</logFile>
- <browserSideLog>${selenium.debug}</browserSideLog>
- <debug>${selenium.debug}</debug>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>failsafe-maven-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>${ftest.resources.dir}/${testng.suite}</suiteXmlFile>
- </suiteXmlFiles>
- <argLine>-Xmx748m</argLine>
- <forkMode>once</forkMode>
- <properties>
- <property>
- <name>listener</name>
- <value>org.jboss.seam.example.common.test.selenium.SeleniumFunctionalTestListener</value>
- </property>
- </properties>
- <systemProperties>
- <property>
- <name>selenium.browser</name>
- <value>${selenium.browser}</value>
- </property>
- <property>
- <name>selenium.browser.url</name>
- <value>${selenium.browser.url}</value>
- </property>
- <property>
- <name>example.context.path</name>
- <value>${example.context.path}</value>
- </property>
- <property>
- <name>selenium.host</name>
- <value>${selenium.server.host}</value>
- </property>
- <property>
- <name>selenium.server.port</name>
- <value>${selenium.server.port}</value>
- </property>
- <property>
- <name>selenium.speed</name>
- <value>${selenium.speed}</value>
- </property>
- <property>
- <name>selenium.timeout</name>
- <value>${selenium.timeout}</value>
- </property>
- <property>
- <name>selenium.output.dir</name>
- <value>${selenium.output.dir}</value>
- </property>
- <property>
- <name>jboss.home</name>
- <value>${jboss.home}</value>
- </property>
- <property>
- <name>container</name>
- <value>${container}</value>
- </property>
- <property>
- <name>openid.account</name>
- <value>${openid.account}</value>
- </property>
- <property>
- <name>openid.password</name>
- <value>${openid.password}</value>
- </property>
- <!-- WebDriver specific properties -->
- <property>
- <name>browser</name>
- <value>${selenium.browser}</value>
- </property>
- <property>
- <name>server.url</name>
- <value>${selenium.browser.url}</value>
- </property>
- <property>
- <name>context.path</name>
- <value>${example.context.path}</value>
- </property>
- </systemProperties>
- </configuration>
- <executions>
- <execution>
- <id>verify</id>
- <phase>verify</phase>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-application</id>
- <phase>pre-integration-test</phase>
- <configuration>
- <tasks>
- <fail unless="catalina.home" message="CATALINA_HOME environment property was not set"/>
- <copy file="${basedir}/../${example.name}-web/target/${example.context.path}.war" todir="${catalina.home}/webapps"
- overwrite="true"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>wait-for-application</id>
- <phase>pre-integration-test</phase>
- <configuration>
- <tasks>
- <echo message="Waiting for ${selenium.browser.url}/${example.context.path}"/>
- <waitfor maxwait="1" maxwaitunit="minute" checkevery="5000">
- <http url="${selenium.browser.url}/${example.context.path}" errorsBeginAt="404"/>
- </waitfor>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>stop-selenium</id>
- <phase>post-integration-test</phase>
- <configuration>
- <tasks>
- <echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected"/>
- <get taskname="selenium-shutdown"
- src="http://${selenium.server.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer"
- ignoreerrors="true" dest="${selenium.log.dir}/selenium.stop.msg"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>undeploy-application</id>
- <phase>post-integration-test</phase>
- <configuration>
- <tasks>
- <delete file="${catalina.home}/webapps/${example.context.path}.war" failonerror="false"/>
- <delete dir="${catalina.home}/webapps/${example.context.path}" failonerror="false"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- <profile>
- <id>ftest-jbossas-cluster</id>
- <properties>
- <testng.suite>testng-cluster.xml</testng.suite>
- <container>jboss5</container>
- </properties>
- <dependencies>
<dependency>
- <groupId>org.seleniumhq.selenium.server</groupId>
- <artifactId>selenium-server</artifactId>
- <classifier>standalone</classifier>
- <scope>test</scope>
+ <groupId>com.sun.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>${version.jsf2}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.seleniumhq.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
- <scope>test</scope>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.2</version>
+ <scope>provided</scope>
</dependency>
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <!-- skip unit tests when running functional tests -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- <version>1.1</version>
- <executions>
- <execution>
- <id>start-selenium</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start-server</goal>
- </goals>
- <configuration>
- <background>true</background>
- <port>${selenium.server.port}</port>
- <logOutput>true</logOutput>
- <logFile>${selenium.log.dir}/selenium-server.log</logFile>
- <browserSideLog>${selenium.debug}</browserSideLog>
- <debug>${selenium.debug}</debug>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>failsafe-maven-plugin</artifactId>
- <version>2.4.3-alpha-1</version>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>${ftest.resources.dir}/${testng.suite}</suiteXmlFile>
- </suiteXmlFiles>
- <argLine>-Xmx748m</argLine>
- <forkMode>once</forkMode>
- <properties>
- <property>
- <name>listener</name>
- <value>org.jboss.seam.example.common.test.selenium.SeleniumFunctionalTestListener</value>
- </property>
- </properties>
- <systemProperties>
- <property>
- <name>selenium.browser</name>
- <value>${selenium.browser}</value>
- </property>
- <property>
- <name>selenium.browser.url</name>
- <value>${selenium.browser.url}</value>
- </property>
- <property>
- <name>example.context.path</name>
- <value>${example.context.path}</value>
- </property>
- <property>
- <name>selenium.host</name>
- <value>${selenium.server.host}</value>
- </property>
- <property>
- <name>selenium.server.port</name>
- <value>${selenium.server.port}</value>
- </property>
- <property>
- <name>selenium.speed</name>
- <value>${selenium.speed}</value>
- </property>
- <property>
- <name>selenium.timeout</name>
- <value>${selenium.timeout}</value>
- </property>
- <property>
- <name>selenium.output.dir</name>
- <value>${selenium.output.dir}</value>
- </property>
- <property>
- <name>jboss.home</name>
- <value>${jboss.home}</value>
- </property>
- <property>
- <name>container</name>
- <value>${container}</value>
- </property>
- <property>
- <name>openid.account</name>
- <value>${openid.account}</value>
- </property>
- <property>
- <name>openid.password</name>
- <value>${openid.password}</value>
- </property>
- <property>
- <name>xml.namespace.aware</name>
- <value>${xml.namespace.aware}</value>
- </property>
- <!-- WebDriver specific properties -->
- <property>
- <name>browser</name>
- <value>${selenium.browser}</value>
- </property>
- <property>
- <name>server.url</name>
- <value>${selenium.browser.url}</value>
- </property>
- <property>
- <name>context.path</name>
- <value>${example.context.path}</value>
- </property>
- </systemProperties>
- </configuration>
- <executions>
- <execution>
- <id>verify</id>
- <phase>verify</phase>
- <goals>
- <goal>verify</goal>
- </goals>
- </execution>
- <execution>
- <id>integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>integration-test</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-to-cluster</id>
- <phase>pre-integration-test</phase>
- <configuration>
- <tasks>
- <copy todir="${jboss.master.configuration}/farm" overwrite="true" flatten="true">
- <fileset dir="${basedir}/../${example.name}-ear/">
- <include name="src/main/resources/jboss-seam-${example.name}-ds.xml"/>
- <include name="target/${example.context.path}.ear"/>
- </fileset>
- </copy>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <!-- this ant script runs testng natively -->
- <id>wait-for-application</id>
- <phase>pre-integration-test</phase>
- <configuration>
- <tasks>
- <echo message="Waiting for ${selenium.browser.cluster.url}/${example.context.path}"/>
- <waitfor maxwait="1" maxwaitunit="minute" checkevery="5000">
- <http url="${selenium.browser.cluster.url}/${example.context.path}" errorsBeginAt="404"/>
- </waitfor>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <!-- this ant script runs testng natively -->
- <id>stop-selenium</id>
- <phase>post-integration-test</phase>
- <configuration>
- <tasks>
- <echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected"/>
- <get taskname="selenium-shutdown"
- src="http://${selenium.server.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer"
- ignoreerrors="true" dest="${selenium.log.dir}/selenium.stop.msg"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- <execution>
- <id>undeploy-from-cluster</id>
- <phase>post-integration-test</phase>
- <configuration>
- <tasks>
- <delete failonerror="false">
- <fileset dir="${jboss.master.configuration}/farm">
- <include name="jboss-seam-${example.name}-ds.xml"/>
- <include name="${example.context.path}.ear"/>
- </fileset>
- </delete>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- </profiles>
+ <dependency>
+ <groupId>javax</groupId>
+ <artifactId>javaee-web-api</artifactId>
+ <version>6.0</version>
+ <scope>provided</scope>
+ </dependency>
- <properties>
- <!-- artifact versions -->
- <hibernate.version>3.3.2.GA</hibernate.version>
- <hibernate-em.version>3.4.0.GA</hibernate-em.version>
- <richfaces.version>4.1.0.Final</richfaces.version>
- <slf4j.version>1.5.8</slf4j.version>
- <java.version>1.5</java.version>
- <!-- Excluded TestNG groups (ex: slow annotated tests won't run during
- the test phase) -->
- <tests.excludedGroups>slow</tests.excludedGroups>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>4.0.1.Final</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>4.2.0.Final</version>
+ </dependency>
+
+ <!-- common test scope dependencies -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
- <!-- dependencies for functional tests -->
- <ant.junit.version>1.6.2</ant.junit.version>
- <ftest.version.discriminator/>
- <selenium.browser>*firefoxproxy</selenium.browser>
- <selenium.browser.url>http://localhost:8080</selenium.browser.url>
- <selenium.browser.cluster.url>http://localhost:8180</selenium.browser.cluster.url>
- <selenium.server.port>14444</selenium.server.port>
- <selenium.server.host>localhost</selenium.server.host>
- <selenium.speed>0</selenium.speed>
- <selenium.timeout>30000</selenium.timeout>
- <selenium.debug>false</selenium.debug>
- <selenium.log.dir>${project.build.directory}/ftest-logs</selenium.log.dir>
- <selenium.output.dir>${project.build.directory}/ftest-output</selenium.output.dir>
- <application.deploy.timeout>300</application.deploy.timeout>
- <browserSessionReuse>true</browserSessionReuse>
- <ftest.resources.dir>src/test/resources-ftest</ftest.resources.dir>
- <context.host>localhost</context.host>
- <example.context.path>/${project.build.finalName}/</example.context.path>
- <jboss.master.configuration>${env.JBOSS_HOME}/server/all</jboss.master.configuration>
- <jboss.home>${env.JBOSS_HOME}</jboss.home>
- <jboss.domain>default</jboss.domain>
- <catalina.home>${env.CATALINA_HOME}</catalina.home>
- <xml.namespace.aware>false</xml.namespace.aware>
- </properties>
+ <profiles>
+ <profile>
+ <id>distribution</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>distribution</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>project</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>integration-tests</id>
+ <activation>
+ <property>
+ <name>arquillian</name>
+ </property>
+ </activation>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <id>integration-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skip>false</skip>
+ <!-- Needed as we have both junit and testng -->
+ <testNGArtifactName>none:none</testNGArtifactName>
+ <!-- exclude selenium tests -->
+ <excludes>
+ <exclude>**/selenium/*</exclude>
+ </excludes>
+ <systemProperties>
+ <!-- used by the jbossas-managed-7 profile in arquillian.xml for the jbossHome property-->
+ <version.jbossas7>${version.jbossas7}</version.jbossas7>
+ </systemProperties>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </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>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-as7</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.as</groupId>
+ <artifactId>jboss-as-dist</artifactId>
+ <version>${version.jbossas7}</version>
+ <type>zip</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </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>
+
+ <profile>
+ <id>ftest-jbossas</id>
+ <properties>
+ <testng.suite>testng.xml</testng.suite>
+ <container>jbossas7</container>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.seleniumhq.selenium.server</groupId>
+ <artifactId>selenium-server</artifactId>
+ <classifier>standalone</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.seleniumhq.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- skip unit tests when running functional tests -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>start-selenium</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start-server</goal>
+ </goals>
+ <configuration>
+ <background>true</background>
+ <port>${selenium.server.port}</port>
+ <logOutput>true</logOutput>
+ <logFile>${selenium.log.dir}/selenium-server.log</logFile>
+ <browserSideLog>${selenium.debug}</browserSideLog>
+ <debug>${selenium.debug}</debug>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>failsafe-maven-plugin</artifactId>
+ <version>2.4.3-alpha-1</version>
+ <configuration>
+ <junitArtifactName>none:node</junitArtifactName>
+ <suiteXmlFiles>
+ <suiteXmlFile>${ftest.resources.dir}/${testng.suite}</suiteXmlFile>
+ </suiteXmlFiles>
+ <argLine>-Xmx748m</argLine>
+ <forkMode>once</forkMode>
+ <properties>
+ <property>
+ <name>listener</name>
+ <value>org.jboss.seam.example.common.test.selenium.SeleniumFunctionalTestListener</value>
+ </property>
+ </properties>
+ <systemProperties>
+ <property>
+ <name>selenium.browser</name>
+ <value>${selenium.browser}</value>
+ </property>
+ <property>
+ <name>selenium.browser.url</name>
+ <value>${selenium.browser.url}</value>
+ </property>
+ <property>
+ <name>example.context.path</name>
+ <value>${example.context.path}</value>
+ </property>
+ <property>
+ <name>selenium.host</name>
+ <value>${selenium.server.host}</value>
+ </property>
+ <property>
+ <name>selenium.server.port</name>
+ <value>${selenium.server.port}</value>
+ </property>
+ <property>
+ <name>selenium.speed</name>
+ <value>${selenium.speed}</value>
+ </property>
+ <property>
+ <name>selenium.timeout</name>
+ <value>${selenium.timeout}</value>
+ </property>
+ <property>
+ <name>selenium.output.dir</name>
+ <value>${selenium.output.dir}</value>
+ </property>
+ <property>
+ <name>jboss.home</name>
+ <value>${jboss.home}</value>
+ </property>
+ <property>
+ <name>container</name>
+ <value>${container}</value>
+ </property>
+ <property>
+ <name>openid.account</name>
+ <value>${openid.account}</value>
+ </property>
+ <property>
+ <name>openid.password</name>
+ <value>${openid.password}</value>
+ </property>
+ <property>
+ <name>xml.namespace.aware</name>
+ <value>${xml.namespace.aware}</value>
+ </property>
+ <!-- WebDriver specific properties -->
+ <property>
+ <name>browser</name>
+ <value>${selenium.browser}</value>
+ </property>
+ <property>
+ <name>server.url</name>
+ <value>${selenium.browser.url}</value>
+ </property>
+ <property>
+ <name>context.path</name>
+ <value>${example.context.path}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <id>verify</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>integration-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <!-- this ant script runs testng natively -->
+ <id>wait-for-application</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <echo message="Waiting for ${selenium.browser.url}/${example.context.path}" />
+ <waitfor maxwait="1" maxwaitunit="minute" checkevery="5000">
+ <http url="${selenium.browser.url}/${example.context.path}" errorsBeginAt="404" />
+ </waitfor>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <!-- this ant script runs testng natively -->
+ <id>stop-selenium</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected" />
+ <get taskname="selenium-shutdown" src="http://${selenium.server.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer" ignoreerrors="true" dest="${selenium.log.dir}/selenium.stop.msg" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <!-- undeploy the example now in the event of being a directory (exploded) -->
+ <id>undeploy-exploded</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <delete dir="${jboss.home}/server/${jboss.domain}/deploy/${example.context.path}.war" failonerror="false" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ <profile>
+ <id>ftest-tomcat</id>
+ <properties>
+ <testng.suite>testng.xml</testng.suite>
+ <container>jboss5</container>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.seleniumhq.selenium.server</groupId>
+ <artifactId>selenium-server</artifactId>
+ <classifier>standalone</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.seleniumhq.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- skip unit tests when running functional tests -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>start-selenium</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start-server</goal>
+ </goals>
+ <configuration>
+ <background>true</background>
+ <port>${selenium.server.port}</port>
+ <logOutput>true</logOutput>
+ <logFile>${selenium.log.dir}/selenium-server.log</logFile>
+ <browserSideLog>${selenium.debug}</browserSideLog>
+ <debug>${selenium.debug}</debug>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>failsafe-maven-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>${ftest.resources.dir}/${testng.suite}</suiteXmlFile>
+ </suiteXmlFiles>
+ <argLine>-Xmx748m</argLine>
+ <forkMode>once</forkMode>
+ <properties>
+ <property>
+ <name>listener</name>
+ <value>org.jboss.seam.example.common.test.selenium.SeleniumFunctionalTestListener</value>
+ </property>
+ </properties>
+ <systemProperties>
+ <property>
+ <name>selenium.browser</name>
+ <value>${selenium.browser}</value>
+ </property>
+ <property>
+ <name>selenium.browser.url</name>
+ <value>${selenium.browser.url}</value>
+ </property>
+ <property>
+ <name>example.context.path</name>
+ <value>${example.context.path}</value>
+ </property>
+ <property>
+ <name>selenium.host</name>
+ <value>${selenium.server.host}</value>
+ </property>
+ <property>
+ <name>selenium.server.port</name>
+ <value>${selenium.server.port}</value>
+ </property>
+ <property>
+ <name>selenium.speed</name>
+ <value>${selenium.speed}</value>
+ </property>
+ <property>
+ <name>selenium.timeout</name>
+ <value>${selenium.timeout}</value>
+ </property>
+ <property>
+ <name>selenium.output.dir</name>
+ <value>${selenium.output.dir}</value>
+ </property>
+ <property>
+ <name>jboss.home</name>
+ <value>${jboss.home}</value>
+ </property>
+ <property>
+ <name>container</name>
+ <value>${container}</value>
+ </property>
+ <property>
+ <name>openid.account</name>
+ <value>${openid.account}</value>
+ </property>
+ <property>
+ <name>openid.password</name>
+ <value>${openid.password}</value>
+ </property>
+ <!-- WebDriver specific properties -->
+ <property>
+ <name>browser</name>
+ <value>${selenium.browser}</value>
+ </property>
+ <property>
+ <name>server.url</name>
+ <value>${selenium.browser.url}</value>
+ </property>
+ <property>
+ <name>context.path</name>
+ <value>${example.context.path}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <id>verify</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>integration-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-application</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <fail unless="catalina.home" message="CATALINA_HOME environment property was not set" />
+ <copy file="${basedir}/../${example.name}-web/target/${example.context.path}.war" todir="${catalina.home}/webapps" overwrite="true" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>wait-for-application</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <echo message="Waiting for ${selenium.browser.url}/${example.context.path}" />
+ <waitfor maxwait="1" maxwaitunit="minute" checkevery="5000">
+ <http url="${selenium.browser.url}/${example.context.path}" errorsBeginAt="404" />
+ </waitfor>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stop-selenium</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected" />
+ <get taskname="selenium-shutdown" src="http://${selenium.server.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer" ignoreerrors="true" dest="${selenium.log.dir}/selenium.stop.msg" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>undeploy-application</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <delete file="${catalina.home}/webapps/${example.context.path}.war" failonerror="false" />
+ <delete dir="${catalina.home}/webapps/${example.context.path}" failonerror="false" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ <profile>
+ <id>ftest-jbossas-cluster</id>
+ <properties>
+ <testng.suite>testng-cluster.xml</testng.suite>
+ <container>jboss5</container>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.seleniumhq.selenium.server</groupId>
+ <artifactId>selenium-server</artifactId>
+ <classifier>standalone</classifier>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.seleniumhq.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- skip unit tests when running functional tests -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>selenium-maven-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>start-selenium</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start-server</goal>
+ </goals>
+ <configuration>
+ <background>true</background>
+ <port>${selenium.server.port}</port>
+ <logOutput>true</logOutput>
+ <logFile>${selenium.log.dir}/selenium-server.log</logFile>
+ <browserSideLog>${selenium.debug}</browserSideLog>
+ <debug>${selenium.debug}</debug>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>failsafe-maven-plugin</artifactId>
+ <version>2.4.3-alpha-1</version>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>${ftest.resources.dir}/${testng.suite}</suiteXmlFile>
+ </suiteXmlFiles>
+ <argLine>-Xmx748m</argLine>
+ <forkMode>once</forkMode>
+ <properties>
+ <property>
+ <name>listener</name>
+ <value>org.jboss.seam.example.common.test.selenium.SeleniumFunctionalTestListener</value>
+ </property>
+ </properties>
+ <systemProperties>
+ <property>
+ <name>selenium.browser</name>
+ <value>${selenium.browser}</value>
+ </property>
+ <property>
+ <name>selenium.browser.url</name>
+ <value>${selenium.browser.url}</value>
+ </property>
+ <property>
+ <name>example.context.path</name>
+ <value>${example.context.path}</value>
+ </property>
+ <property>
+ <name>selenium.host</name>
+ <value>${selenium.server.host}</value>
+ </property>
+ <property>
+ <name>selenium.server.port</name>
+ <value>${selenium.server.port}</value>
+ </property>
+ <property>
+ <name>selenium.speed</name>
+ <value>${selenium.speed}</value>
+ </property>
+ <property>
+ <name>selenium.timeout</name>
+ <value>${selenium.timeout}</value>
+ </property>
+ <property>
+ <name>selenium.output.dir</name>
+ <value>${selenium.output.dir}</value>
+ </property>
+ <property>
+ <name>jboss.home</name>
+ <value>${jboss.home}</value>
+ </property>
+ <property>
+ <name>container</name>
+ <value>${container}</value>
+ </property>
+ <property>
+ <name>openid.account</name>
+ <value>${openid.account}</value>
+ </property>
+ <property>
+ <name>openid.password</name>
+ <value>${openid.password}</value>
+ </property>
+ <property>
+ <name>xml.namespace.aware</name>
+ <value>${xml.namespace.aware}</value>
+ </property>
+ <!-- WebDriver specific properties -->
+ <property>
+ <name>browser</name>
+ <value>${selenium.browser}</value>
+ </property>
+ <property>
+ <name>server.url</name>
+ <value>${selenium.browser.url}</value>
+ </property>
+ <property>
+ <name>context.path</name>
+ <value>${example.context.path}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ <executions>
+ <execution>
+ <id>verify</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>integration-test</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>integration-test</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>deploy-to-cluster</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <copy todir="${jboss.master.configuration}/farm" overwrite="true" flatten="true">
+ <fileset dir="${basedir}/../${example.name}-ear/">
+ <include name="src/main/resources/jboss-seam-${example.name}-ds.xml" />
+ <include name="target/${example.context.path}.ear" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <!-- this ant script runs testng natively -->
+ <id>wait-for-application</id>
+ <phase>pre-integration-test</phase>
+ <configuration>
+ <tasks>
+ <echo message="Waiting for ${selenium.browser.cluster.url}/${example.context.path}" />
+ <waitfor maxwait="1" maxwaitunit="minute" checkevery="5000">
+ <http url="${selenium.browser.cluster.url}/${example.context.path}" errorsBeginAt="404" />
+ </waitfor>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <!-- this ant script runs testng natively -->
+ <id>stop-selenium</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <echo taskname="selenium-shutdown" message="DGF Errors during shutdown are expected" />
+ <get taskname="selenium-shutdown" src="http://${selenium.server.host}:${selenium.server.port}/selenium-server/driver/?cmd=shutDownSeleniumServer" ignoreerrors="true" dest="${selenium.log.dir}/selenium.stop.msg" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>undeploy-from-cluster</id>
+ <phase>post-integration-test</phase>
+ <configuration>
+ <tasks>
+ <delete failonerror="false">
+ <fileset dir="${jboss.master.configuration}/farm">
+ <include name="jboss-seam-${example.name}-ds.xml" />
+ <include name="${example.context.path}.ear" />
+ </fileset>
+ </delete>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ </profile>
+ </profiles>
+
+ <properties>
+ <!-- artifact versions -->
+ <hibernate.version>3.3.2.GA</hibernate.version>
+ <hibernate-em.version>3.4.0.GA</hibernate-em.version>
+ <richfaces.version>4.1.0.Final</richfaces.version>
+ <slf4j.version>1.5.8</slf4j.version>
+ <java.version>1.5</java.version>
+ <!-- Excluded TestNG groups (ex: slow annotated tests won't run during
+ the test phase) -->
+ <tests.excludedGroups>slow</tests.excludedGroups>
+
+ <!-- dependencies for functional tests -->
+ <ant.junit.version>1.6.2</ant.junit.version>
+ <ftest.version.discriminator />
+ <selenium.browser>*firefoxproxy</selenium.browser>
+ <selenium.browser.url>http://localhost:8080</selenium.browser.url>
+ <selenium.browser.cluster.url>http://localhost:8180</selenium.browser.cluster.url>
+ <selenium.server.port>14444</selenium.server.port>
+ <selenium.server.host>localhost</selenium.server.host>
+ <selenium.speed>0</selenium.speed>
+ <selenium.timeout>30000</selenium.timeout>
+ <selenium.debug>false</selenium.debug>
+ <selenium.log.dir>${project.build.directory}/ftest-logs</selenium.log.dir>
+ <selenium.output.dir>${project.build.directory}/ftest-output</selenium.output.dir>
+ <application.deploy.timeout>300</application.deploy.timeout>
+ <browserSessionReuse>true</browserSessionReuse>
+ <ftest.resources.dir>src/test/resources-ftest</ftest.resources.dir>
+ <context.host>localhost</context.host>
+ <example.context.path>/${project.build.finalName}/</example.context.path>
+ <jboss.master.configuration>${env.JBOSS_HOME}/server/all</jboss.master.configuration>
+ <jboss.home>${env.JBOSS_HOME}</jboss.home>
+ <jboss.domain>default</jboss.domain>
+ <catalina.home>${env.CATALINA_HOME}</catalina.home>
+ <xml.namespace.aware>false</xml.namespace.aware>
+ </properties>
</project>
More information about the seam-commits
mailing list