April 2012 - seam-commits - Jboss List Archives

Seam SVN: r14496 - in branches/community/Seam_2_3/examples-ee6: jpa and 58 other directories.

by seam-commits＠lists.jboss.org

Author: dhinojosa Date: 2012-04-03 17:08:11 -0400 (Tue, 03 Apr 2012) New Revision: 14496 Added: branches/community/Seam_2_3/examples-ee6/jpa/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/pom.xml branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/BookingTest.java branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/ChangePasswordTest.java branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/LoginTest.java branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources-ftest/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources-ftest/testng.xml branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources-integration/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources-integration/testng.xml branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources/jpa.properties branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources/seam.properties branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/pom.xml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/java/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/java/GlassfishDerbyDialect.java branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/resources/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/resources/META-INF/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/resources/META-INF/persistence.xml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/resources/import.sql branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/resources/log4j.xml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/resources/seam.properties branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/webapp/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/webapp/WEB-INF/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/webapp/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/webapp/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/webapp/WEB-INF/pages.xml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/webapp/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/jboss/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/jboss/webapp/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/jboss/webapp/WEB-INF/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/jboss/webapp/WEB-INF/jboss-web.xml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/AuthenticatorAction.java branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/Booking.java branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/BookingListAction.java branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/ChangePasswordAction.java branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/Hotel.java branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/HotelBookingAction.java branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/HotelSearchingAction.java branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/RegisterAction.java branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/User.java branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/resources/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/resources/META-INF/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/resources/META-INF/persistence.xml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/resources/import.sql branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/resources/seam.properties branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/pages.xml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/book.xhtml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/confirm.xhtml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/conversations.xhtml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/css/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/css/screen.css branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/css/trailblazer_main.css branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/home.xhtml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/hotel.xhtml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/bg.gif branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/btn.bg.gif branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/cal-next.png branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/cal-prev.png branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/cnt.bg.gif branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/dtpick.gif branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/hdr.ad.jpg branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/hdr.bar.jpg branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/hdr.bg.gif branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/hdr.title.gif branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/header_line.gif branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/input.bg.gif branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/sdb.bg.gif branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/spinner.gif branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/th.bg.gif branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/index.html branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/main.xhtml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/password.xhtml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/register.xhtml branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/template.xhtml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-jboss405.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-tomcat55.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-tomcat6.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-weblogic10.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-weblogic92.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-websphere61.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-websphere7.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/readme.txt branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/META-INF/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/META-INF/context.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/META-INF/persistence.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/classes/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/classes/log4j.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/pages.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/import.sql branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/seam.properties branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/META-INF/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/META-INF/persistence.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/classes/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/classes/log4j.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/pages.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/weblogic.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/import.sql branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/seam.properties branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/META-INF/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/META-INF/persistence.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/classes/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/pages.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/import.sql branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/seam.properties branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/META-INF/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/META-INF/persistence.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/classes/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/pages.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/import.sql branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/seam.properties branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/META-INF/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/META-INF/persistence.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/classes/ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/classes/log4j.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/pages.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/import.sql branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/seam.properties branches/community/Seam_2_3/examples-ee6/jpa/pom.xml branches/community/Seam_2_3/examples-ee6/jpa/readme.txt Log: added jpa, not functioning currently but do need it committed Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/pom.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,181 @@ +<?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>jpa</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>jpa-tests</artifactId> + <name>JPA Integration Tests Module (EE6)</name> + + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </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>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> + + </dependencies> + + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + <testResource> + <directory>src/test/resources-integration</directory> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>integration-tests</id> + <activation> + <property> + <name>arquillian</name> + </property> + </activation> + </profile> + + <profile> + <id>arq-jbossas-7-managed</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-managed-7</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>arq-jbossas-7-remote</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-remote-7</value> + </property> + </activation> + </profile> + + <profile> + <id>ftest-jbossas</id> + <properties> + <example.context.path>seam-guice</example.context.path> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jboss-maven-plugin</artifactId> + <configuration> + <jbossHome>${jboss.home}</jbossHome> + <serverName>${jboss.domain}</serverName> + <fileNames> + <param>${basedir}/../guice-ear/target/seam-guice.ear</param> + </fileNames> + </configuration> + </plugin> + <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-guice</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> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/BookingTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/BookingTest.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/BookingTest.java 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,288 @@ +//$Id: BookingTest.java 6505 2007-10-12 11:24:54Z pmuir $ +package org.jboss.seam.example.jpa.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.seam.contexts.Contexts; +import org.jboss.seam.core.Manager; +import org.jboss.seam.example.jpa.Booking; +import org.jboss.seam.example.jpa.Hotel; +import org.jboss.seam.example.jpa.HotelBookingAction; +import org.jboss.seam.example.jpa.User; +import org.jboss.seam.mock.SeamTest; +import org.testng.annotations.Test; + +public class BookingTest extends SeamTest +{ + + @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 { + HotelBookingAction hotelBooking = (HotelBookingAction) 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(); + + } + +} Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/ChangePasswordTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/ChangePasswordTest.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/ChangePasswordTest.java 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,138 @@ +//$Id: ChangePasswordTest.java 6505 2007-10-12 11:24:54Z pmuir $ +package org.jboss.seam.example.jpa.test; + +import org.jboss.seam.contexts.Contexts; +import org.jboss.seam.core.Manager; +import org.jboss.seam.example.jpa.User; +import org.jboss.seam.mock.SeamTest; +import org.testng.annotations.Test; + +public class ChangePasswordTest extends SeamTest +{ + + @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(); + + } + +} Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/LoginTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/LoginTest.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/java/org/jboss/seam/example/jpa/test/LoginTest.java 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,115 @@ +//$Id: LoginTest.java 6505 2007-10-12 11:24:54Z pmuir $ +package org.jboss.seam.example.jpa.test; + +import org.jboss.seam.core.Manager; +import org.jboss.seam.web.Session; +import org.jboss.seam.mock.SeamTest; +import org.testng.annotations.Test; + +public class LoginTest extends SeamTest +{ + + @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(); + + } + +} Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources/jpa.properties =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources/jpa.properties (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources/jpa.properties 2012-04-03 21:08:11 UTC (rev 14496) @@ -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 verify +PASSWORD_VALUE_REQUIRED_MESSAGE //*[@id='setpassword:Message' or @id='setpassword:PasswordDecorate:Message'] +PASSWORD_LENGTH_MESSAGE length 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=main:searchString +SEARCH_SUBMIT id=main: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 xpath=//*[@id='booking:Message' or @id='booking:checkinDateDecorate:Message'] +HOTEL_CHECKOUT_DATE_FIELD id=booking:checkoutDateDecorate:checkoutDateInputDate +HOTEL_CHECKOUT_DATE_MESSAGE xpath=//*[@id='booking:Message' or @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='main:messages']/li +REGISTRATION id=login:register +REGISTRATION_USERNAME id=register:usernameDecorate:username +REGISTRATION_USERNAME_MESSAGE id=register:usernameDecorate:message +REGISTRATION_NAME id=register:nameDecorate:name +REGISTRATION_NAME_MESSAGE id=register:nameDecorate:message +REGISTRATION_PASSWORD id=register:passwordDecorate:password +REGISTRATION_PASSWORD_MESSAGE id=register:passwordDecorate:message +REGISTRATION_VERIFY id=register:verifyDecorate:verify +REGISTRATION_VERIFY_MESSAGE id=register:verifyDecorate:message +REGISTRATION_SUBMIT id=register:register +REGISTRATION_REENTER_MESSAGE verify +REGISTRATION_LENGTH_MESSAGE length 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\=main\:SpinnerGif \ No newline at end of file Property changes on: branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources/jpa.properties ___________________________________________________________________ Added: svn:executable + * Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources/seam.properties =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources/seam.properties (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources/seam.properties 2012-04-03 21:08:11 UTC (rev 14496) @@ -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 Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources-ftest/testng.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources-ftest/testng.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources-ftest/testng.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,29 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="JPA example" verbose="2" parallel="false"> + <test name="jpa_tests"> + <parameter name="PROPERTY_FILE" value="/jpa.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> Property changes on: branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources-ftest/testng.xml ___________________________________________________________________ Added: svn:executable + * Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources-integration/testng.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources-integration/testng.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-tests/src/test/resources-integration/testng.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -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="JPA Booking"> + <classes> + <class name="org.jboss.seam.example.jpa.test.LoginTest"/> + <class name="org.jboss.seam.example.jpa.test.BookingTest"/> + <class name="org.jboss.seam.example.jpa.test.ChangePasswordTest"/> + </classes> + </test> + +</suite> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/pom.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,484 @@ +<?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>jpa</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>jpa-web</artifactId> + <packaging>war</packaging> + <name>JPA Web Module (EE6)</name> + + <properties> + <loadPersistenceUnits>false</loadPersistenceUnits> + </properties> + + <dependencies> + <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>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui</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</artifactId> + </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>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.15</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>3.3.3.Final</version> + <exclusions> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>3.3.3.Final</version> + <exclusions> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.el</groupId> + <artifactId>jboss-el</artifactId> + </dependency> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <finalName>jboss-seam-jpa</finalName> + <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> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jboss-maven-plugin</artifactId> + <version>1.5.0</version> + <configuration> + <jbossHome>${jboss.home}</jbossHome> + <serverName>${jboss.domain}</serverName> + <fileNames> + <directory>${project.build.directory}/${project.build.finalName}.war</directory> + </fileNames> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>jbossas7</id> + <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> + <plugin> + <groupId>org.jboss.as.plugins</groupId> + <artifactId>jboss-as-maven-plugin</artifactId> + <version>7.0.2.Final</version> + <configuration> + <filename>${project.build.finalName}.war</filename> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> + <exclusion> + <groupId>org.jpa</groupId> + <artifactId>ejb3-persistence</artifactId> + </exclusion> + <exclusion> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> + <exclusion> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + </profile> + <profile> + <id>jbossas51</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>src/jboss/webapp</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/webapp</directory> + <filtering>true</filtering> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>jbossas42</id> + <properties> + <loadPersistenceUnits>true</loadPersistenceUnits> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>src/jboss/webapp</directory> + <filtering>true</filtering> + </resource> + <resource> + <directory>src/main/webapp</directory> + <filtering>true</filtering> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>tomcat</id> + <dependencies> + <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> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>src/jboss/webapp</directory> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>glassfish2</id> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> + <exclusion> + <groupId>org.jpa</groupId> + <artifactId>ejb3-persistence</artifactId> + </exclusion> + <exclusion> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> + <exclusion> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </dependency> + <dependency> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>src/glassfish/webapp</directory> + </resource> + </webResources> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>src/glassfish/java</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-glassfish-resources</id> + <phase>prepare-package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <overwrite>true</overwrite> + <outputDirectory>${project.build.outputDirectory}</outputDirectory> + <resources> + <resource> + <directory>${basedir}/src/glassfish/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/java/GlassfishDerbyDialect.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/java/GlassfishDerbyDialect.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/java/GlassfishDerbyDialect.java 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,19 @@ +import org.hibernate.dialect.DerbyDialect; +import org.hibernate.id.IdentityGenerator; + + +public class GlassfishDerbyDialect extends DerbyDialect { + + public GlassfishDerbyDialect() { + + } + + @Override + public Class getNativeIdentifierGeneratorClass() { + + return IdentityGenerator.class; + } + + + +} Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/resources/META-INF/persistence.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/resources/META-INF/persistence.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/resources/META-INF/persistence.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<persistence xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" + version="1.0"> + <persistence-unit name="bookingDatabase" transaction-type="JTA"> + <provider>org.hibernate.ejb.HibernatePersistence</provider> + <jta-data-source>jdbc/__default</jta-data-source> + <properties> + <property name="hibernate.dialect" value="GlassfishDerbyDialect"/> + <property name="hibernate.hbm2ddl.auto" value="create-drop"/> + <property name="hibernate.show_sql" value="true"/> + <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> +  +  + </properties> + </persistence-unit> +</persistence> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/resources/import.sql =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/resources/import.sql (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/resources/import.sql 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,22 @@ +insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') +insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') +insert into Hotel (price, name, address, city, state, zip, country) values (120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') +insert into Hotel (price, name, address, city, state, zip, country) values (210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') +insert into Hotel (price, name, address, city, state, zip, country) values (240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') +insert into Hotel (price, name, address, city, state, zip, country) values (130, 'Hotel Beaulac', ' Esplanade L�opold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') +insert into Hotel (price, name, address, city, state, zip, country) values (140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') +insert into Hotel (price, name, address, city, state, zip, country) values (230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') +insert into Hotel (price, name, address, city, state, zip, country) values (460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') +insert into Hotel (price, name, address, city, state, zip, country) values (250, 'Meli� White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') +insert into Hotel (price, name, address, city, state, zip, country) values (210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/resources/log4j.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/resources/log4j.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/resources/log4j.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + + + + + + + + + + + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + +  + +  + +  + + <root> + <priority value="INFO"/> + <appender-ref ref="CONSOLE"/> + </root> + +</log4j:configuration> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/resources/seam.properties =================================================================== Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/webapp/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/webapp/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/webapp/WEB-INF/components.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:persistence="http://jboss.com/products/seam/persistence" + xmlns:transaction="http://jboss.com/products/seam/transaction" + xmlns:security="http://jboss.com/products/seam/security" + 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/persistence http://jboss.com/products/seam/persistence-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:manager conversation-timeout="120000" + concurrent-request-timeout="500" + conversation-id-parameter="cid"/> + +  + +  + <persistence:managed-persistence-context name="em" auto-create="true" persistence-unit-jndi-name="java:comp/env/bookingEntityManagerFactory"/> + + <security:identity authenticate-method="#{authenticator.authenticate}"/> + +</components> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/webapp/WEB-INF/faces-config.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/webapp/WEB-INF/faces-config.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="1.2" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + +  + <application> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + </application> + +</faces-config> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/webapp/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/webapp/WEB-INF/pages.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/webapp/WEB-INF/pages.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> +<pages xmlns="http://jboss.com/products/seam/pages" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.3.xsd" + + no-conversation-view-id="/main.xhtml" + login-view-id="/home.xhtml"> + + <page view-id="/register.xhtml"> + + <action if="#{validation.failed}" execute="#{register.invalid}"/> + + <navigation> + <rule if="#{register.registered}"> + <redirect view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + <rule if-outcome="false"> + <render view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/password.xhtml" + login-required="true"> + + <navigation> + <rule if="#{changePassword.changed}"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/main.xhtml" + login-required="true"> + + <navigation from-action="#{hotelBooking.selectHotel(hot)}"> + <redirect view-id="/hotel.xhtml"/> + </navigation> + + </page> + + <page view-id="/hotel.xhtml" + conversation-required="true"> + + <description>View hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.bookHotel}"> + <redirect view-id="/book.xhtml"/> + </navigation> + + </page> + + <page view-id="/book.xhtml" + conversation-required="true"> + + <description>Book hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.setBookingDetails}"> + <rule if="#{hotelBooking.bookingValid}"> + <redirect view-id="/confirm.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/confirm.xhtml" + conversation-required="true"> + + <description>Confirm booking: #{booking.description}</description> + + <navigation from-action="#{hotelBooking.confirm}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <page view-id="*"> + + <navigation from-action="#{identity.logout}"> + <redirect view-id="/home.xhtml"/> + </navigation> + + <navigation from-action="#{hotelBooking.cancel}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <exception class="org.jboss.seam.security.NotLoggedInException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">You must be logged in to use this feature</message> + </redirect> + </exception> + + <exception class="javax.faces.application.ViewExpiredException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">Session expired, please log in again</message> + </redirect> + </exception> + +</pages> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/webapp/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/webapp/WEB-INF/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/glassfish/webapp/WEB-INF/web.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + +  + + <listener> + <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + </listener> + + <filter> + <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>Seam Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <servlet> + <servlet-name>Seam Resource Servlet</servlet-name> + <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Seam Resource Servlet</servlet-name> + <url-pattern>/seam/resource/*</url-pattern> + </servlet-mapping> + +  + + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.seam</url-pattern> + </servlet-mapping> + +  + + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + +  + <persistence-unit-ref> + <persistence-unit-ref-name>bookingEntityManagerFactory</persistence-unit-ref-name> + <persistence-unit-name>bookingDatabase</persistence-unit-name> + </persistence-unit-ref> + +</web-app> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/jboss/webapp/WEB-INF/jboss-web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/jboss/webapp/WEB-INF/jboss-web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/jboss/webapp/WEB-INF/jboss-web.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,8 @@ +<jboss-web> + <class-loading java2ClassLoadingCompliance="false"> + <loader-repository> + seam.jboss.org:loader=jboss-seam-jpa + <loader-repository-config>java2ParentDelegation=false</loader-repository-config> + </loader-repository> + </class-loading> +</jboss-web> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/AuthenticatorAction.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/AuthenticatorAction.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/AuthenticatorAction.java 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,37 @@ +package org.jboss.seam.example.jpa; + +import static org.jboss.seam.ScopeType.SESSION; + +import java.util.List; + +import javax.persistence.EntityManager; + +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Out; + +@Name("authenticator") +public class AuthenticatorAction +{ + @In EntityManager em; + + @Out(required=false, scope = SESSION) + private User user; + + public boolean authenticate() + { + List results = em.createQuery("select u from User u where u.username=#{identity.username} and u.password=#{identity.password}") + .getResultList(); + + if ( results.size()==0 ) + { + return false; + } + else + { + user = (User) results.get(0); + return true; + } + } + +} Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/Booking.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/Booking.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/Booking.java 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,190 @@ +//$Id: Booking.java 3176 2007-01-09 20:53:45Z myuan $ +package org.jboss.seam.example.jpa; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.text.DateFormat; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; + +import org.hibernate.validator.Length; +import org.hibernate.validator.NotNull; +import org.hibernate.validator.Pattern; +import org.jboss.seam.annotations.Name; + +@Entity +@Name("booking") +public class Booking implements Serializable +{ + private Long id; + private User user; + private Hotel hotel; + private Date checkinDate; + private Date checkoutDate; + private String creditCard; + private String creditCardName; + private int creditCardExpiryMonth; + private int creditCardExpiryYear; + private boolean smoking; + private int beds; + + public Booking() {} + + public Booking(Hotel hotel, User user) + { + this.hotel = hotel; + this.user = user; + } + + @Transient + public BigDecimal getTotal() + { + return hotel.getPrice().multiply( new BigDecimal( getNights() ) ); + } + + @Transient + public int getNights() + { + return (int) ( checkoutDate.getTime() - checkinDate.getTime() ) / 1000 / 60 / 60 / 24; + } + + @Id @GeneratedValue + public Long getId() + { + return id; + } + public void setId(Long id) + { + this.id = id; + } + + @NotNull + @Basic @Temporal(TemporalType.DATE) + public Date getCheckinDate() + { + return checkinDate; + } + public void setCheckinDate(Date datetime) + { + this.checkinDate = datetime; + } + + @ManyToOne @NotNull + public Hotel getHotel() + { + return hotel; + } + public void setHotel(Hotel hotel) + { + this.hotel = hotel; + } + + @ManyToOne @NotNull + public User getUser() + { + return user; + } + public void setUser(User user) + { + this.user = user; + } + + @Basic @Temporal(TemporalType.DATE) + @NotNull + public Date getCheckoutDate() + { + return checkoutDate; + } + public void setCheckoutDate(Date checkoutDate) + { + this.checkoutDate = checkoutDate; + } + + @NotNull(message="Credit card number is required") + @Length(min=16, max=16, message="Credit card number must 16 digits long") + @Pattern(regex="^\\d*$", message="Credit card number must be numeric") + public String getCreditCard() + { + return creditCard; + } + + public void setCreditCard(String creditCard) + { + this.creditCard = creditCard; + } + + @Transient + public String getDescription() + { + DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM); + return hotel==null ? null : hotel.getName() + + ", " + df.format( getCheckinDate() ) + + " to " + df.format( getCheckoutDate() ); + } + + public boolean isSmoking() + { + return smoking; + } + + public void setSmoking(boolean smoking) + { + this.smoking = smoking; + } + + public int getBeds() + { + return beds; + } + + public void setBeds(int beds) + { + this.beds = beds; + } + @NotNull(message="Credit card name is required") + @Length(min=3, max=70, message="Credit card name is required") + public String getCreditCardName() + { + return creditCardName; + } + + public void setCreditCardName(String creditCardName) + { + this.creditCardName = creditCardName; + } + + public int getCreditCardExpiryMonth() + { + return creditCardExpiryMonth; + } + + public void setCreditCardExpiryMonth(int creditCardExpiryMonth) + { + this.creditCardExpiryMonth = creditCardExpiryMonth; + } + + public int getCreditCardExpiryYear() + { + return creditCardExpiryYear; + } + + public void setCreditCardExpiryYear(int creditCardExpiryYear) + { + this.creditCardExpiryYear = creditCardExpiryYear; + } + + @Override + public String toString() + { + return "Booking(" + user + ","+ hotel + ")"; + } + +} Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/BookingListAction.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/BookingListAction.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/BookingListAction.java 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,68 @@ +//$Id: BookingListAction.java 8748 2008-08-20 12:08:30Z pete.muir(a)jboss.org $ +package org.jboss.seam.example.jpa; + +// import static javax.ejb.TransactionAttributeType.REQUIRES_NEW; +import static org.jboss.seam.ScopeType.SESSION; + +import java.io.Serializable; +import java.util.List; + +import javax.persistence.EntityManager; + +import org.jboss.seam.annotations.Factory; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Logger; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Observer; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.Transactional; +import org.jboss.seam.annotations.datamodel.DataModel; +import org.jboss.seam.annotations.datamodel.DataModelSelection; +import org.jboss.seam.faces.FacesMessages; +import org.jboss.seam.log.Log; + +@Scope(SESSION) +@Name("bookingList") +// @TransactionAttribute(REQUIRES_NEW) +public class BookingListAction implements Serializable +{ + + @In + private EntityManager em; + + @In + private User user; + + @DataModel + private List<Booking> bookings; + @DataModelSelection + private Booking booking; + + @Logger + private Log log; + + @Factory + @Observer("bookingConfirmed") + @Transactional + public void getBookings() + { + bookings = em.createQuery("select b from Booking b where b.user.username = :username order by b.checkinDate") + .setParameter("username", user.getUsername()) + .getResultList(); + } + + public void cancel() + { + log.info("Cancel booking: #{bookingList.booking.id} for #{user.username}"); + Booking cancelled = em.find(Booking.class, booking.getId()); + if (cancelled!=null) em.remove( cancelled ); + getBookings(); + FacesMessages.instance().add("Booking cancelled for confirmation number #0", booking.getId()); + } + + public Booking getBooking() + { + return booking; + } + +} Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/ChangePasswordAction.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/ChangePasswordAction.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/ChangePasswordAction.java 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,65 @@ +//$Id: ChangePasswordAction.java 5509 2007-06-25 16:19:40Z gavin $ +package org.jboss.seam.example.jpa; + +import static org.jboss.seam.ScopeType.EVENT; + +import javax.persistence.EntityManager; + +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Out; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.faces.FacesMessages; + +@Scope(EVENT) +@Name("changePassword") +public class ChangePasswordAction +{ + + @In @Out + private User user; + + @In + private EntityManager em; + + private String verify; + + private boolean changed; + + public void changePassword() + { + if ( user.getPassword().equals(verify) ) + { + user = em.merge(user); + FacesMessages.instance().add("Password updated"); + changed = true; + } + else + { + FacesMessages.instance().add("verify", "Re-enter new password"); + revertUser(); + verify=null; + } + } + + public boolean isChanged() + { + return changed; + } + + private void revertUser() + { + user = em.find(User.class, user.getUsername()); + } + + public String getVerify() + { + return verify; + } + + public void setVerify(String verify) + { + this.verify = verify; + } + +} Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/Hotel.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/Hotel.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/Hotel.java 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,114 @@ +//$Id: Hotel.java 3176 2007-01-09 20:53:45Z myuan $ +package org.jboss.seam.example.jpa; + +import java.io.Serializable; +import java.math.BigDecimal; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; + +import org.hibernate.validator.Length; +import org.hibernate.validator.NotNull; +import org.jboss.seam.annotations.Name; + +@Entity +@Name("hotel") +public class Hotel implements Serializable +{ + private Long id; + private String name; + private String address; + private String city; + private String state; + private String zip; + private String country; + private BigDecimal price; + + @Id @GeneratedValue + public Long getId() + { + return id; + } + public void setId(Long id) + { + this.id = id; + } + + @Length(max=50) @NotNull + public String getName() + { + return name; + } + public void setName(String name) + { + this.name = name; + } + + @Length(max=100) @NotNull + public String getAddress() + { + return address; + } + public void setAddress(String address) + { + this.address = address; + } + + @Length(max=40) @NotNull + public String getCity() + { + return city; + } + public void setCity(String city) + { + this.city = city; + } + + @Length(min=4, max=6) @NotNull + public String getZip() + { + return zip; + } + public void setZip(String zip) + { + this.zip = zip; + } + + @Length(min=2, max=10) @NotNull + public String getState() + { + return state; + } + public void setState(String state) + { + this.state = state; + } + + @Length(min=2, max=40) @NotNull + public String getCountry() + { + return country; + } + public void setCountry(String country) + { + this.country = country; + } + + @Column(precision=6, scale=2) + public BigDecimal getPrice() + { + return price; + } + public void setPrice(BigDecimal price) + { + this.price = price; + } + + @Override + public String toString() + { + return "Hotel(" + name + "," + address + "," + city + "," + zip + ")"; + } +} Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/HotelBookingAction.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/HotelBookingAction.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/HotelBookingAction.java 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,95 @@ +//$Id: HotelBookingAction.java 5509 2007-06-25 16:19:40Z gavin $ +package org.jboss.seam.example.jpa; + +import java.util.Calendar; + +import javax.persistence.EntityManager; + +import org.jboss.seam.annotations.Begin; +import org.jboss.seam.annotations.End; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Logger; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Out; +import org.jboss.seam.core.Events; +import org.jboss.seam.faces.FacesMessages; +import org.jboss.seam.log.Log; + +@Name("hotelBooking") +public class HotelBookingAction +{ + + @In + private EntityManager em; + + @In + private User user; + + @In(required=false) @Out + private Hotel hotel; + + @In(required=false) + @Out(required=false) + private Booking booking; + + @In + private FacesMessages facesMessages; + + @In + private Events events; + + @Logger + private Log log; + + private boolean bookingValid; + + @Begin + public void selectHotel(Hotel selectedHotel) + { + hotel = em.merge(selectedHotel); + } + + public void bookHotel() + { + booking = new Booking(hotel, user); + Calendar calendar = Calendar.getInstance(); + booking.setCheckinDate( calendar.getTime() ); + calendar.add(Calendar.DAY_OF_MONTH, 1); + booking.setCheckoutDate( calendar.getTime() ); + } + public void setBookingDetails() + { + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.DAY_OF_MONTH, -1); + if ( booking.getCheckinDate().before( calendar.getTime() ) ) + { + facesMessages.addToControl("checkinDate", "Check in date must be a future date"); + bookingValid=false; + } + else if ( !booking.getCheckinDate().before( booking.getCheckoutDate() ) ) + { + facesMessages.addToControl("checkoutDate", "Check out date must be later than check in date"); + bookingValid=false; + } + else + { + bookingValid=true; + } + } + public boolean isBookingValid() + { + return bookingValid; + } + + @End + public void confirm() + { + em.persist(booking); + facesMessages.add("Thank you, #{user.name}, your confimation number for #{hotel.name} is #{booking.id}"); + log.info("New booking: #{booking.id} for #{user.username}"); + events.raiseTransactionSuccessEvent("bookingConfirmed"); + } + + @End + public void cancel() {} +} Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/HotelSearchingAction.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/HotelSearchingAction.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/HotelSearchingAction.java 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,82 @@ +//$Id: HotelSearchingAction.java 9636 2008-11-25 04:51:13Z dan.j.allen $ +package org.jboss.seam.example.jpa; + +import java.io.Serializable; + +import java.util.List; + +import javax.persistence.EntityManager; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Factory; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.datamodel.DataModel; + +@Name("hotelSearch") +(a)Scope(ScopeType.SESSION) +public class HotelSearchingAction implements Serializable +{ + + @In + private EntityManager em; + + private String searchString; + private int pageSize = 10; + private int page; + + @DataModel + private List<Hotel> hotels; + + public void find() + { + page = 0; + queryHotels(); + } + + public void nextPage() + { + page++; + queryHotels(); + } + + private void queryHotels() + { + hotels = em.createQuery("select h from Hotel h where lower(h.name) like #{pattern} or lower(h.city) like #{pattern} or lower(h.zip) like #{pattern} or lower(h.address) like #{pattern}") + .setMaxResults(pageSize) + .setFirstResult( page * pageSize ) + .getResultList(); + } + + @Factory(value="pattern", scope=ScopeType.EVENT) + public String getSearchPattern() + { + return searchString==null ? + "%" : '%' + searchString.toLowerCase().replace('*', '%') + '%'; + } + + public boolean isNextPageAvailable() + { + return hotels!=null && hotels.size()==pageSize; + } + + public int getPageSize() { + return pageSize; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + public String getSearchString() + { + return searchString; + } + + public void setSearchString(String searchString) + { + this.searchString = searchString; + } + +} Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/RegisterAction.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/RegisterAction.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/RegisterAction.java 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,77 @@ +//$Id: RegisterAction.java 5509 2007-06-25 16:19:40Z gavin $ +package org.jboss.seam.example.jpa; + +import static org.jboss.seam.ScopeType.EVENT; + +import java.util.List; + +import javax.persistence.EntityManager; + +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.faces.FacesMessages; + +@Scope(EVENT) +@Name("register") +public class RegisterAction +{ + + @In + private User user; + + @In + private EntityManager em; + + @In + private FacesMessages facesMessages; + + private String verify; + + private boolean registered; + + public void register() + { + if ( user.getPassword().equals(verify) ) + { + List existing = em.createQuery("select u.username from User u where u.username=#{user.username}") + .getResultList(); + if (existing.size()==0) + { + em.persist(user); + facesMessages.add("Successfully registered as #{user.username}"); + registered = true; + } + else + { + facesMessages.addToControl("username", "Username #{user.username} already exists"); + } + } + else + { + facesMessages.add("verify", "Re-enter your password"); + verify=null; + } + } + + public void invalid() + { + facesMessages.add("Please try again"); + } + + public boolean isRegistered() + { + return registered; + } + + public String getVerify() + { + return verify; + } + + public void setVerify(String verify) + { + this.verify = verify; + } + +} Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/User.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/User.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/java/org/jboss/seam/example/jpa/User.java 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,76 @@ +//$Id: User.java 3176 2007-01-09 20:53:45Z myuan $ +package org.jboss.seam.example.jpa; + +import static org.jboss.seam.ScopeType.SESSION; + +import java.io.Serializable; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +import org.hibernate.validator.Length; +import org.hibernate.validator.NotNull; +import org.hibernate.validator.Pattern; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; + +@Entity +@Name("user") +@Scope(SESSION) +@Table(name="Customer") +public class User implements Serializable +{ + private String username; + private String password; + private String name; + + public User(String name, String password, String username) + { + this.name = name; + this.password = password; + this.username = username; + } + + public User() {} + + @NotNull + @Length(max=100) + public String getName() + { + return name; + } + public void setName(String name) + { + this.name = name; + } + + @NotNull + @Length(min=5, max=15) + public String getPassword() + { + return password; + } + public void setPassword(String password) + { + this.password = password; + } + + @Id + @Length(min=5, max=15) + @Pattern(regex="^\\w*$", message="not a valid username") + public String getUsername() + { + return username; + } + public void setUsername(String username) + { + this.username = username; + } + + @Override + public String toString() + { + return "User(" + username + ")"; + } +} Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/resources/META-INF/persistence.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/resources/META-INF/persistence.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/resources/META-INF/persistence.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<persistence xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" + version="1.0"> + <persistence-unit name="bookingDatabase" transaction-type="RESOURCE_LOCAL"> + <provider>org.hibernate.ejb.HibernatePersistence</provider> + <non-jta-data-source>java:/DefaultDS</non-jta-data-source> + <properties> + <property name="hibernate.hbm2ddl.auto" value="create-drop"/> + <property name="hibernate.show_sql" value="true"/> + + <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/> +  + <property name="jboss.entity.manager.factory.jndi.name" value="java:/bookingEntityManagerFactory"/> + </properties> + </persistence-unit> +</persistence> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/resources/import.sql =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/resources/import.sql (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/resources/import.sql 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,22 @@ +insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') +insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') +insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') +insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') +insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') +insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 130, 'Hotel Beaulac', ' Esplanade L�opold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') +insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') +insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') +insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') +insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 250, 'Meli� White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') +insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/resources/seam.properties =================================================================== Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/components.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:persistence="http://jboss.com/products/seam/persistence" + xmlns:transaction="http://jboss.com/products/seam/transaction" + xmlns:security="http://jboss.com/products/seam/security" + 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/persistence http://jboss.com/products/seam/persistence-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:manager conversation-timeout="120000" + concurrent-request-timeout="500" + conversation-id-parameter="cid"/> + + <transaction:entity-transaction entity-manager="#{em}"/> + + <persistence:entity-manager-factory name="bookingDatabase" installed="@loadPersistenceUnits@"/> + +  + <persistence:managed-persistence-context name="em" auto-create="true" + entity-manager-factory="#{bookingDatabase}" persistence-unit-jndi-name="java:/bookingEntityManagerFactory"/> + + <security:identity authenticate-method="#{authenticator.authenticate}"/> + +</components> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="1.2" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + +  + <application> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + </application> + +</faces-config> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,16 @@ +<jboss-deployment-structure> + <deployment> + <exclusions> + <module name="javax.faces.api" slot="main"/> + <module name="com.sun.jsf-impl" slot="main"/> + </exclusions> + <dependencies> + <module name="org.apache.log4j" /> + <module name="org.dom4j" /> + <module name="org.apache.commons.logging" /> + <module name="org.apache.commons.collections" /> + <module name="javax.faces.api" slot="1.2"/> + <module name="com.sun.jsf-impl" slot="1.2"/> + </dependencies> + </deployment> +</jboss-deployment-structure> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/pages.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/pages.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> +<pages xmlns="http://jboss.com/products/seam/pages" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.3.xsd" + + no-conversation-view-id="/main.xhtml" + login-view-id="/home.xhtml"> + + <page view-id="/register.xhtml"> + + <action if="#{validation.failed}" execute="#{register.invalid}"/> + + <navigation> + <rule if="#{register.registered}"> + <redirect view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + <rule if-outcome="false"> + <render view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/password.xhtml" + login-required="true"> + + <navigation> + <rule if="#{changePassword.changed}"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/main.xhtml" + login-required="true"> + + <navigation from-action="#{hotelBooking.selectHotel(hot)}"> + <redirect view-id="/hotel.xhtml"/> + </navigation> + + </page> + + <page view-id="/hotel.xhtml" + conversation-required="true"> + + <description>View hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.bookHotel}"> + <redirect view-id="/book.xhtml"/> + </navigation> + + </page> + + <page view-id="/book.xhtml" + conversation-required="true"> + + <description>Book hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.setBookingDetails}"> + <rule if="#{hotelBooking.bookingValid}"> + <redirect view-id="/confirm.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/confirm.xhtml" + conversation-required="true"> + + <description>Confirm booking: #{booking.description}</description> + + <navigation from-action="#{hotelBooking.confirm}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <page view-id="*"> + + <navigation from-action="#{identity.logout}"> + <redirect view-id="/home.xhtml"/> + </navigation> + + <navigation from-action="#{hotelBooking.cancel}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <exception class="org.jboss.seam.security.NotLoggedInException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">You must be logged in to use this feature</message> + </redirect> + </exception> + + <exception class="javax.faces.application.ViewExpiredException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">Session expired, please log in again</message> + </redirect> + </exception> + +</pages> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/WEB-INF/web.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + +  + + <listener> + <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + </listener> + + <filter> + <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>Seam Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <servlet> + <servlet-name>Seam Resource Servlet</servlet-name> + <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Seam Resource Servlet</servlet-name> + <url-pattern>/seam/resource/*</url-pattern> + </servlet-mapping> + +  + + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.seam</url-pattern> + </servlet-mapping> + +  + + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + +  + +</web-app> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/book.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/book.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/book.xhtml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,175 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:a="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich" + template="template.xhtml"> + + +<ui:define name="content"> +<div class="section"> + <h1>Book Hotel</h1> +</div> +<div class="section"> + <h:form id="booking"> + <fieldset> + <div class="entry"> + <div class="label">Name:</div> + <div class="output">#{hotel.name}</div> + </div> + <div class="entry"> + <div class="label">Address:</div> + <div class="output">#{hotel.address}</div> + </div> + <div class="entry"> + <div class="label">City, State:</div> + <div class="output">#{hotel.city}, #{hotel.state}</div> + </div> + <div class="entry"> + <div class="label">Zip:</div> + <div class="output">#{hotel.zip}</div> + </div> + <div class="entry"> + <div class="label">Country:</div> + <div class="output">#{hotel.country}</div> + </div> + <div class="entry"> + <div class="label">Nightly rate:</div> + <div class="output"> + <h:outputText value="#{hotel.price}"> + <f:convertNumber type="currency" + currencySymbol="$"/> + </h:outputText> + </div> + </div> + + <s:validateAll id="validateAll"> + + <f:facet id="AroundInvalidFieldFacet" name="aroundInvalidField"> + <s:span id="Error" styleClass="errors"/> + </f:facet> + <f:facet id="AfterInvalidFieldFacet" name="afterInvalidField"> + <s:div id="Message" styleClass="errors"> + <s:message/> + </s:div> + </f:facet> + + <div class="entry"> + <div class="label"><h:outputLabel id="CheckinDateLabel" for="checkinDate">Check In Date:</h:outputLabel></div> + <div class="input"> + <s:decorate id="checkinDateDecorate"> + <rich:calendar id="checkinDate" value="#{booking.checkinDate}" required="true" datePattern="MM/dd/yyyy" event="onblur" reRender="checkinDateDecorate" style="width: auto;"/> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel id="CheckoutDateLabel" for="checkoutDate">Check Out Date:</h:outputLabel></div> + <div class="input"> + <s:decorate id="checkoutDateDecorate"> + <rich:calendar id="checkoutDate" value="#{booking.checkoutDate}" required="true" datePattern="MM/dd/yyyy" event="onblur" reRender="checkoutDateDecorate" style="width: auto;"/> + </s:decorate> + </div> + </div> + <div class="entry"> + <div class="label"><h:outputLabel id="RoomPrefLabel" for="beds">Room Preference:</h:outputLabel></div> + <div class="input"> + <s:decorate id="bedsDecorate"> + <h:selectOneMenu id="beds" value="#{booking.beds}"> + <f:selectItem id="OneKingBed" itemLabel="One king-size bed" itemValue="1"/> + <f:selectItem id="TwoDoubleBeds" itemLabel="Two double beds" itemValue="2"/> + <f:selectItem id="ThreeBeds" itemLabel="Three beds" itemValue="3"/> + </h:selectOneMenu> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel id="SmokingPrefLabel" for="smoking">Smoking Preference:</h:outputLabel></div> + <div id="radio" class="input"> + <s:decorate id="smokingDecorate"> + <h:selectOneRadio id="smoking" value="#{booking.smoking}" layout="pageDirection"> + <f:selectItem id="Smoking" itemLabel="Smoking" itemValue="true"/> + <f:selectItem id="NonSmoking" itemLabel="Non Smoking" itemValue="false"/> + </h:selectOneRadio> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel id="CreditCardLabel" for="creditCard">Credit Card #:</h:outputLabel></div> + <div class="input"> + <s:decorate id="creditCardDecorate"> + <h:inputText id="creditCard" value="#{booking.creditCard}" required="true"> + <a:support id="onblur" event="onblur" reRender="creditCardDecorate"/> + </h:inputText> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel id="CreditCardNameLabel" for="creditCardName">Credit Card Name:</h:outputLabel></div> + <div class="input"> + <s:decorate id="creditCardNameDecorate"> + <h:inputText id="creditCardName" value="#{booking.creditCardName}" required="true"> + <a:support id="onblur" event="onblur" reRender="creditCardNameDecorate"/> + </h:inputText> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="creditCardExpiryMonth">Credit Card Expiry:</h:outputLabel></div> + <div class="input"> + <s:decorate id="CreditCardExpiryDecorate"> + <h:selectOneMenu id="creditCardExpiryMonth" value="#{booking.creditCardExpiryMonth}"> + <f:selectItem id="Jan" itemLabel="Jan" itemValue="1"/> + <f:selectItem id="Feb" itemLabel="Feb" itemValue="2"/> + <f:selectItem id="Mar" itemLabel="Mar" itemValue="3"/> + <f:selectItem id="Apr" itemLabel="Apr" itemValue="4"/> + <f:selectItem id="May" itemLabel="May" itemValue="5"/> + <f:selectItem id="Jun" itemLabel="Jun" itemValue="6"/> + <f:selectItem id="Jul" itemLabel="Jul" itemValue="7"/> + <f:selectItem id="Aug" itemLabel="Aug" itemValue="8"/> + <f:selectItem id="Sep" itemLabel="Sep" itemValue="9"/> + <f:selectItem id="Oct" itemLabel="Oct" itemValue="10"/> + <f:selectItem id="Nov" itemLabel="Nov" itemValue="11"/> + <f:selectItem id="Dec" itemLabel="Dec" itemValue="12"/> + </h:selectOneMenu> + <h:selectOneMenu id="creditCardExpiryYear" value="#{booking.creditCardExpiryYear}"> + <f:selectItem id="Year2005" itemLabel="2005" itemValue="2005"/> + <f:selectItem id="Year2006" itemLabel="2006" itemValue="2006"/> + <f:selectItem id="Year2007" itemLabel="2007" itemValue="2007"/> + <f:selectItem id="Year2008" itemLabel="2008" itemValue="2008"/> + <f:selectItem id="Year2009" itemLabel="2009" itemValue="2009"/> + </h:selectOneMenu> + </s:decorate> + </div> + </div> + + </s:validateAll> + + <div class="entry errors"> + <h:messages id="messages" globalOnly="true"/> + </div> + + <div class="entry"> + <div class="label"> </div> + <div class="input"> + <h:commandButton id="proceed" value="Proceed" action="#{hotelBooking.setBookingDetails}"/>  + <s:button id="cancel" value="Cancel" action="#{hotelBooking.cancel}"/> + </div> + </div> + </fieldset> + </h:form> +</div> +</ui:define> + + +<ui:define name="sidebar"> +</ui:define> + +</ui:composition> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/confirm.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/confirm.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/confirm.xhtml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,75 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + template="template.xhtml"> + + +<ui:define name="content"> +<div class="section"> + <h1>Confirm Hotel Booking</h1> +</div> +<div class="section"> + <h:form id="confirm"> + <fieldset> + <div class="entry"> + <div class="label">Name:</div> + <div class="output">#{hotel.name}</div> + </div> + <div class="entry"> + <div class="label">Address:</div> + <div class="output">#{hotel.address}</div> + </div> + <div class="entry"> + <div class="label">City, State:</div> + <div class="output">#{hotel.city}, #{hotel.state}</div> + </div> + <div class="entry"> + <div class="label">Zip:</div> + <div class="output">#{hotel.zip}</div> + </div> + <div class="entry"> + <div class="label">Country:</div> + <div class="output">#{hotel.country}</div> + </div> + <div class="entry"> + <div class="label">Total payment:</div> + <div class="output"> + <h:outputText id="BookingTotal" value="#{booking.total}"> + <f:convertNumber type="currency" + currencySymbol="$"/> + </h:outputText> + </div> + </div> + <div class="entry"> + <div class="label">Check In Date:</div> + <div class="output"><h:outputText id="BookingCheckinDate" value="#{booking.checkinDate}"/></div> + </div> + <div class="entry"> + <div class="label">Check Out Date:</div> + <div class="output"><h:outputText id="BookingCheckoutDate" value="#{booking.checkoutDate}"/></div> + </div> + <div class="entry"> + <div class="label">Credit Card #:</div> + <div class="output">#{booking.creditCard}</div> + </div> + <div class="entry"> + <div class="label"> </div> + <div class="input"> + <h:commandButton id="confirm" value="Confirm" action="#{hotelBooking.confirm}"/>  + <s:button id="revise" value="Revise" view="/book.xhtml"/>  + <h:commandButton id="cancel" value="Cancel" action="#{hotelBooking.cancel}"/> + </div> + </div> + </fieldset> + </h:form> +</div> +</ui:define> + + +<ui:define name="sidebar"> +</ui:define> + +</ui:composition> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/conversations.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/conversations.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/conversations.xhtml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,36 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:c="http://java.sun.com/jstl/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:s="http://jboss.com/products/seam/taglib"> +<div> + +<div class="section"> + <h1><h:outputText id="Workspaces" rendered="#{not empty conversationList}" value="Workspaces"/></h1> +</div> + +<div class="section"> + <h:form id="ConversationListForm"> + <h:dataTable id="ConversationListDataTable" value="#{conversationList}" var="entry"> + <h:column id="column1"> + <h:commandLink id="EntryDescriptionLink" action="#{entry.select}" value="#{entry.description}"/> +   + <h:outputText id="CurrentEntry" value="[current]" rendered="#{entry.current}"/> + </h:column> + <h:column id="column2"> + <h:outputText id="EntryStartDateTime" value="#{entry.startDatetime}"> + <s:convertDateTime type="time" pattern="hh:mm"/> + </h:outputText> + - + <h:outputText id="EntryLastDateTime" value="#{entry.lastDatetime}"> + <s:convertDateTime type="time" pattern="hh:mm"/> + </h:outputText> + </h:column> + </h:dataTable> + </h:form> +</div> + +</div> +</ui:composition> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/css/screen.css =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/css/screen.css (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/css/screen.css 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,272 @@ +/* Setup defaults since variable in browsers +----------------------------------------------- */ +body, div, dd, dt, dl, img, ul, ol, li, p, h1, h2, h3, h4, h5, form, hr, fieldset { + margin: 0; + padding: 0; +} +/* Element Defaults +----------------------------------------------- */ +html { + height: 100%; + background-color: #DBD4C6; +} +img { + border: 0; +} +body { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: small; + line-height: 1.25em; + color: #362F2D; + position: relative; + width: 760px; + height: 100%; + margin-left: auto; + margin-right: auto; +} +label { + font-weight: bold; + color: #5E5147; +} +input { + border: 1px solid #C3BBB6; + padding: 4px; + margin: 5px 0; + background: #fff url(../img/input.bg.gif) 0 0 repeat-x; +} +select { + border: 1px solid #C3BBB6; + padding: 4px; + margin: 5px 0; + background: #fff url(../img/input.bg.gif) 0 0 repeat-x; +}ol, ul { + margin: 10px 0px 10px 6px; +} +li { + margin: 10px 12px; +} +fieldset { + border: 0; +} +/* Layout +----------------------------------------------- */ +#document { + padding: 0 1px; + background: #fff url(../img/bg.gif) 0 0 repeat-y; + float: left; + border-bottom: 1px solid #C3BBB6; +} +#header { + float: left; + width: 758px; + height: 46px; + background: url(../img/hdr.bg.gif) 0 0 repeat-x; +} +#container { + float: left; + width: 758px; + background: url(../img/hdr.bar.jpg) 0 0 repeat-x; +} +#sidebar { + float: left; + width: 190px; + margin-top: 96px; + padding: 20px 10px 0 10px; + background: url(../img/sdb.bg.gif) 0 0 no-repeat; +} +#content { + float: left; + width: 548px; + margin-top: 75px; + padding-top: 5px; + background: #fff url(../img/cnt.bg.gif) 0 0 repeat-x; +} +#footer { + clear: both; + margin-top: 40px; + float: left; + padding: 20px; + border-top: 1px solid #C3BBB6; + background-color: #fff; + width: 718px; + text-align: right; +} +/* General +----------------------------------------------- */ +input[type="submit"], input[type="button"] { + font-weight: bold; + color: #fff; + border: 1px solid #5D1414; + height: 26px; + background: #fff url(../img/btn.bg.gif) 0 0 repeat-x; + border-style: none; +} +.center { + text-align: center; +} +.entry { + clear: both; + padding-top: 10px; +} +.entry .label { + float: left; + padding-top: 10px; + padding-right: 5px; + font-weight: bold; + width: 150px; + text-align: right; +} +.entry .output { + float: left; + width: 250px; + padding-top: 10px; + text-align: left; +} +.entry .input { + float: left; + width: 250px; + text-align: left; +} +/* Sidebar +----------------------------------------------- */ +.notes { + text-align: center; + font-size: small; +} +.subnotes { + margin-top: 1em; + font-size: small; +} +.errors { + font-size: small; + font-weight: bold; + text-align: center; + color: #600; +} +.errors div { + text-align: left; +} +.errors input { + border: 1px solid #600; +} +.errors ul { + list-style: none; +} +.buttonBox { + text-align: center; + padding: 5px 0; +} +#sidebar p { + font-size: small; + color: #8B7869; + line-height: 150%; + padding-bottom: 10px; +} +#sidebar li { + font-size: small; + color: #8B7869; +} +#sidebar h1 { + line-height: normal; + font-weight: bold; + font-size: small; +} +/* +#sidebar p:hover { + color: #362F2D; +} +*/ +/* Content +----------------------------------------------- */ +#content .section { + float: left; + width: 518px; + padding: 15px 15px 0 15px; +} +#content .section h1 { + font-family: "Trebuchet MS", Arial, sans-serif; + line-height: normal; + font-weight: normal; + font-size: large; +} +#content .section p { + line-height: 150%; + padding: 10px 0; + font-size: small; +} +#content table { + width: 100%; + border: 1px solid #D2C9C4; + border-collapse: collapse; +} +#content table caption { + padding-bottom: 6px; + text-align: left; + font-weight: bold; +} +#content table thead th { + border-left: 1px solid #D2C9C4; + background: #fff url(../img/th.bg.gif) 0 100% repeat-x; + border-bottom: 1px solid #D2C9C4; + padding: 6px; + text-align: left; + font-size: small; +} +#content table tbody td { + border-left: 1px solid #E4DBD5; + padding: 4px; + border-bottom: 1px solid #D2C9C4; + font-size: small; +} +#content dt { + font-weight: bold; + float: left; + width: 33%; +} +#content dd { + padding-left: 10px; + float: left; + width: 66%; +} +#radio table { + border: 0px; +} +#radio table tr td { + border: 0px; + border-left: 0px; + border-bottom: 0px; +} +/* Header +----------------------------------------------- */ +#title { + float: left; + padding: 1px 0 6px 15px; +} +#status { + color: #C7B299; + float: right; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-weight: bold; + font-size: x-small; + text-align: right; + padding-top: 14px; + padding-right: 15px; +} +#status a { + color: #C7B299; + text-decoration: none; +} +/* Homepage Modifications +----------------------------------------------- */ +#pgHome #container { + background: url(../img/hdr.ad.jpg) 0 0 repeat-x; +} +#pgHome #sidebar { + margin-top: 207px; +} +#pgHome #content { + margin-top: 183px; +} +#pgHome #sidebar input[type="submit"] { + height: 30px; +} Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/css/trailblazer_main.css =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/css/trailblazer_main.css (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/css/trailblazer_main.css 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,148 @@ +* { + margin: 0px; + padding: 0px; + border: none; +} + +body { + font: 1em verdana, arial, sans-serif; + background: #CCCCCC; +} + +div#main { + margin-left: 0px; + width: 751px; + background: #ecefdf; +} + +div#top,div#pictures{ +} + +div#pictures img { + float:left; +} + +img#head1 { + margin-right: 3px; +} + +img#head2 { + margin-right: 4px; +} + +div.trail { + clear:both; + margin-left: 50px; + margin-top: 0px; + margin-right: 50px +} + +div.foot { + margin-left: 50px; + margin-right: 50px; + margin-top: 50px; + text-align: center; + font-size: .5em; + height: 36px; +} + +div.trail h1 { + margin-top: -30px; + margin-left: -50px; + font-size: 1.2em; + font-weight: bold; + padding-left: .4em; +} + +div.trail h2 { + float: left; + font-size: 1em; + font-weight: bold; + padding-left: .4em; +} + +div.trail h3 { + float: left; + font-size: .8em; + font-weight: bold; + margin-left: -1.4em; + margin-bottom: 1em; +} + + +div.trail p { + clear: both; + margin-top: 20px; + font-size: .8em; + text-decoration: none; +} + +div#next_trail { + margin-left: 36px; +} + +div.numbox { + border: thin solid black; + margin-left: -.8em; + float: left; + background: #ffffff; + padding: .2em .35em .3em; + font-style: normal; + font-weight: bold; + font-size: 1.4em; +} + +div.figure { + text-align: center; + font-size: .6em; + margin-top: 30px; +} + +div.figure img { + display: block; + margin-right: auto; + margin-left: auto; +} + +code { + font: 1.1em "Courier New", Courier, mono; +} + +code.block { + white-space: pre; + font: 10pt "Courier New", Courier, mono; + display: block; + border-style: dashed; + border-width: thin; + padding: .5em; + background: #ffffff; + margin: 20px; +} + +div.foot_image { + float: left; + height: 86px; +} + +a:active { + color : #666666; + text-decoration: none; +} + +a:hover { + color : #000000; + background-color : #D6E0FE; + text-decoration: none; +} + +a:link { + color : #005EB6; + text-decoration: none; +} + +a:visited { + color : #888888; + text-decoration: none; +} + + Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/home.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/home.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/home.xhtml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,49 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> + <title>JBoss Suites: Seam Framework</title> + <link href="css/screen.css" rel="stylesheet" type="text/css" /> +</head> +<body id="pgHome"> +<f:view> +<div id="document"> + <div id="header"> + <div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div> + </div> + <div id="container"> + <div id="sidebar"> + <h:form id="login"> + <fieldset> + <div> + <h:outputLabel id="UsernameLabel" for="username">Login Name</h:outputLabel> + <h:inputText id="username" value="#{identity.username}" style="width: 175px;"/> + <div class="errors"><h:message id="message" for="username"/></div> + </div> + <div> + <h:outputLabel id="PasswordLabel" for="password">Password</h:outputLabel> + <h:inputSecret id="password" value="#{identity.password}" style="width: 175px;"/> + </div> + <div class="errors"><h:messages id="messages" globalOnly="true"/></div> + <div class="buttonBox"><h:commandButton id="login" action="#{identity.quietLogin}" value="Account Login"/></div> + <div class="notes"><s:link id="register" view="/register.xhtml" value="Register New User"/></div> + <div class="subnotes"> + Or use a demo account: + <ul> + <li>gavin/foobar</li> + <li>demo/demo</li> + </ul> + </div> + </fieldset> + </h:form> + </div> + </div> + <div id="footer">Created with JBoss EJB 3.0, Seam, JSF (Mojarra), and Facelets</div> +</div> +</f:view> +</body> +</html> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/hotel.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/hotel.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/hotel.xhtml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,63 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + template="template.xhtml"> + + +<ui:define name="content"> +<div class="section"> + <h1>View Hotel</h1> +</div> +<div class="section"> + <div class="entry"> + <div class="label">Name:</div> + <div class="output">#{hotel.name}</div> + </div> + <div class="entry"> + <div class="label">Address:</div> + <div class="output">#{hotel.address}</div> + </div> + <div class="entry"> + <div class="label">City:</div> + <div class="output">#{hotel.city}</div> + </div> + <div class="entry"> + <div class="label">State:</div> + <div class="output">#{hotel.state}</div> + </div> + <div class="entry"> + <div class="label">Zip:</div> + <div class="output">#{hotel.zip}</div> + </div> + <div class="entry"> + <div class="label">Country:</div> + <div class="output">#{hotel.country}</div> + </div> + <div class="entry"> + <div class="label">Nightly rate:</div> + <div class="output"> + <h:outputText id="HotelPrice" value="#{hotel.price}"> + <f:convertNumber type="currency" + currencySymbol="$"/> + </h:outputText> + </div> + </div> +</div> +<div class="section"> + <h:form id="hotel"> + <fieldset class="buttonBox"> + <h:commandButton id="bookHotel" action="#{hotelBooking.bookHotel}" value="Book Hotel"/>  + <h:commandButton id="cancel" action="#{hotelBooking.cancel}" value="Back to Search"/> + </fieldset> + </h:form> +</div> +</ui:define> + + +<ui:define name="sidebar"> +</ui:define> + +</ui:composition> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/bg.gif =================================================================== (Binary files differ) Property changes on: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/bg.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/btn.bg.gif =================================================================== (Binary files differ) Property changes on: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/btn.bg.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/cal-next.png =================================================================== (Binary files differ) Property changes on: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/cal-next.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/cal-prev.png =================================================================== (Binary files differ) Property changes on: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/cal-prev.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/cnt.bg.gif =================================================================== (Binary files differ) Property changes on: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/cnt.bg.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/dtpick.gif =================================================================== (Binary files differ) Property changes on: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/dtpick.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/hdr.ad.jpg =================================================================== (Binary files differ) Property changes on: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/hdr.ad.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/hdr.bar.jpg =================================================================== (Binary files differ) Property changes on: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/hdr.bar.jpg ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/hdr.bg.gif =================================================================== (Binary files differ) Property changes on: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/hdr.bg.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/hdr.title.gif =================================================================== (Binary files differ) Property changes on: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/hdr.title.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/header_line.gif =================================================================== (Binary files differ) Property changes on: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/header_line.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/input.bg.gif =================================================================== (Binary files differ) Property changes on: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/input.bg.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/sdb.bg.gif =================================================================== (Binary files differ) Property changes on: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/sdb.bg.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/spinner.gif =================================================================== (Binary files differ) Property changes on: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/spinner.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/th.bg.gif =================================================================== (Binary files differ) Property changes on: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/img/th.bg.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/index.html =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/index.html (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/index.html 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,5 @@ +<html> +<head> + <meta http-equiv="Refresh" content="0; URL=home.seam"> +</head> +</html> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/main.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/main.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/main.xhtml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,119 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:a="http://richfaces.org/a4j" + template="template.xhtml"> + + +<ui:define name="content"> + +<div class="section"> + <h:form id="main"> + + <span class="errors"> + <h:messages id="messages" globalOnly="true"/> + </span> + + <h1>Search Hotels</h1> + <fieldset> + <h:inputText id="searchString" value="#{hotelSearch.searchString}" style="width: 165px;"> + <a:support id="onkeyup" event="onkeyup" actionListener="#{hotelSearch.find}" reRender="searchResults" /> + </h:inputText> +   + <a:commandButton id="findHotels" value="Find Hotels" action="#{hotelSearch.find}" reRender="searchResults"/> +   + <a:status id="status"> + <f:facet id="StartFacet" name="start"> + <h:graphicImage id="SpinnerGif" value="/img/spinner.gif"/> + </f:facet> + </a:status> + <br/> + <h:outputLabel id="MaximumResultsLabel" for="pageSize">Maximum results:</h:outputLabel>  + <h:selectOneMenu id="pageSize" value="#{hotelSearch.pageSize}"> + <f:selectItem id="PageSize5" itemLabel="5" itemValue="5"/> + <f:selectItem id="PageSize10" itemLabel="10" itemValue="10"/> + <f:selectItem id="PageSize20" itemLabel="20" itemValue="20"/> + </h:selectOneMenu> + </fieldset> + + </h:form> +</div> + +<a:outputPanel id="searchResults"> + <div class="section"> + <h:outputText id="NoHotelsFoundMessage" value="No Hotels Found" rendered="#{hotels != null and hotels.rowCount==0}"/> + <h:dataTable id="hotels" value="#{hotels}" var="hot" rendered="#{hotels.rowCount>0}"> + <h:column id="column1"> + <f:facet id="NameFacet" name="header">Name</f:facet> + #{hot.name} + </h:column> + <h:column id="column2"> + <f:facet id="AddressFacet" name="header">Address</f:facet> + #{hot.address} + </h:column> + <h:column id="column3"> + <f:facet id="CityStateFacet" name="header">City, State</f:facet> + #{hot.city}, #{hot.state}, #{hot.country} + </h:column> + <h:column id="column4"> + <f:facet id="ZipFacet" name="header">Zip</f:facet> + #{hot.zip} + </h:column> + <h:column id="column5"> + <f:facet id="ActionFacet" name="header">Action</f:facet> + <s:link id="viewHotel" value="View Hotel" action="#{hotelBooking.selectHotel(hot)}"/> + </h:column> + </h:dataTable> + <s:link id="MoreResultsLink" value="More results" action="#{hotelSearch.nextPage}" rendered="#{hotelSearch.nextPageAvailable}"/> + </div> +</a:outputPanel> + +<div class="section"> + <h1>Current Hotel Bookings</h1> +</div> +<div class="section"> + <h:form id="bookings"> + <h:outputText id="NoBookingsFoundMessage" value="No Bookings Found" rendered="#{bookings.rowCount==0}"/> + <h:dataTable id="bookings" value="#{bookings}" var="book" rendered="#{bookings.rowCount>0}"> + <h:column id="column1"> + <f:facet id="NameFacet" name="header">Name</f:facet> + #{book.hotel.name} + </h:column> + <h:column id="column2"> + <f:facet id="AddressFacet" name="header">Address</f:facet> + #{book.hotel.address} + </h:column> + <h:column id="column3"> + <f:facet id="CityStateFacet" name="header">City, State</f:facet> + #{book.hotel.city}, #{book.hotel.state} + </h:column> + <h:column id="column4"> + <f:facet id="CheckinDateFacet" name="header">Check in date</f:facet> + <h:outputText id="BookingCheckinDate" value="#{book.checkinDate}"/> + </h:column> + <h:column id="column5"> + <f:facet id="CheckoutDateFacet" name="header">Check out date</f:facet> + <h:outputText id="BookingCheckoutDate" value="#{book.checkoutDate}"/> + </h:column> + <h:column id="column6"> + <f:facet id="ConfNumberFacet" name="header">Confirmation number</f:facet> + #{book.id} + </h:column> + <h:column id="column7"> + <f:facet id="ActionFacet" name="header">Action</f:facet> + <h:commandLink id="cancel" value="Cancel" action="#{bookingList.cancel}"/> + </h:column> + </h:dataTable> + </h:form> +</div> + +</ui:define> + + +<ui:define name="sidebar"> +</ui:define> + +</ui:composition> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/password.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/password.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/password.xhtml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,81 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + template="template.xhtml"> + + +<ui:define name="content"> +<div class="section"> + <h1>Change Your Password</h1> +</div> +<div class="section"> + <h:form id="setpassword"> + + <f:facet id="AroundInvalidFieldFacet" name="aroundInvalidField"> + <s:span id="ErrorsSpan" styleClass="errors"/> + </f:facet> + <f:facet id="AfterInvalidFieldFacet" name="afterInvalidField"> + <s:div styleClass="errors"> + <s:message id="Message"/> + </s:div> + </f:facet> + + <fieldset> + + <div class="entry"> + <div class="label"><h:outputLabel id="PasswordLabel" for="password">Password:</h:outputLabel></div> + <div class="input"> + <s:decorate id="PasswordDecorate"> + <h:inputSecret id="password" value="#{user.password}" required="true"> + <s:validate/> + </h:inputSecret> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel id="VerifyLabel" for="verify">Verify:</h:outputLabel></div> + <div class="input"> + <s:decorate id="VerifyDecorate"> + <h:inputSecret id="verify" value="#{changePassword.verify}" required="true"/> + </s:decorate> + </div> + </div> + + <div class="entry errors"> + <h:messages id="messages" globalOnly="true"/> + </div> + + <div class="entry"> + <div class="label"> </div> + <div class="input"> + <h:commandButton id="change" value="Change" action="#{changePassword.changePassword}"/>  + <s:button id="cancel" value="Cancel" view="/main.xhtml"/> + </div> + </div> + + </fieldset> + + </h:form> +</div> +</ui:define> + + +<ui:define name="sidebar"> +<h1>Simple things should be easy</h1> +<p> + (And so should some complex things.) You shouldn't have to write four different classes + just to change a password. Traditional J2EE architectures require that developers spend + more time writing code to make the frameworks happy, than they ever get to spend writing + code to make the user happy. Seam lets you reduce the size of your code dramatically. + And that reduces bugs. And it makes refactoring easier. And it makes delivering new + functionality quicker. Productivity matters. But with Seam, JSF, EJB 3.0 and jBPM, you + don't need to sacrifice the ability to handle complex problems just to achieve great + productivity. +</p> +</ui:define> + +</ui:composition> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/register.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/register.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/register.xhtml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,104 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:a="http://richfaces.org/a4j"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> + <title>JBoss Suites: Seam Framework</title> + <link href="css/screen.css" rel="stylesheet" type="text/css" /> +</head> +<body id="pgHome"> +<div id="document"> + <div id="header"> + <div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div> + </div> + <div id="container"> + <div id="sidebar"> + </div> + <div id="content"> + <div class="section"> + <h1>Register</h1> + </div> + <div class="section"> + + <h:form id="register"> + <fieldset> + + <s:validateAll id="ValidateAll"> + + <f:facet id="AroundInvalidFieldFacet" name="aroundInvalidField"> + <s:span id="ErrorsSpan" styleClass="errors"/> + </f:facet> + <f:facet id="AfterInvalidFieldFacet" name="afterInvalidField"> + <s:div id="ErrorsDiv" styleClass="errors"> + <s:message id="message"/> + </s:div> + </f:facet> + + <div class="entry"> + <div class="label"><h:outputLabel id="UsernameLabel" for="username">Username:</h:outputLabel></div> + <div class="input"> + <s:decorate id="usernameDecorate"> + <h:inputText id="username" value="#{user.username}" required="true"> + <a:support id="onblur" event="onblur" reRender="usernameDecorate"/> + </h:inputText> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel id="RealNameLabel" for="name">Real Name:</h:outputLabel></div> + <div class="input"> + <s:decorate id="nameDecorate"> + <h:inputText id="name" value="#{user.name}" required="true"> + <a:support id="onblur" event="onblur" reRender="nameDecorate"/> + </h:inputText> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel id="PasswordLabel" for="password">Password:</h:outputLabel></div> + <div class="input"> + <s:decorate id="passwordDecorate"> + <h:inputSecret id="password" value="#{user.password}" required="true"/> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="verify">Verify Password:</h:outputLabel></div> + <div class="input"> + <s:decorate id="verifyDecorate"> + <h:inputSecret id="verify" value="#{register.verify}" required="true"/> + </s:decorate> + </div> + </div> + + </s:validateAll> + + <div class="entry errors"> + <h:messages id="messages" globalOnly="true"/> + </div> + + <div class="entry"> + <div class="label"> </div> + <div class="input"> + <h:commandButton id="register" value="Register" action="#{register.register}"/>  + <s:button id="cancel" value="Cancel" view="/home.xhtml"/> + </div> + </div> + + </fieldset> + </h:form> + + </div> + </div> + </div> + <div id="footer">Created with JBoss EJB 3.0, Seam, JSF (Mojarra), and Facelets</div> +</div> +</body> +</html> Added: branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/template.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/template.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/jpa-web/src/main/webapp/template.xhtml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,35 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:s="http://jboss.com/products/seam/taglib"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>JBoss Suites: Seam Framework</title> + <link href="css/screen.css" rel="stylesheet" type="text/css" /> +</head> +<body> + +<div id="document"> + <div id="header"> + <div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div> + <div id="status"> + Welcome #{user.name} + | <s:link id="search" view="/main.xhtml" value="Search" propagation="none"/> + | <s:link id="settings" view="/password.xhtml" value="Settings" propagation="none"/> + | <s:link id="logout" action="#{identity.logout}" value="Logout"/> + </div> + </div> + <div id="container"> + <div id="sidebar"> + <ui:insert name="sidebar"/> + </div> + <div id="content"> + <ui:insert name="content"/> + <ui:include src="conversations.xhtml" /> + </div> + </div> + <div id="footer">Created with JBoss Seam, JSF 1.2, Hibernate 3 and Facelets</div> +</div> +</body> +</html> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-jboss405.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-jboss405.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-jboss405.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,36 @@ +<?xml version="1.0"?> + +<project name="JPA Booking" default="noejb.archive" basedir="."> + +  + <property name="Name" value="The JPA Example for JBoss 4.0.5"/> + <property name="example.name" value="jboss-seam-jpa"/> + +  + <property name="resources.dir" value="resources-jboss" /> + <property name="dist.dir" value="dist-jboss405" /> + <property name="exploded-archives.dir" value="exploded-archives-jboss405" /> + +  + <property name="seam.ui.lib" value="true"/> + <property name="seam.debug.lib" value="true"/> + <property name="facelets.lib" value="true"/> + <property name="richfaces.lib" value="true"/> + <property name="el-ri.lib" value="true"/> + + <import file="../build.xml"/> + + <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> + <include name="lib/commons-beanutils.jar"/> + <include name="lib/commons-collections.jar"/> + <include name="lib/commons-digester.jar"/> + <include name="lib/commons-lang.jar"/> + <include name="lib/commons-logging.jar"/> + <include name="lib/jsf-impl.jar"/> + <include name="lib/jsf-api.jar"/> + <include name="lib/jstl.jar"/> + <include name="lib/el-api.jar"/> + </fileset> + +</project> + Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-tomcat55.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-tomcat55.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-tomcat55.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,64 @@ +<?xml version="1.0"?> + +<project name="JPA Booking" default="noejb.archive" basedir="."> + +  + <property name="Name" value="The JPA Example for plain Tomcat 5.5"/> + <property name="example.name" value="jboss-seam-jpa"/> + +  + <property name="resources.dir" value="resources-tomcat" /> + <property name="dist.dir" value="dist-tomcat55" /> + <property name="exploded-archives.dir" value="exploded-archives-tomcat55" /> + +  + <property name="seam.ui.lib" value="true"/> + <property name="seam.debug.lib" value="true"/> + <property name="facelets.lib" value="true"/> + <property name="richfaces.lib" value="true"/> + <property name="el-ri.lib" value="true"/> + <property name="jboss-common-core.lib" value="true" /> + + <import file="../build.xml"/> + + <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> +  + <include name="lib/dom4j.jar" /> + <include name="lib/javassist.jar"/> + +  + <include name="lib/commons-beanutils.jar"/> + <include name="lib/commons-collections.jar"/> + <include name="lib/commons-digester.jar"/> + <include name="lib/commons-lang.jar"/> + <include name="lib/commons-logging.jar"/> + <include name="lib/jta.jar"/> + +  + <include name="lib/jsf-api.jar"/> + <include name="lib/jsf-impl.jar"/> + <include name="lib/jstl.jar"/> + <include name="lib/el-api.jar" /> + +  + <include name="lib/hibernate-core.jar"/> + <include name="lib/hibernate-commons-annotations.jar"/> + <include name="lib/hibernate-annotations.jar"/> + <include name="lib/hibernate-entitymanager.jar"/> + <include name="lib/hibernate-validator.jar"/> + <include name="lib/slf4j-api.jar" /> + <include name="lib/slf4j-log4j12.jar" /> + <include name="lib/persistence-api.jar" /> + <include name="lib/asm.jar" /> + <include name="lib/cglib.jar"/> + <include name="lib/antlr.jar" /> + </fileset> + + + <fileset id="noejb.war.extras" dir="${resources.dir}"> + <include name="META-INF/context.xml" /> + <include name="WEB-INF/classes/log4j.xml" /> + </fileset> + +</project> + Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-tomcat6.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-tomcat6.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-tomcat6.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,55 @@ +<?xml version="1.0"?> + +<project name="JPA Booking" default="noejb.archive" basedir="."> + +  + <property name="Name" value="The JPA Example for plain Tomcat 6.0"/> + <property name="example.name" value="jboss-seam-jpa"/> + +  + <property name="resources.dir" value="resources-tomcat" /> + <property name="dist.dir" value="dist-tomcat6" /> + <property name="exploded-archives.dir" value="exploded-archives-tomcat6" /> + +  + <property name="seam.ui.lib" value="true"/> + <property name="seam.debug.lib" value="true"/> + <property name="facelets.lib" value="true"/> + <property name="richfaces.lib" value="true"/> + <property name="jboss-common-core.lib" value="true" /> + + <import file="../build.xml"/> + + <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> + <include name="lib/commons-beanutils.jar"/> + <include name="lib/commons-collections.jar"/> + <include name="lib/commons-digester.jar"/> + <include name="lib/commons-lang.jar"/> + <include name="lib/commons-logging.jar"/> + <include name="lib/log4j.jar"/> + <include name="lib/jsf-api.jar" /> + <include name="lib/jsf-impl.jar" /> + <include name="lib/jstl.jar" /> + <include name="lib/dom4j.jar" /> + <include name="lib/hibernate-core.jar" /> + <include name="lib/hibernate-commons-annotations.jar" /> + <include name="lib/hibernate-annotations.jar" /> + <include name="lib/hibernate-entitymanager.jar" /> + <include name="lib/hibernate-validator.jar" /> + <include name="lib/slf4j-api.jar" /> + <include name="lib/slf4j-log4j12.jar" /> + <include name="lib/javassist.jar" /> + <include name="lib/persistence-api.jar" /> + <include name="lib/cglib.jar" /> + <include name="lib/jta.jar" /> + <include name="lib/antlr.jar" /> + <include name="lib/asm.jar" /> + </fileset> + + <fileset id="noejb.war.extras" dir="${resources.dir}"> + <include name="META-INF/context.xml" /> + <include name="WEB-INF/classes/log4j.xml" /> + </fileset> + +</project> + Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-weblogic10.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-weblogic10.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-weblogic10.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,54 @@ +<?xml version="1.0"?> + +<project name="JPA Booking" default="noejb.archive" basedir="."> + +  + <property name="Name" value="The JPA Example for WebLogic 10" /> + <property name="example.name" value="jboss-seam-jpa" /> + +  + <property name="resources.dir" value="resources-weblogic10" /> + <property name="dist.dir" value="dist-weblogic10" /> + <property name="exploded-archives.dir" + value="exploded-archives-weblogic10" /> + +  + <property name="seam.ui.lib" value="true" /> + <property name="seam.debug.lib" value="true" /> + <property name="facelets.lib" value="true" /> + <property name="richfaces.lib" value="true" /> + <property name="el-ri.lib" value="true"/> + <property name="jboss-common-core.lib" value="true" /> + + <import file="../build.xml" /> + + <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> +  + <include name="lib/dom4j.jar" /> + <include name="lib/javassist.jar" /> + +  + <include name="lib/commons-beanutils.jar" /> + <include name="lib/commons-digester.jar" /> + <include name="lib/commons-collections.jar" /> + <include name="lib/commons-logging.jar" /> + +  + <include name="lib/hibernate-core.jar" /> + <include name="lib/hibernate-commons-annotations.jar" /> + <include name="lib/hibernate-annotations.jar" /> + <include name="lib/hibernate-entitymanager.jar" /> + <include name="lib/hibernate-validator.jar" /> + <include name="lib/slf4j-api.jar" /> + <include name="lib/slf4j-log4j12.jar" /> + <include name="lib/cglib.jar" /> + <include name="lib/asm.jar"/> + <include name="lib/antlr.jar" /> + </fileset> + + <fileset id="noejb.war.extras" dir="${resources.dir}"> + <include name="WEB-INF/classes/**/*" /> + </fileset> + +</project> + Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-weblogic92.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-weblogic92.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-weblogic92.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,61 @@ +<?xml version="1.0"?> + +<project name="JPA Booking" default="noejb.archive" basedir="."> + +  + <property name="Name" value="The JPA Example for WebLogic 9.2" /> + <property name="example.name" value="jboss-seam-jpa" /> + +  + <property name="resources.dir" value="resources-weblogic92" /> + <property name="dist.dir" value="dist-weblogic92" /> + <property name="exploded-archives.dir" + value="exploded-archives-weblogic92" /> + +  + <property name="seam.ui.lib" value="true" /> + <property name="seam.debug.lib" value="true" /> + <property name="facelets.lib" value="true" /> + <property name="richfaces.lib" value="true" /> + <property name="el-ri.lib" value="true"/> + <property name="jboss-common-core.lib" value="true" /> + + <import file="../build.xml" /> + + <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> +  + <include name="lib/dom4j.jar" /> + <include name="lib/javassist.jar" /> + +  + <include name="lib/jta.jar" /> + <include name="lib/commons-beanutils.jar" /> + <include name="lib/commons-digester.jar" /> + <include name="lib/commons-collections.jar" /> + <include name="lib/commons-logging.jar" /> + +  + <include name="lib/jsf-api.jar" /> + <include name="lib/jsf-impl.jar" /> + <include name="lib/jstl.jar" /> + <include name="lib/el-api.jar" /> + +  + <include name="lib/hibernate-core.jar" /> + <include name="lib/hibernate-commons-annotations.jar" /> + <include name="lib/hibernate-annotations.jar" /> + <include name="lib/hibernate-entitymanager.jar" /> + <include name="lib/hibernate-validator.jar" /> + <include name="lib/slf4j-api.jar" /> + <include name="lib/slf4j-log4j12.jar" /> + <include name="lib/persistence-api.jar" /> + <include name="lib/cglib.jar" /> + <include name="lib/antlr.jar" /> + </fileset> + + <fileset id="noejb.war.extras" dir="${resources.dir}"> + <include name="WEB-INF/classes/**/*" /> + </fileset> + +</project> + Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-websphere61.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-websphere61.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-websphere61.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,56 @@ +<?xml version="1.0"?> + +<project name="JPA Booking" default="noejb.archive" basedir="."> + +  + <property name="Name" value="The JPA Example for WebSphere 6.1.0.13 + EJB3 FP"/> + <property name="example.name" value="jboss-seam-jpa"/> + +  + <property name="resources.dir" value="resources-websphere61" /> + <property name="dist.dir" value="dist-websphere61" /> + <property name="exploded-archives.dir" value="exploded-archives-websphere61" /> + +  + <property name="seam.ui.lib" value="true"/> + <property name="seam.debug.lib" value="true"/> + <property name="facelets.lib" value="true"/> + <property name="richfaces.lib" value="true"/> + <property name="el-ri.lib" value="true"/> + <property name="jboss-common-core.lib" value="true" /> + + <import file="../build.xml"/> + + <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> +  + <include name="lib/dom4j.jar" /> + <include name="lib/javassist.jar"/> + +  + <include name="lib/commons-beanutils.jar"/> + <include name="lib/commons-digester.jar"/> + <include name="lib/commons-collections.jar"/> +  + <include name="lib/jsf-api.jar"/> + <include name="lib/jsf-impl.jar"/> + <include name="lib/el-api.jar" /> + +  + <include name="lib/hibernate-core.jar"/> + <include name="lib/hibernate-commons-annotations.jar"/> + <include name="lib/hibernate-annotations.jar"/> + <include name="lib/hibernate-entitymanager.jar"/> + <include name="lib/hibernate-validator.jar"/> + <include name="lib/slf4j-api.jar" /> + <include name="lib/slf4j-log4j12.jar" /> + <include name="lib/cglib.jar"/> + <include name="lib/asm.jar"/> + <include name="lib/antlr.jar" /> + </fileset> + + <fileset id="noejb.war.extras" dir="${resources.dir}"> + <include name="WEB-INF/classes/**/*" /> + </fileset> + +</project> + Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-websphere7.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-websphere7.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/build-websphere7.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,51 @@ +<?xml version="1.0"?> + +<project name="JPA Booking" default="noejb.archive" basedir="."> + +  + <property name="Name" value="The JPA Example for WebSphere 7" /> + <property name="example.name" value="jboss-seam-jpa" /> + +  + <property name="resources.dir" value="resources-websphere7" /> + <property name="dist.dir" value="dist-websphere7" /> + <property name="exploded-archives.dir" value="exploded-archives-websphere7" /> + +  + <property name="seam.ui.lib" value="true" /> + <property name="seam.debug.lib" value="true" /> + <property name="facelets.lib" value="true" /> + <property name="richfaces.lib" value="true" /> + <property name="el-ri.lib" value="true" /> + + <import file="../build.xml" /> + + <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> +  + <include name="lib/dom4j.jar" /> + <include name="lib/javassist.jar" /> + +  + <include name="lib/commons-beanutils.jar" /> + <include name="lib/commons-digester.jar" /> + <include name="lib/commons-collections.jar" /> + <include name="lib/log4j.jar" /> + +  + <include name="lib/hibernate-core.jar" /> + <include name="lib/hibernate-commons-annotations.jar" /> + <include name="lib/hibernate-annotations.jar" /> + <include name="lib/hibernate-entitymanager.jar" /> + <include name="lib/hibernate-validator.jar" /> + <include name="lib/slf4j-api.jar" /> + <include name="lib/slf4j-log4j12.jar" /> + <include name="lib/antlr.jar" /> + + </fileset> + + <fileset id="noejb.war.extras" dir="${resources.dir}"> + <include name="WEB-INF/classes/**/*" /> + </fileset> + +</project> + Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/readme.txt =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/readme.txt (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/readme.txt 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,93 @@ +Seam JPA Example +================ + +This is the Hotel Booking example implemented in Seam POJO and Hibernate JPA. +It can be deployed in JBoss AS 4.x, WebLogic, GlassFish, Tomcat (both with and +without the EJB3 container). + +JBoss AS 4.2.0: + * Install JBoss AS 4.2.0 GA + * ant jboss + * Start JBoss AS + * Access the app at http://localhost:8080/jboss-seam-jpa/ + * ant jboss.undeploy + +JBoss AS 4.0.5 (with or without EJB3): + * Install JBoss AS 4.0.5 with the default J2EE profile + * ant jboss405 + * Deploy dist-jboss405/jboss-seam-jpa.war + * Start JBoss AS + * Access the app at http://localhost:8080/jboss-seam-jpa/ + +WebLogic 9.2: + * Install WebLogic 9.2 + * ant weblogic92 + * Start the WebLogic "examples" server + * Load the admin console http://localhost:7001/console/ + * Deploy dist-weblogic92/jboss-seam-jpa.war + * Access the app at http://localhost:7001/jboss-seam-jpa/ + +WebLogic 10.X: + * Install WebLogic 10.X + * Create an hsql datasource called 'seam-jpa-ds" (see reference guide) + * Deploy Weblogics jsf-1.2.war shared library for JSF 1.2 support. (see reference guide) + * ant weblogic10 + * Start the WebLogic domain you created or the "examples" domain if installed. + * Load the admin console http://localhost:7001/console/ + * Deploy dist-weblogic10/jboss-seam-jpa.war + * Access the app at http://localhost:7001/jboss-seam-jpa/ + * See Weblogic reference guide chapter for full details. + +WebSphere 6.1: + * Install and run WebSphere 6.1 + * The "Default Applications" must be installed because this app will the Derby database that is installe with teh default application + * Set a Websphere web container custom property "com.ibm.ws.webcontainer.invokefilterscompatibility" to true. See Seam reference guide chapter for details. + * Set a Websphere web container custom property "prependSlashToResource" to true. See Seam reference guide chapter for details. + * ant websphere61 + * Deploy dist-websphere61/jboss-seam-jpa.war and specify a context_root + * From the "Enterprise Applications" list select: "jboss-seam-jpa" --> "Manager Modules" --> "jboss-seam-jpa.war" --> "Classes loaded with application class loader first", and then Apply + * Start the application + * Access it at http://localhost:9080/context_root/index.html + +WebSphere 7.0: + * Install and run WebSphere 7.0 + * The "Default Applications" must be installed because this app will the Derby database that is installe with teh default application + * ant websphere7 + * Deploy dist-websphere7/jboss-seam-jpa.war and specify a context_root (choose the "fast path" and keep all the defaults) + * Start the application + * Access it at http://localhost:9080/<context_root> + +Tomcat with JBoss Embedded: + * Install Tomcat + * Install JBoss Embedded + * ant jboss-embedded + * Deploy dist-jboss-embedded/jboss-seam-jpa.war + * Start Tomcat + * Access the app at http://localhost:8080/jboss-seam-jpa/ + +Tomcat (5.5 or 6) without JBoss Embedded: + * Install Tomcat + * Copy lib/hsqldb.jar from this distribution into $TOMCAT_HOME/common/lib (Tomcat 5.5) or $TOMCAT_HOME/lib (Tomcat 6) + * ant tomcat55 or ant tomcat6 + * Deploy dist-jboss/jboss-seam-jpa.war + * Start Tomcat + * Access the app at http://localhost:8080/jboss-seam-jpa/ + +GlassFish: + * Install GlassFish V2 + * ant glassfish + * Start GlassFish and the Embedded Derby Database + * Load the admin console http://localhost:4848/ + * Deploy dist-glassfish/jboss-seam-jpa.war in the admin console (Applications > Web Applications) + or using the command $GLASSFISH_HOME/bin/asadmin deploy dist-glassfish/jboss-seam-jpa.war + * Access the app at http://localhost:8080/jboss-seam-jpa/ + +NOTES FOR GLASSFISH USERS: + In order for the app to work out of the box with GlassFish, we have + used the Derby (i.e., Java DB) database in GlassFish. The included + WEB-INF/classes/GlassfishDerbyDialect.class is a special hack to get + around a Derby bug in GlassFish V2. You must use it as your Hibernate + dialect if you use Derby with GlassFish. + + However, we strongly recommend you to use a non-Derby data source if + possible (for example, HSQL is a much better embedded DB). Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/META-INF/context.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/META-INF/context.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/META-INF/context.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,9 @@ +<Context path="/jboss-seam-jpa" docBase="jboss-seam-jpa" + debug="5" reloadable="true" crossContext="true"> + + <Resource name="jdbc/TestDB" auth="Container" type="javax.sql.DataSource" + maxActive="100" maxIdle="30" maxWait="10000" + username="sa" driverClassName="org.hsqldb.jdbcDriver" + url="jdbc:hsqldb:."/> + +</Context> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/META-INF/persistence.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/META-INF/persistence.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/META-INF/persistence.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<persistence xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" + version="1.0"> + <persistence-unit name="bookingDatabase" transaction-type="RESOURCE_LOCAL"> + <provider>org.hibernate.ejb.HibernatePersistence</provider> + <jta-data-source>java:comp/env/jdbc/TestDB</jta-data-source> + <properties> + <property name="hibernate.hbm2ddl.auto" value="create-drop"/> + <property name="hibernate.show_sql" value="true"/> + <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> +  +  + </properties> + </persistence-unit> +</persistence> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/classes/log4j.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/classes/log4j.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/classes/log4j.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + + + + + + + + + + + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> +  + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + +  + +  + +  + + <root> + <priority value="INFO"/> + <appender-ref ref="CONSOLE"/> + </root> + +</log4j:configuration> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/components.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:persistence="http://jboss.com/products/seam/persistence" + xmlns:transaction="http://jboss.com/products/seam/transaction" + xmlns:security="http://jboss.com/products/seam/security" + 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/persistence http://jboss.com/products/seam/persistence-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:manager conversation-timeout="120000" + concurrent-request-timeout="500" + conversation-id-parameter="cid"/> + + <transaction:entity-transaction entity-manager="#{em}"/> + + <persistence:entity-manager-factory name="bookingDatabase"/> + + <persistence:managed-persistence-context name="em" + auto-create="true" + entity-manager-factory="#{bookingDatabase}"/> + + <security:identity authenticate-method="#{authenticator.authenticate}"/> + +</components> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/faces-config.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/faces-config.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="1.2" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + +  + <application> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + </application> + +</faces-config> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/pages.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/pages.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> +<pages xmlns="http://jboss.com/products/seam/pages" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.3.xsd" + + no-conversation-view-id="/main.xhtml" + login-view-id="/home.xhtml"> + + <page view-id="/register.xhtml"> + + <action if="#{validation.failed}" execute="#{register.invalid}"/> + + <navigation> + <rule if="#{register.registered}"> + <redirect view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + <rule if-outcome="false"> + <render view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/password.xhtml" + login-required="true"> + + <navigation> + <rule if="#{changePassword.changed}"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/main.xhtml" + login-required="true"> + + <navigation from-action="#{hotelBooking.selectHotel(hot)}"> + <redirect view-id="/hotel.xhtml"/> + </navigation> + + </page> + + <page view-id="/hotel.xhtml" + conversation-required="true"> + + <description>View hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.bookHotel}"> + <redirect view-id="/book.xhtml"/> + </navigation> + + </page> + + <page view-id="/book.xhtml" + conversation-required="true"> + + <description>Book hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.setBookingDetails}"> + <rule if="#{hotelBooking.bookingValid}"> + <redirect view-id="/confirm.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/confirm.xhtml" + conversation-required="true"> + + <description>Confirm booking: #{booking.description}</description> + + <navigation from-action="#{hotelBooking.confirm}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <page view-id="*"> + + <navigation from-action="#{identity.logout}"> + <redirect view-id="/home.xhtml"/> + </navigation> + + <navigation from-action="#{hotelBooking.cancel}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <exception class="org.jboss.seam.security.NotLoggedInException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">You must be logged in to use this feature</message> + </redirect> + </exception> + + <exception class="javax.faces.application.ViewExpiredException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">Session expired, please log in again</message> + </redirect> + </exception> + +</pages> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/WEB-INF/web.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + +  + + <listener> + <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + </listener> + + <filter> + <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>Seam Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <servlet> + <servlet-name>Seam Resource Servlet</servlet-name> + <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Seam Resource Servlet</servlet-name> + <url-pattern>/seam/resource/*</url-pattern> + </servlet-mapping> + +  + + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.seam</url-pattern> + </servlet-mapping> + +  + + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + + <session-config> + <session-timeout>10</session-timeout> + </session-config> + +</web-app> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/import.sql =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/import.sql (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/import.sql 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,22 @@ +insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') +insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') +insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') +insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') +insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') +insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 130, 'Hotel Beaulac', ' Esplanade L�opold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') +insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') +insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') +insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') +insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 250, 'Meli� White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') +insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-tomcat/seam.properties =================================================================== Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/META-INF/persistence.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/META-INF/persistence.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/META-INF/persistence.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<persistence xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" + version="1.0"> + <persistence-unit name="bookingDatabase" transaction-type="RESOURCE_LOCAL"> + <provider>org.hibernate.ejb.HibernatePersistence</provider> + <jta-data-source>seam-jpa-ds</jta-data-source> + <properties> + <property name="hibernate.dialect" value="org.hibernate.dialect.HSQLDialect"/> + <property name="hibernate.hbm2ddl.auto" value="create-drop"/> + <property name="hibernate.show_sql" value="true"/> + <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> + <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.WeblogicTransactionManagerLookup"/> + </properties> + </persistence-unit> +</persistence> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/classes/log4j.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/classes/log4j.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/classes/log4j.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + + + + + + + + + + + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + +  + +  + +  + + <root> + <priority value="INFO"/> + <appender-ref ref="CONSOLE"/> + </root> + +</log4j:configuration> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/components.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:persistence="http://jboss.com/products/seam/persistence" + xmlns:transaction="http://jboss.com/products/seam/transaction" + xmlns:security="http://jboss.com/products/seam/security" + 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/persistence http://jboss.com/products/seam/persistence-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:manager conversation-timeout="120000" + concurrent-request-timeout="500" + conversation-id-parameter="cid"/> + + <transaction:entity-transaction entity-manager="#{em}"/> + + <persistence:entity-manager-factory name="bookingDatabase" /> + + <persistence:managed-persistence-context name="em" + auto-create="true" + entity-manager-factory="#{bookingDatabase}" /> + + <security:identity authenticate-method="#{authenticator.authenticate}"/> + +</components> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/faces-config.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/faces-config.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="1.2" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + +  + <application> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + </application> + +</faces-config> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/pages.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/pages.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> +<pages xmlns="http://jboss.com/products/seam/pages" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.3.xsd" + + no-conversation-view-id="/main.xhtml" + login-view-id="/home.xhtml"> + + <page view-id="/register.xhtml"> + + <action if="#{validation.failed}" execute="#{register.invalid}"/> + + <navigation> + <rule if="#{register.registered}"> + <redirect view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + <rule if-outcome="false"> + <render view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/password.xhtml" + login-required="true"> + + <navigation> + <rule if="#{changePassword.changed}"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/main.xhtml" + login-required="true"> + + <navigation from-action="#{hotelBooking.selectHotel(hot)}"> + <redirect view-id="/hotel.xhtml"/> + </navigation> + + </page> + + <page view-id="/hotel.xhtml" + conversation-required="true"> + + <description>View hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.bookHotel}"> + <redirect view-id="/book.xhtml"/> + </navigation> + + </page> + + <page view-id="/book.xhtml" + conversation-required="true"> + + <description>Book hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.setBookingDetails}"> + <rule if="#{hotelBooking.bookingValid}"> + <redirect view-id="/confirm.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/confirm.xhtml" + conversation-required="true"> + + <description>Confirm booking: #{booking.description}</description> + + <navigation from-action="#{hotelBooking.confirm}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <page view-id="*"> + + <navigation from-action="#{identity.logout}"> + <redirect view-id="/home.xhtml"/> + </navigation> + + <navigation from-action="#{hotelBooking.cancel}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <exception class="org.jboss.seam.security.NotLoggedInException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">You must be logged in to use this feature</message> + </redirect> + </exception> + + <exception class="javax.faces.application.ViewExpiredException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">Session expired, please log in again</message> + </redirect> + </exception> + +</pages> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/web.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,61 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + +  + + <listener> + <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + </listener> + + <listener> + <listener-class>com.sun.faces.config.ConfigureListener</listener-class> + </listener> + + <filter> + <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>Seam Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <servlet> + <servlet-name>Seam Resource Servlet</servlet-name> + <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Seam Resource Servlet</servlet-name> + <url-pattern>/seam/resource/*</url-pattern> + </servlet-mapping> + +  + + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.seam</url-pattern> + </servlet-mapping> + +  + + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> +</web-app> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/weblogic.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/weblogic.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/WEB-INF/weblogic.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<weblogic-web-app xmlns="http://www.bea.com/ns/weblogic/90" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.bea.com/ns/weblogic/90 http://www.bea.com/ns/weblogic/90/weblogic-web-app.xsd"> + <library-ref> + <library-name>jsf</library-name> + <specification-version>1.2</specification-version> + <implementation-version>1.2</implementation-version> + <exact-match>false</exact-match> + </library-ref> + <container-descriptor> + <prefer-web-inf-classes>true</prefer-web-inf-classes> + </container-descriptor> +</weblogic-web-app> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/import.sql =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/import.sql (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/import.sql 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,22 @@ +insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') +insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') +insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') +insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') +insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') +insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 130, 'Hotel Beaulac', ' Esplanade L�opold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') +insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') +insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') +insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') +insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 250, 'Meli� White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') +insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic10/seam.properties =================================================================== Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/META-INF/persistence.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/META-INF/persistence.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/META-INF/persistence.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<persistence> + <persistence-unit name="bookingDatabase" transaction-type="JTA"> + <provider>org.hibernate.ejb.HibernatePersistence</provider> + <jta-data-source>examples-dataSource-demoPool</jta-data-source> + <properties> + <property name="hibernate.dialect" + value="org.hibernate.dialect.PointbaseDialect"/> + <property name="hibernate.hbm2ddl.auto" value="create-drop"/> + <property name="hibernate.show_sql" value="true"/> + <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> + <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.WeblogicTransactionManagerLookup"/> +  + </properties> + </persistence-unit> +</persistence> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + + + + + + + + + + + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + +  + +  + +  + + <root> + <priority value="INFO"/> + <appender-ref ref="CONSOLE"/> + </root> + +</log4j:configuration> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/components.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:persistence="http://jboss.com/products/seam/persistence" + xmlns:transaction="http://jboss.com/products/seam/transaction" + xmlns:security="http://jboss.com/products/seam/security" + 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/persistence http://jboss.com/products/seam/persistence-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:manager conversation-timeout="120000" + concurrent-request-timeout="500" + conversation-id-parameter="cid"/> + + <persistence:entity-manager-factory name="bookingDatabase"/> + + <persistence:managed-persistence-context name="em" + auto-create="true" + entity-manager-factory="#{bookingDatabase}"/> + + <security:identity authenticate-method="#{authenticator.authenticate}"/> + +</components> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="1.2" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + +  + <application> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + </application> + +</faces-config> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/pages.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/pages.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> +<pages xmlns="http://jboss.com/products/seam/pages" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.3.xsd" + + no-conversation-view-id="/main.xhtml" + login-view-id="/home.xhtml"> + + <page view-id="/register.xhtml"> + + <action if="#{validation.failed}" execute="#{register.invalid}"/> + + <navigation> + <rule if="#{register.registered}"> + <redirect view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + <rule if-outcome="false"> + <render view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/password.xhtml" + login-required="true"> + + <navigation> + <rule if="#{changePassword.changed}"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/main.xhtml" + login-required="true"> + + <navigation from-action="#{hotelBooking.selectHotel(hot)}"> + <redirect view-id="/hotel.xhtml"/> + </navigation> + + </page> + + <page view-id="/hotel.xhtml" + conversation-required="true"> + + <description>View hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.bookHotel}"> + <redirect view-id="/book.xhtml"/> + </navigation> + + </page> + + <page view-id="/book.xhtml" + conversation-required="true"> + + <description>Book hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.setBookingDetails}"> + <rule if="#{hotelBooking.bookingValid}"> + <redirect view-id="/confirm.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/confirm.xhtml" + conversation-required="true"> + + <description>Confirm booking: #{booking.description}</description> + + <navigation from-action="#{hotelBooking.confirm}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <page view-id="*"> + + <navigation from-action="#{identity.logout}"> + <redirect view-id="/home.xhtml"/> + </navigation> + + <navigation from-action="#{hotelBooking.cancel}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <exception class="org.jboss.seam.security.NotLoggedInException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">You must be logged in to use this feature</message> + </redirect> + </exception> + + <exception class="javax.faces.application.ViewExpiredException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">Session expired, please log in again</message> + </redirect> + </exception> + +</pages> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/WEB-INF/web.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.4" + xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> + +  + + <listener> + <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + </listener> + + <filter> + <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>Seam Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <servlet> + <servlet-name>Seam Resource Servlet</servlet-name> + <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Seam Resource Servlet</servlet-name> + <url-pattern>/seam/resource/*</url-pattern> + </servlet-mapping> + +  + + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.seam</url-pattern> + </servlet-mapping> + +  + + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + + <listener> + <listener-class>com.sun.faces.config.ConfigureListener</listener-class> + </listener> + + <session-config> + <session-timeout>10</session-timeout> + </session-config> + +</web-app> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/import.sql =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/import.sql (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/import.sql 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,22 @@ +insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') +insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') +insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') +insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') +insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') +insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 130, 'Hotel Beaulac', ' Esplanade L�opold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') +insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') +insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') +insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') +insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 250, 'Meli� White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') +insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-weblogic92/seam.properties =================================================================== Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/META-INF/persistence.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/META-INF/persistence.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/META-INF/persistence.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<persistence xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" + version="1.0"> + <persistence-unit name="bookingDatabase" transaction-type="RESOURCE_LOCAL"> + <provider>org.hibernate.ejb.HibernatePersistence</provider> + <jta-data-source>DefaultDatasource</jta-data-source> + <properties> +  + <property name="hibernate.dialect" value="GlassfishDerbyDialect"/> + <property name="hibernate.hbm2ddl.auto" value="create-drop"/> + <property name="hibernate.show_sql" value="true"/> + <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/> + <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"/> + </properties> + </persistence-unit> +</persistence> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + + + + + + + + + + + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + +  + +  + +  + + <root> + <priority value="INFO"/> + <appender-ref ref="CONSOLE"/> + </root> + +</log4j:configuration> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/components.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:persistence="http://jboss.com/products/seam/persistence" + xmlns:transaction="http://jboss.com/products/seam/transaction" + xmlns:security="http://jboss.com/products/seam/security" + xmlns:web="http://jboss.com/products/seam/web" + 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/persistence http://jboss.com/products/seam/persistence-2.3.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.3.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.3.xsd + http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.3.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd"> + + <core:manager conversation-timeout="120000" + concurrent-request-timeout="500" + conversation-id-parameter="cid"/> + + <transaction:entity-transaction entity-manager="#{em}"/> + + <persistence:entity-manager-factory name="bookingDatabase"/> + + <persistence:managed-persistence-context name="em" auto-create="true" + entity-manager-factory="#{bookingDatabase}"/> + + <security:identity authenticate-method="#{authenticator.authenticate}"/> + +</components> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/faces-config.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/faces-config.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="1.2" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + +  + <application> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + </application> + +</faces-config> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/pages.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/pages.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> +<pages xmlns="http://jboss.com/products/seam/pages" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.3.xsd" + + no-conversation-view-id="/main.xhtml" + login-view-id="/home.xhtml"> + + <page view-id="/register.xhtml"> + + <action if="#{validation.failed}" execute="#{register.invalid}"/> + + <navigation> + <rule if="#{register.registered}"> + <redirect view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + <rule if-outcome="false"> + <render view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/password.xhtml" + login-required="true"> + + <navigation> + <rule if="#{changePassword.changed}"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/main.xhtml" + login-required="true"> + + <navigation from-action="#{hotelBooking.selectHotel(hot)}"> + <redirect view-id="/hotel.xhtml"/> + </navigation> + + </page> + + <page view-id="/hotel.xhtml" + conversation-required="true"> + + <description>View hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.bookHotel}"> + <redirect view-id="/book.xhtml"/> + </navigation> + + </page> + + <page view-id="/book.xhtml" + conversation-required="true"> + + <description>Book hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.setBookingDetails}"> + <rule if="#{hotelBooking.bookingValid}"> + <redirect view-id="/confirm.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/confirm.xhtml" + conversation-required="true"> + + <description>Confirm booking: #{booking.description}</description> + + <navigation from-action="#{hotelBooking.confirm}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <page view-id="*"> + + <navigation from-action="#{identity.logout}"> + <redirect view-id="/home.xhtml"/> + </navigation> + + <navigation from-action="#{hotelBooking.cancel}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <exception class="org.jboss.seam.security.NotLoggedInException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">You must be logged in to use this feature</message> + </redirect> + </exception> + + <exception class="javax.faces.application.ViewExpiredException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">Session expired, please log in again</message> + </redirect> + </exception> + +</pages> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/WEB-INF/web.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app id="WebApp_ID" version="2.4" +xmlns="http://java.sun.com/xml/ns/j2ee" +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee +http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> +  + + <listener> + <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + </listener> + + <filter> + <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>Seam Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <servlet> + <servlet-name>Seam Resource Servlet</servlet-name> + <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Seam Resource Servlet</servlet-name> + <url-pattern>/seam/resource/*</url-pattern> + </servlet-mapping> + + +  + + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + +  + + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.seam</url-pattern> + </servlet-mapping> + +  + + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + + <listener> + <listener-class>com.sun.faces.config.ConfigureListener</listener-class> + </listener> + + <session-config> + <session-timeout>10</session-timeout> + </session-config> + +</web-app> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/import.sql =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/import.sql (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/import.sql 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,22 @@ +insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') +insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') +insert into Hotel (price, name, address, city, state, zip, country) values (120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') +insert into Hotel (price, name, address, city, state, zip, country) values (210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') +insert into Hotel (price, name, address, city, state, zip, country) values (240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') +insert into Hotel (price, name, address, city, state, zip, country) values (130, 'Hotel Beaulac', ' Esplanade Leopold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') +insert into Hotel (price, name, address, city, state, zip, country) values (140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') +insert into Hotel (price, name, address, city, state, zip, country) values (230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') +insert into Hotel (price, name, address, city, state, zip, country) values (460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') +insert into Hotel (price, name, address, city, state, zip, country) values (250, 'Meli White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') +insert into Hotel (price, name, address, city, state, zip, country) values (210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere61/seam.properties =================================================================== Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/META-INF/persistence.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/META-INF/persistence.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/META-INF/persistence.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<persistence xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" + version="1.0"> + + <persistence-unit name="bookingDatabase" transaction-type="RESOURCE_LOCAL"> + + <provider>org.hibernate.ejb.HibernatePersistence</provider> + + <jta-data-source>DefaultDatasource</jta-data-source> + + <properties> + <property name="hibernate.hbm2ddl.auto" value="create-drop"/> + <property name="hibernate.show_sql" value="true"/> + <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.WebSphereExtendedJTATransactionLookup"/> + +  + <property name="hibernate.dialect" value="GlassfishDerbyDialect"/> + + </properties> + </persistence-unit> +</persistence> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/classes/log4j.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/classes/log4j.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/classes/log4j.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + + + + + + + + + + + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + +  + + + <category name="org.jboss.seam"> + <priority value="DEBUG"/> + </category> + + +  + + <root> + <priority value="INFO"/> + <appender-ref ref="CONSOLE"/> + </root> + +</log4j:configuration> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/components.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:persistence="http://jboss.com/products/seam/persistence" + xmlns:transaction="http://jboss.com/products/seam/transaction" + xmlns:security="http://jboss.com/products/seam/security" + xmlns:web="http://jboss.com/products/seam/web" + 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/persistence http://jboss.com/products/seam/persistence-2.3.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.3.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.3.xsd + http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.3.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd"> + + <core:manager conversation-timeout="120000" + concurrent-request-timeout="500" + conversation-id-parameter="cid"/> + + <transaction:entity-transaction entity-manager="#{em}"/> + + <persistence:entity-manager-factory name="bookingDatabase"/> + + <persistence:managed-persistence-context name="em" auto-create="true" + entity-manager-factory="#{bookingDatabase}"/> + + <security:identity authenticate-method="#{authenticator.authenticate}"/> + +</components> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/faces-config.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/faces-config.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="1.2" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + +  + <application> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + </application> + +</faces-config> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/pages.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/pages.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> +<pages xmlns="http://jboss.com/products/seam/pages" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.3.xsd" + + no-conversation-view-id="/main.xhtml" + login-view-id="/home.xhtml"> + + <page view-id="/register.xhtml"> + + <action if="#{validation.failed}" execute="#{register.invalid}"/> + + <navigation> + <rule if="#{register.registered}"> + <redirect view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + <rule if-outcome="false"> + <render view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/password.xhtml" + login-required="true"> + + <navigation> + <rule if="#{changePassword.changed}"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/main.xhtml" + login-required="true"> + + <navigation from-action="#{hotelBooking.selectHotel(hot)}"> + <redirect view-id="/hotel.xhtml"/> + </navigation> + + </page> + + <page view-id="/hotel.xhtml" + conversation-required="true"> + + <description>View hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.bookHotel}"> + <redirect view-id="/book.xhtml"/> + </navigation> + + </page> + + <page view-id="/book.xhtml" + conversation-required="true"> + + <description>Book hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.setBookingDetails}"> + <rule if="#{hotelBooking.bookingValid}"> + <redirect view-id="/confirm.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/confirm.xhtml" + conversation-required="true"> + + <description>Confirm booking: #{booking.description}</description> + + <navigation from-action="#{hotelBooking.confirm}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <page view-id="*"> + + <navigation from-action="#{identity.logout}"> + <redirect view-id="/home.xhtml"/> + </navigation> + + <navigation from-action="#{hotelBooking.cancel}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <exception class="org.jboss.seam.security.NotLoggedInException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">You must be logged in to use this feature</message> + </redirect> + </exception> + + <exception class="javax.faces.application.ViewExpiredException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">Session expired, please log in again</message> + </redirect> + </exception> + +</pages> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/WEB-INF/web.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,73 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + + <display-name>Seam POJO Booking Example</display-name> + +  + + <listener> + <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + </listener> + + <filter> + <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>Seam Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <servlet> + <servlet-name>Seam Resource Servlet</servlet-name> + <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Seam Resource Servlet</servlet-name> + <url-pattern>/seam/resource/*</url-pattern> + </servlet-mapping> + + +  + + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + +  + + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.seam</url-pattern> + </servlet-mapping> + +  + + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + + <session-config> + <session-timeout>10</session-timeout> + </session-config> + +  + + <welcome-file-list> + <welcome-file>index.html</welcome-file> + </welcome-file-list> + +</web-app> Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/import.sql =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/import.sql (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/import.sql 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,22 @@ +insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') +insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') +insert into Hotel (price, name, address, city, state, zip, country) values (120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') +insert into Hotel (price, name, address, city, state, zip, country) values (210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') +insert into Hotel (price, name, address, city, state, zip, country) values (240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') +insert into Hotel (price, name, address, city, state, zip, country) values (130, 'Hotel Beaulac', ' Esplanade Leopold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') +insert into Hotel (price, name, address, city, state, zip, country) values (140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') +insert into Hotel (price, name, address, city, state, zip, country) values (230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') +insert into Hotel (price, name, address, city, state, zip, country) values (460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') +insert into Hotel (price, name, address, city, state, zip, country) values (250, 'Meli White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') +insert into Hotel (price, name, address, city, state, zip, country) values (210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Added: branches/community/Seam_2_3/examples-ee6/jpa/other-configurations/resources-websphere7/seam.properties =================================================================== Added: branches/community/Seam_2_3/examples-ee6/jpa/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/pom.xml 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,33 @@ +<?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>jpa</artifactId> + <parent> + <groupId>org.jboss.seam</groupId> + <artifactId>examples-ee6</artifactId> + <version>2.3.0.Beta2-SNAPSHOT</version> + </parent> + <packaging>pom</packaging> + <name>JPA Example (EE6)</name> + + <properties> + <example.name>jpa</example.name> + </properties> + + <modules> + <module>jpa-web</module> + <module>jpa-tests</module> + </modules> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples</groupId> + <artifactId>jpa-web</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + </dependencies> + </dependencyManagement> +</project> Added: branches/community/Seam_2_3/examples-ee6/jpa/readme.txt =================================================================== --- branches/community/Seam_2_3/examples-ee6/jpa/readme.txt (rev 0) +++ branches/community/Seam_2_3/examples-ee6/jpa/readme.txt 2012-04-03 21:08:11 UTC (rev 14496) @@ -0,0 +1,30 @@ +Seam JPA Example +================ + +This is the Hotel Booking example implemented in Seam POJO and Hibernate JPA. +This application runs on JBoss AS 4.2, 5 and 6, Tomcat with JBoss Embedded +and Glassfish V2. + +To deploy the example to JBossAS 5 or 6, follow these steps: + +* In the example root directory run: + + mvn clean package + +* Set JBOSS_HOME environment property. + +* In the jpa-web directory run: + + mvn jboss:hard-deploy + +The following is a list of profiles which you should use to build the +application for various application servers. + +JBoss AS 4.2 -> -Pjbossas42 (i.e. mvn clean package -Pjbossas42) +Glassfish V2 -> -Pglassfish2 +Tomcat with JBoss Embedded -> -Ptomcat + +Furthermore, when you're targeting a different application server than +JBossAS 5 or 6, you have to deploy the application manually. + +* Open this URL in a web browser: http://localhost:8080/jboss-seam-jpa

12 years, 1 month

1
0
0 / 0

[forge/core] f45a44: FORGE-530: Grouped url-patterns into a single serv...

by GitHub

Branch: refs/heads/master Home: https://github.com/forge/core Commit: f45a44b78499424c8905f90c2fca30947fddd02a https://github.com/forge/core/commit/f45a44b78499424c8905f90c2fca30947fdd... Author: George Gastaldi <gegastaldi(a)gmail.com> Date: 2012-04-03 (Tue, 03 Apr 2012) Changed paths: M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/jsf/FacesFacetImpl.java Log Message: ----------- FORGE-530: Grouped url-patterns into a single servlet-mapping Commit: c077917e73b12aff98d3bbe5ff8afa24922e5eb1 https://github.com/forge/core/commit/c077917e73b12aff98d3bbe5ff8afa24922e... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-03 (Tue, 03 Apr 2012) Changed paths: M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/jsf/FacesFacetImpl.java Log Message: ----------- Merge pull request #133 from gastaldi/FORGE-530 FORGE-530: Grouped url-patterns into a single servlet-mapping Compare: https://github.com/forge/core/compare/475b67e...c077917

12 years, 1 month

1
0
0 / 0

[forge/core] 475b67: FORGE-522

by GitHub

Branch: refs/heads/master Home: https://github.com/forge/core Commit: 475b67edaf44ea220d70783051e4c06f6c6ea0c9 https://github.com/forge/core/commit/475b67edaf44ea220d70783051e4c06f6c6e... Author: Lincoln Baxter, III <lincolnbaxter(a)gmail.com> Date: 2012-04-03 (Tue, 03 Apr 2012) Changed paths: M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/jsf/FacesAPIFacetImpl.java M javaee-impl/src/main/java/org/jboss/forge/spec/javaee/jsf/FacesFacetImpl.java R javaee-impl/src/main/java/org/jboss/forge/spec/javaee/jsf/ServletMappingHelper.java R javaee-impl/src/test/java/org/jboss/forge/spec/javaee/jsf/ServletMappingHelperTest.java A javaee-impl/src/test/java/org/jboss/forge/spec/jsf/FacesPluginTest.java A javaee-impl/src/test/java/org/jboss/forge/spec/jsf/ServletMappingHelperTest.java Log Message: ----------- FORGE-522

12 years, 1 month

1
0
0 / 0

Seam SVN: r14495 - in branches/community/Seam_2_3/examples-ee6: guice and 30 other directories.

by seam-commits＠lists.jboss.org

Author: dhinojosa Date: 2012-04-03 12:37:44 -0400 (Tue, 03 Apr 2012) New Revision: 14495 Added: branches/community/Seam_2_3/examples-ee6/guice/ branches/community/Seam_2_3/examples-ee6/guice/guice-ear/ branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/AppleJuice.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Juice.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBar.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBarModule.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Orange.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/OrangeJuice.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/resources/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/resources/seam.properties branches/community/Seam_2_3/examples-ee6/guice/guice-tests/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/JuiceTestBar.java branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/GuiceTest.java branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-ftest/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-ftest/testng.xml branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources/seam.properties branches/community/Seam_2_3/examples-ee6/guice/guice-web/ branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/bar.xhtml branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/index.html branches/community/Seam_2_3/examples-ee6/guice/pom.xml branches/community/Seam_2_3/examples-ee6/guice/readme.txt Removed: branches/community/Seam_2_3/examples-ee6/guice/guice-ear/ branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/AppleJuice.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Juice.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBar.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBarModule.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Orange.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/OrangeJuice.java branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/resources/ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/resources/seam.properties branches/community/Seam_2_3/examples-ee6/guice/guice-tests/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/JuiceTestBar.java branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/GuiceTest.java branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-ftest/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-ftest/testng.xml branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources/ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources/seam.properties branches/community/Seam_2_3/examples-ee6/guice/guice-web/ branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/bar.xhtml branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/index.html branches/community/Seam_2_3/examples-ee6/guice/pom.xml branches/community/Seam_2_3/examples-ee6/guice/readme.txt Log: guice migrated in, still not functional, does compile, test, not integration-test Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ear/pom.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,161 +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>guice</artifactId> - <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-ear</artifactId> - <packaging>ear</packaging> - <name>Guice 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>guice-web</artifactId> - <type>war</type> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-ejb</artifactId> - <type>ejb</type> - </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>org.jboss.seam</groupId> - <artifactId>jboss-seam-ioc</artifactId> - <scope>compile</scope> - </dependency> - </dependencies> - - <build> - <finalName>seam-guice</finalName> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-ear-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <version>5</version> - <defaultLibBundleDir>lib</defaultLibBundleDir> -  - <earSourceExcludes>**/application.xml, **/jboss-app.xml</earSourceExcludes> -  - <generateApplicationXml>true</generateApplicationXml> - <jboss> - <version>5</version> - <loader-repository>seam.jboss.org:loader=seam-guice.ear</loader-repository> - </jboss> - <modules> - <webModule> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-web</artifactId> - <contextRoot>/seam-guice</contextRoot> - <bundleFileName>guice-web.war</bundleFileName> - </webModule> - <ejbModule> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-ejb</artifactId> - <bundleFileName>guice-ejb.jar</bundleFileName> - </ejbModule> - </modules> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <configuration> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - <fileNames> - <param>${project.build.directory}/${project.build.finalName}.${project.packaging}</param> - </fileNames> - </configuration> - </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>guice-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>guice-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>guice-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> - <version>1.5.0</version> - <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> -</project> Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ear/pom.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ear/pom.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,161 @@ +<?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>guice</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-ear</artifactId> + <packaging>ear</packaging> + <name>Guice 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>guice-web</artifactId> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-ejb</artifactId> + <type>ejb</type> + </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>org.jboss.seam</groupId> + <artifactId>jboss-seam-ioc</artifactId> + <scope>compile</scope> + </dependency> + </dependencies> + + <build> + <finalName>seam-guice</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <version>2.3.2</version> + <configuration> + <version>5</version> + <defaultLibBundleDir>lib</defaultLibBundleDir> +  + <earSourceExcludes>**/application.xml, **/jboss-app.xml</earSourceExcludes> +  + <generateApplicationXml>true</generateApplicationXml> + <jboss> + <version>5</version> + <loader-repository>seam.jboss.org:loader=seam-guice.ear</loader-repository> + </jboss> + <modules> + <webModule> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-web</artifactId> + <contextRoot>/seam-guice</contextRoot> + <bundleFileName>guice-web.war</bundleFileName> + </webModule> + <ejbModule> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-ejb</artifactId> + <bundleFileName>guice-ejb.jar</bundleFileName> + </ejbModule> + </modules> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jboss-maven-plugin</artifactId> + <configuration> + <jbossHome>${jboss.home}</jbossHome> + <serverName>${jboss.domain}</serverName> + <fileNames> + <param>${project.build.directory}/${project.build.finalName}.${project.packaging}</param> + </fileNames> + </configuration> + </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>guice-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>guice-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>guice-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> + <version>1.5.0</version> + <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> +</project> Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/pom.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,49 +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>guice</artifactId> - <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-ejb</artifactId> - <packaging>ejb</packaging> - <name>Guice EJB Module (EE6)</name> - - <dependencies> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ioc</artifactId> - </dependency> - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - </dependency> - <dependency> - <groupId>javax.ejb</groupId> - <artifactId>ejb-api</artifactId> - </dependency> -  -  -  -  -  -  - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice</artifactId> - </dependency> - </dependencies> -</project> Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/pom.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/pom.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,49 @@ +<?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>guice</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-ejb</artifactId> + <packaging>ejb</packaging> + <name>Guice EJB Module (EE6)</name> + + <dependencies> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ioc</artifactId> + </dependency> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + </dependency> + <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + </dependency> +  +  +  +  +  +  + <dependency> + <groupId>com.google.code.guice</groupId> + <artifactId>guice</artifactId> + </dependency> + </dependencies> +</project> Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/AppleJuice.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/AppleJuice.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/AppleJuice.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,28 +0,0 @@ -package org.jboss.seam.example.guice; - -/** - * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) - */ -public class AppleJuice implements Juice -{ - private static final String name = "Apple Juice"; - private static final int price = 10; - - public AppleJuice() {} - - public String getName() - { - return name; - } - - public int getPrice() - { - return price; - } - - @Override - public String toString() - { - return name; - } -} \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/AppleJuice.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/AppleJuice.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/AppleJuice.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/AppleJuice.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,28 @@ +package org.jboss.seam.example.guice; + +/** + * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) + */ +public class AppleJuice implements Juice +{ + private static final String name = "Apple Juice"; + private static final int price = 10; + + public AppleJuice() {} + + public String getName() + { + return name; + } + + public int getPrice() + { + return price; + } + + @Override + public String toString() + { + return name; + } +} \ No newline at end of file Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Juice.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Juice.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Juice.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,11 +0,0 @@ -package org.jboss.seam.example.guice; - -/** - * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) - */ -public interface Juice -{ - public String getName(); - - public int getPrice(); -} Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Juice.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Juice.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Juice.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Juice.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,11 @@ +package org.jboss.seam.example.guice; + +/** + * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) + */ +public interface Juice +{ + public String getName(); + + public int getPrice(); +} Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBar.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBar.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBar.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,26 +0,0 @@ -package org.jboss.seam.example.guice; - -import org.jboss.seam.annotations.Name; -import org.jboss.seam.ioc.guice.Guice; -import com.google.inject.Inject; - -/** - * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) - */ -@Name("juiceBar") -@Guice // Activates @Inject on a Seam component -public class JuiceBar -{ - @Inject protected Juice juiceOfTheDay; // Guice looks at the variable type, not name - @Inject @Orange protected Juice anotherJuice; - - public Juice getJuiceOfTheDay() - { - return juiceOfTheDay; - } - - public Juice getAnotherJuice() - { - return anotherJuice; - } -} Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBar.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBar.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBar.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBar.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,26 @@ +package org.jboss.seam.example.guice; + +import org.jboss.seam.annotations.Name; +import org.jboss.seam.ioc.guice.Guice; +import com.google.inject.Inject; + +/** + * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) + */ +@Name("juiceBar") +@Guice // Activates @Inject on a Seam component +public class JuiceBar +{ + @Inject protected Juice juiceOfTheDay; // Guice looks at the variable type, not name + @Inject @Orange protected Juice anotherJuice; + + public Juice getJuiceOfTheDay() + { + return juiceOfTheDay; + } + + public Juice getAnotherJuice() + { + return anotherJuice; + } +} Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBarModule.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBarModule.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBarModule.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,18 +0,0 @@ -package org.jboss.seam.example.guice; - -import com.google.inject.Module; -import com.google.inject.Binder; -import com.google.inject.Scopes; - -/** - * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) - */ -public class JuiceBarModule implements Module -{ - public void configure(Binder binder) - { - binder.bind(Juice.class).to(AppleJuice.class); // Create a new instance every time. - - binder.bind(Juice.class).annotatedWith(Orange.class).to(OrangeJuice.class).in(Scopes.SINGLETON); - } -} Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBarModule.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBarModule.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBarModule.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/JuiceBarModule.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,18 @@ +package org.jboss.seam.example.guice; + +import com.google.inject.Module; +import com.google.inject.Binder; +import com.google.inject.Scopes; + +/** + * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) + */ +public class JuiceBarModule implements Module +{ + public void configure(Binder binder) + { + binder.bind(Juice.class).to(AppleJuice.class); // Create a new instance every time. + + binder.bind(Juice.class).annotatedWith(Orange.class).to(OrangeJuice.class).in(Scopes.SINGLETON); + } +} Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Orange.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Orange.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Orange.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,20 +0,0 @@ -package org.jboss.seam.example.guice; - -import com.google.inject.BindingAnnotation; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.ElementType; - -/** - * Indicates we want the orange version of a binding. - * - * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) - */ -(a)Retention(RetentionPolicy.RUNTIME) -(a)Target({ElementType.FIELD, ElementType.PARAMETER}) -@BindingAnnotation -public @interface Orange -{ -} Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Orange.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Orange.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Orange.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/Orange.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,20 @@ +package org.jboss.seam.example.guice; + +import com.google.inject.BindingAnnotation; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.ElementType; + +/** + * Indicates we want the orange version of a binding. + * + * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) + */ +(a)Retention(RetentionPolicy.RUNTIME) +(a)Target({ElementType.FIELD, ElementType.PARAMETER}) +@BindingAnnotation +public @interface Orange +{ +} Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/OrangeJuice.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/OrangeJuice.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/OrangeJuice.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,28 +0,0 @@ -package org.jboss.seam.example.guice; - -/** - * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) - */ -public class OrangeJuice implements Juice -{ - private static final String name = "Orange Juice"; - private static final int price = 12; - - public OrangeJuice() {} - - public String getName() - { - return name; - } - - public int getPrice() - { - return price; - } - - @Override - public String toString() - { - return name + " (" + price + " cents)"; - } -} Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/OrangeJuice.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/OrangeJuice.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/OrangeJuice.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/java/org/jboss/seam/example/guice/OrangeJuice.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,28 @@ +package org.jboss.seam.example.guice; + +/** + * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) + */ +public class OrangeJuice implements Juice +{ + private static final String name = "Orange Juice"; + private static final int price = 12; + + public OrangeJuice() {} + + public String getName() + { + return name; + } + + public int getPrice() + { + return price; + } + + @Override + public String toString() + { + return name + " (" + price + " cents)"; + } +} Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/resources/seam.properties =================================================================== Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-ejb/src/main/resources/seam.properties (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-ejb/src/main/resources/seam.properties) =================================================================== Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/pom.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,190 +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>guice</artifactId> - <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-tests</artifactId> - <name>Guice Integration Tests Module (EE6)</name> - - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-ejb</artifactId> - <type>ejb</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> - </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>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> - - </dependencies> - - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - </testResource> - <testResource> - <directory>src/test/resources-integration</directory> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>integration-tests</id> - <activation> - <property> - <name>arquillian</name> - </property> - </activation> - </profile> - - <profile> - <id>arq-jbossas-7-managed</id> - <activation> - <property> - <name>arquillian</name> - <value>jbossas-managed-7</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>arq-jbossas-7-remote</id> - <activation> - <property> - <name>arquillian</name> - <value>jbossas-remote-7</value> - </property> - </activation> - </profile> - - <profile> - <id>ftest-jbossas</id> - <properties> - <example.context.path>seam-guice</example.context.path> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <configuration> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - <fileNames> - <param>${basedir}/../guice-ear/target/seam-guice.ear</param> - </fileNames> - </configuration> - </plugin> - <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-guice</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/guice/guice-tests/pom.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/pom.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/pom.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,190 @@ +<?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>guice</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-tests</artifactId> + <name>Guice Integration Tests Module (EE6)</name> + + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-ejb</artifactId> + <type>ejb</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </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>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> + + </dependencies> + + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + <testResource> + <directory>src/test/resources-integration</directory> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>integration-tests</id> + <activation> + <property> + <name>arquillian</name> + </property> + </activation> + </profile> + + <profile> + <id>arq-jbossas-7-managed</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-managed-7</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>arq-jbossas-7-remote</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-remote-7</value> + </property> + </activation> + </profile> + + <profile> + <id>ftest-jbossas</id> + <properties> + <example.context.path>seam-guice</example.context.path> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jboss-maven-plugin</artifactId> + <configuration> + <jbossHome>${jboss.home}</jbossHome> + <serverName>${jboss.domain}</serverName> + <fileNames> + <param>${basedir}/../guice-ear/target/seam-guice.ear</param> + </fileNames> + </configuration> + </plugin> + <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-guice</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/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,83 +0,0 @@ -package org.jboss.seam.example.guice.test; - -import org.jboss.seam.example.guice.JuiceBar; -import org.jboss.seam.example.guice.Juice; -import org.jboss.seam.example.guice.AppleJuice; -import org.jboss.seam.example.guice.Orange; -import org.jboss.seam.example.guice.OrangeJuice; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; - -import com.google.inject.Injector; -import com.google.inject.Key; - -/** - * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) - */ -public class GuiceTest extends SeamTest -{ - @Test - public void testGuiceInjector() throws Exception - { - new ComponentTest() - { - @Override - protected void testComponents() throws Exception - { - Injector injector = (Injector) getInstance("guiceExampleInjector"); - - Object juiceInstance = injector.getInstance(Juice.class); - assert juiceInstance instanceof AppleJuice : juiceInstance; - - Object orangeInstance = injector.getInstance(Key.get(Juice.class, Orange.class)); - assert orangeInstance instanceof OrangeJuice : orangeInstance; - } - }.run(); - } - - @Test - public void testGuiceIntegration() throws Exception - { - new ComponentTest() - { - @Override - protected void testComponents() throws Exception - { - JuiceBar juiceBar = (JuiceBar) getInstance("juiceBar"); - - Juice juiceOfTheDay = juiceBar.getJuiceOfTheDay(); - assert "Apple Juice".equals(juiceOfTheDay.getName()) : juiceOfTheDay.getName(); - Juice anotherJuice = juiceBar.getAnotherJuice(); - assert "Orange Juice".equals(anotherJuice.getName()) : anotherJuice.getName(); - - Juice juiceOfTheDay2 = juiceBar.getJuiceOfTheDay(); - assert juiceOfTheDay != juiceOfTheDay2 : "A new instance should be created by Guice."; - Juice anotherJuice2 = juiceBar.getAnotherJuice(); - assert anotherJuice == anotherJuice2 : "Different instances returned for the singleton object."; - } - }.run(); - } - - @Test - public void testGuiceDisinjection() throws Exception - { - new ComponentTest() - { - @Override - protected void testComponents() throws Exception - { - JuiceTestBar juiceBar = (JuiceTestBar) getInstance("juiceTestBar"); - juiceBar.getJuiceOfTheDay(); // Call a method to trigger Guice injection - - assert juiceBar.getJuiceOfTheDay() != null; - assert juiceBar.getAnotherJuice() != null; - - // Reflection to obtain the field value would not work here due to the proxy - assert juiceBar.getJuiceOfTheDayBypassInterceptors() == null - : "Value injected by Guice was not cleared after the call"; - assert juiceBar.getAnotherJuiceBypassInterceptors() == null - : "Value injected by Guice was not cleared after the call"; - } - }.run(); - } -} Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/GuiceTest.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,83 @@ +package org.jboss.seam.example.guice.test; + +import org.jboss.seam.example.guice.JuiceBar; +import org.jboss.seam.example.guice.Juice; +import org.jboss.seam.example.guice.AppleJuice; +import org.jboss.seam.example.guice.Orange; +import org.jboss.seam.example.guice.OrangeJuice; +import org.jboss.seam.mock.SeamTest; +import org.testng.annotations.Test; + +import com.google.inject.Injector; +import com.google.inject.Key; + +/** + * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org) + */ +public class GuiceTest extends SeamTest +{ + @Test + public void testGuiceInjector() throws Exception + { + new ComponentTest() + { + @Override + protected void testComponents() throws Exception + { + Injector injector = (Injector) getInstance("guiceExampleInjector"); + + Object juiceInstance = injector.getInstance(Juice.class); + assert juiceInstance instanceof AppleJuice : juiceInstance; + + Object orangeInstance = injector.getInstance(Key.get(Juice.class, Orange.class)); + assert orangeInstance instanceof OrangeJuice : orangeInstance; + } + }.run(); + } + + @Test + public void testGuiceIntegration() throws Exception + { + new ComponentTest() + { + @Override + protected void testComponents() throws Exception + { + JuiceBar juiceBar = (JuiceBar) getInstance("juiceBar"); + + Juice juiceOfTheDay = juiceBar.getJuiceOfTheDay(); + assert "Apple Juice".equals(juiceOfTheDay.getName()) : juiceOfTheDay.getName(); + Juice anotherJuice = juiceBar.getAnotherJuice(); + assert "Orange Juice".equals(anotherJuice.getName()) : anotherJuice.getName(); + + Juice juiceOfTheDay2 = juiceBar.getJuiceOfTheDay(); + assert juiceOfTheDay != juiceOfTheDay2 : "A new instance should be created by Guice."; + Juice anotherJuice2 = juiceBar.getAnotherJuice(); + assert anotherJuice == anotherJuice2 : "Different instances returned for the singleton object."; + } + }.run(); + } + + @Test + public void testGuiceDisinjection() throws Exception + { + new ComponentTest() + { + @Override + protected void testComponents() throws Exception + { + JuiceTestBar juiceBar = (JuiceTestBar) getInstance("juiceTestBar"); + juiceBar.getJuiceOfTheDay(); // Call a method to trigger Guice injection + + assert juiceBar.getJuiceOfTheDay() != null; + assert juiceBar.getAnotherJuice() != null; + + // Reflection to obtain the field value would not work here due to the proxy + assert juiceBar.getJuiceOfTheDayBypassInterceptors() == null + : "Value injected by Guice was not cleared after the call"; + assert juiceBar.getAnotherJuiceBypassInterceptors() == null + : "Value injected by Guice was not cleared after the call"; + } + }.run(); + } +} Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/JuiceTestBar.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/JuiceTestBar.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/JuiceTestBar.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,29 +0,0 @@ -package org.jboss.seam.example.guice.test; - -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.intercept.BypassInterceptors; -import org.jboss.seam.example.guice.JuiceBar; -import org.jboss.seam.example.guice.Juice; -import org.jboss.seam.ioc.guice.Guice; - -/** - * A component used by the disinjection test to obtain the values of the fields after the proxied call. - * - * @author Pawel Wrzeszcz (pawel . wrzeszcz [at] gmail . com) - */ -@Name("juiceTestBar") -@Guice -public class JuiceTestBar extends JuiceBar -{ - @BypassInterceptors - public Juice getJuiceOfTheDayBypassInterceptors() - { - return juiceOfTheDay; - } - - @BypassInterceptors - public Juice getAnotherJuiceBypassInterceptors() - { - return anotherJuice; - } -} Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/JuiceTestBar.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/JuiceTestBar.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/JuiceTestBar.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/JuiceTestBar.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,29 @@ +package org.jboss.seam.example.guice.test; + +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.intercept.BypassInterceptors; +import org.jboss.seam.example.guice.JuiceBar; +import org.jboss.seam.example.guice.Juice; +import org.jboss.seam.ioc.guice.Guice; + +/** + * A component used by the disinjection test to obtain the values of the fields after the proxied call. + * + * @author Pawel Wrzeszcz (pawel . wrzeszcz [at] gmail . com) + */ +@Name("juiceTestBar") +@Guice +public class JuiceTestBar extends JuiceBar +{ + @BypassInterceptors + public Juice getJuiceOfTheDayBypassInterceptors() + { + return juiceOfTheDay; + } + + @BypassInterceptors + public Juice getAnotherJuiceBypassInterceptors() + { + return anotherJuice; + } +} Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/GuiceTest.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/GuiceTest.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/GuiceTest.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,58 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ - -package org.jboss.seam.example.guice.test.selenium; - -import org.jboss.seam.example.common.test.selenium.SeamSeleniumTest; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; -import static org.testng.AssertJUnit.assertTrue; - - /* - * @author Martin Gencur - * - */ -public class GuiceTest extends SeamSeleniumTest -{ - protected static final String BAR_URL = "/bar.seam"; - protected static final String JUICE_OF_THE_DAY = "Apple Juice* - 10 cents"; - protected static final String ANOTHER_JUICE = "Orange Juice - 12 cents"; - protected static final String GUICE_TITLE = "Juice Bar"; - - @Override - @BeforeMethod - public void setUp() - { - super.setUp(); - browser.open(CONTEXT_PATH + BAR_URL); - } - - @Test - public void simplePageContentTest() - { - assertTrue("Home page of Guice Example expected", browser.getLocation().contains(BAR_URL)); - assertTrue("Different page title expected",browser.getTitle().contains(GUICE_TITLE)); - assertTrue("Juice of the day should contain its name and price", browser.isTextPresent(JUICE_OF_THE_DAY)); - assertTrue("Another juice should contain its name and price", browser.isTextPresent(ANOTHER_JUICE)); - } - -} Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/GuiceTest.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/GuiceTest.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/GuiceTest.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/java/org/jboss/seam/example/guice/test/selenium/GuiceTest.java 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,58 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.seam.example.guice.test.selenium; + +import org.jboss.seam.example.common.test.selenium.SeamSeleniumTest; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; +import static org.testng.AssertJUnit.assertTrue; + + /* + * @author Martin Gencur + * + */ +public class GuiceTest extends SeamSeleniumTest +{ + protected static final String BAR_URL = "/bar.seam"; + protected static final String JUICE_OF_THE_DAY = "Apple Juice* - 10 cents"; + protected static final String ANOTHER_JUICE = "Orange Juice - 12 cents"; + protected static final String GUICE_TITLE = "Juice Bar"; + + @Override + @BeforeMethod + public void setUp() + { + super.setUp(); + browser.open(CONTEXT_PATH + BAR_URL); + } + + @Test + public void simplePageContentTest() + { + assertTrue("Home page of Guice Example expected", browser.getLocation().contains(BAR_URL)); + assertTrue("Different page title expected",browser.getTitle().contains(GUICE_TITLE)); + assertTrue("Juice of the day should contain its name and price", browser.isTextPresent(JUICE_OF_THE_DAY)); + assertTrue("Another juice should contain its name and price", browser.isTextPresent(ANOTHER_JUICE)); + } + +} Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources/seam.properties =================================================================== Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources/seam.properties (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/src/test/resources/seam.properties) =================================================================== Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-ftest/testng.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/src/test/resources-ftest/testng.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-ftest/testng.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,27 +0,0 @@ - -  -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="Guice example" verbose="2" parallel="false"> - <test name="guice_jboss5"> - <parameter name="PROPERTY_FILE" value="" /> - <classes> - <class - name="org.jboss.seam.example.guice.test.selenium.GuiceTest" /> - </classes> - </test> -</suite> Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-ftest/testng.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/src/test/resources-ftest/testng.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-ftest/testng.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-ftest/testng.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,27 @@ + +  +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Guice example" verbose="2" parallel="false"> + <test name="guice_jboss5"> + <parameter name="PROPERTY_FILE" value="" /> + <classes> + <class + name="org.jboss.seam.example.guice.test.selenium.GuiceTest" /> + </classes> + </test> +</suite> Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,11 +0,0 @@ -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > - -<suite name="Guice" verbose="2" parallel="false"> - - <test name="Guice"> - <classes> - <class name="org.jboss.seam.example.guice.test.GuiceTest"/> - </classes> - </test> - -</suite> \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-tests/src/test/resources-integration/testng.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,11 @@ +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > + +<suite name="Guice" verbose="2" parallel="false"> + + <test name="Guice"> + <classes> + <class name="org.jboss.seam.example.guice.test.GuiceTest"/> + </classes> + </test> + +</suite> \ No newline at end of file Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/pom.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,131 +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>guice</artifactId> - <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-web</artifactId> - <packaging>war</packaging> - <name>Guice Web Module (EE6)</name> - - <properties> -  - <jndiPattern>java:app/guice-ejb/#{ejbName}</jndiPattern> - </properties> - - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-ejb</artifactId> - <type>ejb</type> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-debug</artifactId> - </dependency> -  -  -  -  - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui</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> - - <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> -  - <jndiPattern>#{ejbName}/local</jndiPattern> - </properties> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>guice-ejb</artifactId> - <type>ejb</type> - <scope>compile</scope> - </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> - <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> - </dependencies> - <build> - <finalName>jboss-seam-guice</finalName> - </build> - </profile> - </profiles> -</project> Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/pom.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/pom.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,131 @@ +<?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>guice</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-web</artifactId> + <packaging>war</packaging> + <name>Guice Web Module (EE6)</name> + + <properties> +  + <jndiPattern>java:app/guice-ejb/#{ejbName}</jndiPattern> + </properties> + + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-ejb</artifactId> + <type>ejb</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-debug</artifactId> + </dependency> +  +  +  +  + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui</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> + + <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> +  + <jndiPattern>#{ejbName}/local</jndiPattern> + </properties> + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples</groupId> + <artifactId>guice-ejb</artifactId> + <type>ejb</type> + <scope>compile</scope> + </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> + <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> + </dependencies> + <build> + <finalName>jboss-seam-guice</finalName> + </build> + </profile> + </profiles> +</project> Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/components.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/components.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<components xmlns="http://jboss.com/products/seam/components" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:core="http://jboss.com/products/seam/core" - xmlns:guice="http://jboss.com/products/seam/guice" - xsi:schemaLocation=" - http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.3.xsd - http://jboss.com/products/seam/guice http://jboss.com/products/seam/guice-2.3.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd"> - - <core:init debug="true"/> - - <guice:injector name="guiceExampleInjector"> - <guice:modules> - <value>org.jboss.seam.example.guice.JuiceBarModule</value> - </guice:modules> - </guice:injector> - - <guice:init injector="#{guiceExampleInjector}"/> - -</components> Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/components.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/components.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/components.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:guice="http://jboss.com/products/seam/guice" + xsi:schemaLocation=" + http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.3.xsd + http://jboss.com/products/seam/guice http://jboss.com/products/seam/guice-2.3.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd"> + + <core:init debug="true"/> + + <guice:injector name="guiceExampleInjector"> + <guice:modules> + <value>org.jboss.seam.example.guice.JuiceBarModule</value> + </guice:modules> + </guice:injector> + + <guice:init injector="#{guiceExampleInjector}"/> + +</components> Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,11 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<faces-config version="1.2" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> - - <application> - <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> - </application> - -</faces-config> Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,11 @@ +<?xml version='1.0' encoding='UTF-8'?> +<faces-config version="1.2" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + + <application> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + </application> + +</faces-config> Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.5" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - - <display-name>Seam Guice Example</display-name> - - <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> - </listener> - - <filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</param-value> - </context-param> - - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.seam</url-pattern> - </servlet-mapping> - - <session-config> - <session-timeout>10</session-timeout> - </session-config> - -</web-app> Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/WEB-INF/web.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + + <display-name>Seam Guice Example</display-name> + + <listener> + <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + </listener> + + <filter> + <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>Seam Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.seam</url-pattern> + </servlet-mapping> + + <session-config> + <session-timeout>10</session-timeout> + </session-config> + +</web-app> Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/bar.xhtml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/src/main/webapp/bar.xhtml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/bar.xhtml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,23 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core"> - <head> - <title>Juice Bar</title> - </head> - <body> - <h1>Juice Bar</h1> - <h:form id="main"> - <div> - Which juice do you prefer? - <ul> - <li>#{juiceBar.juiceOfTheDay.name}* - #{juiceBar.juiceOfTheDay.price} cents</li> - <li>#{juiceBar.anotherJuice.name} - #{juiceBar.anotherJuice.price} cents</li> - </ul> - <p><em>* Juice of the day</em></p> - </div> - <p><small>This page is intentionally static (no form action).</small></p> - </h:form> - </body> -</html> Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/bar.xhtml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/src/main/webapp/bar.xhtml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/bar.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/bar.xhtml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,23 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core"> + <head> + <title>Juice Bar</title> + </head> + <body> + <h1>Juice Bar</h1> + <h:form id="main"> + <div> + Which juice do you prefer? + <ul> + <li>#{juiceBar.juiceOfTheDay.name}* - #{juiceBar.juiceOfTheDay.price} cents</li> + <li>#{juiceBar.anotherJuice.name} - #{juiceBar.anotherJuice.price} cents</li> + </ul> + <p><em>* Juice of the day</em></p> + </div> + <p><small>This page is intentionally static (no form action).</small></p> + </h:form> + </body> +</html> Deleted: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/index.html =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/src/main/webapp/index.html 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/index.html 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,5 +0,0 @@ -<html> -<head> - <meta http-equiv="Refresh" content="0; URL=bar.seam"> -</head> -</html> \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/index.html (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/guice-web/src/main/webapp/index.html) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/index.html (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/guice-web/src/main/webapp/index.html 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,5 @@ +<html> +<head> + <meta http-equiv="Refresh" content="0; URL=bar.seam"> +</head> +</html> \ No newline at end of file Deleted: branches/community/Seam_2_3/examples-ee6/guice/pom.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/pom.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/pom.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,48 +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"> - <parent> - <artifactId>examples-ee6</artifactId> - <groupId>org.jboss.seam</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice</artifactId> - <packaging>pom</packaging> - <name>Guice Example (EE6)</name> - - <modules> - <module>guice-ejb</module> - <module>guice-web</module> - <module>guice-ear</module> - <module>guice-tests</module> - </modules> - - <properties> - <example.name>guice</example.name> - </properties> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-ejb</artifactId> - <version>${project.version}</version> - <type>ejb</type> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-web</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>guice-ear</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - -</project> Copied: branches/community/Seam_2_3/examples-ee6/guice/pom.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/pom.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/pom.xml 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +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.Beta1-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice</artifactId> + <packaging>pom</packaging> + <name>Guice Example (EE6)</name> + + <modules> + <module>guice-ejb</module> + <module>guice-web</module> + <module>guice-ear</module> + <module>guice-tests</module> + </modules> + + <properties> + <example.name>guice</example.name> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-ejb</artifactId> + <version>${project.version}</version> + <type>ejb</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-web</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>guice-ear</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </dependencyManagement> +</project> Deleted: branches/community/Seam_2_3/examples-ee6/guice/readme.txt =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/guice/readme.txt 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/guice/readme.txt 2012-04-03 16:37:44 UTC (rev 14495) @@ -1,25 +0,0 @@ -Seam Guice Example -====================== -This is a simple example demonstrating the use of Google Guice with Seam. - -example.name=guice - -To deploy the example to JBossAS, follow these steps: - -* In the example root directory run: - - mvn clean package - -* Set JBOSS_HOME environment property. - -* In the guice-ear directory run: - - mvn jboss:hard-deploy - -To deploy the example to Tomcat with Embedded JBoss, follow these steps: - -* In the example root directory run: - - mvn clean package -Ptomcat - -* Deploy the resulting WAR from guice-web/target directory to Tomcat manually. Copied: branches/community/Seam_2_3/examples-ee6/guice/readme.txt (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/guice/readme.txt) =================================================================== --- branches/community/Seam_2_3/examples-ee6/guice/readme.txt (rev 0) +++ branches/community/Seam_2_3/examples-ee6/guice/readme.txt 2012-04-03 16:37:44 UTC (rev 14495) @@ -0,0 +1,25 @@ +Seam Guice Example +====================== +This is a simple example demonstrating the use of Google Guice with Seam. + +example.name=guice + +To deploy the example to JBossAS, follow these steps: + +* In the example root directory run: + + mvn clean package + +* Set JBOSS_HOME environment property. + +* In the guice-ear directory run: + + mvn jboss:hard-deploy + +To deploy the example to Tomcat with Embedded JBoss, follow these steps: + +* In the example root directory run: + + mvn clean package -Ptomcat + +* Deploy the resulting WAR from guice-web/target directory to Tomcat manually.

12 years, 1 month

1
0
0 / 0

Seam SVN: r14494 - in branches/community/Seam_2_3/examples-ee6: groovybooking and 28 other directories.

by seam-commits＠lists.jboss.org

Author: dhinojosa Date: 2012-04-03 12:24:40 -0400 (Tue, 03 Apr 2012) New Revision: 14494 Added: branches/community/Seam_2_3/examples-ee6/groovybooking/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/pom.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources-ftest/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources-ftest/testng.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/groovybooking.properties branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/seam.properties branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/jbossas/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/jbossas/resources/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/jbossas/resources/groovybooking-ds.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Booking.groovy branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/BookingListAction.groovy branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Hotel.groovy branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/HotelBookingAction.groovy branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/HotelSearchingAction.groovy branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Random.groovy branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/RegisterAction.groovy branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/User.groovy branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/groovy/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/groovy/AuthenticatorAction.java branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/groovy/ChangePasswordAction.java branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/META-INF/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/META-INF/persistence.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/import.sql branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/messages_en.properties branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/seam.properties branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-web.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/pages.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/book.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/confirm.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/conversations.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/css/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/css/screen.css branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/css/trailblazer_main.css branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/home.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/hotel.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/bg.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/btn.bg.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/cal-next.png branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/cal-prev.png branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/cnt.bg.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/dtpick.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/hdr.ad.jpg branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/hdr.bar.jpg branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/hdr.bg.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/hdr.title.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/header_line.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/input.bg.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/sdb.bg.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/spinner.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/th.bg.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/index.html branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/main.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/password.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/register.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/template.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/pom.xml branches/community/Seam_2_3/examples-ee6/groovybooking/readme.txt Removed: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/pom.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources-ftest/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources-ftest/testng.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/groovybooking.properties branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/seam.properties branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/jbossas/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/jbossas/resources/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/jbossas/resources/groovybooking-ds.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Booking.groovy branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/BookingListAction.groovy branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Hotel.groovy branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/HotelBookingAction.groovy branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/HotelSearchingAction.groovy branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Random.groovy branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/RegisterAction.groovy branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/User.groovy branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/groovy/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/groovy/AuthenticatorAction.java branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/groovy/ChangePasswordAction.java branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/META-INF/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/META-INF/persistence.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/import.sql branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/messages_en.properties branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/seam.properties branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-web.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/pages.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/book.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/confirm.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/conversations.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/css/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/css/screen.css branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/css/trailblazer_main.css branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/home.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/hotel.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/bg.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/btn.bg.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/cal-next.png branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/cal-prev.png branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/cnt.bg.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/dtpick.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/hdr.ad.jpg branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/hdr.bar.jpg branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/hdr.bg.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/hdr.title.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/header_line.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/input.bg.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/sdb.bg.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/spinner.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/th.bg.gif branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/index.html branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/main.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/password.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/register.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/template.xhtml branches/community/Seam_2_3/examples-ee6/groovybooking/pom.xml branches/community/Seam_2_3/examples-ee6/groovybooking/readme.txt Log: groovybooking migrated in, still not functional, does compile, test, not integration-test Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/pom.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-tests/pom.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/pom.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,184 +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>groovybooking</artifactId> - <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>groovybooking-tests</artifactId> - <name>Groovy Booking Integration Tests Module (EE6)</name> - - - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> - </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>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> - - </dependencies> - - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - </testResource> - <testResource> - <directory>src/test/resources-integration</directory> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>integration-tests</id> - <activation> - <property> - <name>arquillian</name> - </property> - </activation> - </profile> - - <profile> - <id>arq-jbossas-7-managed</id> - <activation> - <property> - <name>arquillian</name> - <value>jbossas-managed-7</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - </plugin> - </plugins> - </build> - </profile> - - <profile> - <id>arq-jbossas-7-remote</id> - <activation> - <property> - <name>arquillian</name> - <value>jbossas-remote-7</value> - </property> - </activation> - </profile> - - <profile> - <id>ftest-jbossas</id> - <properties> - <example.context.path>seam-messages</example.context.path> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <configuration> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - <fileNames> - <param>${basedir}/../messages-ear/target/seam-messages.ear</param> - </fileNames> - </configuration> - </plugin> - <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-messages</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/groovybooking/groovybooking-tests/pom.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-tests/pom.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/pom.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,203 @@ +<?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>groovybooking</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>groovybooking-tests</artifactId> + <name>Groovy Booking Integration Tests Module (EE6)</name> + + + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </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>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> + + </dependencies> + + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + <testResource> + <directory>src/test/resources-integration</directory> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-test-source</id> + <phase>generate-test-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>${basedir}/../hibernate-web/src/main/groovy</source> + <source>${basedir}/../hibernate-web/src/main/java</source> + </sources> + </configuration> + </execution> + </executions> + </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-messages</example.context.path> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jboss-maven-plugin</artifactId> + <configuration> + <jbossHome>${jboss.home}</jbossHome> + <serverName>${jboss.domain}</serverName> + <fileNames> + <param>${basedir}/../messages-ear/target/seam-messages.ear</param> + </fileNames> + </configuration> + </plugin> + <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-messages</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/groovybooking/groovybooking-tests/src/test/resources/groovybooking.properties =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/groovybooking.properties 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/groovybooking.properties 2012-04-03 16:24:40 UTC (rev 14494) @@ -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 verify -PASSWORD_VALUE_REQUIRED_MESSAGE //*[@id='setpassword:Message' or @id='setpassword:PasswordDecorate:Message'] -PASSWORD_LENGTH_MESSAGE length 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=main:searchString -SEARCH_SUBMIT id=main: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 xpath=//*[@id='booking:Message' or @id='booking:checkinDateDecorate:Message'] -HOTEL_CHECKOUT_DATE_FIELD id=booking:checkoutDateDecorate:checkoutDateInputDate -HOTEL_CHECKOUT_DATE_MESSAGE xpath=//*[@id='booking:Message' or @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='main:messages']/li -REGISTRATION id=login:register -REGISTRATION_USERNAME id=register:usernameDecorate:username -REGISTRATION_USERNAME_MESSAGE id=register:usernameDecorate:message -REGISTRATION_NAME id=register:nameDecorate:name -REGISTRATION_NAME_MESSAGE id=register:nameDecorate:message -REGISTRATION_PASSWORD id=register:passwordDecorate:password -REGISTRATION_PASSWORD_MESSAGE id=register:passwordDecorate:message -REGISTRATION_VERIFY id=register:verifyDecorate:verify -REGISTRATION_VERIFY_MESSAGE id=register:verifyDecorate:message -REGISTRATION_SUBMIT id=register:register -REGISTRATION_REENTER_MESSAGE verify -REGISTRATION_LENGTH_MESSAGE length 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\=main\:Spinner \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/groovybooking.properties (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/groovybooking.properties) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/groovybooking.properties (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/groovybooking.properties 2012-04-03 16:24:40 UTC (rev 14494) @@ -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 verify +PASSWORD_VALUE_REQUIRED_MESSAGE //*[@id='setpassword:Message' or @id='setpassword:PasswordDecorate:Message'] +PASSWORD_LENGTH_MESSAGE length 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=main:searchString +SEARCH_SUBMIT id=main: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 xpath=//*[@id='booking:Message' or @id='booking:checkinDateDecorate:Message'] +HOTEL_CHECKOUT_DATE_FIELD id=booking:checkoutDateDecorate:checkoutDateInputDate +HOTEL_CHECKOUT_DATE_MESSAGE xpath=//*[@id='booking:Message' or @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='main:messages']/li +REGISTRATION id=login:register +REGISTRATION_USERNAME id=register:usernameDecorate:username +REGISTRATION_USERNAME_MESSAGE id=register:usernameDecorate:message +REGISTRATION_NAME id=register:nameDecorate:name +REGISTRATION_NAME_MESSAGE id=register:nameDecorate:message +REGISTRATION_PASSWORD id=register:passwordDecorate:password +REGISTRATION_PASSWORD_MESSAGE id=register:passwordDecorate:message +REGISTRATION_VERIFY id=register:verifyDecorate:verify +REGISTRATION_VERIFY_MESSAGE id=register:verifyDecorate:message +REGISTRATION_SUBMIT id=register:register +REGISTRATION_REENTER_MESSAGE verify +REGISTRATION_LENGTH_MESSAGE length 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\=main\:Spinner \ No newline at end of file Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/seam.properties =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/seam.properties 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/seam.properties 2012-04-03 16:24:40 UTC (rev 14494) @@ -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/groovybooking/groovybooking-tests/src/test/resources/seam.properties (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/seam.properties) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/seam.properties (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/seam.properties 2012-04-03 16:24:40 UTC (rev 14494) @@ -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/groovybooking/groovybooking-tests/src/test/resources-ftest/testng.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-tests/src/test/resources-ftest/testng.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources-ftest/testng.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,36 +0,0 @@ - -  -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="Groovybooking example" verbose="2" parallel="false"> - <test name="groovybooking_tests"> - <parameter name="PROPERTY_FILE" - value="/groovybooking.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> Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources-ftest/testng.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-tests/src/test/resources-ftest/testng.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources-ftest/testng.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources-ftest/testng.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,36 @@ + +  +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Groovybooking example" verbose="2" parallel="false"> + <test name="groovybooking_tests"> + <parameter name="PROPERTY_FILE" + value="/groovybooking.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> Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/pom.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,318 +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>groovybooking</artifactId> - <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>groovybooking-web</artifactId> - <packaging>war</packaging> - <name>Groovy Booking Web Module (EE6)</name> - - <properties> -  - <jndiPattern>java:app/groovybooking-ejb/#{ejbName}</jndiPattern> - <debug>true</debug> - <loadPersistenceUnits>false</loadPersistenceUnits> - </properties> - - <dependencies> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui</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</artifactId> - </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>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>3.3.3.Final</version> - <exclusions> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui</artifactId> - <version>3.3.3.Final</version> - <exclusions> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - </dependency> - <dependency> - <groupId>org.eclipse.jdt</groupId> - <artifactId>core</artifactId> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-core</artifactId> - <exclusions> - <exclusion> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-decisiontables</artifactId> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-compiler</artifactId> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-templates</artifactId> - </dependency> - <dependency> - <groupId>org.drools</groupId> - <artifactId>drools-api</artifactId> - </dependency> - <dependency> - <groupId>org.jboss.el</groupId> - <artifactId>jboss-el</artifactId> - </dependency> - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.1</version> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <finalName>jboss-seam-groovybooking</finalName> - <plugins> - <plugin> - <groupId>org.codehaus.gmaven</groupId> - <artifactId>gmaven-plugin</artifactId> - <version>1.4</version> - <executions> - <execution> - <goals> - <goal>generateStubs</goal> - <goal>compile</goal> - <goal>generateTestStubs</goal> - <goal>testCompile</goal> - </goals> - </execution> - </executions> - </plugin> - -  -  -  - -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>${basedir}/src/main/groovy/action</source> - </sources> - <resources> -  - <resource> - <directory>${project.build.outputDirectory}</directory> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <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> - <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</groupId> - <artifactId>groovybooking-web</artifactId> - <type>war</type> - <overWrite>true</overWrite> - <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.war</outputDirectory> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <version>1.5.0</version> - <configuration> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - <fileNames> - <param>${basedir}/src/jbossas/resources/groovybooking-ds.xml</param> - <directory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.war</directory> - </fileNames> - </configuration> - </plugin> - </plugins> - </build> - - <profiles> - <profile> - <id>ftest-jbossas</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>wait-for-application</id> - <phase>none</phase> - </execution> - <execution> - <id>stop-selenium</id> - <phase>none</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>jbossas42</id> - <properties> - <loadPersistenceUnits>true</loadPersistenceUnits> - </properties> - </profile> - </profiles> -</project> Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/pom.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,318 @@ +<?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>groovybooking</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>groovybooking-web</artifactId> + <packaging>war</packaging> + <name>Groovy Booking Web Module (EE6)</name> + + <properties> +  + <jndiPattern>java:app/groovybooking-ejb/#{ejbName}</jndiPattern> + <debug>true</debug> + <loadPersistenceUnits>false</loadPersistenceUnits> + </properties> + + <dependencies> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui</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</artifactId> + </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>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>3.3.3.Final</version> + <exclusions> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>3.3.3.Final</version> + <exclusions> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + </dependency> + <dependency> + <groupId>org.eclipse.jdt</groupId> + <artifactId>core</artifactId> + </dependency> + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-core</artifactId> + <exclusions> + <exclusion> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-decisiontables</artifactId> + </dependency> + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-compiler</artifactId> + </dependency> + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-templates</artifactId> + </dependency> + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-api</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.el</groupId> + <artifactId>jboss-el</artifactId> + </dependency> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <finalName>jboss-seam-groovybooking</finalName> + <plugins> + <plugin> + <groupId>org.codehaus.gmaven</groupId> + <artifactId>gmaven-plugin</artifactId> + <version>1.4</version> + <executions> + <execution> + <goals> + <goal>generateStubs</goal> + <goal>compile</goal> + <goal>generateTestStubs</goal> + <goal>testCompile</goal> + </goals> + </execution> + </executions> + </plugin> + +  +  +  + +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>${basedir}/src/main/groovy/action</source> + </sources> + <resources> +  + <resource> + <directory>${project.build.outputDirectory}</directory> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + <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> + <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</groupId> + <artifactId>groovybooking-web</artifactId> + <type>war</type> + <overWrite>true</overWrite> + <outputDirectory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.war</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jboss-maven-plugin</artifactId> + <version>1.5.0</version> + <configuration> + <jbossHome>${jboss.home}</jbossHome> + <serverName>${jboss.domain}</serverName> + <fileNames> + <param>${basedir}/src/jbossas/resources/groovybooking-ds.xml</param> + <directory>${project.build.directory}/${project.build.finalName}-exploded/${project.build.finalName}.war</directory> + </fileNames> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>ftest-jbossas</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>wait-for-application</id> + <phase>none</phase> + </execution> + <execution> + <id>stop-selenium</id> + <phase>none</phase> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>jbossas42</id> + <properties> + <loadPersistenceUnits>true</loadPersistenceUnits> + </properties> + </profile> + </profiles> +</project> Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/jbossas/resources/groovybooking-ds.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/jbossas/resources/groovybooking-ds.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/jbossas/resources/groovybooking-ds.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,26 +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>groovyDatasource</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/groovybooking/groovybooking-web/src/jbossas/resources/groovybooking-ds.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/jbossas/resources/groovybooking-ds.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/jbossas/resources/groovybooking-ds.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/jbossas/resources/groovybooking-ds.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,26 @@ +<?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>groovyDatasource</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/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Booking.groovy =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Booking.groovy 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Booking.groovy 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,92 +0,0 @@ -//$Id: Booking.groovy 4698 2007-04-18 06:40:06Z ebernard $ -package org.jboss.seam.example.groovy - -import java.text.DateFormat -import javax.persistence.Basic -import javax.persistence.Entity -import javax.persistence.GeneratedValue -import javax.persistence.Id -import javax.persistence.ManyToOne -import javax.persistence.Temporal -import javax.persistence.TemporalType -import javax.persistence.Transient - -import org.jboss.seam.annotations.Name -import javax.validation.constraints.NotNull -import javax.validation.constraints.Pattern -import javax.validation.constraints.Size - -@Entity -@Name("booking") -class Booking implements Serializable -{ - @Id @GeneratedValue - Long id - - @ManyToOne @NotNull - User user - - @ManyToOne @NotNull - Hotel hotel - - @NotNull - @Basic @Temporal(TemporalType.DATE) - Date checkinDate - - @Basic @Temporal(TemporalType.DATE) - @NotNull - Date checkoutDate - - @NotNull(message="Credit card number is required") - @Size(min=16, max=16, message="Credit card number must 16 digits long") - @Pattern(regexp=/^\d*$/, message="Credit card number must be numeric") - String creditCard - - @NotNull(message="Credit card name is required") - @Size(min=3, max=70, message="Credit card name is required") - String creditCardName - - int creditCardExpiryMonth - - int creditCardExpiryYear - - boolean smoking - - int beds - - Booking() {} - - Booking(Hotel hotel, User user) - { - this.hotel = hotel - this.user = user - } - - @Transient - BigDecimal getTotal() - { - return hotel.price * getNights() - } - - @Transient - int getNights() - { - return (int) ( ( checkoutDate.time - checkinDate.time ) / 1000 / 60 / 60 / 24 ) - } - - @Transient - String getDescription() - { - DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM) - return hotel ? - "${hotel.name}, ${df.format( checkinDate )} to ${df.format(checkoutDate)}" : - null - } - - @Override - String toString() - { - return "Booking(" + user + ","+ hotel + ")" - } - -} Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Booking.groovy (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Booking.groovy) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Booking.groovy (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Booking.groovy 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,92 @@ +//$Id: Booking.groovy 4698 2007-04-18 06:40:06Z ebernard $ +package org.jboss.seam.example.groovy + +import java.text.DateFormat +import javax.persistence.Basic +import javax.persistence.Entity +import javax.persistence.GeneratedValue +import javax.persistence.Id +import javax.persistence.ManyToOne +import javax.persistence.Temporal +import javax.persistence.TemporalType +import javax.persistence.Transient + +import org.jboss.seam.annotations.Name +import javax.validation.constraints.NotNull +import javax.validation.constraints.Pattern +import javax.validation.constraints.Size + +@Entity +@Name("booking") +class Booking implements Serializable +{ + @Id @GeneratedValue + Long id + + @ManyToOne @NotNull + User user + + @ManyToOne @NotNull + Hotel hotel + + @NotNull + @Basic @Temporal(TemporalType.DATE) + Date checkinDate + + @Basic @Temporal(TemporalType.DATE) + @NotNull + Date checkoutDate + + @NotNull(message="Credit card number is required") + @Size(min=16, max=16, message="Credit card number must 16 digits long") + @Pattern(regexp=/^\d*$/, message="Credit card number must be numeric") + String creditCard + + @NotNull(message="Credit card name is required") + @Size(min=3, max=70, message="Credit card name is required") + String creditCardName + + int creditCardExpiryMonth + + int creditCardExpiryYear + + boolean smoking + + int beds + + Booking() {} + + Booking(Hotel hotel, User user) + { + this.hotel = hotel + this.user = user + } + + @Transient + BigDecimal getTotal() + { + return hotel.price * getNights() + } + + @Transient + int getNights() + { + return (int) ( ( checkoutDate.time - checkinDate.time ) / 1000 / 60 / 60 / 24 ) + } + + @Transient + String getDescription() + { + DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM) + return hotel ? + "${hotel.name}, ${df.format( checkinDate )} to ${df.format(checkoutDate)}" : + null + } + + @Override + String toString() + { + return "Booking(" + user + ","+ hotel + ")" + } + +} Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/BookingListAction.groovy =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/BookingListAction.groovy 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/BookingListAction.groovy 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,57 +0,0 @@ -//$Id: BookingListAction.groovy 8748 2008-08-20 12:08:30Z pete.muir(a)jboss.org $ -package org.jboss.seam.example.groovy - -import javax.persistence.EntityManager - -import org.jboss.seam.ScopeType -import org.jboss.seam.annotations.Factory -import org.jboss.seam.annotations.In -import org.jboss.seam.annotations.Logger -import org.jboss.seam.annotations.Name -import org.jboss.seam.annotations.Scope -import org.jboss.seam.annotations.datamodel.DataModel -import org.jboss.seam.annotations.datamodel.DataModelSelection -import org.jboss.seam.faces.FacesMessages -import org.jboss.seam.log.Log - -(a)Scope(ScopeType.SESSION) -@Name("bookingList") -class BookingListAction implements Serializable -{ - - @In - EntityManager em - - @In - User user - - @DataModel - private List<Booking> bookings - - @DataModelSelection - Booking booking - - @Logger - Log log - - @Factory - public void getBookings() - { - bookings = em.createQuery(''' - select b from Booking b - where b.user.username = :username - order by b.checkinDate''') - .setParameter("username", user.username) - .getResultList() - } - - public void cancel() - { - log.info("Cancel booking: #{bookingList.booking.id} for #{user.username}") - Booking cancelled = em.find(Booking.class, booking.id) - if (cancelled != null) em.remove( cancelled ) - getBookings() - FacesMessages.instance().add("Booking cancelled for confirmation number #0", booking.getId()) - } - -} Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/BookingListAction.groovy (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/BookingListAction.groovy) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/BookingListAction.groovy (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/BookingListAction.groovy 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,57 @@ +//$Id: BookingListAction.groovy 8748 2008-08-20 12:08:30Z pete.muir(a)jboss.org $ +package org.jboss.seam.example.groovy + +import javax.persistence.EntityManager + +import org.jboss.seam.ScopeType +import org.jboss.seam.annotations.Factory +import org.jboss.seam.annotations.In +import org.jboss.seam.annotations.Logger +import org.jboss.seam.annotations.Name +import org.jboss.seam.annotations.Scope +import org.jboss.seam.annotations.datamodel.DataModel +import org.jboss.seam.annotations.datamodel.DataModelSelection +import org.jboss.seam.faces.FacesMessages +import org.jboss.seam.log.Log + +(a)Scope(ScopeType.SESSION) +@Name("bookingList") +class BookingListAction implements Serializable +{ + + @In + EntityManager em + + @In + User user + + @DataModel + private List<Booking> bookings + + @DataModelSelection + Booking booking + + @Logger + Log log + + @Factory + public void getBookings() + { + bookings = em.createQuery(''' + select b from Booking b + where b.user.username = :username + order by b.checkinDate''') + .setParameter("username", user.username) + .getResultList() + } + + public void cancel() + { + log.info("Cancel booking: #{bookingList.booking.id} for #{user.username}") + Booking cancelled = em.find(Booking.class, booking.id) + if (cancelled != null) em.remove( cancelled ) + getBookings() + FacesMessages.instance().add("Booking cancelled for confirmation number #0", booking.getId()) + } + +} Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Hotel.groovy =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Hotel.groovy 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Hotel.groovy 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,47 +0,0 @@ -//$Id: Hotel.groovy 4698 2007-04-18 06:40:06Z ebernard $ -package org.jboss.seam.example.groovy - -import javax.persistence.Column -import javax.persistence.Entity -import javax.persistence.GeneratedValue -import javax.persistence.Id - -import org.jboss.seam.annotations.Name -import javax.validation.constraints.NotNull -import javax.validation.constraints.Size - - -@Entity -@Name("hotel") -class Hotel implements Serializable -{ - @Id @GeneratedValue - Long id - - @Size(max=50) @NotNull - String name - - @Size(max=100) @NotNull - String address - - @Size(max=40) @NotNull - String city - - @Size(min=2, max=10) @NotNull - String state - - @Size(min=4, max=6) @NotNull - String zip - - @Size(min=2, max=40) @NotNull - String country - - @Column(precision=6, scale=2) - BigDecimal price - - @Override - String toString() - { - return "Hotel(${name},${address},${city},${zip})" - } -} Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Hotel.groovy (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Hotel.groovy) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Hotel.groovy (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Hotel.groovy 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,47 @@ +//$Id: Hotel.groovy 4698 2007-04-18 06:40:06Z ebernard $ +package org.jboss.seam.example.groovy + +import javax.persistence.Column +import javax.persistence.Entity +import javax.persistence.GeneratedValue +import javax.persistence.Id + +import org.jboss.seam.annotations.Name +import javax.validation.constraints.NotNull +import javax.validation.constraints.Size + + +@Entity +@Name("hotel") +class Hotel implements Serializable +{ + @Id @GeneratedValue + Long id + + @Size(max=50) @NotNull + String name + + @Size(max=100) @NotNull + String address + + @Size(max=40) @NotNull + String city + + @Size(min=2, max=10) @NotNull + String state + + @Size(min=4, max=6) @NotNull + String zip + + @Size(min=2, max=40) @NotNull + String country + + @Column(precision=6, scale=2) + BigDecimal price + + @Override + String toString() + { + return "Hotel(${name},${address},${city},${zip})" + } +} Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/HotelBookingAction.groovy =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/HotelBookingAction.groovy 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/HotelBookingAction.groovy 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,98 +0,0 @@ -//$Id: HotelBookingAction.groovy 5563 2007-06-26 22:20:03Z gavin $ -package org.jboss.seam.example.groovy - -import javax.persistence.EntityManager - -import org.jboss.seam.ScopeType -import org.jboss.seam.annotations.Begin -import org.jboss.seam.annotations.End -import org.jboss.seam.annotations.In -import org.jboss.seam.annotations.Logger -import org.jboss.seam.annotations.Name -import org.jboss.seam.annotations.Out -import org.jboss.seam.core.Events -import org.jboss.seam.faces.FacesMessages -import org.jboss.seam.log.Log - -@Name("hotelBooking") -class HotelBookingAction -{ - - @In - EntityManager em - - @In - User user - - @In(required=false) @Out - Hotel hotel - - @In(required=false) - @Out(required=false) - Booking booking - - @In - FacesMessages facesMessages - - @In - Events events - - @Logger - Log log - - boolean bookingValid - - @Begin - void selectHotel(Hotel selectedHotel) - { - hotel = em.merge(selectedHotel) - } - - void bookHotel() - { - booking = new Booking(hotel, user) - Calendar calendar = Calendar.getInstance() - booking.checkinDate = calendar.time - calendar.add Calendar.DAY_OF_MONTH, 1 - booking.checkoutDate = calendar.time - } - - void setBookingDetails() - { - Calendar calendar = Calendar.getInstance() - calendar.add Calendar.DAY_OF_MONTH, -1 - if ( booking.checkinDate < calendar.time ) - { - facesMessages.addToControl "checkinDate", "Check in date must be a future date" - bookingValid=false - } - else if ( booking.checkinDate >= booking.checkoutDate ) - { - facesMessages.addToControl "checkoutDate", "Check out date must be later than check in date" - bookingValid=false - } - else - { - bookingValid=true - } - } - - @Out (required=false, scope=ScopeType.SESSION) - List <Booking> bookings - - @End - void confirm() - { - em.persist(booking) - facesMessages.add "Thank you, #{user.name}, your confimation number for #{hotel.name} is #{booking.id}", new Object[0] - log.info("New booking: #{booking.id} for #{user.username}") - // events.raiseTransactionSuccessEvent("bookingConfirmed") - - // force refresh in main.xhtml - bookings = null - } - - @End - void cancel() {} - -} Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/HotelBookingAction.groovy (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/HotelBookingAction.groovy) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/HotelBookingAction.groovy (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/HotelBookingAction.groovy 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,98 @@ +//$Id: HotelBookingAction.groovy 5563 2007-06-26 22:20:03Z gavin $ +package org.jboss.seam.example.groovy + +import javax.persistence.EntityManager + +import org.jboss.seam.ScopeType +import org.jboss.seam.annotations.Begin +import org.jboss.seam.annotations.End +import org.jboss.seam.annotations.In +import org.jboss.seam.annotations.Logger +import org.jboss.seam.annotations.Name +import org.jboss.seam.annotations.Out +import org.jboss.seam.core.Events +import org.jboss.seam.faces.FacesMessages +import org.jboss.seam.log.Log + +@Name("hotelBooking") +class HotelBookingAction +{ + + @In + EntityManager em + + @In + User user + + @In(required=false) @Out + Hotel hotel + + @In(required=false) + @Out(required=false) + Booking booking + + @In + FacesMessages facesMessages + + @In + Events events + + @Logger + Log log + + boolean bookingValid + + @Begin + void selectHotel(Hotel selectedHotel) + { + hotel = em.merge(selectedHotel) + } + + void bookHotel() + { + booking = new Booking(hotel, user) + Calendar calendar = Calendar.getInstance() + booking.checkinDate = calendar.time + calendar.add Calendar.DAY_OF_MONTH, 1 + booking.checkoutDate = calendar.time + } + + void setBookingDetails() + { + Calendar calendar = Calendar.getInstance() + calendar.add Calendar.DAY_OF_MONTH, -1 + if ( booking.checkinDate < calendar.time ) + { + facesMessages.addToControl "checkinDate", "Check in date must be a future date" + bookingValid=false + } + else if ( booking.checkinDate >= booking.checkoutDate ) + { + facesMessages.addToControl "checkoutDate", "Check out date must be later than check in date" + bookingValid=false + } + else + { + bookingValid=true + } + } + + @Out (required=false, scope=ScopeType.SESSION) + List <Booking> bookings + + @End + void confirm() + { + em.persist(booking) + facesMessages.add "Thank you, #{user.name}, your confimation number for #{hotel.name} is #{booking.id}", new Object[0] + log.info("New booking: #{booking.id} for #{user.username}") + // events.raiseTransactionSuccessEvent("bookingConfirmed") + + // force refresh in main.xhtml + bookings = null + } + + @End + void cancel() {} + +} Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/HotelSearchingAction.groovy =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/HotelSearchingAction.groovy 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/HotelSearchingAction.groovy 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,70 +0,0 @@ -//$Id: HotelSearchingAction.groovy 4933 2007-05-27 03:13:24Z ebernard $ -package org.jboss.seam.example.groovy - -import javax.persistence.EntityManager -import javax.persistence.PersistenceContext - -import org.jboss.seam.ScopeType -import org.jboss.seam.annotations.Destroy -import org.jboss.seam.annotations.Name -import org.jboss.seam.annotations.Scope -import org.jboss.seam.annotations.datamodel.DataModel - -import org.jboss.seam.annotations.In - -import org.jboss.seam.annotations.Factory - -@Name("hotelSearch") -(a)Scope(ScopeType.SESSION) -class HotelSearchingAction -{ - - @In - private EntityManager em - - String searchString - int pageSize = 10 - int page - - @DataModel - List<Hotel> hotels - - void find() - { - page = 0 - queryHotels() - } - - void nextPage() - { - page++ - queryHotels() - } - - private void queryHotels() - { - def query = em.createQuery(''' - select h from Hotel h where - lower(h.name) like #{pattern} - or lower(h.city) like #{pattern} - or lower(h.zip) like #{pattern} - or lower(h.address) like #{pattern} - ''') - query.maxResults = pageSize - query.firstResult = page * pageSize - hotels = query.getResultList() - } - - @Factory(value="pattern", scope=ScopeType.EVENT) - String getSearchPattern() - { - return searchString ? - "%${searchString.toLowerCase().replace('*', '%')}%" : - "%"; - } - - boolean isNextPageAvailable() - { - return hotels && hotels.size()==pageSize - } -} Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/HotelSearchingAction.groovy (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/HotelSearchingAction.groovy) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/HotelSearchingAction.groovy (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/HotelSearchingAction.groovy 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,70 @@ +//$Id: HotelSearchingAction.groovy 4933 2007-05-27 03:13:24Z ebernard $ +package org.jboss.seam.example.groovy + +import javax.persistence.EntityManager +import javax.persistence.PersistenceContext + +import org.jboss.seam.ScopeType +import org.jboss.seam.annotations.Destroy +import org.jboss.seam.annotations.Name +import org.jboss.seam.annotations.Scope +import org.jboss.seam.annotations.datamodel.DataModel + +import org.jboss.seam.annotations.In + +import org.jboss.seam.annotations.Factory + +@Name("hotelSearch") +(a)Scope(ScopeType.SESSION) +class HotelSearchingAction +{ + + @In + private EntityManager em + + String searchString + int pageSize = 10 + int page + + @DataModel + List<Hotel> hotels + + void find() + { + page = 0 + queryHotels() + } + + void nextPage() + { + page++ + queryHotels() + } + + private void queryHotels() + { + def query = em.createQuery(''' + select h from Hotel h where + lower(h.name) like #{pattern} + or lower(h.city) like #{pattern} + or lower(h.zip) like #{pattern} + or lower(h.address) like #{pattern} + ''') + query.maxResults = pageSize + query.firstResult = page * pageSize + hotels = query.getResultList() + } + + @Factory(value="pattern", scope=ScopeType.EVENT) + String getSearchPattern() + { + return searchString ? + "%${searchString.toLowerCase().replace('*', '%')}%" : + "%"; + } + + boolean isNextPageAvailable() + { + return hotels && hotels.size()==pageSize + } +} Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Random.groovy =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Random.groovy 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Random.groovy 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,10 +0,0 @@ -//$Id: Random.groovy 4698 2007-04-18 06:40:06Z ebernard $ -package org.jboss.seam.example.groovy; - -/** - * Not used in the application but a non Seam component is also hot deployable - */ -class Random -{ - -} Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Random.groovy (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Random.groovy) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Random.groovy (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/Random.groovy 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,10 @@ +//$Id: Random.groovy 4698 2007-04-18 06:40:06Z ebernard $ +package org.jboss.seam.example.groovy; + +/** + * Not used in the application but a non Seam component is also hot deployable + */ +class Random +{ + +} Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/RegisterAction.groovy =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/RegisterAction.groovy 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/RegisterAction.groovy 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,63 +0,0 @@ -//$Id: RegisterAction.groovy 5563 2007-06-26 22:20:03Z gavin $ -package org.jboss.seam.example.groovy; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; - -import org.jboss.seam.annotations.Destroy; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.faces.FacesMessages; -import static org.jboss.seam.ScopeType.EVENT; - -@Scope(EVENT) -@Name("register") -class RegisterAction -{ - - @In - User user; - - @In - EntityManager em; - - @In - FacesMessages facesMessages; - - String verify; - - boolean registered; - - void register() - { - if ( user.password == verify ) { - List existing = em.createQuery( - '''select u.username - from User u - where u.username=#{user.username} - ''').getResultList() - - if (!existing.size()) - { - em.persist(user) - facesMessages.add("Successfully registered as #{user.username}", new Object[0]); - registered = true - } - else - { - facesMessages.addToControl("username", "Username #{user.username} already exists") - } - } - else - { - facesMessages.add("verify", "Re-enter your password") - verify=null - } - } - - void invalid() - { - facesMessages.add("Please try again", new Object[0]) - } -} Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/RegisterAction.groovy (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/RegisterAction.groovy) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/RegisterAction.groovy (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/RegisterAction.groovy 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,63 @@ +//$Id: RegisterAction.groovy 5563 2007-06-26 22:20:03Z gavin $ +package org.jboss.seam.example.groovy; + +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +import org.jboss.seam.annotations.Destroy; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.faces.FacesMessages; +import static org.jboss.seam.ScopeType.EVENT; + +@Scope(EVENT) +@Name("register") +class RegisterAction +{ + + @In + User user; + + @In + EntityManager em; + + @In + FacesMessages facesMessages; + + String verify; + + boolean registered; + + void register() + { + if ( user.password == verify ) { + List existing = em.createQuery( + '''select u.username + from User u + where u.username=#{user.username} + ''').getResultList() + + if (!existing.size()) + { + em.persist(user) + facesMessages.add("Successfully registered as #{user.username}", new Object[0]); + registered = true + } + else + { + facesMessages.addToControl("username", "Username #{user.username} already exists") + } + } + else + { + facesMessages.add("verify", "Re-enter your password") + verify=null + } + } + + void invalid() + { + facesMessages.add("Please try again", new Object[0]) + } +} Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/User.groovy =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/User.groovy 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/User.groovy 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,49 +0,0 @@ -//$Id: User.groovy 4698 2007-04-18 06:40:06Z ebernard $ -package org.jboss.seam.example.groovy - -import javax.persistence.Entity -import javax.persistence.Id -import javax.persistence.Table - - -import org.jboss.seam.ScopeType -import org.jboss.seam.annotations.Name -import org.jboss.seam.annotations.Scope -import javax.validation.constraints.Pattern -import javax.validation.constraints.NotNull -import javax.validation.constraints.Size - -@Entity -@Name("user") -(a)Scope(ScopeType.SESSION) -@Table(name="Customer") -class User implements Serializable -{ - @Id - @Size(min=5, max=15) - @Pattern(regexp=/^\w*$/, message="not a valid username") - String username - - @NotNull - @Size(min=5, max=15) - String password - - @NotNull - @Size(max=100) - String name - - User(String name, String password, String username) - { - this.name = name - this.password = password - this.username = username - } - - User() {} - - @Override - String toString() - { - return "User(${username})" - } -} Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/User.groovy (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/User.groovy) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/User.groovy (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/groovy/org/jboss/seam/example/groovy/User.groovy 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,49 @@ +//$Id: User.groovy 4698 2007-04-18 06:40:06Z ebernard $ +package org.jboss.seam.example.groovy + +import javax.persistence.Entity +import javax.persistence.Id +import javax.persistence.Table + + +import org.jboss.seam.ScopeType +import org.jboss.seam.annotations.Name +import org.jboss.seam.annotations.Scope +import javax.validation.constraints.Pattern +import javax.validation.constraints.NotNull +import javax.validation.constraints.Size + +@Entity +@Name("user") +(a)Scope(ScopeType.SESSION) +@Table(name="Customer") +class User implements Serializable +{ + @Id + @Size(min=5, max=15) + @Pattern(regexp=/^\w*$/, message="not a valid username") + String username + + @NotNull + @Size(min=5, max=15) + String password + + @NotNull + @Size(max=100) + String name + + User(String name, String password, String username) + { + this.name = name + this.password = password + this.username = username + } + + User() {} + + @Override + String toString() + { + return "User(${username})" + } +} Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/groovy/AuthenticatorAction.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/groovy/AuthenticatorAction.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/groovy/AuthenticatorAction.java 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,35 +0,0 @@ -package org.jboss.seam.example.groovy; - -import java.util.List; -import javax.persistence.EntityManager; - -import static org.jboss.seam.ScopeType.SESSION; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Out; - -@Name("authenticator") -public class AuthenticatorAction -{ - @In EntityManager em; - - @Out(required=false, scope = SESSION) - private User user; - - public boolean authenticate() - { - List results = em.createQuery("select u from User u where u.username=#{identity.username} and u.password=#{identity.password}") - .getResultList(); - - if ( results.size()==0 ) - { - return false; - } - else - { - user = (User) results.get(0); - return true; - } - } - -} Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/groovy/AuthenticatorAction.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/groovy/AuthenticatorAction.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/groovy/AuthenticatorAction.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/groovy/AuthenticatorAction.java 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,35 @@ +package org.jboss.seam.example.groovy; + +import java.util.List; +import javax.persistence.EntityManager; + +import static org.jboss.seam.ScopeType.SESSION; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Out; + +@Name("authenticator") +public class AuthenticatorAction +{ + @In EntityManager em; + + @Out(required=false, scope = SESSION) + private User user; + + public boolean authenticate() + { + List results = em.createQuery("select u from User u where u.username=#{identity.username} and u.password=#{identity.password}") + .getResultList(); + + if ( results.size()==0 ) + { + return false; + } + else + { + user = (User) results.get(0); + return true; + } + } + +} Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/groovy/ChangePasswordAction.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/groovy/ChangePasswordAction.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/groovy/ChangePasswordAction.java 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,64 +0,0 @@ -//$Id: ChangePasswordAction.java 5305 2007-06-20 01:30:37Z gavin $ -package org.jboss.seam.example.groovy; - -import javax.persistence.EntityManager; - -import static org.jboss.seam.ScopeType.EVENT; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Out; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.faces.FacesMessages; - -@Scope(EVENT) -@Name("changePassword") -public class ChangePasswordAction -{ - - @In @Out - private User user; - - @In - private EntityManager em; - - private String verify; - - private boolean changed; - - public void changePassword() - { - if ( user.getPassword().equals(verify) ) - { - user = em.merge(user); - FacesMessages.instance().add("Password updated"); - changed = true; - } - else - { - FacesMessages.instance().add("verify", "Re-enter new password"); - revertUser(); - verify=null; - } - } - - public boolean isChanged() - { - return changed; - } - - private void revertUser() - { - user = em.find(User.class, user.getUsername()); - } - - public String getVerify() - { - return verify; - } - - public void setVerify(String verify) - { - this.verify = verify; - } - -} Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/groovy/ChangePasswordAction.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/groovy/ChangePasswordAction.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/groovy/ChangePasswordAction.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/java/org/jboss/seam/example/groovy/ChangePasswordAction.java 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,64 @@ +//$Id: ChangePasswordAction.java 5305 2007-06-20 01:30:37Z gavin $ +package org.jboss.seam.example.groovy; + +import javax.persistence.EntityManager; + +import static org.jboss.seam.ScopeType.EVENT; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Out; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.faces.FacesMessages; + +@Scope(EVENT) +@Name("changePassword") +public class ChangePasswordAction +{ + + @In @Out + private User user; + + @In + private EntityManager em; + + private String verify; + + private boolean changed; + + public void changePassword() + { + if ( user.getPassword().equals(verify) ) + { + user = em.merge(user); + FacesMessages.instance().add("Password updated"); + changed = true; + } + else + { + FacesMessages.instance().add("verify", "Re-enter new password"); + revertUser(); + verify=null; + } + } + + public boolean isChanged() + { + return changed; + } + + private void revertUser() + { + user = em.find(User.class, user.getUsername()); + } + + public String getVerify() + { + return verify; + } + + public void setVerify(String verify) + { + this.verify = verify; + } + +} Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/META-INF/persistence.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/resources/META-INF/persistence.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/META-INF/persistence.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<persistence xmlns="http://java.sun.com/xml/ns/persistence" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" - version="1.0"> - - <persistence-unit name="groovy" transaction-type="JTA"> - <provider>org.hibernate.ejb.HibernatePersistence</provider> - <jta-data-source>java:/groovyDatasource</jta-data-source> - <properties> - <property name="hibernate.hbm2ddl.auto" value="create-drop"/> - <property name="hibernate.show_sql" value="true"/> - <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/> -  - <property name="jboss.entity.manager.factory.jndi.name" value="java:/groovyEntityManagerFactory"/> - </properties> - </persistence-unit> - -</persistence> Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/META-INF/persistence.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/resources/META-INF/persistence.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/META-INF/persistence.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/META-INF/persistence.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<persistence xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" + version="1.0"> + + <persistence-unit name="groovy" transaction-type="JTA"> + <provider>org.hibernate.ejb.HibernatePersistence</provider> + <jta-data-source>java:/groovyDatasource</jta-data-source> + <properties> + <property name="hibernate.hbm2ddl.auto" value="create-drop"/> + <property name="hibernate.show_sql" value="true"/> + <property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/> +  + <property name="jboss.entity.manager.factory.jndi.name" value="java:/groovyEntityManagerFactory"/> + </properties> + </persistence-unit> + +</persistence> Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/import.sql =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/resources/import.sql 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/import.sql 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,22 +0,0 @@ -insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') -insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') -insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 160, 'MarriottDowntown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') -insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') -insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 130, 'Hotel Beaulac', ' Esplanade L�opold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') -insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') -insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 250, 'Meli� White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/import.sql (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/resources/import.sql) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/import.sql (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/import.sql 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,22 @@ +insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') +insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') +insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 160, 'MarriottDowntown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') +insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') +insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') +insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 130, 'Hotel Beaulac', ' Esplanade L�opold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') +insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') +insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') +insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') +insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 250, 'Meli� White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') +insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/messages_en.properties =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/resources/messages_en.properties 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/messages_en.properties 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,75 +0,0 @@ -javax.faces.component.UIInput.CONVERSION=value could not be converted to the expected type -javax.faces.component.UIInput.REQUIRED=value is required -javax.faces.component.UIInput.REQUIRED_detail=value is required -javax.faces.component.UIInput.UPDATE=an error occurred when processing your submitted information -javax.faces.component.UISelectOne.INVALID=value is not valid -javax.faces.component.UISelectMany.INVALID=value is not valid - -javax.faces.converter.BigDecimalConverter.DECIMAL=value must be a number -javax.faces.converter.BigDecimalConverter.DECIMAL_detail=value must be a signed decimal number consisting of zero or more digits, optionally followed by a decimal point and fraction, eg. {1} -javax.faces.converter.BigIntegerConverter.BIGINTEGER=value must be a number -javax.faces.converter.BigIntegerConverter.BIGINTEGER_detail=value must be a signed integer number consisting of zero or more digits -javax.faces.converter.BooleanConverter.BOOLEAN=value must be true or false -javax.faces.converter.BooleanConverter.BOOLEAN_detail=value must be true or false (any value other than true will evaluate to false) -javax.faces.converter.ByteConverter.BYTE=value must be a number between 0 and 255 -javax.faces.converter.ByteConverter.BYTE_detail=value must be a number between 0 and 255 -javax.faces.converter.CharacterConverter.CHARACTER=value must be a character -javax.faces.converter.CharacterConverter.CHARACTER_detail=value must be a valid ASCII character -javax.faces.convert.DateTimeConverter.CONVERSION = Conversion Error -javax.faces.convert.DateTimeConverter.CONVERSION_detail = "{1}": Specified value is not a valid date/time. -javax.faces.converter.DateTimeConverter.DATE=value must be a date -javax.faces.converter.DateTimeConverter.DATE_detail=value must be a date, eg. {1} -javax.faces.converter.DateTimeConverter.TIME=value must be a time -javax.faces.converter.DateTimeConverter.TIME_detail=value must be a time, eg. {1} -javax.faces.converter.DateTimeConverter.DATETIME=value must be a date and time -javax.faces.converter.DateTimeConverter.DATETIME_detail=value must be a date and time, eg. {1} -javax.faces.converter.DateTimeConverter.PATTERN_TYPE=a pattern or type attribute must be specified to convert the value -javax.faces.converter.DoubleConverter.DOUBLE=value must be a number -javax.faces.converter.DoubleConverter.DOUBLE_detail=value must be a number between 4.9E-324 and 1.7976931348623157E308 -javax.faces.converter.EnumConverter.ENUM=value must be convertible to an enum -javax.faces.converter.EnumConverter.ENUM_detail=value must be convertible to an enum or from the enum that contains the constant {1} -javax.faces.converter.EnumConverter.ENUM_NO_CLASS=value must be convertible to an enum or from the enum, but no enum class provided -javax.faces.converter.EnumConverter.ENUM_NO_CLASS_detail=value must be convertible to an enum or from the enum, but no enum class provided -javax.faces.converter.FloatConverter.FLOAT=value must be a number -javax.faces.converter.FloatConverter.FLOAT_detail=value must be a number between 1.4E-45 and 3.4028235E38 -javax.faces.converter.IntegerConverter.INTEGER=value must be a number -javax.faces.converter.IntegerConverter.INTEGER_detail=value must be a number between -2147483648 and 2147483647 -javax.faces.converter.LongConverter.LONG=value must be a number -javax.faces.converter.LongConverter.LONG_detail=must be a number between -9223372036854775808 and 9223372036854775807 -javax.faces.converter.NumberConverter.CURRENCY=value must be a currency amount -javax.faces.converter.NumberConverter.CURRENCY_detail=value must be a currency amount, eg. {1} -javax.faces.converter.NumberConverter.PERCENT=value must be a percentage amount -javax.faces.converter.NumberConverter.PERCENT_detail=value must be a percentage amount, eg. {1} -javax.faces.converter.NumberConverter.NUMBER=value must be a number -javax.faces.converter.NumberConverter.NUMBER_detail=value must be a number -javax.faces.converter.NumberConverter.PATTERN=value must be a number -javax.faces.converter.NumberConverter.PATTERN_detail=value must be a number -javax.faces.converter.ShortConverter.SHORT=value must be a number -javax.faces.converter.ShortConverter.SHORT_detail=value must be a number between -32768 and 32767 - -#JSF 1.1: -javax.faces.convert.BigDecimalConverter.CONVERSION = value must be a number -javax.faces.convert.BigDecimalConverter.CONVERSION_detail = value must be a number -javax.faces.convert.BigIntegerConverter.CONVERSION = value must be an integre -javax.faces.convert.BigIntegerConverter.CONVERSION_detail = value must be a number -javax.faces.convert.BooleanConverter.CONVERSION = value must be true or false -javax.faces.convert.BooleanConverter.CONVERSION_detail = value must be true or false -javax.faces.convert.ByteConverter.CONVERSION = value must be a byte -javax.faces.convert.ByteConverter.CONVERSION_detail = value must be a byte -javax.faces.convert.CharacterConverter.CONVERSION = value must be a character -javax.faces.convert.CharacterConverter.CONVERSION_detail = value must be a character -javax.faces.convert.DateTimeConverter.CONVERSION = value must be a datetime -javax.faces.convert.DateTimeConverter.CONVERSION_detail = value must be a datetime -javax.faces.convert.DoubleConverter.CONVERSION = value must be a number -javax.faces.convert.DoubleConverter.CONVERSION_detail = value must be a number -javax.faces.convert.FloatConverter.CONVERSION = value must be a number -javax.faces.convert.FloatConverter.CONVERSION_detail = value must be a number -javax.faces.convert.IntegerConverter.CONVERSION = value must be an integer -javax.faces.convert.IntegerConverter.CONVERSION_detail = value must be an integer -javax.faces.convert.LongConverter.CONVERSION = value must be an integer -javax.faces.convert.LongConverter.CONVERSION_detail = value must be a long integer -javax.faces.convert.NumberConverter.CONVERSION = value must be a number -javax.faces.convert.NumberConverter.CONVERSION_detail = value must be a number -javax.faces.convert.ShortConverter.CONVERSION = value must be an integer -javax.faces.convert.ShortConverter.CONVERSION_detail = value must be a short integer - Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/messages_en.properties (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/resources/messages_en.properties) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/messages_en.properties (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/messages_en.properties 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,75 @@ +javax.faces.component.UIInput.CONVERSION=value could not be converted to the expected type +javax.faces.component.UIInput.REQUIRED=value is required +javax.faces.component.UIInput.REQUIRED_detail=value is required +javax.faces.component.UIInput.UPDATE=an error occurred when processing your submitted information +javax.faces.component.UISelectOne.INVALID=value is not valid +javax.faces.component.UISelectMany.INVALID=value is not valid + +javax.faces.converter.BigDecimalConverter.DECIMAL=value must be a number +javax.faces.converter.BigDecimalConverter.DECIMAL_detail=value must be a signed decimal number consisting of zero or more digits, optionally followed by a decimal point and fraction, eg. {1} +javax.faces.converter.BigIntegerConverter.BIGINTEGER=value must be a number +javax.faces.converter.BigIntegerConverter.BIGINTEGER_detail=value must be a signed integer number consisting of zero or more digits +javax.faces.converter.BooleanConverter.BOOLEAN=value must be true or false +javax.faces.converter.BooleanConverter.BOOLEAN_detail=value must be true or false (any value other than true will evaluate to false) +javax.faces.converter.ByteConverter.BYTE=value must be a number between 0 and 255 +javax.faces.converter.ByteConverter.BYTE_detail=value must be a number between 0 and 255 +javax.faces.converter.CharacterConverter.CHARACTER=value must be a character +javax.faces.converter.CharacterConverter.CHARACTER_detail=value must be a valid ASCII character +javax.faces.convert.DateTimeConverter.CONVERSION = Conversion Error +javax.faces.convert.DateTimeConverter.CONVERSION_detail = "{1}": Specified value is not a valid date/time. +javax.faces.converter.DateTimeConverter.DATE=value must be a date +javax.faces.converter.DateTimeConverter.DATE_detail=value must be a date, eg. {1} +javax.faces.converter.DateTimeConverter.TIME=value must be a time +javax.faces.converter.DateTimeConverter.TIME_detail=value must be a time, eg. {1} +javax.faces.converter.DateTimeConverter.DATETIME=value must be a date and time +javax.faces.converter.DateTimeConverter.DATETIME_detail=value must be a date and time, eg. {1} +javax.faces.converter.DateTimeConverter.PATTERN_TYPE=a pattern or type attribute must be specified to convert the value +javax.faces.converter.DoubleConverter.DOUBLE=value must be a number +javax.faces.converter.DoubleConverter.DOUBLE_detail=value must be a number between 4.9E-324 and 1.7976931348623157E308 +javax.faces.converter.EnumConverter.ENUM=value must be convertible to an enum +javax.faces.converter.EnumConverter.ENUM_detail=value must be convertible to an enum or from the enum that contains the constant {1} +javax.faces.converter.EnumConverter.ENUM_NO_CLASS=value must be convertible to an enum or from the enum, but no enum class provided +javax.faces.converter.EnumConverter.ENUM_NO_CLASS_detail=value must be convertible to an enum or from the enum, but no enum class provided +javax.faces.converter.FloatConverter.FLOAT=value must be a number +javax.faces.converter.FloatConverter.FLOAT_detail=value must be a number between 1.4E-45 and 3.4028235E38 +javax.faces.converter.IntegerConverter.INTEGER=value must be a number +javax.faces.converter.IntegerConverter.INTEGER_detail=value must be a number between -2147483648 and 2147483647 +javax.faces.converter.LongConverter.LONG=value must be a number +javax.faces.converter.LongConverter.LONG_detail=must be a number between -9223372036854775808 and 9223372036854775807 +javax.faces.converter.NumberConverter.CURRENCY=value must be a currency amount +javax.faces.converter.NumberConverter.CURRENCY_detail=value must be a currency amount, eg. {1} +javax.faces.converter.NumberConverter.PERCENT=value must be a percentage amount +javax.faces.converter.NumberConverter.PERCENT_detail=value must be a percentage amount, eg. {1} +javax.faces.converter.NumberConverter.NUMBER=value must be a number +javax.faces.converter.NumberConverter.NUMBER_detail=value must be a number +javax.faces.converter.NumberConverter.PATTERN=value must be a number +javax.faces.converter.NumberConverter.PATTERN_detail=value must be a number +javax.faces.converter.ShortConverter.SHORT=value must be a number +javax.faces.converter.ShortConverter.SHORT_detail=value must be a number between -32768 and 32767 + +#JSF 1.1: +javax.faces.convert.BigDecimalConverter.CONVERSION = value must be a number +javax.faces.convert.BigDecimalConverter.CONVERSION_detail = value must be a number +javax.faces.convert.BigIntegerConverter.CONVERSION = value must be an integre +javax.faces.convert.BigIntegerConverter.CONVERSION_detail = value must be a number +javax.faces.convert.BooleanConverter.CONVERSION = value must be true or false +javax.faces.convert.BooleanConverter.CONVERSION_detail = value must be true or false +javax.faces.convert.ByteConverter.CONVERSION = value must be a byte +javax.faces.convert.ByteConverter.CONVERSION_detail = value must be a byte +javax.faces.convert.CharacterConverter.CONVERSION = value must be a character +javax.faces.convert.CharacterConverter.CONVERSION_detail = value must be a character +javax.faces.convert.DateTimeConverter.CONVERSION = value must be a datetime +javax.faces.convert.DateTimeConverter.CONVERSION_detail = value must be a datetime +javax.faces.convert.DoubleConverter.CONVERSION = value must be a number +javax.faces.convert.DoubleConverter.CONVERSION_detail = value must be a number +javax.faces.convert.FloatConverter.CONVERSION = value must be a number +javax.faces.convert.FloatConverter.CONVERSION_detail = value must be a number +javax.faces.convert.IntegerConverter.CONVERSION = value must be an integer +javax.faces.convert.IntegerConverter.CONVERSION_detail = value must be an integer +javax.faces.convert.LongConverter.CONVERSION = value must be an integer +javax.faces.convert.LongConverter.CONVERSION_detail = value must be a long integer +javax.faces.convert.NumberConverter.CONVERSION = value must be a number +javax.faces.convert.NumberConverter.CONVERSION_detail = value must be a number +javax.faces.convert.ShortConverter.CONVERSION = value must be an integer +javax.faces.convert.ShortConverter.CONVERSION_detail = value must be a short integer + Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/seam.properties =================================================================== Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/seam.properties (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/resources/seam.properties) =================================================================== Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/components.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/components.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,52 +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:persistence="http://jboss.com/products/seam/persistence" - xmlns:drools="http://jboss.com/products/seam/drools" - xmlns:security="http://jboss.com/products/seam/security" - 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/persistence http://jboss.com/products/seam/persistence-2.3.xsd - http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.3.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-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="@jndiPattern@"/> - - <core:manager concurrent-request-timeout="500" - conversation-timeout="120000" - conversation-id-parameter="cid"/> - - <persistence:entity-manager-factory name="groovyEntityManagerFactory" - persistence-unit-name="groovy" installed="@loadPersistenceUnits@"/> - -  - <persistence:managed-persistence-context name="em" auto-create="true" - entity-manager-factory="#{groovyEntityManagerFactory}" - persistence-unit-jndi-name="java:/groovyEntityManagerFactory"/> - - <security:identity authenticate-method="#{authenticator.authenticate}" - remember-me="true"/> - - <event type="org.jboss.seam.security.notLoggedIn"> - <action execute="#{redirect.captureCurrentView}"/> - </event> - <event type="org.jboss.seam.security.loginSuccessful"> - <action execute="#{redirect.returnToCapturedView}"/> - </event> - - <mail:mail-session host="localhost" port="2525" username="test" password="test" /> - -  -  - -</components> Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/components.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/components.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/components.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,52 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:persistence="http://jboss.com/products/seam/persistence" + xmlns:drools="http://jboss.com/products/seam/drools" + xmlns:security="http://jboss.com/products/seam/security" + 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/persistence http://jboss.com/products/seam/persistence-2.3.xsd + http://jboss.com/products/seam/drools http://jboss.com/products/seam/drools-2.3.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-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="@jndiPattern@"/> + + <core:manager concurrent-request-timeout="500" + conversation-timeout="120000" + conversation-id-parameter="cid"/> + + <persistence:entity-manager-factory name="groovyEntityManagerFactory" + persistence-unit-name="groovy" installed="@loadPersistenceUnits@"/> + +  + <persistence:managed-persistence-context name="em" auto-create="true" + entity-manager-factory="#{groovyEntityManagerFactory}" + persistence-unit-jndi-name="java:/groovyEntityManagerFactory"/> + + <security:identity authenticate-method="#{authenticator.authenticate}" + remember-me="true"/> + + <event type="org.jboss.seam.security.notLoggedIn"> + <action execute="#{redirect.captureCurrentView}"/> + </event> + <event type="org.jboss.seam.security.loginSuccessful"> + <action execute="#{redirect.returnToCapturedView}"/> + </event> + + <mail:mail-session host="localhost" port="2525" username="test" password="test" /> + +  +  + +</components> Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,12 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<faces-config version="1.2" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> - -  - - <application> - <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> - </application> -</faces-config> Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/faces-config.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/faces-config.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,12 @@ +<?xml version='1.0' encoding='UTF-8'?> +<faces-config version="1.2" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + +  + + <application> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + </application> +</faces-config> Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-web.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-web.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,12 +0,0 @@ -<!DOCTYPE jboss-web PUBLIC - "-//JBoss//DTD Web Application 4.2//EN" - "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> - -<jboss-web> - <class-loading java2ClassLoadingCompliance="false"> - <loader-repository> - seam.jboss.org:loader=jboss-seam-groovybooking - <loader-repository-config>java2ParentDelegation=false</loader-repository-config> - </loader-repository> - </class-loading> -</jboss-web> Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-web.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-web.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-web.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,12 @@ +<!DOCTYPE jboss-web PUBLIC + "-//JBoss//DTD Web Application 4.2//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> + +<jboss-web> + <class-loading java2ClassLoadingCompliance="false"> + <loader-repository> + seam.jboss.org:loader=jboss-seam-groovybooking + <loader-repository-config>java2ParentDelegation=false</loader-repository-config> + </loader-repository> + </class-loading> +</jboss-web> Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/pages.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/pages.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,111 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pages xmlns="http://jboss.com/products/seam/pages" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.3.xsd" - - no-conversation-view-id="/main.xhtml" - login-view-id="/home.xhtml"> - - <page view-id="/register.xhtml"> - - <action if="#{validation.failed}" - execute="#{register.invalid}"/> - - <navigation> - <rule if="#{register.registered}"> - <redirect view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/home.xhtml"> - - <navigation> - <rule if="#{identity.loggedIn}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/password.xhtml" - login-required="true"> - - <navigation> - <rule if="#{changePassword.changed}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/main.xhtml" - login-required="true"> - - <navigation from-action="#{hotelBooking.selectHotel(hot)}"> - <redirect view-id="/hotel.xhtml"/> - </navigation> - - </page> - - <page view-id="/hotel.xhtml" - conversation-required="true"> - - <description>View hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.bookHotel}"> - <redirect view-id="/book.xhtml"/> - </navigation> - - </page> - - <page view-id="/book.xhtml" - conversation-required="true"> - - <description>Book hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.setBookingDetails}"> - <rule if="#{hotelBooking.bookingValid}"> - <redirect view-id="/confirm.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/confirm.xhtml" - conversation-required="true"> - - <description>Confirm booking: #{booking.description}</description> - - <navigation from-action="#{hotelBooking.confirm}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <page view-id="*"> - - <navigation from-action="#{identity.logout}"> - <redirect view-id="/home.xhtml"/> - </navigation> - - <navigation from-action="#{hotelBooking.cancel}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <exception class="org.jboss.seam.security.NotLoggedInException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">You must be logged in to use this feature</message> - </redirect> - </exception> - - <exception class="javax.faces.application.ViewExpiredException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">Session expired, please log in again</message> - </redirect> - </exception> - -</pages> Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/pages.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/pages.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/pages.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/pages.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,111 @@ +<?xml version="1.0" encoding="UTF-8"?> +<pages xmlns="http://jboss.com/products/seam/pages" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.3.xsd" + + no-conversation-view-id="/main.xhtml" + login-view-id="/home.xhtml"> + + <page view-id="/register.xhtml"> + + <action if="#{validation.failed}" + execute="#{register.invalid}"/> + + <navigation> + <rule if="#{register.registered}"> + <redirect view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/home.xhtml"> + + <navigation> + <rule if="#{identity.loggedIn}"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/password.xhtml" + login-required="true"> + + <navigation> + <rule if="#{changePassword.changed}"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/main.xhtml" + login-required="true"> + + <navigation from-action="#{hotelBooking.selectHotel(hot)}"> + <redirect view-id="/hotel.xhtml"/> + </navigation> + + </page> + + <page view-id="/hotel.xhtml" + conversation-required="true"> + + <description>View hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.bookHotel}"> + <redirect view-id="/book.xhtml"/> + </navigation> + + </page> + + <page view-id="/book.xhtml" + conversation-required="true"> + + <description>Book hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.setBookingDetails}"> + <rule if="#{hotelBooking.bookingValid}"> + <redirect view-id="/confirm.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/confirm.xhtml" + conversation-required="true"> + + <description>Confirm booking: #{booking.description}</description> + + <navigation from-action="#{hotelBooking.confirm}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <page view-id="*"> + + <navigation from-action="#{identity.logout}"> + <redirect view-id="/home.xhtml"/> + </navigation> + + <navigation from-action="#{hotelBooking.cancel}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <exception class="org.jboss.seam.security.NotLoggedInException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">You must be logged in to use this feature</message> + </redirect> + </exception> + + <exception class="javax.faces.application.ViewExpiredException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">Session expired, please log in again</message> + </redirect> + </exception> + +</pages> Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/web.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/web.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,74 +0,0 @@ -<?xml version="1.0" ?> -<web-app xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - version="2.5"> - - <context-param> - <param-name>org.richfaces.SKIN</param-name> - <param-value>blueSky</param-value> - </context-param> - -  - - <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> - </listener> - - <filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <servlet> - <servlet-name>Seam Resource Servlet</servlet-name> - <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>Seam Resource Servlet</servlet-name> - <url-pattern>/seam/resource/*</url-pattern> - </servlet-mapping> - -  - - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</param-value> - </context-param> - -  - - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.seam</url-pattern> - </servlet-mapping> - - <security-constraint> - <display-name>Restrict raw XHTML Documents</display-name> - <web-resource-collection> - <web-resource-name>XHTML</web-resource-name> - <url-pattern>*.xhtml</url-pattern> - </web-resource-collection> - <auth-constraint> - <role-name>NONE</role-name> - </auth-constraint> - </security-constraint> - -</web-app> Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/web.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/web.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/web.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,74 @@ +<?xml version="1.0" ?> +<web-app xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + version="2.5"> + + <context-param> + <param-name>org.richfaces.SKIN</param-name> + <param-value>blueSky</param-value> + </context-param> + +  + + <listener> + <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + </listener> + + <filter> + <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>Seam Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <servlet> + <servlet-name>Seam Resource Servlet</servlet-name> + <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Seam Resource Servlet</servlet-name> + <url-pattern>/seam/resource/*</url-pattern> + </servlet-mapping> + +  + + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + +  + + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.seam</url-pattern> + </servlet-mapping> + + <security-constraint> + <display-name>Restrict raw XHTML Documents</display-name> + <web-resource-collection> + <web-resource-name>XHTML</web-resource-name> + <url-pattern>*.xhtml</url-pattern> + </web-resource-collection> + <auth-constraint> + <role-name>NONE</role-name> + </auth-constraint> + </security-constraint> + +</web-app> Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/book.xhtml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/book.xhtml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/book.xhtml 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,176 +0,0 @@ -<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:a="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich" - template="template.xhtml"> - - -<ui:define name="content"> -<div class="section"> - <h1>Book Hotel</h1> -</div> -<div class="section"> - <h:form id="booking"> - <fieldset> - <div class="entry"> - <div class="label">Name:</div> - <div class="output">#{hotel.name}</div> - </div> - <div class="entry"> - <div class="label">Address:</div> - <div class="output">#{hotel.address}</div> - </div> - <div class="entry"> - <div class="label">City, State:</div> - <div class="output">#{hotel.city}, #{hotel.state}</div> - </div> - <div class="entry"> - <div class="label">Zip:</div> - <div class="output">#{hotel.zip}</div> - </div> - <div class="entry"> - <div class="label">Country:</div> - <div class="output">#{hotel.country}</div> - </div> - <div class="entry"> - <div class="label">Nightly rate:</div> - <div class="output"> - <h:outputText value="#{hotel.price}"> - <f:convertNumber type="currency" - currencySymbol="$"/> - </h:outputText> - </div> - </div> - - <s:validateAll> - - <f:facet name="aroundInvalidField"> - <s:span id="Error" styleClass="errors"/> - </f:facet> - <f:facet name="afterInvalidField"> - <s:div id="Message" styleClass="errors"> - <s:message/> - </s:div> - </f:facet> - - <div class="entry"> - <div class="label"><h:outputLabel for="checkinDate">Check In Date:</h:outputLabel></div> - <div class="input"> - <s:decorate id="checkinDateDecorate"> - <rich:calendar id="checkinDate" value="#{booking.checkinDate}" required="true" datePattern="MM/dd/yyyy" event="onblur" reRender="checkinDateDecorate" style="width: auto;" /> - </s:decorate> - </div> - </div> - - <div class="entry"> - <div class="label"><h:outputLabel for="checkoutDate">Check Out Date:</h:outputLabel></div> - <div class="input"> - <s:decorate id="checkoutDateDecorate"> - <rich:calendar id="checkoutDate" value="#{booking.checkoutDate}" required="true" datePattern="MM/dd/yyyy" event="onblur" reRender="checkoutDateDecorate" style="width: auto;" /> - </s:decorate> - </div> - </div> - - <div class="entry"> - <div class="label"><h:outputLabel for="beds">Room Preference:</h:outputLabel></div> - <div class="input"> - <s:decorate id="bedsDecorate"> - <h:selectOneMenu id="beds" value="#{booking.beds}"> - <f:selectItem itemLabel="One king-size bed" itemValue="1"/> - <f:selectItem itemLabel="Two double beds" itemValue="2"/> - <f:selectItem itemLabel="Three beds" itemValue="3"/> - </h:selectOneMenu> - </s:decorate> - </div> - </div> - - <div class="entry"> - <div class="label"><h:outputLabel for="smoking">Smoking Preference:</h:outputLabel></div> - <div id="radio" class="input"> - <s:decorate id="smokingDecorate"> - <h:selectOneRadio id="smoking" value="#{booking.smoking}" layout="pageDirection"> - <f:selectItem itemLabel="Smoking" itemValue="true"/> - <f:selectItem itemLabel="Non Smoking" itemValue="false"/> - </h:selectOneRadio> - </s:decorate> - </div> - </div> - - <div class="entry"> - <div class="label"><h:outputLabel for="creditCard">Credit Card #:</h:outputLabel></div> - <div class="input"> - <s:decorate id="creditCardDecorate"> - <h:inputText id="creditCard" value="#{booking.creditCard}" required="true"> - <a:support event="onblur" reRender="creditCardDecorate"/> - </h:inputText> - </s:decorate> - </div> - </div> - - <div class="entry"> - <div class="label"><h:outputLabel for="creditCardName">Credit Card Name:</h:outputLabel></div> - <div class="input"> - <s:decorate id="creditCardNameDecorate"> - <h:inputText id="creditCardName" value="#{booking.creditCardName}" required="true"> - <a:support event="onblur" reRender="creditCardNameDecorate"/> - </h:inputText> - </s:decorate> - </div> - </div> - - <div class="entry"> - <div class="label"><h:outputLabel for="creditCardExpiryMonth">Credit Card Expiry:</h:outputLabel></div> - <div class="input"> - <s:decorate id="creditCardExpiryDecorate"> - <h:selectOneMenu id="creditCardExpiryMonth" value="#{booking.creditCardExpiryMonth}"> - <f:selectItem itemLabel="Jan" itemValue="1"/> - <f:selectItem itemLabel="Feb" itemValue="2"/> - <f:selectItem itemLabel="Mar" itemValue="3"/> - <f:selectItem itemLabel="Apr" itemValue="4"/> - <f:selectItem itemLabel="May" itemValue="5"/> - <f:selectItem itemLabel="Jun" itemValue="6"/> - <f:selectItem itemLabel="Jul" itemValue="7"/> - <f:selectItem itemLabel="Aug" itemValue="8"/> - <f:selectItem itemLabel="Sep" itemValue="9"/> - <f:selectItem itemLabel="Oct" itemValue="10"/> - <f:selectItem itemLabel="Nov" itemValue="11"/> - <f:selectItem itemLabel="Dec" itemValue="12"/> - </h:selectOneMenu> - <h:selectOneMenu id="creditCardExpiryYear" value="#{booking.creditCardExpiryYear}"> - <f:selectItem itemLabel="2005" itemValue="2005"/> - <f:selectItem itemLabel="2006" itemValue="2006"/> - <f:selectItem itemLabel="2007" itemValue="2007"/> - <f:selectItem itemLabel="2008" itemValue="2008"/> - <f:selectItem itemLabel="2009" itemValue="2009"/> - </h:selectOneMenu> - </s:decorate> - </div> - </div> - - </s:validateAll> - - <div class="entry errors"> - <h:messages globalOnly="true"/> - </div> - - <div class="entry"> - <div class="label"> </div> - <div class="input"> - <h:commandButton id="proceed" value="Proceed" action="#{hotelBooking.setBookingDetails}"/>  - <s:button id="cancel" value="Cancel" action="#{hotelBooking.cancel}"/> - </div> - </div> - </fieldset> - </h:form> -</div> -</ui:define> - - -<ui:define name="sidebar"> -</ui:define> - -</ui:composition> Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/book.xhtml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/book.xhtml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/book.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/book.xhtml 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,176 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:a="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich" + template="template.xhtml"> + + +<ui:define name="content"> +<div class="section"> + <h1>Book Hotel</h1> +</div> +<div class="section"> + <h:form id="booking"> + <fieldset> + <div class="entry"> + <div class="label">Name:</div> + <div class="output">#{hotel.name}</div> + </div> + <div class="entry"> + <div class="label">Address:</div> + <div class="output">#{hotel.address}</div> + </div> + <div class="entry"> + <div class="label">City, State:</div> + <div class="output">#{hotel.city}, #{hotel.state}</div> + </div> + <div class="entry"> + <div class="label">Zip:</div> + <div class="output">#{hotel.zip}</div> + </div> + <div class="entry"> + <div class="label">Country:</div> + <div class="output">#{hotel.country}</div> + </div> + <div class="entry"> + <div class="label">Nightly rate:</div> + <div class="output"> + <h:outputText value="#{hotel.price}"> + <f:convertNumber type="currency" + currencySymbol="$"/> + </h:outputText> + </div> + </div> + + <s:validateAll> + + <f:facet name="aroundInvalidField"> + <s:span id="Error" styleClass="errors"/> + </f:facet> + <f:facet name="afterInvalidField"> + <s:div id="Message" styleClass="errors"> + <s:message/> + </s:div> + </f:facet> + + <div class="entry"> + <div class="label"><h:outputLabel for="checkinDate">Check In Date:</h:outputLabel></div> + <div class="input"> + <s:decorate id="checkinDateDecorate"> + <rich:calendar id="checkinDate" value="#{booking.checkinDate}" required="true" datePattern="MM/dd/yyyy" event="onblur" reRender="checkinDateDecorate" style="width: auto;" /> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="checkoutDate">Check Out Date:</h:outputLabel></div> + <div class="input"> + <s:decorate id="checkoutDateDecorate"> + <rich:calendar id="checkoutDate" value="#{booking.checkoutDate}" required="true" datePattern="MM/dd/yyyy" event="onblur" reRender="checkoutDateDecorate" style="width: auto;" /> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="beds">Room Preference:</h:outputLabel></div> + <div class="input"> + <s:decorate id="bedsDecorate"> + <h:selectOneMenu id="beds" value="#{booking.beds}"> + <f:selectItem itemLabel="One king-size bed" itemValue="1"/> + <f:selectItem itemLabel="Two double beds" itemValue="2"/> + <f:selectItem itemLabel="Three beds" itemValue="3"/> + </h:selectOneMenu> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="smoking">Smoking Preference:</h:outputLabel></div> + <div id="radio" class="input"> + <s:decorate id="smokingDecorate"> + <h:selectOneRadio id="smoking" value="#{booking.smoking}" layout="pageDirection"> + <f:selectItem itemLabel="Smoking" itemValue="true"/> + <f:selectItem itemLabel="Non Smoking" itemValue="false"/> + </h:selectOneRadio> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="creditCard">Credit Card #:</h:outputLabel></div> + <div class="input"> + <s:decorate id="creditCardDecorate"> + <h:inputText id="creditCard" value="#{booking.creditCard}" required="true"> + <a:support event="onblur" reRender="creditCardDecorate"/> + </h:inputText> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="creditCardName">Credit Card Name:</h:outputLabel></div> + <div class="input"> + <s:decorate id="creditCardNameDecorate"> + <h:inputText id="creditCardName" value="#{booking.creditCardName}" required="true"> + <a:support event="onblur" reRender="creditCardNameDecorate"/> + </h:inputText> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="creditCardExpiryMonth">Credit Card Expiry:</h:outputLabel></div> + <div class="input"> + <s:decorate id="creditCardExpiryDecorate"> + <h:selectOneMenu id="creditCardExpiryMonth" value="#{booking.creditCardExpiryMonth}"> + <f:selectItem itemLabel="Jan" itemValue="1"/> + <f:selectItem itemLabel="Feb" itemValue="2"/> + <f:selectItem itemLabel="Mar" itemValue="3"/> + <f:selectItem itemLabel="Apr" itemValue="4"/> + <f:selectItem itemLabel="May" itemValue="5"/> + <f:selectItem itemLabel="Jun" itemValue="6"/> + <f:selectItem itemLabel="Jul" itemValue="7"/> + <f:selectItem itemLabel="Aug" itemValue="8"/> + <f:selectItem itemLabel="Sep" itemValue="9"/> + <f:selectItem itemLabel="Oct" itemValue="10"/> + <f:selectItem itemLabel="Nov" itemValue="11"/> + <f:selectItem itemLabel="Dec" itemValue="12"/> + </h:selectOneMenu> + <h:selectOneMenu id="creditCardExpiryYear" value="#{booking.creditCardExpiryYear}"> + <f:selectItem itemLabel="2005" itemValue="2005"/> + <f:selectItem itemLabel="2006" itemValue="2006"/> + <f:selectItem itemLabel="2007" itemValue="2007"/> + <f:selectItem itemLabel="2008" itemValue="2008"/> + <f:selectItem itemLabel="2009" itemValue="2009"/> + </h:selectOneMenu> + </s:decorate> + </div> + </div> + + </s:validateAll> + + <div class="entry errors"> + <h:messages globalOnly="true"/> + </div> + + <div class="entry"> + <div class="label"> </div> + <div class="input"> + <h:commandButton id="proceed" value="Proceed" action="#{hotelBooking.setBookingDetails}"/>  + <s:button id="cancel" value="Cancel" action="#{hotelBooking.cancel}"/> + </div> + </div> + </fieldset> + </h:form> +</div> +</ui:define> + + +<ui:define name="sidebar"> +</ui:define> + +</ui:composition> Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/confirm.xhtml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/confirm.xhtml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/confirm.xhtml 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,75 +0,0 @@ -<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - template="template.xhtml"> - - -<ui:define name="content"> -<div class="section"> - <h1>Confirm Hotel Booking</h1> -</div> -<div class="section"> - <h:form id="confirm"> - <fieldset> - <div class="entry"> - <div class="label">Name:</div> - <div class="output">#{hotel.name}</div> - </div> - <div class="entry"> - <div class="label">Address:</div> - <div class="output">#{hotel.address}</div> - </div> - <div class="entry"> - <div class="label">City, State:</div> - <div class="output">#{hotel.city}, #{hotel.state}</div> - </div> - <div class="entry"> - <div class="label">Zip:</div> - <div class="output">#{hotel.zip}</div> - </div> - <div class="entry"> - <div class="label">Country:</div> - <div class="output">#{hotel.country}</div> - </div> - <div class="entry"> - <div class="label">Total payment:</div> - <div class="output"> - <h:outputText value="#{booking.total}"> - <f:convertNumber type="currency" - currencySymbol="$"/> - </h:outputText> - </div> - </div> - <div class="entry"> - <div class="label">Check In Date:</div> - <div class="output"><h:outputText value="#{booking.checkinDate}"/></div> - </div> - <div class="entry"> - <div class="label">Check Out Date:</div> - <div class="output"><h:outputText value="#{booking.checkoutDate}"/></div> - </div> - <div class="entry"> - <div class="label">Credit Card #:</div> - <div class="output">#{booking.creditCard}</div> - </div> - <div class="entry"> - <div class="label"> </div> - <div class="input"> - <h:commandButton id="confirm" value="Confirm" action="#{hotelBooking.confirm}"/>  - <s:button id="revise" value="Revise" view="/book.xhtml"/>  - <h:commandButton id="cancel" value="Cancel" action="#{hotelBooking.cancel}"/> - </div> - </div> - </fieldset> - </h:form> -</div> -</ui:define> - - -<ui:define name="sidebar"> -</ui:define> - -</ui:composition> Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/confirm.xhtml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/confirm.xhtml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/confirm.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/confirm.xhtml 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,75 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + template="template.xhtml"> + + +<ui:define name="content"> +<div class="section"> + <h1>Confirm Hotel Booking</h1> +</div> +<div class="section"> + <h:form id="confirm"> + <fieldset> + <div class="entry"> + <div class="label">Name:</div> + <div class="output">#{hotel.name}</div> + </div> + <div class="entry"> + <div class="label">Address:</div> + <div class="output">#{hotel.address}</div> + </div> + <div class="entry"> + <div class="label">City, State:</div> + <div class="output">#{hotel.city}, #{hotel.state}</div> + </div> + <div class="entry"> + <div class="label">Zip:</div> + <div class="output">#{hotel.zip}</div> + </div> + <div class="entry"> + <div class="label">Country:</div> + <div class="output">#{hotel.country}</div> + </div> + <div class="entry"> + <div class="label">Total payment:</div> + <div class="output"> + <h:outputText value="#{booking.total}"> + <f:convertNumber type="currency" + currencySymbol="$"/> + </h:outputText> + </div> + </div> + <div class="entry"> + <div class="label">Check In Date:</div> + <div class="output"><h:outputText value="#{booking.checkinDate}"/></div> + </div> + <div class="entry"> + <div class="label">Check Out Date:</div> + <div class="output"><h:outputText value="#{booking.checkoutDate}"/></div> + </div> + <div class="entry"> + <div class="label">Credit Card #:</div> + <div class="output">#{booking.creditCard}</div> + </div> + <div class="entry"> + <div class="label"> </div> + <div class="input"> + <h:commandButton id="confirm" value="Confirm" action="#{hotelBooking.confirm}"/>  + <s:button id="revise" value="Revise" view="/book.xhtml"/>  + <h:commandButton id="cancel" value="Cancel" action="#{hotelBooking.cancel}"/> + </div> + </div> + </fieldset> + </h:form> +</div> +</ui:define> + + +<ui:define name="sidebar"> +</ui:define> + +</ui:composition> Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/conversations.xhtml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/conversations.xhtml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/conversations.xhtml 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,34 +0,0 @@ - -<div xmlns="http://www.w3.org/1999/xhtml" - xmlns:c="http://java.sun.com/jstl/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:s="http://jboss.com/products/seam/taglib"> - -<div class="section"> - <h1><h:outputText rendered="#{not empty conversationList}" value="Workspaces"/></h1> -</div> - -<div class="section"> - <h:form id="ConversationListForm"> - <h:dataTable id="ConversationListDataTable" value="#{conversationList}" var="entry"> - <h:column id="column1"> - <h:commandLink id="EntryDescriptionLink" action="#{entry.select}" value="#{entry.description}"/> -   - <h:outputText id="CurrentEntry" value="[current]" rendered="#{entry.current}"/> - </h:column> - <h:column id="column2"> - <h:outputText id="EntryStartDateTime" value="#{entry.startDatetime}"> - <s:convertDateTime type="time" pattern="hh:mm"/> - </h:outputText> - - - <h:outputText id="EntryLastDateTime" value="#{entry.lastDatetime}"> - <s:convertDateTime type="time" pattern="hh:mm"/> - </h:outputText> - </h:column> - </h:dataTable> - </h:form> -</div> - -</div> \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/conversations.xhtml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/conversations.xhtml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/conversations.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/conversations.xhtml 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,34 @@ + +<div xmlns="http://www.w3.org/1999/xhtml" + xmlns:c="http://java.sun.com/jstl/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:s="http://jboss.com/products/seam/taglib"> + +<div class="section"> + <h1><h:outputText rendered="#{not empty conversationList}" value="Workspaces"/></h1> +</div> + +<div class="section"> + <h:form id="ConversationListForm"> + <h:dataTable id="ConversationListDataTable" value="#{conversationList}" var="entry"> + <h:column id="column1"> + <h:commandLink id="EntryDescriptionLink" action="#{entry.select}" value="#{entry.description}"/> +   + <h:outputText id="CurrentEntry" value="[current]" rendered="#{entry.current}"/> + </h:column> + <h:column id="column2"> + <h:outputText id="EntryStartDateTime" value="#{entry.startDatetime}"> + <s:convertDateTime type="time" pattern="hh:mm"/> + </h:outputText> + - + <h:outputText id="EntryLastDateTime" value="#{entry.lastDatetime}"> + <s:convertDateTime type="time" pattern="hh:mm"/> + </h:outputText> + </h:column> + </h:dataTable> + </h:form> +</div> + +</div> \ No newline at end of file Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/css/screen.css =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/css/screen.css 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/css/screen.css 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,274 +0,0 @@ -/* Setup defaults since variable in browsers ------------------------------------------------ */ -body, div, dd, dt, dl, img, ul, ol, li, p, h1, h2, h3, h4, h5, form, hr, fieldset { - margin: 0; - padding: 0; -} -/* Element Defaults ------------------------------------------------ */ -html { - height: 100%; - background-color: #DBD4C6; -} -img { - border: 0; -} -body { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: small; - line-height: 1.25em; - color: #362F2D; - position: relative; - width: 760px; - height: 100%; - margin-left: auto; - margin-right: auto; -} -label { - font-weight: bold; - color: #5E5147; -} -input { - border: 1px solid #C3BBB6; - padding: 4px; - margin: 5px 0; - background: #fff url(../img/input.bg.gif) 0 0 repeat-x; -} -select { - border: 1px solid #C3BBB6; - padding: 4px; - margin: 5px 0; - background: #fff url(../img/input.bg.gif) 0 0 repeat-x; -}ol, ul { - margin: 10px 0px 10px 6px; -} -li { - margin: 10px 12px; -} -fieldset { - border: 0; -} -/* Layout ------------------------------------------------ */ -#document { - padding: 0 1px; - background: #fff url(../img/bg.gif) 0 0 repeat-y; - float: left; - border-bottom: 1px solid #C3BBB6; -} -#header { - float: left; - width: 758px; - height: 46px; - background: url(../img/hdr.bg.gif) 0 0 repeat-x; -} -#container { - float: left; - width: 758px; - background: url(../img/hdr.bar.jpg) 0 0 repeat-x; -} -#sidebar { - float: left; - width: 190px; - margin-top: 96px; - padding: 20px 10px 0 10px; - background: url(../img/sdb.bg.gif) 0 0 no-repeat; -} -#content { - float: left; - width: 548px; - margin-top: 75px; - padding-top: 5px; - background: #fff url(../img/cnt.bg.gif) 0 0 repeat-x; -} -#footer { - clear: both; - margin-top: 40px; - float: left; - padding: 20px; - border-top: 1px solid #C3BBB6; - background-color: #fff; - width: 718px; - text-align: right; -} -/* General ------------------------------------------------ */ -input[type="submit"], input[type="button"] { - font-weight: bold; - color: #fff; - border: 1px solid #5D1414; - height: 26px; - background: #fff url(../img/btn.bg.gif) 0 0 repeat-x; - border-style: none; -} -.center { - text-align: center; -} -.entry { - clear: both; - padding-top: 10px; -} -.entry .label { - float: left; - padding-top: 10px; - padding-right: 5px; - font-weight: bold; - width: 150px; - text-align: right; -} -.entry .output { - float: left; - width: 250px; - padding-top: 10px; - text-align: left; -} -.entry .input { - float: left; - width: 250px; - text-align: left; -} -/* Sidebar ------------------------------------------------ */ -.notes { - text-align: center; - font-size: small; -} -.subnotes { - margin-top: 1em; - font-size: small; -} -.errors { - font-size: small; - font-weight: bold; - text-align: center; - color: #600; -} -.errors div { - text-align: left; -} -.errors input { - border: 1px solid #600; -} -.errors ul { - list-style: none; -} -.buttonBox { - text-align: center; - padding: 5px 0; -} -#sidebar p { - font-size: small; - color: #8B7869; - line-height: 150%; - padding-bottom: 10px; -} -#sidebar li { - font-size: small; - color: #8B7869; -} -#sidebar h1 { - line-height: normal; - font-weight: bold; - font-size: small; -} -/* -#sidebar p:hover { - color: #362F2D; -} -*/ -/* Content ------------------------------------------------ */ -#content .section { - float: left; - width: 518px; - padding: 15px 15px 0 15px; -} -#content .section h1 { - font-family: "Trebuchet MS", Arial, sans-serif; - line-height: normal; - font-weight: normal; - font-size: large; -} -#content .section p { - line-height: 150%; - padding: 10px 0; - font-size: small; -} -#content table { - width: 100%; - border: 1px solid #D2C9C4; - border-collapse: collapse; -} -#content table caption { - padding-bottom: 6px; - text-align: left; - font-weight: bold; -} -#content table thead th { - border-left: 1px solid #D2C9C4; - background: #fff url(../img/th.bg.gif) 0 100% repeat-x; - border-bottom: 1px solid #D2C9C4; - padding: 6px; - text-align: left; - font-size: small; -} -#content table tbody td { - border-left: 1px solid #E4DBD5; - padding: 4px; - border-bottom: 1px solid #D2C9C4; - font-size: small; -} -#content dt { - font-weight: bold; - float: left; - width: 33%; -} -#content dd { - padding-left: 10px; - float: left; - width: 66%; -} -#radio table { - border: 0px; -} -#content .input table, -#content .input tbody tr td, -#radio table tr td { - border: 0px; - border-left: 0px; - border-bottom: 0px; -} -/* Header ------------------------------------------------ */ -#title { - float: left; - padding: 1px 0 6px 15px; -} -#status { - color: #C7B299; - float: right; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-weight: bold; - font-size: x-small; - text-align: right; - padding-top: 14px; - padding-right: 15px; -} -#status a { - color: #C7B299; - text-decoration: none; -} -/* Homepage Modifications ------------------------------------------------ */ -#pgHome #container { - background: url(../img/hdr.ad.jpg) 0 0 repeat-x; -} -#pgHome #sidebar { - margin-top: 207px; -} -#pgHome #content { - margin-top: 183px; -} -#pgHome #sidebar input[type="submit"] { - height: 30px; -} Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/css/screen.css (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/css/screen.css) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/css/screen.css (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/css/screen.css 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,274 @@ +/* Setup defaults since variable in browsers +----------------------------------------------- */ +body, div, dd, dt, dl, img, ul, ol, li, p, h1, h2, h3, h4, h5, form, hr, fieldset { + margin: 0; + padding: 0; +} +/* Element Defaults +----------------------------------------------- */ +html { + height: 100%; + background-color: #DBD4C6; +} +img { + border: 0; +} +body { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: small; + line-height: 1.25em; + color: #362F2D; + position: relative; + width: 760px; + height: 100%; + margin-left: auto; + margin-right: auto; +} +label { + font-weight: bold; + color: #5E5147; +} +input { + border: 1px solid #C3BBB6; + padding: 4px; + margin: 5px 0; + background: #fff url(../img/input.bg.gif) 0 0 repeat-x; +} +select { + border: 1px solid #C3BBB6; + padding: 4px; + margin: 5px 0; + background: #fff url(../img/input.bg.gif) 0 0 repeat-x; +}ol, ul { + margin: 10px 0px 10px 6px; +} +li { + margin: 10px 12px; +} +fieldset { + border: 0; +} +/* Layout +----------------------------------------------- */ +#document { + padding: 0 1px; + background: #fff url(../img/bg.gif) 0 0 repeat-y; + float: left; + border-bottom: 1px solid #C3BBB6; +} +#header { + float: left; + width: 758px; + height: 46px; + background: url(../img/hdr.bg.gif) 0 0 repeat-x; +} +#container { + float: left; + width: 758px; + background: url(../img/hdr.bar.jpg) 0 0 repeat-x; +} +#sidebar { + float: left; + width: 190px; + margin-top: 96px; + padding: 20px 10px 0 10px; + background: url(../img/sdb.bg.gif) 0 0 no-repeat; +} +#content { + float: left; + width: 548px; + margin-top: 75px; + padding-top: 5px; + background: #fff url(../img/cnt.bg.gif) 0 0 repeat-x; +} +#footer { + clear: both; + margin-top: 40px; + float: left; + padding: 20px; + border-top: 1px solid #C3BBB6; + background-color: #fff; + width: 718px; + text-align: right; +} +/* General +----------------------------------------------- */ +input[type="submit"], input[type="button"] { + font-weight: bold; + color: #fff; + border: 1px solid #5D1414; + height: 26px; + background: #fff url(../img/btn.bg.gif) 0 0 repeat-x; + border-style: none; +} +.center { + text-align: center; +} +.entry { + clear: both; + padding-top: 10px; +} +.entry .label { + float: left; + padding-top: 10px; + padding-right: 5px; + font-weight: bold; + width: 150px; + text-align: right; +} +.entry .output { + float: left; + width: 250px; + padding-top: 10px; + text-align: left; +} +.entry .input { + float: left; + width: 250px; + text-align: left; +} +/* Sidebar +----------------------------------------------- */ +.notes { + text-align: center; + font-size: small; +} +.subnotes { + margin-top: 1em; + font-size: small; +} +.errors { + font-size: small; + font-weight: bold; + text-align: center; + color: #600; +} +.errors div { + text-align: left; +} +.errors input { + border: 1px solid #600; +} +.errors ul { + list-style: none; +} +.buttonBox { + text-align: center; + padding: 5px 0; +} +#sidebar p { + font-size: small; + color: #8B7869; + line-height: 150%; + padding-bottom: 10px; +} +#sidebar li { + font-size: small; + color: #8B7869; +} +#sidebar h1 { + line-height: normal; + font-weight: bold; + font-size: small; +} +/* +#sidebar p:hover { + color: #362F2D; +} +*/ +/* Content +----------------------------------------------- */ +#content .section { + float: left; + width: 518px; + padding: 15px 15px 0 15px; +} +#content .section h1 { + font-family: "Trebuchet MS", Arial, sans-serif; + line-height: normal; + font-weight: normal; + font-size: large; +} +#content .section p { + line-height: 150%; + padding: 10px 0; + font-size: small; +} +#content table { + width: 100%; + border: 1px solid #D2C9C4; + border-collapse: collapse; +} +#content table caption { + padding-bottom: 6px; + text-align: left; + font-weight: bold; +} +#content table thead th { + border-left: 1px solid #D2C9C4; + background: #fff url(../img/th.bg.gif) 0 100% repeat-x; + border-bottom: 1px solid #D2C9C4; + padding: 6px; + text-align: left; + font-size: small; +} +#content table tbody td { + border-left: 1px solid #E4DBD5; + padding: 4px; + border-bottom: 1px solid #D2C9C4; + font-size: small; +} +#content dt { + font-weight: bold; + float: left; + width: 33%; +} +#content dd { + padding-left: 10px; + float: left; + width: 66%; +} +#radio table { + border: 0px; +} +#content .input table, +#content .input tbody tr td, +#radio table tr td { + border: 0px; + border-left: 0px; + border-bottom: 0px; +} +/* Header +----------------------------------------------- */ +#title { + float: left; + padding: 1px 0 6px 15px; +} +#status { + color: #C7B299; + float: right; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-weight: bold; + font-size: x-small; + text-align: right; + padding-top: 14px; + padding-right: 15px; +} +#status a { + color: #C7B299; + text-decoration: none; +} +/* Homepage Modifications +----------------------------------------------- */ +#pgHome #container { + background: url(../img/hdr.ad.jpg) 0 0 repeat-x; +} +#pgHome #sidebar { + margin-top: 207px; +} +#pgHome #content { + margin-top: 183px; +} +#pgHome #sidebar input[type="submit"] { + height: 30px; +} Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/css/trailblazer_main.css =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/css/trailblazer_main.css 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/css/trailblazer_main.css 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,148 +0,0 @@ -* { - margin: 0px; - padding: 0px; - border: none; -} - -body { - font: 1em verdana, arial, sans-serif; - background: #CCCCCC; -} - -div#main { - margin-left: 0px; - width: 751px; - background: #ecefdf; -} - -div#top,div#pictures{ -} - -div#pictures img { - float:left; -} - -img#head1 { - margin-right: 3px; -} - -img#head2 { - margin-right: 4px; -} - -div.trail { - clear:both; - margin-left: 50px; - margin-top: 0px; - margin-right: 50px -} - -div.foot { - margin-left: 50px; - margin-right: 50px; - margin-top: 50px; - text-align: center; - font-size: .5em; - height: 36px; -} - -div.trail h1 { - margin-top: -30px; - margin-left: -50px; - font-size: 1.2em; - font-weight: bold; - padding-left: .4em; -} - -div.trail h2 { - float: left; - font-size: 1em; - font-weight: bold; - padding-left: .4em; -} - -div.trail h3 { - float: left; - font-size: .8em; - font-weight: bold; - margin-left: -1.4em; - margin-bottom: 1em; -} - - -div.trail p { - clear: both; - margin-top: 20px; - font-size: .8em; - text-decoration: none; -} - -div#next_trail { - margin-left: 36px; -} - -div.numbox { - border: thin solid black; - margin-left: -.8em; - float: left; - background: #ffffff; - padding: .2em .35em .3em; - font-style: normal; - font-weight: bold; - font-size: 1.4em; -} - -div.figure { - text-align: center; - font-size: .6em; - margin-top: 30px; -} - -div.figure img { - display: block; - margin-right: auto; - margin-left: auto; -} - -code { - font: 1.1em "Courier New", Courier, mono; -} - -code.block { - white-space: pre; - font: 10pt "Courier New", Courier, mono; - display: block; - border-style: dashed; - border-width: thin; - padding: .5em; - background: #ffffff; - margin: 20px; -} - -div.foot_image { - float: left; - height: 86px; -} - -a:active { - color : #666666; - text-decoration: none; -} - -a:hover { - color : #000000; - background-color : #D6E0FE; - text-decoration: none; -} - -a:link { - color : #005EB6; - text-decoration: none; -} - -a:visited { - color : #888888; - text-decoration: none; -} - - Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/css/trailblazer_main.css (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/css/trailblazer_main.css) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/css/trailblazer_main.css (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/css/trailblazer_main.css 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,148 @@ +* { + margin: 0px; + padding: 0px; + border: none; +} + +body { + font: 1em verdana, arial, sans-serif; + background: #CCCCCC; +} + +div#main { + margin-left: 0px; + width: 751px; + background: #ecefdf; +} + +div#top,div#pictures{ +} + +div#pictures img { + float:left; +} + +img#head1 { + margin-right: 3px; +} + +img#head2 { + margin-right: 4px; +} + +div.trail { + clear:both; + margin-left: 50px; + margin-top: 0px; + margin-right: 50px +} + +div.foot { + margin-left: 50px; + margin-right: 50px; + margin-top: 50px; + text-align: center; + font-size: .5em; + height: 36px; +} + +div.trail h1 { + margin-top: -30px; + margin-left: -50px; + font-size: 1.2em; + font-weight: bold; + padding-left: .4em; +} + +div.trail h2 { + float: left; + font-size: 1em; + font-weight: bold; + padding-left: .4em; +} + +div.trail h3 { + float: left; + font-size: .8em; + font-weight: bold; + margin-left: -1.4em; + margin-bottom: 1em; +} + + +div.trail p { + clear: both; + margin-top: 20px; + font-size: .8em; + text-decoration: none; +} + +div#next_trail { + margin-left: 36px; +} + +div.numbox { + border: thin solid black; + margin-left: -.8em; + float: left; + background: #ffffff; + padding: .2em .35em .3em; + font-style: normal; + font-weight: bold; + font-size: 1.4em; +} + +div.figure { + text-align: center; + font-size: .6em; + margin-top: 30px; +} + +div.figure img { + display: block; + margin-right: auto; + margin-left: auto; +} + +code { + font: 1.1em "Courier New", Courier, mono; +} + +code.block { + white-space: pre; + font: 10pt "Courier New", Courier, mono; + display: block; + border-style: dashed; + border-width: thin; + padding: .5em; + background: #ffffff; + margin: 20px; +} + +div.foot_image { + float: left; + height: 86px; +} + +a:active { + color : #666666; + text-decoration: none; +} + +a:hover { + color : #000000; + background-color : #D6E0FE; + text-decoration: none; +} + +a:link { + color : #005EB6; + text-decoration: none; +} + +a:visited { + color : #888888; + text-decoration: none; +} + + Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/home.xhtml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/home.xhtml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/home.xhtml 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,49 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <title>JBoss Suites: Seam Framework</title> - <link href="css/screen.css" rel="stylesheet" type="text/css" /> -</head> -<body id="pgHome"> -<f:view> -<div id="document"> - <div id="header"> - <div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div> - </div> - <div id="container"> - <div id="sidebar"> - <h:form id="login"> - <fieldset> - <div> - <h:outputLabel for="username">Login Name</h:outputLabel> - <h:inputText id="username" value="#{identity.username}" style="width: 175px;"/> - <div class="errors"><h:message for="username"/></div> - </div> - <div> - <h:outputLabel for="password">Password</h:outputLabel> - <h:inputSecret id="password" value="#{identity.password}" style="width: 175px;"/> - </div> - <div class="errors"><h:messages globalOnly="true"/></div> - <div class="buttonBox"><h:commandButton id="login" action="#{identity.login}" value="Account Login"/></div> - <div class="notes"><s:link id="register" view="/register.xhtml" value="Register New User"/></div> - <div class="subnotes"> - Or use a demo account: - <ul> - <li>gavin/foobar</li> - <li>demo/demo</li> - </ul> - </div> - </fieldset> - </h:form> - </div> - </div> - <div id="footer">Created with JBoss EJB 3.0, Seam, JSF (Mojarra), and Facelets</div> -</div> -</f:view> -</body> -</html> Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/home.xhtml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/home.xhtml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/home.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/home.xhtml 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,49 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> + <title>JBoss Suites: Seam Framework</title> + <link href="css/screen.css" rel="stylesheet" type="text/css" /> +</head> +<body id="pgHome"> +<f:view> +<div id="document"> + <div id="header"> + <div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div> + </div> + <div id="container"> + <div id="sidebar"> + <h:form id="login"> + <fieldset> + <div> + <h:outputLabel for="username">Login Name</h:outputLabel> + <h:inputText id="username" value="#{identity.username}" style="width: 175px;"/> + <div class="errors"><h:message for="username"/></div> + </div> + <div> + <h:outputLabel for="password">Password</h:outputLabel> + <h:inputSecret id="password" value="#{identity.password}" style="width: 175px;"/> + </div> + <div class="errors"><h:messages globalOnly="true"/></div> + <div class="buttonBox"><h:commandButton id="login" action="#{identity.login}" value="Account Login"/></div> + <div class="notes"><s:link id="register" view="/register.xhtml" value="Register New User"/></div> + <div class="subnotes"> + Or use a demo account: + <ul> + <li>gavin/foobar</li> + <li>demo/demo</li> + </ul> + </div> + </fieldset> + </h:form> + </div> + </div> + <div id="footer">Created with JBoss EJB 3.0, Seam, JSF (Mojarra), and Facelets</div> +</div> +</f:view> +</body> +</html> Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/hotel.xhtml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/hotel.xhtml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/hotel.xhtml 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,63 +0,0 @@ -<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - template="template.xhtml"> - - -<ui:define name="content"> -<div class="section"> - <h1>View Hotel</h1> -</div> -<div class="section"> - <div class="entry"> - <div class="label">Name:</div> - <div class="output">#{hotel.name}</div> - </div> - <div class="entry"> - <div class="label">Address:</div> - <div class="output">#{hotel.address}</div> - </div> - <div class="entry"> - <div class="label">City:</div> - <div class="output">#{hotel.city}</div> - </div> - <div class="entry"> - <div class="label">State:</div> - <div class="output">#{hotel.state}</div> - </div> - <div class="entry"> - <div class="label">Zip:</div> - <div class="output">#{hotel.zip}</div> - </div> - <div class="entry"> - <div class="label">Country:</div> - <div class="output">#{hotel.country}</div> - </div> - <div class="entry"> - <div class="label">Nightly rate:</div> - <div class="output"> - <h:outputText value="#{hotel.price}"> - <f:convertNumber type="currency" - currencySymbol="$"/> - </h:outputText> - </div> - </div> -</div> -<div class="section"> - <h:form id="hotel"> - <fieldset class="buttonBox"> - <h:commandButton id="bookHotel" action="#{hotelBooking.bookHotel}" value="Book Hotel"/>  - <h:commandButton id="cancel" action="#{hotelBooking.cancel}" value="Back to Search"/> - </fieldset> - </h:form> -</div> -</ui:define> - - -<ui:define name="sidebar"> -</ui:define> - -</ui:composition> Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/hotel.xhtml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/hotel.xhtml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/hotel.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/hotel.xhtml 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,63 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + template="template.xhtml"> + + +<ui:define name="content"> +<div class="section"> + <h1>View Hotel</h1> +</div> +<div class="section"> + <div class="entry"> + <div class="label">Name:</div> + <div class="output">#{hotel.name}</div> + </div> + <div class="entry"> + <div class="label">Address:</div> + <div class="output">#{hotel.address}</div> + </div> + <div class="entry"> + <div class="label">City:</div> + <div class="output">#{hotel.city}</div> + </div> + <div class="entry"> + <div class="label">State:</div> + <div class="output">#{hotel.state}</div> + </div> + <div class="entry"> + <div class="label">Zip:</div> + <div class="output">#{hotel.zip}</div> + </div> + <div class="entry"> + <div class="label">Country:</div> + <div class="output">#{hotel.country}</div> + </div> + <div class="entry"> + <div class="label">Nightly rate:</div> + <div class="output"> + <h:outputText value="#{hotel.price}"> + <f:convertNumber type="currency" + currencySymbol="$"/> + </h:outputText> + </div> + </div> +</div> +<div class="section"> + <h:form id="hotel"> + <fieldset class="buttonBox"> + <h:commandButton id="bookHotel" action="#{hotelBooking.bookHotel}" value="Book Hotel"/>  + <h:commandButton id="cancel" action="#{hotelBooking.cancel}" value="Back to Search"/> + </fieldset> + </h:form> +</div> +</ui:define> + + +<ui:define name="sidebar"> +</ui:define> + +</ui:composition> Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/bg.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/bg.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/bg.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/btn.bg.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/btn.bg.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/btn.bg.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/cal-next.png =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/cal-next.png (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/cal-next.png) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/cal-prev.png =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/cal-prev.png (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/cal-prev.png) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/cnt.bg.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/cnt.bg.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/cnt.bg.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/dtpick.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/dtpick.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/dtpick.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/hdr.ad.jpg =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/hdr.ad.jpg (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/hdr.ad.jpg) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/hdr.bar.jpg =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/hdr.bar.jpg (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/hdr.bar.jpg) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/hdr.bg.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/hdr.bg.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/hdr.bg.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/hdr.title.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/hdr.title.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/hdr.title.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/header_line.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/header_line.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/header_line.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/input.bg.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/input.bg.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/input.bg.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/sdb.bg.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/sdb.bg.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/sdb.bg.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/spinner.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/spinner.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/spinner.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/th.bg.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/th.bg.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/img/th.bg.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/index.html =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/index.html 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/index.html 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,5 +0,0 @@ -<html> -<head> - <meta http-equiv="Refresh" content="0; URL=home.seam"> -</head> -</html> \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/index.html (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/index.html) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/index.html (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/index.html 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,5 @@ +<html> +<head> + <meta http-equiv="Refresh" content="0; URL=home.seam"> +</head> +</html> \ No newline at end of file Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/main.xhtml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/main.xhtml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/main.xhtml 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,119 +0,0 @@ -<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:a="http://richfaces.org/a4j" - template="template.xhtml"> - - -<ui:define name="content"> - -<div class="section"> - <h:form id="main"> - - <span class="errors"> - <h:messages id="messages" globalOnly="true"/> - </span> - - <h1>Search Hotels</h1> - <fieldset> - <h:inputText id="searchString" value="#{hotelSearch.searchString}" style="width: 165px;"> - <a:support event="onkeyup" actionListener="#{hotelSearch.find}" reRender="searchResults" /> - </h:inputText> -   - <a:commandButton id="findHotels" value="Find Hotels" action="#{hotelSearch.find}" reRender="searchResults"/> -   - <a:status> - <f:facet name="start"> - <h:graphicImage id="Spinner" value="/img/spinner.gif"/> - </f:facet> - </a:status> - <br/> - <h:outputLabel for="pageSize">Maximum results:</h:outputLabel>  - <h:selectOneMenu value="#{hotelSearch.pageSize}" id="pageSize"> - <f:selectItem itemLabel="5" itemValue="5"/> - <f:selectItem itemLabel="10" itemValue="10"/> - <f:selectItem itemLabel="20" itemValue="20"/> - </h:selectOneMenu> - </fieldset> - - </h:form> -</div> - -<a:outputPanel id="searchResults"> - <div class="section"> - <h:outputText id="NoHotelsFoundMessage" value="No Hotels Found" rendered="#{hotels != null and hotels.rowCount==0}"/> - <h:dataTable id="hotels" value="#{hotels}" var="hot" rendered="#{hotels.rowCount>0}"> - <h:column> - <f:facet name="header">Name</f:facet> - #{hot.name} - </h:column> - <h:column> - <f:facet name="header">Address</f:facet> - #{hot.address} - </h:column> - <h:column> - <f:facet name="header">City, State</f:facet> - #{hot.city}, #{hot.state}, #{hot.country} - </h:column> - <h:column> - <f:facet name="header">Zip</f:facet> - #{hot.zip} - </h:column> - <h:column> - <f:facet name="header">Action</f:facet> - <s:link id="viewHotel" value="View Hotel" action="#{hotelBooking.selectHotel(hot)}"/> - </h:column> - </h:dataTable> - <s:link id="MoreResultsLink" value="More results" action="#{hotelSearch.nextPage}" rendered="#{hotelSearch.nextPageAvailable}"/> - </div> -</a:outputPanel> - -<div class="section"> - <h1>Current Hotel Bookings</h1> -</div> -<div class="section"> - <h:form id="bookings"> - <h:outputText value="No Bookings Found" rendered="#{bookings.rowCount==0}"/> - <h:dataTable id="bookings" value="#{bookings}" var="book" rendered="#{bookings.rowCount>0}"> - <h:column> - <f:facet name="header">Name</f:facet> - #{book.hotel.name} - </h:column> - <h:column> - <f:facet name="header">Address</f:facet> - #{book.hotel.address} - </h:column> - <h:column> - <f:facet name="header">City, State</f:facet> - #{book.hotel.city}, #{book.hotel.state} - </h:column> - <h:column> - <f:facet name="header">Check in date</f:facet> - <h:outputText value="#{book.checkinDate}"/> - </h:column> - <h:column> - <f:facet name="header">Check out date</f:facet> - <h:outputText value="#{book.checkoutDate}"/> - </h:column> - <h:column> - <f:facet name="header">Confirmation number</f:facet> - #{book.id} - </h:column> - <h:column> - <f:facet name="header">Action</f:facet> - <h:commandLink id="cancel" value="Cancel" action="#{bookingList.cancel}"/> - </h:column> - </h:dataTable> - </h:form> -</div> - -</ui:define> - - -<ui:define name="sidebar"> -</ui:define> - -</ui:composition> Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/main.xhtml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/main.xhtml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/main.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/main.xhtml 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,119 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:a="http://richfaces.org/a4j" + template="template.xhtml"> + + +<ui:define name="content"> + +<div class="section"> + <h:form id="main"> + + <span class="errors"> + <h:messages id="messages" globalOnly="true"/> + </span> + + <h1>Search Hotels</h1> + <fieldset> + <h:inputText id="searchString" value="#{hotelSearch.searchString}" style="width: 165px;"> + <a:support event="onkeyup" actionListener="#{hotelSearch.find}" reRender="searchResults" /> + </h:inputText> +   + <a:commandButton id="findHotels" value="Find Hotels" action="#{hotelSearch.find}" reRender="searchResults"/> +   + <a:status> + <f:facet name="start"> + <h:graphicImage id="Spinner" value="/img/spinner.gif"/> + </f:facet> + </a:status> + <br/> + <h:outputLabel for="pageSize">Maximum results:</h:outputLabel>  + <h:selectOneMenu value="#{hotelSearch.pageSize}" id="pageSize"> + <f:selectItem itemLabel="5" itemValue="5"/> + <f:selectItem itemLabel="10" itemValue="10"/> + <f:selectItem itemLabel="20" itemValue="20"/> + </h:selectOneMenu> + </fieldset> + + </h:form> +</div> + +<a:outputPanel id="searchResults"> + <div class="section"> + <h:outputText id="NoHotelsFoundMessage" value="No Hotels Found" rendered="#{hotels != null and hotels.rowCount==0}"/> + <h:dataTable id="hotels" value="#{hotels}" var="hot" rendered="#{hotels.rowCount>0}"> + <h:column> + <f:facet name="header">Name</f:facet> + #{hot.name} + </h:column> + <h:column> + <f:facet name="header">Address</f:facet> + #{hot.address} + </h:column> + <h:column> + <f:facet name="header">City, State</f:facet> + #{hot.city}, #{hot.state}, #{hot.country} + </h:column> + <h:column> + <f:facet name="header">Zip</f:facet> + #{hot.zip} + </h:column> + <h:column> + <f:facet name="header">Action</f:facet> + <s:link id="viewHotel" value="View Hotel" action="#{hotelBooking.selectHotel(hot)}"/> + </h:column> + </h:dataTable> + <s:link id="MoreResultsLink" value="More results" action="#{hotelSearch.nextPage}" rendered="#{hotelSearch.nextPageAvailable}"/> + </div> +</a:outputPanel> + +<div class="section"> + <h1>Current Hotel Bookings</h1> +</div> +<div class="section"> + <h:form id="bookings"> + <h:outputText value="No Bookings Found" rendered="#{bookings.rowCount==0}"/> + <h:dataTable id="bookings" value="#{bookings}" var="book" rendered="#{bookings.rowCount>0}"> + <h:column> + <f:facet name="header">Name</f:facet> + #{book.hotel.name} + </h:column> + <h:column> + <f:facet name="header">Address</f:facet> + #{book.hotel.address} + </h:column> + <h:column> + <f:facet name="header">City, State</f:facet> + #{book.hotel.city}, #{book.hotel.state} + </h:column> + <h:column> + <f:facet name="header">Check in date</f:facet> + <h:outputText value="#{book.checkinDate}"/> + </h:column> + <h:column> + <f:facet name="header">Check out date</f:facet> + <h:outputText value="#{book.checkoutDate}"/> + </h:column> + <h:column> + <f:facet name="header">Confirmation number</f:facet> + #{book.id} + </h:column> + <h:column> + <f:facet name="header">Action</f:facet> + <h:commandLink id="cancel" value="Cancel" action="#{bookingList.cancel}"/> + </h:column> + </h:dataTable> + </h:form> +</div> + +</ui:define> + + +<ui:define name="sidebar"> +</ui:define> + +</ui:composition> Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/password.xhtml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/password.xhtml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/password.xhtml 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,81 +0,0 @@ -<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - template="template.xhtml"> - - -<ui:define name="content"> -<div class="section"> - <h1>Change Your Password</h1> -</div> -<div class="section"> - <h:form id="setpassword"> - - <f:facet name="aroundInvalidField"> - <s:span id="Error" styleClass="errors"/> - </f:facet> - <f:facet name="afterInvalidField"> - <s:div id="Message" styleClass="errors"> - <s:message/> - </s:div> - </f:facet> - - <fieldset> - - <div class="entry"> - <div class="label"><h:outputLabel for="password">Password:</h:outputLabel></div> - <div class="input"> - <s:decorate id="PasswordDecorate"> - <h:inputSecret id="password" value="#{user.password}" required="true"> - <s:validate/> - </h:inputSecret> - </s:decorate> - </div> - </div> - - <div class="entry"> - <div class="label"><h:outputLabel for="verify">Verify:</h:outputLabel></div> - <div class="input"> - <s:decorate id="VerifyDecorate"> - <h:inputSecret id="verify" value="#{changePassword.verify}" required="true"/> - </s:decorate> - </div> - </div> - - <div class="entry errors"> - <h:messages id="Messages" globalOnly="true"/> - </div> - - <div class="entry"> - <div class="label"> </div> - <div class="input"> - <h:commandButton id="change" value="Change" action="#{changePassword.changePassword}"/>  - <s:button id="cancel" value="Cancel" view="/main.xhtml"/> - </div> - </div> - - </fieldset> - - </h:form> -</div> -</ui:define> - - -<ui:define name="sidebar"> -<h1>Simple things should be easy</h1> -<p> - (And so should some complex things.) You shouldn't have to write four different classes - just to change a password. Traditional J2EE architectures require that developers spend - more time writing code to make the frameworks happy, than they ever get to spend writing - code to make the user happy. Seam lets you reduce the size of your code dramatically. - And that reduces bugs. And it makes refactoring easier. And it makes delivering new - functionality quicker. Productivity matters. But with Seam, JSF, EJB 3.0 and jBPM, you - don't need to sacrifice the ability to handle complex problems just to achieve great - productivity. -</p> -</ui:define> - -</ui:composition> \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/password.xhtml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/password.xhtml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/password.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/password.xhtml 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,81 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + template="template.xhtml"> + + +<ui:define name="content"> +<div class="section"> + <h1>Change Your Password</h1> +</div> +<div class="section"> + <h:form id="setpassword"> + + <f:facet name="aroundInvalidField"> + <s:span id="Error" styleClass="errors"/> + </f:facet> + <f:facet name="afterInvalidField"> + <s:div id="Message" styleClass="errors"> + <s:message/> + </s:div> + </f:facet> + + <fieldset> + + <div class="entry"> + <div class="label"><h:outputLabel for="password">Password:</h:outputLabel></div> + <div class="input"> + <s:decorate id="PasswordDecorate"> + <h:inputSecret id="password" value="#{user.password}" required="true"> + <s:validate/> + </h:inputSecret> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="verify">Verify:</h:outputLabel></div> + <div class="input"> + <s:decorate id="VerifyDecorate"> + <h:inputSecret id="verify" value="#{changePassword.verify}" required="true"/> + </s:decorate> + </div> + </div> + + <div class="entry errors"> + <h:messages id="Messages" globalOnly="true"/> + </div> + + <div class="entry"> + <div class="label"> </div> + <div class="input"> + <h:commandButton id="change" value="Change" action="#{changePassword.changePassword}"/>  + <s:button id="cancel" value="Cancel" view="/main.xhtml"/> + </div> + </div> + + </fieldset> + + </h:form> +</div> +</ui:define> + + +<ui:define name="sidebar"> +<h1>Simple things should be easy</h1> +<p> + (And so should some complex things.) You shouldn't have to write four different classes + just to change a password. Traditional J2EE architectures require that developers spend + more time writing code to make the frameworks happy, than they ever get to spend writing + code to make the user happy. Seam lets you reduce the size of your code dramatically. + And that reduces bugs. And it makes refactoring easier. And it makes delivering new + functionality quicker. Productivity matters. But with Seam, JSF, EJB 3.0 and jBPM, you + don't need to sacrifice the ability to handle complex problems just to achieve great + productivity. +</p> +</ui:define> + +</ui:composition> \ No newline at end of file Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/register.xhtml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/register.xhtml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/register.xhtml 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,102 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:a="http://richfaces.org/a4j"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <title>JBoss Suites: Seam Framework</title> - <link href="css/screen.css" rel="stylesheet" type="text/css" /> -</head> -<body id="pgHome"> -<div id="document"> - <div id="header"> - <div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div> - </div> - <div id="container"> - <div id="content"> - <div class="section"> - <h1>Register</h1> - </div> - <div class="section"> - - <h:form id="register"> - <fieldset> - - <s:validateAll> - - <f:facet name="aroundInvalidField"> - <s:span styleClass="errors"/> - </f:facet> - <f:facet name="afterInvalidField"> - <s:div styleClass="errors"> - <s:message/> - </s:div> - </f:facet> - - <div class="entry"> - <div class="label"><h:outputLabel for="username">Username:</h:outputLabel></div> - <div class="input"> - <s:decorate id="usernameDecorate"> - <h:inputText id="username" value="#{user.username}" required="true"> - <a:support event="onblur" reRender="usernameDecorate"/> - </h:inputText> - </s:decorate> - </div> - </div> - - <div class="entry"> - <div class="label"><h:outputLabel for="name">Real Name:</h:outputLabel></div> - <div class="input"> - <s:decorate id="nameDecorate"> - <h:inputText id="name" value="#{user.name}" required="true"> - <a:support event="onblur" reRender="nameDecorate"/> - </h:inputText> - </s:decorate> - </div> - </div> - - <div class="entry"> - <div class="label"><h:outputLabel for="password">Password:</h:outputLabel></div> - <div class="input"> - <s:decorate id="passwordDecorate"> - <h:inputSecret id="password" value="#{user.password}" required="true"/> - </s:decorate> - </div> - </div> - - <div class="entry"> - <div class="label"><h:outputLabel for="verify">Verify Password:</h:outputLabel></div> - <div class="input"> - <s:decorate id="verifyDecorate"> - <h:inputSecret id="verify" value="#{register.verify}" required="true"/> - </s:decorate> - </div> - </div> - - </s:validateAll> - - <div class="entry errors"> - <h:messages id="messages" globalOnly="true"/> - </div> - - <div class="entry"> - <div class="label"> </div> - <div class="input"> - <h:commandButton id="register" value="Register" action="#{register.register}"/>  - <s:button id="cancel" value="Cancel" view="/home.xhtml"/> - </div> - </div> - - </fieldset> - </h:form> - - </div> - </div> - </div> - <div id="footer">Created with JBoss EJB 3.0, Seam, JSF (Mojarra), and Facelets</div> -</div> -</body> -</html> Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/register.xhtml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/register.xhtml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/register.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/register.xhtml 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,102 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:a="http://richfaces.org/a4j"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> + <title>JBoss Suites: Seam Framework</title> + <link href="css/screen.css" rel="stylesheet" type="text/css" /> +</head> +<body id="pgHome"> +<div id="document"> + <div id="header"> + <div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div> + </div> + <div id="container"> + <div id="content"> + <div class="section"> + <h1>Register</h1> + </div> + <div class="section"> + + <h:form id="register"> + <fieldset> + + <s:validateAll> + + <f:facet name="aroundInvalidField"> + <s:span styleClass="errors"/> + </f:facet> + <f:facet name="afterInvalidField"> + <s:div styleClass="errors"> + <s:message/> + </s:div> + </f:facet> + + <div class="entry"> + <div class="label"><h:outputLabel for="username">Username:</h:outputLabel></div> + <div class="input"> + <s:decorate id="usernameDecorate"> + <h:inputText id="username" value="#{user.username}" required="true"> + <a:support event="onblur" reRender="usernameDecorate"/> + </h:inputText> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="name">Real Name:</h:outputLabel></div> + <div class="input"> + <s:decorate id="nameDecorate"> + <h:inputText id="name" value="#{user.name}" required="true"> + <a:support event="onblur" reRender="nameDecorate"/> + </h:inputText> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="password">Password:</h:outputLabel></div> + <div class="input"> + <s:decorate id="passwordDecorate"> + <h:inputSecret id="password" value="#{user.password}" required="true"/> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="verify">Verify Password:</h:outputLabel></div> + <div class="input"> + <s:decorate id="verifyDecorate"> + <h:inputSecret id="verify" value="#{register.verify}" required="true"/> + </s:decorate> + </div> + </div> + + </s:validateAll> + + <div class="entry errors"> + <h:messages id="messages" globalOnly="true"/> + </div> + + <div class="entry"> + <div class="label"> </div> + <div class="input"> + <h:commandButton id="register" value="Register" action="#{register.register}"/>  + <s:button id="cancel" value="Cancel" view="/home.xhtml"/> + </div> + </div> + + </fieldset> + </h:form> + + </div> + </div> + </div> + <div id="footer">Created with JBoss EJB 3.0, Seam, JSF (Mojarra), and Facelets</div> +</div> +</body> +</html> Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/template.xhtml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/template.xhtml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/template.xhtml 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,35 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:s="http://jboss.com/products/seam/taglib"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>JBoss Suites: Seam Framework</title> - <link href="css/screen.css" rel="stylesheet" type="text/css" /> -</head> -<body> - -<div id="document"> - <div id="header"> - <div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div> - <div id="status"> - Welcome #{user.name} - | <s:link id="search" view="/main.xhtml" value="Search" propagation="none"/> - | <s:link id="settings" view="/password.xhtml" value="Settings" propagation="none"/> - | <s:link id="logout" action="#{identity.logout}" value="Logout"/> - </div> - </div> - <div id="container"> - <div id="sidebar"> - <ui:insert name="sidebar"/> - </div> - <div id="content"> - <ui:insert name="content"/> - <ui:include src="conversations.xhtml" /> - </div> - </div> - <div id="footer">Created with Groovy, JBoss Seam, and Facelets</div> -</div> -</body> -</html> Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/template.xhtml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/template.xhtml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/template.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/template.xhtml 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,35 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:s="http://jboss.com/products/seam/taglib"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>JBoss Suites: Seam Framework</title> + <link href="css/screen.css" rel="stylesheet" type="text/css" /> +</head> +<body> + +<div id="document"> + <div id="header"> + <div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div> + <div id="status"> + Welcome #{user.name} + | <s:link id="search" view="/main.xhtml" value="Search" propagation="none"/> + | <s:link id="settings" view="/password.xhtml" value="Settings" propagation="none"/> + | <s:link id="logout" action="#{identity.logout}" value="Logout"/> + </div> + </div> + <div id="container"> + <div id="sidebar"> + <ui:insert name="sidebar"/> + </div> + <div id="content"> + <ui:insert name="content"/> + <ui:include src="conversations.xhtml" /> + </div> + </div> + <div id="footer">Created with Groovy, JBoss Seam, and Facelets</div> +</div> +</body> +</html> Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/pom.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/pom.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/pom.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,33 +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> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>groovybooking</artifactId> - <parent> - <groupId>org.jboss.seam</groupId> - <artifactId>examples-ee6</artifactId> - <version>2.3.0.Beta1-SNAPSHOT</version> - </parent> - <packaging>pom</packaging> - <name>Groovy Booking Example (EE6)</name> - - <properties> - <example.name>groovybooking</example.name> - </properties> - - <modules> - <module>groovybooking-web</module> - <module>groovybooking-tests</module> - </modules> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.jboss.seam.examples</groupId> - <artifactId>groovybooking-web</artifactId> - <version>${project.version}</version> - <type>war</type> - </dependency> - </dependencies> - </dependencyManagement> -</project> Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/pom.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/pom.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/pom.xml 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,33 @@ +<?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>groovybooking</artifactId> + <parent> + <groupId>org.jboss.seam</groupId> + <artifactId>examples-ee6</artifactId> + <version>2.3.0.Beta1-SNAPSHOT</version> + </parent> + <packaging>pom</packaging> + <name>Groovy Booking Example (EE6)</name> + + <properties> + <example.name>groovybooking</example.name> + </properties> + + <modules> + <module>groovybooking-web</module> + <module>groovybooking-tests</module> + </modules> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples</groupId> + <artifactId>groovybooking-web</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + </dependencies> + </dependencyManagement> +</project> Deleted: branches/community/Seam_2_3/examples-ee6/groovybooking/readme.txt =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/readme.txt 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/readme.txt 2012-04-03 16:24:40 UTC (rev 14494) @@ -1,23 +0,0 @@ -Seam GroovyBooking Example -========================== - -This is the Hotel Booking example implemented in Groovy Beans and Hibernate JPA. -This application runs on JBoss AS, but is deployed as an *exploded* WAR rather -than an EAR. - -To deploy the example to JBossAS 5, follow these steps: - -* In the example root directory run: - - mvn clean package - -* Set JBOSS_HOME environment property. - -* In the groovybooking-web directory run: - - mvn jboss:hard-deploy - -When deploying to JBossAS 4, use a -Pjbossas42 maven profile to package the -application. - -* Open this URL in a web browser: http://localhost:8080/jboss-seam-groovybooking Copied: branches/community/Seam_2_3/examples-ee6/groovybooking/readme.txt (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/groovybooking/readme.txt) =================================================================== --- branches/community/Seam_2_3/examples-ee6/groovybooking/readme.txt (rev 0) +++ branches/community/Seam_2_3/examples-ee6/groovybooking/readme.txt 2012-04-03 16:24:40 UTC (rev 14494) @@ -0,0 +1,23 @@ +Seam GroovyBooking Example +========================== + +This is the Hotel Booking example implemented in Groovy Beans and Hibernate JPA. +This application runs on JBoss AS, but is deployed as an *exploded* WAR rather +than an EAR. + +To deploy the example to JBossAS 5, follow these steps: + +* In the example root directory run: + + mvn clean package + +* Set JBOSS_HOME environment property. + +* In the groovybooking-web directory run: + + mvn jboss:hard-deploy + +When deploying to JBossAS 4, use a -Pjbossas42 maven profile to package the +application. + +* Open this URL in a web browser: http://localhost:8080/jboss-seam-groovybooking

12 years, 1 month

1
0
0 / 0

Seam SVN: r14493 - in branches/community/Seam_2_3/examples-ee6: hibernate and 43 other directories.

by seam-commits＠lists.jboss.org

Author: dhinojosa Date: 2012-04-03 12:16:16 -0400 (Tue, 03 Apr 2012) New Revision: 14493 Added: branches/community/Seam_2_3/examples-ee6/hibernate/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom-back.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/BookingTest.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/ChangePasswordTest.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/LoginTest.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-ftest/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-ftest/testng.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/testng.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources/hibernate.properties branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources/seam.properties branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/pom.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/java/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/java/GlassfishDerbyDialect.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/hibernate.cfg.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/import.sql branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/log4j.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/pages.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/jboss/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/jboss/webapp/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/jboss/webapp/WEB-INF/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/jboss/webapp/WEB-INF/jboss-web.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/AuthenticatorAction.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/Booking.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/BookingListAction.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/ChangePasswordAction.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/Hotel.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/HotelBookingAction.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/HotelSearchingAction.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/RegisterAction.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/User.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/hibernate.cfg.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/import.sql branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/seam.properties branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/pages.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/book.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/confirm.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/conversations.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/css/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/css/screen.css branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/css/trailblazer_main.css branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/home.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/hotel.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/bg.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/btn.bg.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/cal-next.png branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/cal-prev.png branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/cnt.bg.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/dtpick.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/hdr.ad.jpg branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/hdr.bar.jpg branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/hdr.bg.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/hdr.title.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/header_line.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/input.bg.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/sdb.bg.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/spinner.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/th.bg.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/index.html branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/main.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/password.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/register.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/template.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-jboss405.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-tomcat55.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-tomcat6.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-weblogic92.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-websphere61.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/classes/ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/pages.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/hibernate.cfg.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/import.sql branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/seam.properties branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/ajax4jsf.taglib.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-core.taglib.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-html.taglib.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-ui.taglib.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/rich.taglib.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/s.taglib.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/GlassfishDerbyDialect.class branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/pages.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/hibernate.cfg.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/import.sql branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/seam.properties branches/community/Seam_2_3/examples-ee6/hibernate/pom.xml branches/community/Seam_2_3/examples-ee6/hibernate/readme.txt Removed: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom-back.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/BookingTest.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/ChangePasswordTest.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/LoginTest.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-ftest/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-ftest/testng.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/testng.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources/hibernate.properties branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources/seam.properties branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/pom.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/java/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/java/GlassfishDerbyDialect.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/hibernate.cfg.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/import.sql branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/log4j.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/pages.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/jboss/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/jboss/webapp/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/jboss/webapp/WEB-INF/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/jboss/webapp/WEB-INF/jboss-web.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/AuthenticatorAction.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/Booking.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/BookingListAction.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/ChangePasswordAction.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/Hotel.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/HotelBookingAction.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/HotelSearchingAction.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/RegisterAction.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/User.java branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/hibernate.cfg.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/import.sql branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/seam.properties branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/pages.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/book.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/confirm.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/conversations.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/css/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/css/screen.css branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/css/trailblazer_main.css branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/home.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/hotel.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/bg.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/btn.bg.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/cal-next.png branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/cal-prev.png branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/cnt.bg.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/dtpick.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/hdr.ad.jpg branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/hdr.bar.jpg branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/hdr.bg.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/hdr.title.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/header_line.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/input.bg.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/sdb.bg.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/spinner.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/th.bg.gif branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/index.html branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/main.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/password.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/register.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/template.xhtml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-jboss405.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-tomcat55.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-tomcat6.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-weblogic92.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-websphere61.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/classes/ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/pages.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/hibernate.cfg.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/import.sql branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/seam.properties branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/ajax4jsf.taglib.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-core.taglib.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-html.taglib.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-ui.taglib.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/rich.taglib.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/s.taglib.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/GlassfishDerbyDialect.class branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/pages.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/hibernate.cfg.xml branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/import.sql branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/seam.properties branches/community/Seam_2_3/examples-ee6/hibernate/pom.xml branches/community/Seam_2_3/examples-ee6/hibernate/readme.txt Log: hibernate migrated in, still not functional, does compile, test, not integration-test Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom-back.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-tests/pom-back.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom-back.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,187 +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>hibernate</artifactId> - <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>hibernate-tests</artifactId> - <version>2.3.0.Beta1-SNAPSHOT</version> - <name>Hibernate Integration Tests Module (EE6)</name> - - - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - </dependency> - <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>hibernate-web</artifactId> - <version>2.3.0.Beta1-SNAPSHOT</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> - </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>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> - </dependencies> - -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  - -  -  -  -  -  -  -  -  -  - -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  - -  -  -  -  -  -  -  -  -  - -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -</project> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom-back.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-tests/pom-back.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom-back.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom-back.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,187 @@ +<?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>hibernate</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>hibernate-tests</artifactId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <name>Hibernate Integration Tests Module (EE6)</name> + + + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>hibernate-web</artifactId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </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>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> + </dependencies> + +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  + +  +  +  +  +  +  +  +  +  + +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  + +  +  +  +  +  +  +  +  +  + +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +  +</project> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-tests/pom.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,225 +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>hibernate</artifactId> - <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>hibernate-tests</artifactId> - <name>Hibernate Integration Tests Module (EE6)</name> - <version>2.3.0.Beta1-SNAPSHOT</version> - - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - </dependency> -  -  -  -  -  -  -  - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <type>ejb</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> - </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>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> - - </dependencies> - - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - </testResource> - <testResource> - <directory>src/test/resources-integration</directory> - </testResource> - </testResources> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.2</version> - <configuration> - <overlays> - <overlay> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>hibernate-web</artifactId> - <version>2.3.0.Beta1-SNAPSHOT</version> - <type>war</type> - </overlay> - </overlays> - </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-hibernate</example.context.path> - </properties> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <configuration> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - <fileNames> - <param>${basedir}/../hibernate-ear/target/seam-hibernate.ear</param> - </fileNames> - </configuration> - </plugin> - <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-hibernate</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/hibernate/hibernate-tests/pom.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-tests/pom.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,241 @@ +<?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>hibernate</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>hibernate-tests</artifactId> + <name>Hibernate Integration Tests Module (EE6)</name> + <version>2.3.0.Beta1-SNAPSHOT</version> + + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>org.jboss.el</groupId> + <artifactId>jboss-el</artifactId> + </dependency> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>4.1.1.Final</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + <scope>provided</scope> + </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>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> + + </dependencies> + + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + <testResource> + <directory>src/test/resources-integration</directory> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-test-source</id> + <phase>generate-test-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>${basedir}/../hibernate-web/src/main/java</source> + </sources> + </configuration> + </execution> + </executions> + </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> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> +  + <additionalClasspathElements> + <additionalClasspathElement> + ../hibernate-web/target/classes + </additionalClasspathElement> + </additionalClasspathElements> + </configuration> + </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-hibernate</example.context.path> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jboss-maven-plugin</artifactId> + <configuration> + <jbossHome>${jboss.home}</jbossHome> + <serverName>${jboss.domain}</serverName> + <fileNames> + <param>${basedir}/../hibernate-ear/target/seam-hibernate.ear</param> + </fileNames> + </configuration> + </plugin> + <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-hibernate</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/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/BookingTest.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/BookingTest.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/BookingTest.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,288 +0,0 @@ -//$Id: BookingTest.java 6987 2007-12-23 19:53:07Z pmuir $ -package org.jboss.seam.example.hibernate.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.seam.contexts.Contexts; -import org.jboss.seam.core.Manager; -import org.jboss.seam.example.hibernate.Booking; -import org.jboss.seam.example.hibernate.Hotel; -import org.jboss.seam.example.hibernate.HotelBookingAction; -import org.jboss.seam.example.hibernate.User; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; - -public class BookingTest extends SeamTest -{ - - @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 { - HotelBookingAction hotelBooking = (HotelBookingAction) 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/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/BookingTest.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/BookingTest.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/BookingTest.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/BookingTest.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,288 @@ +//$Id: BookingTest.java 6987 2007-12-23 19:53:07Z pmuir $ +package org.jboss.seam.example.hibernate.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.seam.contexts.Contexts; +import org.jboss.seam.core.Manager; +import org.jboss.seam.example.hibernate.Booking; +import org.jboss.seam.example.hibernate.Hotel; +import org.jboss.seam.example.hibernate.HotelBookingAction; +import org.jboss.seam.example.hibernate.User; +import org.jboss.seam.mock.SeamTest; +import org.testng.annotations.Test; + +public class BookingTest extends SeamTest +{ + + @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 { + HotelBookingAction hotelBooking = (HotelBookingAction) 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/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/ChangePasswordTest.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/ChangePasswordTest.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/ChangePasswordTest.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,138 +0,0 @@ -//$Id: ChangePasswordTest.java 6987 2007-12-23 19:53:07Z pmuir $ -package org.jboss.seam.example.hibernate.test; - -import org.jboss.seam.contexts.Contexts; -import org.jboss.seam.core.Manager; -import org.jboss.seam.example.hibernate.User; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; - -public class ChangePasswordTest extends SeamTest -{ - - @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/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/ChangePasswordTest.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/ChangePasswordTest.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/ChangePasswordTest.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/ChangePasswordTest.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,138 @@ +//$Id: ChangePasswordTest.java 6987 2007-12-23 19:53:07Z pmuir $ +package org.jboss.seam.example.hibernate.test; + +import org.jboss.seam.contexts.Contexts; +import org.jboss.seam.core.Manager; +import org.jboss.seam.example.hibernate.User; +import org.jboss.seam.mock.SeamTest; +import org.testng.annotations.Test; + +public class ChangePasswordTest extends SeamTest +{ + + @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/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/LoginTest.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/LoginTest.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/LoginTest.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,115 +0,0 @@ -//$Id: LoginTest.java 6987 2007-12-23 19:53:07Z pmuir $ -package org.jboss.seam.example.hibernate.test; - -import org.jboss.seam.core.Manager; -import org.jboss.seam.web.Session; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; - -public class LoginTest extends SeamTest -{ - - @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/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/LoginTest.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/LoginTest.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/LoginTest.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/java/org/jboss/seam/example/hibernate/test/LoginTest.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,115 @@ +//$Id: LoginTest.java 6987 2007-12-23 19:53:07Z pmuir $ +package org.jboss.seam.example.hibernate.test; + +import org.jboss.seam.core.Manager; +import org.jboss.seam.web.Session; +import org.jboss.seam.mock.SeamTest; +import org.testng.annotations.Test; + +public class LoginTest extends SeamTest +{ + + @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/hibernate/hibernate-tests/src/test/resources/hibernate.properties =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-tests/src/test/resources/hibernate.properties 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources/hibernate.properties 2012-04-03 16:16:16 UTC (rev 14493) @@ -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 verify -PASSWORD_VALUE_REQUIRED_MESSAGE //*[@id='setpassword:Message' or @id='setpassword:PasswordDecorate:Message'] -PASSWORD_LENGTH_MESSAGE length 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=main:searchString -SEARCH_SUBMIT id=main: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 xpath=//*[@id='booking:Message' or @id='booking:checkinDateDecorate:Message'] -HOTEL_CHECKOUT_DATE_FIELD id=booking:checkoutDateDecorate:checkoutDateInputDate -HOTEL_CHECKOUT_DATE_MESSAGE xpath=//*[@id='booking:Message' or @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='main:messages']/li -REGISTRATION id=login:register -REGISTRATION_USERNAME id=register:usernameDecorate:username -REGISTRATION_USERNAME_MESSAGE id=register:usernameDecorate:message -REGISTRATION_NAME id=register:nameDecorate:name -REGISTRATION_NAME_MESSAGE id=register:nameDecorate:message -REGISTRATION_PASSWORD id=register:passwordDecorate:password -REGISTRATION_PASSWORD_MESSAGE id=register:passwordDecorate:message -REGISTRATION_VERIFY id=register:verifyDecorate:verify -REGISTRATION_VERIFY_MESSAGE id=register:verifyDecorate:message -REGISTRATION_SUBMIT id=register:register -REGISTRATION_REENTER_MESSAGE verify -REGISTRATION_LENGTH_MESSAGE length 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\=main\:Spinner \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources/hibernate.properties (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-tests/src/test/resources/hibernate.properties) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources/hibernate.properties (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources/hibernate.properties 2012-04-03 16:16:16 UTC (rev 14493) @@ -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 verify +PASSWORD_VALUE_REQUIRED_MESSAGE //*[@id='setpassword:Message' or @id='setpassword:PasswordDecorate:Message'] +PASSWORD_LENGTH_MESSAGE length 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=main:searchString +SEARCH_SUBMIT id=main: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 xpath=//*[@id='booking:Message' or @id='booking:checkinDateDecorate:Message'] +HOTEL_CHECKOUT_DATE_FIELD id=booking:checkoutDateDecorate:checkoutDateInputDate +HOTEL_CHECKOUT_DATE_MESSAGE xpath=//*[@id='booking:Message' or @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='main:messages']/li +REGISTRATION id=login:register +REGISTRATION_USERNAME id=register:usernameDecorate:username +REGISTRATION_USERNAME_MESSAGE id=register:usernameDecorate:message +REGISTRATION_NAME id=register:nameDecorate:name +REGISTRATION_NAME_MESSAGE id=register:nameDecorate:message +REGISTRATION_PASSWORD id=register:passwordDecorate:password +REGISTRATION_PASSWORD_MESSAGE id=register:passwordDecorate:message +REGISTRATION_VERIFY id=register:verifyDecorate:verify +REGISTRATION_VERIFY_MESSAGE id=register:verifyDecorate:message +REGISTRATION_SUBMIT id=register:register +REGISTRATION_REENTER_MESSAGE verify +REGISTRATION_LENGTH_MESSAGE length 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\=main\:Spinner \ No newline at end of file Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources/seam.properties =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-tests/src/test/resources/seam.properties 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources/seam.properties 2012-04-03 16:16:16 UTC (rev 14493) @@ -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/hibernate/hibernate-tests/src/test/resources/seam.properties (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-tests/src/test/resources/seam.properties) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources/seam.properties (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources/seam.properties 2012-04-03 16:16:16 UTC (rev 14493) @@ -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/hibernate/hibernate-tests/src/test/resources-ftest/testng.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-tests/src/test/resources-ftest/testng.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-ftest/testng.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,29 +0,0 @@ - -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > -<suite name="Hibernate example" verbose="2" parallel="false"> - <test name="hibernate_tests"> - <parameter name="PROPERTY_FILE" value="/hibernate.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> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-ftest/testng.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-tests/src/test/resources-ftest/testng.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-ftest/testng.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-ftest/testng.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,29 @@ + +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="Hibernate example" verbose="2" parallel="false"> + <test name="hibernate_tests"> + <parameter name="PROPERTY_FILE" value="/hibernate.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> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/testng.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/testng.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/testng.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -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="Hibernate Booking"> - <classes> - <class name="org.jboss.seam.example.hibernate.test.LoginTest"/> - <class name="org.jboss.seam.example.hibernate.test.BookingTest"/> - <class name="org.jboss.seam.example.hibernate.test.ChangePasswordTest"/> - </classes> - </test> - -</suite> \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/testng.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/testng.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/testng.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources-integration/testng.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -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="Hibernate Booking"> + <classes> + <class name="org.jboss.seam.example.hibernate.test.LoginTest"/> + <class name="org.jboss.seam.example.hibernate.test.BookingTest"/> + <class name="org.jboss.seam.example.hibernate.test.ChangePasswordTest"/> + </classes> + </test> + +</suite> \ No newline at end of file Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/pom.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/pom.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/pom.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,462 +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>hibernate</artifactId> - <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>hibernate-web</artifactId> - <version>2.3.0.Beta1-SNAPSHOT</version> - <packaging>war</packaging> - <name>Hibernate Web Module (EE6)</name> - - - <build> - <finalName>jboss-seam-hibernate</finalName> - <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> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jboss-maven-plugin</artifactId> - <version>1.5.0</version> - <configuration> - <jbossHome>${jboss.home}</jbossHome> - <serverName>${jboss.domain}</serverName> - <fileNames> - <directory>${project.build.directory}/${project.build.finalName}.war</directory> - </fileNames> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <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>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui</artifactId> - <exclusions> - <exclusion> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-jul</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>javax.validation</groupId> - <artifactId>validation-api</artifactId> - <version>1.0.0.GA</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-debug</artifactId> - </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>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.15</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>org.richfaces.framework</groupId> - <artifactId>richfaces-impl</artifactId> - <version>3.3.3.Final</version> - <exclusions> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-ui</artifactId> - <version>3.3.3.Final</version> - <exclusions> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.el</groupId> - <artifactId>jboss-el</artifactId> - </dependency> - <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>4.1.1.Final</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.1</version> - <scope>provided</scope> - </dependency> - </dependencies> - - - <profiles> - <profile> - <id>jbossas51</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>src/jboss/webapp</directory> - </resource> - </webResources> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>jbossas42</id> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - </exclusions> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>src/jboss/webapp</directory> - </resource> - </webResources> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>tomcat</id> - <dependencies> - <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> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <scope>runtime</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>src/jboss/webapp</directory> - </resource> - </webResources> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>glassfish2</id> - <dependencies> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-entitymanager</artifactId> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-validator</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>javax.transaction</groupId> - <artifactId>jta</artifactId> - </exclusion> - <exclusion> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-annotations</artifactId> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.hibernate</groupId> - <artifactId>ejb3-persistence</artifactId> - </exclusion> - <exclusion> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>jboss</groupId> - <artifactId>jboss-common-core</artifactId> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - </dependency> - <dependency> - <groupId>antlr</groupId> - <artifactId>antlr</artifactId> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>src/glassfish/webapp</directory> - </resource> - </webResources> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>src/glassfish/java</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <executions> - <execution> - <id>copy-glassfish-resources</id> - <phase>prepare-package</phase> - <goals> - <goal>copy-resources</goal> - </goals> - <configuration> - <overwrite>true</overwrite> - <outputDirectory>${project.build.outputDirectory}</outputDirectory> - <resources> - <resource> - <directory>${basedir}/src/glassfish/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/pom.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/pom.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/pom.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,462 @@ +<?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>hibernate</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>hibernate-web</artifactId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <packaging>war</packaging> + <name>Hibernate Web Module (EE6)</name> + + + <build> + <finalName>jboss-seam-hibernate</finalName> + <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> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jboss-maven-plugin</artifactId> + <version>1.5.0</version> + <configuration> + <jbossHome>${jboss.home}</jbossHome> + <serverName>${jboss.domain}</serverName> + <fileNames> + <directory>${project.build.directory}/${project.build.finalName}.war</directory> + </fileNames> + </configuration> + </plugin> + </plugins> + </build> + + <dependencies> + <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>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui</artifactId> + <exclusions> + <exclusion> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-jul</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>1.0.0.GA</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-debug</artifactId> + </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>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.15</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.framework</groupId> + <artifactId>richfaces-impl</artifactId> + <version>3.3.3.Final</version> + <exclusions> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-ui</artifactId> + <version>3.3.3.Final</version> + <exclusions> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.el</groupId> + <artifactId>jboss-el</artifactId> + </dependency> + <dependency> + <groupId>javax.persistence</groupId> + <artifactId>persistence-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>4.1.1.Final</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + </dependencies> + + + <profiles> + <profile> + <id>jbossas51</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>src/jboss/webapp</directory> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>jbossas42</id> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + </exclusion> + <exclusion> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> + <exclusion> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>src/jboss/webapp</directory> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>tomcat</id> + <dependencies> + <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> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>src/jboss/webapp</directory> + </resource> + </webResources> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>glassfish2</id> + <dependencies> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</artifactId> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + </exclusion> + <exclusion> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> + </exclusion> + <exclusion> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-annotations</artifactId> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>ejb3-persistence</artifactId> + </exclusion> + <exclusion> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + </dependency> + <dependency> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>src/glassfish/webapp</directory> + </resource> + </webResources> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>src/glassfish/java</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <executions> + <execution> + <id>copy-glassfish-resources</id> + <phase>prepare-package</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <overwrite>true</overwrite> + <outputDirectory>${project.build.outputDirectory}</outputDirectory> + <resources> + <resource> + <directory>${basedir}/src/glassfish/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/java/GlassfishDerbyDialect.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/glassfish/java/GlassfishDerbyDialect.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/java/GlassfishDerbyDialect.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,19 +0,0 @@ -import org.hibernate.dialect.DerbyDialect; -import org.hibernate.id.IdentityGenerator; - - -public class GlassfishDerbyDialect extends DerbyDialect { - - public GlassfishDerbyDialect() { - - } - - @Override - public Class getNativeIdentifierGeneratorClass() { - - return IdentityGenerator.class; - } - - - -} Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/java/GlassfishDerbyDialect.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/glassfish/java/GlassfishDerbyDialect.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/java/GlassfishDerbyDialect.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/java/GlassfishDerbyDialect.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,19 @@ +import org.hibernate.dialect.DerbyDialect; +import org.hibernate.id.IdentityGenerator; + + +public class GlassfishDerbyDialect extends DerbyDialect { + + public GlassfishDerbyDialect() { + + } + + @Override + public Class getNativeIdentifierGeneratorClass() { + + return IdentityGenerator.class; + } + + + +} Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/hibernate.cfg.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/hibernate.cfg.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/hibernate.cfg.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,20 +0,0 @@ -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> - -<hibernate-configuration> - <session-factory name="bookingDatabase"> - <property name="show_sql">false</property> - <property name="connection.datasource">jdbc/__default</property> - <property name="hbm2ddl.auto">create-drop</property> - <property name="transaction.flush_before_completion">true</property> - <property name="connection.release_mode">after_statement</property> - <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <property name="dialect">GlassfishDerbyDialect</property> - <property name="transaction.manager_lookup_class">org.hibernate.transaction.SunONETransactionManagerLookup</property> - <property name="transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> - <mapping class="org.jboss.seam.example.hibernate.Hotel"/> - <mapping class="org.jboss.seam.example.hibernate.User"/> - <mapping class="org.jboss.seam.example.hibernate.Booking"/> - </session-factory> -</hibernate-configuration> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/hibernate.cfg.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/hibernate.cfg.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/hibernate.cfg.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/hibernate.cfg.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,20 @@ +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory name="bookingDatabase"> + <property name="show_sql">false</property> + <property name="connection.datasource">jdbc/__default</property> + <property name="hbm2ddl.auto">create-drop</property> + <property name="transaction.flush_before_completion">true</property> + <property name="connection.release_mode">after_statement</property> + <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> + <property name="dialect">GlassfishDerbyDialect</property> + <property name="transaction.manager_lookup_class">org.hibernate.transaction.SunONETransactionManagerLookup</property> + <property name="transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> + <mapping class="org.jboss.seam.example.hibernate.Hotel"/> + <mapping class="org.jboss.seam.example.hibernate.User"/> + <mapping class="org.jboss.seam.example.hibernate.Booking"/> + </session-factory> +</hibernate-configuration> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/import.sql =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/import.sql 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/import.sql 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,22 +0,0 @@ -insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') -insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') -insert into Hotel (price, name, address, city, state, zip, country) values (120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') -insert into Hotel (price, name, address, city, state, zip, country) values (210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') -insert into Hotel (price, name, address, city, state, zip, country) values (240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') -insert into Hotel (price, name, address, city, state, zip, country) values (130, 'Hotel Beaulac', ' Esplanade L�opold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') -insert into Hotel (price, name, address, city, state, zip, country) values (140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') -insert into Hotel (price, name, address, city, state, zip, country) values (230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') -insert into Hotel (price, name, address, city, state, zip, country) values (460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') -insert into Hotel (price, name, address, city, state, zip, country) values (250, 'Meli� White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') -insert into Hotel (price, name, address, city, state, zip, country) values (210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/import.sql (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/import.sql) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/import.sql (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/import.sql 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,22 @@ +insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') +insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') +insert into Hotel (price, name, address, city, state, zip, country) values (120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') +insert into Hotel (price, name, address, city, state, zip, country) values (210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') +insert into Hotel (price, name, address, city, state, zip, country) values (240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') +insert into Hotel (price, name, address, city, state, zip, country) values (130, 'Hotel Beaulac', ' Esplanade L�opold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') +insert into Hotel (price, name, address, city, state, zip, country) values (140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') +insert into Hotel (price, name, address, city, state, zip, country) values (230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') +insert into Hotel (price, name, address, city, state, zip, country) values (460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') +insert into Hotel (price, name, address, city, state, zip, country) values (250, 'Meli� White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') +insert into Hotel (price, name, address, city, state, zip, country) values (210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/log4j.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/log4j.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/log4j.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - - - - - - - - - - - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/> - </layout> - </appender> - -  - -  - -  - - <root> - <priority value="INFO"/> - <appender-ref ref="CONSOLE"/> - </root> - -</log4j:configuration> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/log4j.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/log4j.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/log4j.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/resources/log4j.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + + + + + + + + + + + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + +  + +  + +  + + <root> + <priority value="INFO"/> + <appender-ref ref="CONSOLE"/> + </root> + +</log4j:configuration> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/components.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/components.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,26 +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:persistence="http://jboss.com/products/seam/persistence" - xmlns:security="http://jboss.com/products/seam/security" - 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/persistence http://jboss.com/products/seam/persistence-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 debug="true"/> - - <core:manager conversation-timeout="120000" - concurrent-request-timeout="500" - conversation-id-parameter="cid"/> - - <persistence:hibernate-session-factory name="hibernateSessionFactory"/> - - <persistence:managed-hibernate-session name="bookingDatabase" - auto-create="true" - session-factory-jndi-name="bookingDatabase"/> - - <security:identity authenticate-method="#{authenticator.authenticate}"/> -</components> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/components.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/components.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/components.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:persistence="http://jboss.com/products/seam/persistence" + xmlns:security="http://jboss.com/products/seam/security" + 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/persistence http://jboss.com/products/seam/persistence-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 debug="true"/> + + <core:manager conversation-timeout="120000" + concurrent-request-timeout="500" + conversation-id-parameter="cid"/> + + <persistence:hibernate-session-factory name="hibernateSessionFactory"/> + + <persistence:managed-hibernate-session name="bookingDatabase" + auto-create="true" + session-factory-jndi-name="bookingDatabase"/> + + <security:identity authenticate-method="#{authenticator.authenticate}"/> +</components> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/faces-config.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/faces-config.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<faces-config version="1.2" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> - -  - - <application> - <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> - </application> - -</faces-config> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/faces-config.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/faces-config.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/faces-config.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/faces-config.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="1.2" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + +  + + <application> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + </application> + +</faces-config> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/pages.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/pages.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pages xmlns="http://jboss.com/products/seam/pages" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.3.xsd" - - no-conversation-view-id="/main.xhtml" - login-view-id="/home.xhtml"> - - <page view-id="/register.xhtml"> - - <action if="#{validation.failed}" execute="#{register.invalid}"/> - - <navigation> - <rule if="#{register.registered}"> - <redirect view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> - - <navigation from-action="#{identity.isLoggedIn}"> - <rule if-outcome="true"> - <redirect view-id="/main.xhtml"/> - </rule> - <rule if-outcome="false"> - <render view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/password.xhtml" - login-required="true"> - - <navigation> - <rule if="#{changePassword.changed}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/main.xhtml" - login-required="true"> - - <navigation from-action="#{hotelBooking.selectHotel(hot)}"> - <redirect view-id="/hotel.xhtml"/> - </navigation> - - </page> - - <page view-id="/hotel.xhtml" - conversation-required="true"> - - <description>View hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.bookHotel}"> - <redirect view-id="/book.xhtml"/> - </navigation> - - </page> - - <page view-id="/book.xhtml" - conversation-required="true"> - - <description>Book hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.setBookingDetails}"> - <rule if="#{hotelBooking.bookingValid}"> - <redirect view-id="/confirm.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/confirm.xhtml" - conversation-required="true"> - - <description>Confirm booking: #{booking.description}</description> - - <navigation from-action="#{hotelBooking.confirm}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <page view-id="*"> - - <navigation from-action="#{identity.logout}"> - <redirect view-id="/home.xhtml"/> - </navigation> - - <navigation from-action="#{hotelBooking.cancel}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <exception class="org.jboss.seam.security.NotLoggedInException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">You must be logged in to use this feature</message> - </redirect> - </exception> - - <exception class="javax.faces.application.ViewExpiredException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">Session expired, please log in again</message> - </redirect> - </exception> - -</pages> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/pages.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/pages.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/pages.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/pages.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> +<pages xmlns="http://jboss.com/products/seam/pages" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.3.xsd" + + no-conversation-view-id="/main.xhtml" + login-view-id="/home.xhtml"> + + <page view-id="/register.xhtml"> + + <action if="#{validation.failed}" execute="#{register.invalid}"/> + + <navigation> + <rule if="#{register.registered}"> + <redirect view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + <rule if-outcome="false"> + <render view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/password.xhtml" + login-required="true"> + + <navigation> + <rule if="#{changePassword.changed}"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/main.xhtml" + login-required="true"> + + <navigation from-action="#{hotelBooking.selectHotel(hot)}"> + <redirect view-id="/hotel.xhtml"/> + </navigation> + + </page> + + <page view-id="/hotel.xhtml" + conversation-required="true"> + + <description>View hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.bookHotel}"> + <redirect view-id="/book.xhtml"/> + </navigation> + + </page> + + <page view-id="/book.xhtml" + conversation-required="true"> + + <description>Book hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.setBookingDetails}"> + <rule if="#{hotelBooking.bookingValid}"> + <redirect view-id="/confirm.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/confirm.xhtml" + conversation-required="true"> + + <description>Confirm booking: #{booking.description}</description> + + <navigation from-action="#{hotelBooking.confirm}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <page view-id="*"> + + <navigation from-action="#{identity.logout}"> + <redirect view-id="/home.xhtml"/> + </navigation> + + <navigation from-action="#{hotelBooking.cancel}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <exception class="org.jboss.seam.security.NotLoggedInException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">You must be logged in to use this feature</message> + </redirect> + </exception> + + <exception class="javax.faces.application.ViewExpiredException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">Session expired, please log in again</message> + </redirect> + </exception> + +</pages> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/web.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/web.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,67 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.5" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - -  - - <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> - </listener> - - <filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <servlet> - <servlet-name>Seam Resource Servlet</servlet-name> - <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>Seam Resource Servlet</servlet-name> - <url-pattern>/seam/resource/*</url-pattern> - </servlet-mapping> - - -  - - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.seam</url-pattern> - </servlet-mapping> - -  - - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</param-value> - </context-param> - - <listener> - <listener-class>com.sun.faces.config.ConfigureListener</listener-class> - </listener> - - <session-config> - <session-timeout>10</session-timeout> - </session-config> - -</web-app> \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/web.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/web.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/glassfish/webapp/WEB-INF/web.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + +  + + <listener> + <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + </listener> + + <filter> + <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>Seam Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <servlet> + <servlet-name>Seam Resource Servlet</servlet-name> + <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Seam Resource Servlet</servlet-name> + <url-pattern>/seam/resource/*</url-pattern> + </servlet-mapping> + + +  + + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.seam</url-pattern> + </servlet-mapping> + +  + + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + + <listener> + <listener-class>com.sun.faces.config.ConfigureListener</listener-class> + </listener> + + <session-config> + <session-timeout>10</session-timeout> + </session-config> + +</web-app> \ No newline at end of file Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/jboss/webapp/WEB-INF/jboss-web.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/jboss/webapp/WEB-INF/jboss-web.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/jboss/webapp/WEB-INF/jboss-web.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,8 +0,0 @@ -<jboss-web> - <class-loading java2ClassLoadingCompliance="false"> - <loader-repository> - seam.jboss.org:loader=jboss-seam-hibernate - <loader-repository-config>java2ParentDelegation=false</loader-repository-config> - </loader-repository> - </class-loading> -</jboss-web> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/jboss/webapp/WEB-INF/jboss-web.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/jboss/webapp/WEB-INF/jboss-web.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/jboss/webapp/WEB-INF/jboss-web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/jboss/webapp/WEB-INF/jboss-web.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,8 @@ +<jboss-web> + <class-loading java2ClassLoadingCompliance="false"> + <loader-repository> + seam.jboss.org:loader=jboss-seam-hibernate + <loader-repository-config>java2ParentDelegation=false</loader-repository-config> + </loader-repository> + </class-loading> +</jboss-web> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/AuthenticatorAction.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/AuthenticatorAction.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/AuthenticatorAction.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,37 +0,0 @@ -package org.jboss.seam.example.hibernate; - -import static org.jboss.seam.ScopeType.SESSION; - -import java.util.List; - -import org.hibernate.Session; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Out; - -@Name("authenticator") -public class AuthenticatorAction -{ - @In - Session bookingDatabase; - - @Out(required=false, scope = SESSION) - private User user; - - public boolean authenticate() - { - List results = bookingDatabase.createQuery("select u from User u where u.username=#{identity.username} and u.password=#{identity.password}") - .list(); - - if ( results.size()==0 ) - { - return false; - } - else - { - user = (User) results.get(0); - return true; - } - } - -} Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/AuthenticatorAction.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/AuthenticatorAction.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/AuthenticatorAction.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/AuthenticatorAction.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,37 @@ +package org.jboss.seam.example.hibernate; + +import static org.jboss.seam.ScopeType.SESSION; + +import java.util.List; + +import org.hibernate.Session; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Out; + +@Name("authenticator") +public class AuthenticatorAction +{ + @In + Session bookingDatabase; + + @Out(required=false, scope = SESSION) + private User user; + + public boolean authenticate() + { + List results = bookingDatabase.createQuery("select u from User u where u.username=#{identity.username} and u.password=#{identity.password}") + .list(); + + if ( results.size()==0 ) + { + return false; + } + else + { + user = (User) results.get(0); + return true; + } + } + +} Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/Booking.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/Booking.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/Booking.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,190 +0,0 @@ -//$Id: Booking.java 6987 2007-12-23 19:53:07Z pmuir $ -package org.jboss.seam.example.hibernate; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.text.DateFormat; -import java.util.Date; - -import javax.persistence.Basic; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.persistence.ManyToOne; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; -import javax.persistence.Transient; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; - -import org.jboss.seam.annotations.Name; - -@Entity -@Name("booking") -public class Booking implements Serializable -{ - private Long id; - private User user; - private Hotel hotel; - private Date checkinDate; - private Date checkoutDate; - private String creditCard; - private String creditCardName; - private int creditCardExpiryMonth; - private int creditCardExpiryYear; - private boolean smoking; - private int beds; - - public Booking() {} - - public Booking(Hotel hotel, User user) - { - this.hotel = hotel; - this.user = user; - } - - @Transient - public BigDecimal getTotal() - { - return hotel.getPrice().multiply( new BigDecimal( getNights() ) ); - } - - @Transient - public int getNights() - { - return (int) ( checkoutDate.getTime() - checkinDate.getTime() ) / 1000 / 60 / 60 / 24; - } - - @Id @GeneratedValue - public Long getId() - { - return id; - } - public void setId(Long id) - { - this.id = id; - } - - @NotNull - @Basic @Temporal(TemporalType.DATE) - public Date getCheckinDate() - { - return checkinDate; - } - public void setCheckinDate(Date datetime) - { - this.checkinDate = datetime; - } - - @ManyToOne @NotNull - public Hotel getHotel() - { - return hotel; - } - public void setHotel(Hotel hotel) - { - this.hotel = hotel; - } - - @ManyToOne @NotNull - public User getUser() - { - return user; - } - public void setUser(User user) - { - this.user = user; - } - - @Basic @Temporal(TemporalType.DATE) - @NotNull - public Date getCheckoutDate() - { - return checkoutDate; - } - public void setCheckoutDate(Date checkoutDate) - { - this.checkoutDate = checkoutDate; - } - - @NotNull(message="Credit card number is required") - @Size(min=16, max=16, message="Credit card number must 16 digits long") - @Pattern(regexp="^\\d*$", message="Credit card number must be numeric") - public String getCreditCard() - { - return creditCard; - } - - public void setCreditCard(String creditCard) - { - this.creditCard = creditCard; - } - - @Transient - public String getDescription() - { - DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM); - return hotel==null ? null : hotel.getName() + - ", " + df.format( getCheckinDate() ) + - " to " + df.format( getCheckoutDate() ); - } - - public boolean isSmoking() - { - return smoking; - } - - public void setSmoking(boolean smoking) - { - this.smoking = smoking; - } - - public int getBeds() - { - return beds; - } - - public void setBeds(int beds) - { - this.beds = beds; - } - @NotNull(message="Credit card name is required") - @Size(min=3, max=70, message="Credit card name is required") - public String getCreditCardName() - { - return creditCardName; - } - - public void setCreditCardName(String creditCardName) - { - this.creditCardName = creditCardName; - } - - public int getCreditCardExpiryMonth() - { - return creditCardExpiryMonth; - } - - public void setCreditCardExpiryMonth(int creditCardExpiryMonth) - { - this.creditCardExpiryMonth = creditCardExpiryMonth; - } - - public int getCreditCardExpiryYear() - { - return creditCardExpiryYear; - } - - public void setCreditCardExpiryYear(int creditCardExpiryYear) - { - this.creditCardExpiryYear = creditCardExpiryYear; - } - - @Override - public String toString() - { - return "Booking(" + user + ","+ hotel + ")"; - } - -} Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/Booking.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/Booking.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/Booking.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/Booking.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,190 @@ +//$Id: Booking.java 6987 2007-12-23 19:53:07Z pmuir $ +package org.jboss.seam.example.hibernate; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.text.DateFormat; +import java.util.Date; + +import javax.persistence.Basic; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.persistence.ManyToOne; +import javax.persistence.Temporal; +import javax.persistence.TemporalType; +import javax.persistence.Transient; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; + +import org.jboss.seam.annotations.Name; + +@Entity +@Name("booking") +public class Booking implements Serializable +{ + private Long id; + private User user; + private Hotel hotel; + private Date checkinDate; + private Date checkoutDate; + private String creditCard; + private String creditCardName; + private int creditCardExpiryMonth; + private int creditCardExpiryYear; + private boolean smoking; + private int beds; + + public Booking() {} + + public Booking(Hotel hotel, User user) + { + this.hotel = hotel; + this.user = user; + } + + @Transient + public BigDecimal getTotal() + { + return hotel.getPrice().multiply( new BigDecimal( getNights() ) ); + } + + @Transient + public int getNights() + { + return (int) ( checkoutDate.getTime() - checkinDate.getTime() ) / 1000 / 60 / 60 / 24; + } + + @Id @GeneratedValue + public Long getId() + { + return id; + } + public void setId(Long id) + { + this.id = id; + } + + @NotNull + @Basic @Temporal(TemporalType.DATE) + public Date getCheckinDate() + { + return checkinDate; + } + public void setCheckinDate(Date datetime) + { + this.checkinDate = datetime; + } + + @ManyToOne @NotNull + public Hotel getHotel() + { + return hotel; + } + public void setHotel(Hotel hotel) + { + this.hotel = hotel; + } + + @ManyToOne @NotNull + public User getUser() + { + return user; + } + public void setUser(User user) + { + this.user = user; + } + + @Basic @Temporal(TemporalType.DATE) + @NotNull + public Date getCheckoutDate() + { + return checkoutDate; + } + public void setCheckoutDate(Date checkoutDate) + { + this.checkoutDate = checkoutDate; + } + + @NotNull(message="Credit card number is required") + @Size(min=16, max=16, message="Credit card number must 16 digits long") + @Pattern(regexp="^\\d*$", message="Credit card number must be numeric") + public String getCreditCard() + { + return creditCard; + } + + public void setCreditCard(String creditCard) + { + this.creditCard = creditCard; + } + + @Transient + public String getDescription() + { + DateFormat df = DateFormat.getDateInstance(DateFormat.MEDIUM); + return hotel==null ? null : hotel.getName() + + ", " + df.format( getCheckinDate() ) + + " to " + df.format( getCheckoutDate() ); + } + + public boolean isSmoking() + { + return smoking; + } + + public void setSmoking(boolean smoking) + { + this.smoking = smoking; + } + + public int getBeds() + { + return beds; + } + + public void setBeds(int beds) + { + this.beds = beds; + } + @NotNull(message="Credit card name is required") + @Size(min=3, max=70, message="Credit card name is required") + public String getCreditCardName() + { + return creditCardName; + } + + public void setCreditCardName(String creditCardName) + { + this.creditCardName = creditCardName; + } + + public int getCreditCardExpiryMonth() + { + return creditCardExpiryMonth; + } + + public void setCreditCardExpiryMonth(int creditCardExpiryMonth) + { + this.creditCardExpiryMonth = creditCardExpiryMonth; + } + + public int getCreditCardExpiryYear() + { + return creditCardExpiryYear; + } + + public void setCreditCardExpiryYear(int creditCardExpiryYear) + { + this.creditCardExpiryYear = creditCardExpiryYear; + } + + @Override + public String toString() + { + return "Booking(" + user + ","+ hotel + ")"; + } + +} Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/BookingListAction.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/BookingListAction.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/BookingListAction.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,67 +0,0 @@ -//$Id: BookingListAction.java 8748 2008-08-20 12:08:30Z pete.muir(a)jboss.org $ -package org.jboss.seam.example.hibernate; - -// import static javax.ejb.TransactionAttributeType.REQUIRES_NEW; -import static org.jboss.seam.ScopeType.SESSION; - -import java.io.Serializable; -import java.util.List; - -import org.hibernate.Session; -import org.jboss.seam.annotations.Factory; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Observer; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.Transactional; -import org.jboss.seam.annotations.datamodel.DataModel; -import org.jboss.seam.annotations.datamodel.DataModelSelection; -import org.jboss.seam.faces.FacesMessages; -import org.jboss.seam.log.Log; - -@Scope(SESSION) -@Name("bookingList") -// @TransactionAttribute(REQUIRES_NEW) -public class BookingListAction implements Serializable -{ - - @In - private Session bookingDatabase; - - @In - private User user; - - @DataModel - private List<Booking> bookings; - @DataModelSelection - private Booking booking; - - @Logger - private Log log; - - @Factory - @Observer("bookingConfirmed") - @Transactional - public void getBookings() - { - bookings = bookingDatabase.createQuery("select b from Booking b where b.user.username = :username order by b.checkinDate") - .setParameter("username", user.getUsername()) - .list(); - } - - public void cancel() - { - log.info("Cancel booking: #{bookingList.booking.id} for #{user.username}"); - Booking cancelled = (Booking) bookingDatabase.get(Booking.class, booking.getId()); - if (cancelled!=null) bookingDatabase.delete( cancelled ); - getBookings(); - FacesMessages.instance().add("Booking cancelled for confirmation number #0", booking.getId()); - } - - public Booking getBooking() - { - return booking; - } - -} Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/BookingListAction.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/BookingListAction.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/BookingListAction.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/BookingListAction.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,67 @@ +//$Id: BookingListAction.java 8748 2008-08-20 12:08:30Z pete.muir(a)jboss.org $ +package org.jboss.seam.example.hibernate; + +// import static javax.ejb.TransactionAttributeType.REQUIRES_NEW; +import static org.jboss.seam.ScopeType.SESSION; + +import java.io.Serializable; +import java.util.List; + +import org.hibernate.Session; +import org.jboss.seam.annotations.Factory; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Logger; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Observer; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.Transactional; +import org.jboss.seam.annotations.datamodel.DataModel; +import org.jboss.seam.annotations.datamodel.DataModelSelection; +import org.jboss.seam.faces.FacesMessages; +import org.jboss.seam.log.Log; + +@Scope(SESSION) +@Name("bookingList") +// @TransactionAttribute(REQUIRES_NEW) +public class BookingListAction implements Serializable +{ + + @In + private Session bookingDatabase; + + @In + private User user; + + @DataModel + private List<Booking> bookings; + @DataModelSelection + private Booking booking; + + @Logger + private Log log; + + @Factory + @Observer("bookingConfirmed") + @Transactional + public void getBookings() + { + bookings = bookingDatabase.createQuery("select b from Booking b where b.user.username = :username order by b.checkinDate") + .setParameter("username", user.getUsername()) + .list(); + } + + public void cancel() + { + log.info("Cancel booking: #{bookingList.booking.id} for #{user.username}"); + Booking cancelled = (Booking) bookingDatabase.get(Booking.class, booking.getId()); + if (cancelled!=null) bookingDatabase.delete( cancelled ); + getBookings(); + FacesMessages.instance().add("Booking cancelled for confirmation number #0", booking.getId()); + } + + public Booking getBooking() + { + return booking; + } + +} Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/ChangePasswordAction.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/ChangePasswordAction.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/ChangePasswordAction.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,64 +0,0 @@ -//$Id: ChangePasswordAction.java 6987 2007-12-23 19:53:07Z pmuir $ -package org.jboss.seam.example.hibernate; - -import static org.jboss.seam.ScopeType.EVENT; - -import org.hibernate.Session; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Out; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.faces.FacesMessages; - -@Scope(EVENT) -@Name("changePassword") -public class ChangePasswordAction -{ - - @In @Out - private User user; - - @In - private Session bookingDatabase; - - private String verify; - - private boolean changed; - - public void changePassword() - { - if ( user.getPassword().equals(verify) ) - { - user = (User) bookingDatabase.merge(user); - FacesMessages.instance().add("Password updated"); - changed = true; - } - else - { - FacesMessages.instance().add("verify", "Re-enter new password"); - revertUser(); - verify=null; - } - } - - public boolean isChanged() - { - return changed; - } - - private void revertUser() - { - user = (User) bookingDatabase.get(User.class, user.getUsername()); - } - - public String getVerify() - { - return verify; - } - - public void setVerify(String verify) - { - this.verify = verify; - } - -} Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/ChangePasswordAction.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/ChangePasswordAction.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/ChangePasswordAction.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/ChangePasswordAction.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,64 @@ +//$Id: ChangePasswordAction.java 6987 2007-12-23 19:53:07Z pmuir $ +package org.jboss.seam.example.hibernate; + +import static org.jboss.seam.ScopeType.EVENT; + +import org.hibernate.Session; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Out; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.faces.FacesMessages; + +@Scope(EVENT) +@Name("changePassword") +public class ChangePasswordAction +{ + + @In @Out + private User user; + + @In + private Session bookingDatabase; + + private String verify; + + private boolean changed; + + public void changePassword() + { + if ( user.getPassword().equals(verify) ) + { + user = (User) bookingDatabase.merge(user); + FacesMessages.instance().add("Password updated"); + changed = true; + } + else + { + FacesMessages.instance().add("verify", "Re-enter new password"); + revertUser(); + verify=null; + } + } + + public boolean isChanged() + { + return changed; + } + + private void revertUser() + { + user = (User) bookingDatabase.get(User.class, user.getUsername()); + } + + public String getVerify() + { + return verify; + } + + public void setVerify(String verify) + { + this.verify = verify; + } + +} Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/Hotel.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/Hotel.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/Hotel.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,114 +0,0 @@ -//$Id: Hotel.java 6987 2007-12-23 19:53:07Z pmuir $ -package org.jboss.seam.example.hibernate; - -import java.io.Serializable; -import java.math.BigDecimal; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.Id; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; - -import org.jboss.seam.annotations.Name; - -@Entity -@Name("hotel") -public class Hotel implements Serializable -{ - private Long id; - private String name; - private String address; - private String city; - private String state; - private String zip; - private String country; - private BigDecimal price; - - @Id @GeneratedValue - public Long getId() - { - return id; - } - public void setId(Long id) - { - this.id = id; - } - - @Size(max=50) @NotNull - public String getName() - { - return name; - } - public void setName(String name) - { - this.name = name; - } - - @Size(max=100) @NotNull - public String getAddress() - { - return address; - } - public void setAddress(String address) - { - this.address = address; - } - - @Size(max=40) @NotNull - public String getCity() - { - return city; - } - public void setCity(String city) - { - this.city = city; - } - - @Size(min=4, max=6) @NotNull - public String getZip() - { - return zip; - } - public void setZip(String zip) - { - this.zip = zip; - } - - @Size(min=2, max=10) @NotNull - public String getState() - { - return state; - } - public void setState(String state) - { - this.state = state; - } - - @Size(min=2, max=40) @NotNull - public String getCountry() - { - return country; - } - public void setCountry(String country) - { - this.country = country; - } - - @Column(precision=6, scale=2) - public BigDecimal getPrice() - { - return price; - } - public void setPrice(BigDecimal price) - { - this.price = price; - } - - @Override - public String toString() - { - return "Hotel(" + name + "," + address + "," + city + "," + zip + ")"; - } -} Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/Hotel.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/Hotel.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/Hotel.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/Hotel.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,114 @@ +//$Id: Hotel.java 6987 2007-12-23 19:53:07Z pmuir $ +package org.jboss.seam.example.hibernate; + +import java.io.Serializable; +import java.math.BigDecimal; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.Id; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; + +import org.jboss.seam.annotations.Name; + +@Entity +@Name("hotel") +public class Hotel implements Serializable +{ + private Long id; + private String name; + private String address; + private String city; + private String state; + private String zip; + private String country; + private BigDecimal price; + + @Id @GeneratedValue + public Long getId() + { + return id; + } + public void setId(Long id) + { + this.id = id; + } + + @Size(max=50) @NotNull + public String getName() + { + return name; + } + public void setName(String name) + { + this.name = name; + } + + @Size(max=100) @NotNull + public String getAddress() + { + return address; + } + public void setAddress(String address) + { + this.address = address; + } + + @Size(max=40) @NotNull + public String getCity() + { + return city; + } + public void setCity(String city) + { + this.city = city; + } + + @Size(min=4, max=6) @NotNull + public String getZip() + { + return zip; + } + public void setZip(String zip) + { + this.zip = zip; + } + + @Size(min=2, max=10) @NotNull + public String getState() + { + return state; + } + public void setState(String state) + { + this.state = state; + } + + @Size(min=2, max=40) @NotNull + public String getCountry() + { + return country; + } + public void setCountry(String country) + { + this.country = country; + } + + @Column(precision=6, scale=2) + public BigDecimal getPrice() + { + return price; + } + public void setPrice(BigDecimal price) + { + this.price = price; + } + + @Override + public String toString() + { + return "Hotel(" + name + "," + address + "," + city + "," + zip + ")"; + } +} Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/HotelBookingAction.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/HotelBookingAction.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/HotelBookingAction.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,97 +0,0 @@ -//$Id: HotelBookingAction.java 6987 2007-12-23 19:53:07Z pmuir $ -package org.jboss.seam.example.hibernate; - -import java.util.Calendar; - -import org.hibernate.Session; -import org.jboss.seam.annotations.Begin; -import org.jboss.seam.annotations.End; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Logger; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Out; -import org.jboss.seam.core.Events; -import org.jboss.seam.faces.FacesMessages; -import org.jboss.seam.log.Log; - -@Name("hotelBooking") -public class HotelBookingAction -{ - - @In - private Session bookingDatabase; - - @In - private User user; - - @In(required=false) @Out - private Hotel hotel; - - @In(required=false) - @Out(required=false) - private Booking booking; - - @In - private FacesMessages facesMessages; - - @In - private Events events; - - @Logger - private Log log; - - private boolean bookingValid; - - @Begin - public void selectHotel(Hotel selectedHotel) - { - hotel = (Hotel) bookingDatabase.merge(selectedHotel); - } - - public void bookHotel() - { - booking = new Booking(hotel, user); - Calendar calendar = Calendar.getInstance(); - booking.setCheckinDate( calendar.getTime() ); - calendar.add(Calendar.DAY_OF_MONTH, 1); - booking.setCheckoutDate( calendar.getTime() ); - } - - public void setBookingDetails() - { - Calendar calendar = Calendar.getInstance(); - calendar.add(Calendar.DAY_OF_MONTH, -1); - if ( booking.getCheckinDate().before( calendar.getTime() ) ) - { - facesMessages.addToControl("checkinDate", "Check in date must be a future date"); - bookingValid=false; - } - else if ( !booking.getCheckinDate().before( booking.getCheckoutDate() ) ) - { - facesMessages.addToControl("checkoutDate", "Check out date must be later than check in date"); - bookingValid=false; - } - else - { - bookingValid=true; - } - } - - public boolean isBookingValid() - { - return bookingValid; - } - - @End - public void confirm() - { - bookingDatabase.persist(booking); - facesMessages.add("Thank you, #{user.name}, your confimation number for #{hotel.name} is #{booking.id}"); - log.info("New booking: #{booking.id} for #{user.username}"); - events.raiseTransactionSuccessEvent("bookingConfirmed"); - } - - @End - public void cancel() {} - -} Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/HotelBookingAction.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/HotelBookingAction.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/HotelBookingAction.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/HotelBookingAction.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,97 @@ +//$Id: HotelBookingAction.java 6987 2007-12-23 19:53:07Z pmuir $ +package org.jboss.seam.example.hibernate; + +import java.util.Calendar; + +import org.hibernate.Session; +import org.jboss.seam.annotations.Begin; +import org.jboss.seam.annotations.End; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Logger; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Out; +import org.jboss.seam.core.Events; +import org.jboss.seam.faces.FacesMessages; +import org.jboss.seam.log.Log; + +@Name("hotelBooking") +public class HotelBookingAction +{ + + @In + private Session bookingDatabase; + + @In + private User user; + + @In(required=false) @Out + private Hotel hotel; + + @In(required=false) + @Out(required=false) + private Booking booking; + + @In + private FacesMessages facesMessages; + + @In + private Events events; + + @Logger + private Log log; + + private boolean bookingValid; + + @Begin + public void selectHotel(Hotel selectedHotel) + { + hotel = (Hotel) bookingDatabase.merge(selectedHotel); + } + + public void bookHotel() + { + booking = new Booking(hotel, user); + Calendar calendar = Calendar.getInstance(); + booking.setCheckinDate( calendar.getTime() ); + calendar.add(Calendar.DAY_OF_MONTH, 1); + booking.setCheckoutDate( calendar.getTime() ); + } + + public void setBookingDetails() + { + Calendar calendar = Calendar.getInstance(); + calendar.add(Calendar.DAY_OF_MONTH, -1); + if ( booking.getCheckinDate().before( calendar.getTime() ) ) + { + facesMessages.addToControl("checkinDate", "Check in date must be a future date"); + bookingValid=false; + } + else if ( !booking.getCheckinDate().before( booking.getCheckoutDate() ) ) + { + facesMessages.addToControl("checkoutDate", "Check out date must be later than check in date"); + bookingValid=false; + } + else + { + bookingValid=true; + } + } + + public boolean isBookingValid() + { + return bookingValid; + } + + @End + public void confirm() + { + bookingDatabase.persist(booking); + facesMessages.add("Thank you, #{user.name}, your confimation number for #{hotel.name} is #{booking.id}"); + log.info("New booking: #{booking.id} for #{user.username}"); + events.raiseTransactionSuccessEvent("bookingConfirmed"); + } + + @End + public void cancel() {} + +} Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/HotelSearchingAction.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/HotelSearchingAction.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/HotelSearchingAction.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,80 +0,0 @@ -//$Id: HotelSearchingAction.java 6987 2007-12-23 19:53:07Z pmuir $ -package org.jboss.seam.example.hibernate; - -import java.io.Serializable; -import java.util.List; - -import org.hibernate.Session; -import org.jboss.seam.ScopeType; -import org.jboss.seam.annotations.Factory; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.datamodel.DataModel; - -@Name("hotelSearch") -(a)Scope(ScopeType.SESSION) -public class HotelSearchingAction implements Serializable -{ - - @In - private Session bookingDatabase; - - private String searchString; - private int pageSize = 10; - private int page; - - @DataModel - private List<Hotel> hotels; - - public void find() - { - page = 0; - queryHotels(); - } - - public void nextPage() - { - page++; - queryHotels(); - } - - private void queryHotels() - { - hotels = bookingDatabase.createQuery("select h from Hotel h where lower(h.name) like #{pattern} or lower(h.city) like #{pattern} or lower(h.zip) like #{pattern} or lower(h.address) like #{pattern}") - .setMaxResults(pageSize) - .setFirstResult( page * pageSize ) - .list(); - } - - @Factory(value="pattern", scope=ScopeType.EVENT) - public String getSearchPattern() - { - return searchString==null ? - "%" : '%' + searchString.toLowerCase().replace('*', '%') + '%'; - } - - public boolean isNextPageAvailable() - { - return hotels!=null && hotels.size()==pageSize; - } - - public int getPageSize() { - return pageSize; - } - - public void setPageSize(int pageSize) { - this.pageSize = pageSize; - } - - public String getSearchString() - { - return searchString; - } - - public void setSearchString(String searchString) - { - this.searchString = searchString; - } - -} Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/HotelSearchingAction.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/HotelSearchingAction.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/HotelSearchingAction.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/HotelSearchingAction.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,80 @@ +//$Id: HotelSearchingAction.java 6987 2007-12-23 19:53:07Z pmuir $ +package org.jboss.seam.example.hibernate; + +import java.io.Serializable; +import java.util.List; + +import org.hibernate.Session; +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Factory; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.annotations.datamodel.DataModel; + +@Name("hotelSearch") +(a)Scope(ScopeType.SESSION) +public class HotelSearchingAction implements Serializable +{ + + @In + private Session bookingDatabase; + + private String searchString; + private int pageSize = 10; + private int page; + + @DataModel + private List<Hotel> hotels; + + public void find() + { + page = 0; + queryHotels(); + } + + public void nextPage() + { + page++; + queryHotels(); + } + + private void queryHotels() + { + hotels = bookingDatabase.createQuery("select h from Hotel h where lower(h.name) like #{pattern} or lower(h.city) like #{pattern} or lower(h.zip) like #{pattern} or lower(h.address) like #{pattern}") + .setMaxResults(pageSize) + .setFirstResult( page * pageSize ) + .list(); + } + + @Factory(value="pattern", scope=ScopeType.EVENT) + public String getSearchPattern() + { + return searchString==null ? + "%" : '%' + searchString.toLowerCase().replace('*', '%') + '%'; + } + + public boolean isNextPageAvailable() + { + return hotels!=null && hotels.size()==pageSize; + } + + public int getPageSize() { + return pageSize; + } + + public void setPageSize(int pageSize) { + this.pageSize = pageSize; + } + + public String getSearchString() + { + return searchString; + } + + public void setSearchString(String searchString) + { + this.searchString = searchString; + } + +} Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/RegisterAction.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/RegisterAction.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/RegisterAction.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,76 +0,0 @@ -//$Id: RegisterAction.java 6987 2007-12-23 19:53:07Z pmuir $ -package org.jboss.seam.example.hibernate; - -import static org.jboss.seam.ScopeType.EVENT; - -import java.util.List; - -import org.hibernate.Session; -import org.jboss.seam.annotations.In; -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; -import org.jboss.seam.faces.FacesMessages; - -@Scope(EVENT) -@Name("register") -public class RegisterAction -{ - - @In - private User user; - - @In - private Session bookingDatabase; - - @In - private FacesMessages facesMessages; - - private String verify; - - private boolean registered; - - public void register() - { - if ( user.getPassword().equals(verify) ) - { - List existing = bookingDatabase.createQuery("select u.username from User u where u.username=#{user.username}") - .list(); - if (existing.size()==0) - { - bookingDatabase.persist(user); - facesMessages.add("Successfully registered as #{user.username}"); - registered = true; - } - else - { - facesMessages.addToControl("username", "Username #{user.username} already exists"); - } - } - else - { - facesMessages.add("verify", "Re-enter your password"); - verify=null; - } - } - - public void invalid() - { - facesMessages.add("Please try again"); - } - - public boolean isRegistered() - { - return registered; - } - - public String getVerify() - { - return verify; - } - - public void setVerify(String verify) - { - this.verify = verify; - } - -} Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/RegisterAction.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/RegisterAction.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/RegisterAction.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/RegisterAction.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,76 @@ +//$Id: RegisterAction.java 6987 2007-12-23 19:53:07Z pmuir $ +package org.jboss.seam.example.hibernate; + +import static org.jboss.seam.ScopeType.EVENT; + +import java.util.List; + +import org.hibernate.Session; +import org.jboss.seam.annotations.In; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; +import org.jboss.seam.faces.FacesMessages; + +@Scope(EVENT) +@Name("register") +public class RegisterAction +{ + + @In + private User user; + + @In + private Session bookingDatabase; + + @In + private FacesMessages facesMessages; + + private String verify; + + private boolean registered; + + public void register() + { + if ( user.getPassword().equals(verify) ) + { + List existing = bookingDatabase.createQuery("select u.username from User u where u.username=#{user.username}") + .list(); + if (existing.size()==0) + { + bookingDatabase.persist(user); + facesMessages.add("Successfully registered as #{user.username}"); + registered = true; + } + else + { + facesMessages.addToControl("username", "Username #{user.username} already exists"); + } + } + else + { + facesMessages.add("verify", "Re-enter your password"); + verify=null; + } + } + + public void invalid() + { + facesMessages.add("Please try again"); + } + + public boolean isRegistered() + { + return registered; + } + + public String getVerify() + { + return verify; + } + + public void setVerify(String verify) + { + this.verify = verify; + } + +} Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/User.java =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/User.java 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/User.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,70 +0,0 @@ -//$Id: User.java 6987 2007-12-23 19:53:07Z pmuir $ -package org.jboss.seam.example.hibernate; - -import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Scope; - -import javax.persistence.Entity; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; -import java.io.Serializable; - -import static org.jboss.seam.ScopeType.SESSION; - -@Entity -@Name("user") -@Scope(SESSION) -@Table(name = "Customer") -public class User implements Serializable { - private String username; - private String password; - private String name; - - public User(String name, String password, String username) { - this.name = name; - this.password = password; - this.username = username; - } - - public User() { - } - - @NotNull - @Size(max = 100) - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @NotNull - @Size(min = 5, max = 15) - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - - @Id - @Size(min = 5, max = 15) - @Pattern(regexp = "^\\w*$", message = "not a valid username") - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - @Override - public String toString() { - return "User(" + username + ")"; - } -} Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/User.java (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/User.java) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/User.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/java/org/jboss/seam/example/hibernate/User.java 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,70 @@ +//$Id: User.java 6987 2007-12-23 19:53:07Z pmuir $ +package org.jboss.seam.example.hibernate; + +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import javax.validation.constraints.Size; +import java.io.Serializable; + +import static org.jboss.seam.ScopeType.SESSION; + +@Entity +@Name("user") +@Scope(SESSION) +@Table(name = "Customer") +public class User implements Serializable { + private String username; + private String password; + private String name; + + public User(String name, String password, String username) { + this.name = name; + this.password = password; + this.username = username; + } + + public User() { + } + + @NotNull + @Size(max = 100) + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + @NotNull + @Size(min = 5, max = 15) + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + + @Id + @Size(min = 5, max = 15) + @Pattern(regexp = "^\\w*$", message = "not a valid username") + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + @Override + public String toString() { + return "User(" + username + ")"; + } +} Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/hibernate.cfg.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/resources/hibernate.cfg.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/hibernate.cfg.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,17 +0,0 @@ -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> - -<hibernate-configuration> - <session-factory name="java:/bookingDatabase"> - <property name="show_sql">false</property> - <property name="connection.datasource">java:/DefaultDS</property> - <property name="hbm2ddl.auto">create-drop</property> - <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <property name="transaction.flush_before_completion">true</property> - <property name="transaction.factory_class">org.hibernate.transaction.JDBCTransactionFactory</property> - <mapping class="org.jboss.seam.example.hibernate.Hotel"/> - <mapping class="org.jboss.seam.example.hibernate.User"/> - <mapping class="org.jboss.seam.example.hibernate.Booking"/> - </session-factory> -</hibernate-configuration> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/hibernate.cfg.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/resources/hibernate.cfg.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/hibernate.cfg.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/hibernate.cfg.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,17 @@ +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory name="java:/bookingDatabase"> + <property name="show_sql">false</property> + <property name="connection.datasource">java:/DefaultDS</property> + <property name="hbm2ddl.auto">create-drop</property> + <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> + <property name="transaction.flush_before_completion">true</property> + <property name="transaction.factory_class">org.hibernate.transaction.JDBCTransactionFactory</property> + <mapping class="org.jboss.seam.example.hibernate.Hotel"/> + <mapping class="org.jboss.seam.example.hibernate.User"/> + <mapping class="org.jboss.seam.example.hibernate.Booking"/> + </session-factory> +</hibernate-configuration> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/import.sql =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/resources/import.sql 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/import.sql 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,22 +0,0 @@ -insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') -insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') -insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') -insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') -insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 130, 'Hotel Beaulac', ' Esplanade L�opold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') -insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') -insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 250, 'Meli� White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/import.sql (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/resources/import.sql) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/import.sql (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/import.sql 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,22 @@ +insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') +insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') +insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') +insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') +insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') +insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 130, 'Hotel Beaulac', ' Esplanade L�opold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') +insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') +insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') +insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') +insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 250, 'Meli� White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') +insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/seam.properties =================================================================== Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/seam.properties (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/resources/seam.properties) =================================================================== Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/components.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/components.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,28 +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:persistence="http://jboss.com/products/seam/persistence" - 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/persistence http://jboss.com/products/seam/persistence-2.3.xsd - http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.3.xsd - http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.3.xsd - http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd"> - - <core:manager conversation-timeout="120000" - concurrent-request-timeout="500" - conversation-id-parameter="cid"/> - - <persistence:hibernate-session-factory name="hibernateSessionFactory"/> - - <persistence:managed-hibernate-session name="bookingDatabase" - auto-create="true"/> - - <security:identity authenticate-method="#{authenticator.authenticate}"/> - - <transaction:hibernate-transaction session="#{bookingDatabase}"/> - -</components> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/components.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/components.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/components.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:persistence="http://jboss.com/products/seam/persistence" + 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/persistence http://jboss.com/products/seam/persistence-2.3.xsd + http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.3.xsd + http://jboss.com/products/seam/transaction http://jboss.com/products/seam/transaction-2.3.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd"> + + <core:manager conversation-timeout="120000" + concurrent-request-timeout="500" + conversation-id-parameter="cid"/> + + <persistence:hibernate-session-factory name="hibernateSessionFactory"/> + + <persistence:managed-hibernate-session name="bookingDatabase" + auto-create="true"/> + + <security:identity authenticate-method="#{authenticator.authenticate}"/> + + <transaction:hibernate-transaction session="#{bookingDatabase}"/> + +</components> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<faces-config version="1.2" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> - -  - - <application> - <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> - </application> - -</faces-config> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/faces-config.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/faces-config.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="1.2" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + +  + + <application> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + </application> + +</faces-config> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/pages.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/pages.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pages xmlns="http://jboss.com/products/seam/pages" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.3.xsd" - - no-conversation-view-id="/main.xhtml" - login-view-id="/home.xhtml"> - - <page view-id="/register.xhtml"> - - <action if="#{validation.failed}" execute="#{register.invalid}"/> - - <navigation> - <rule if="#{register.registered}"> - <redirect view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> - - <navigation from-action="#{identity.isLoggedIn}"> - <rule if-outcome="true"> - <redirect view-id="/main.xhtml"/> - </rule> - <rule if-outcome="false"> - <render view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/password.xhtml" - login-required="true"> - - <navigation> - <rule if="#{changePassword.changed}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/main.xhtml" - login-required="true"> - - <navigation from-action="#{hotelBooking.selectHotel(hot)}"> - <redirect view-id="/hotel.xhtml"/> - </navigation> - - </page> - - <page view-id="/hotel.xhtml" - conversation-required="true"> - - <description>View hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.bookHotel}"> - <redirect view-id="/book.xhtml"/> - </navigation> - - </page> - - <page view-id="/book.xhtml" - conversation-required="true"> - - <description>Book hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.setBookingDetails}"> - <rule if="#{hotelBooking.bookingValid}"> - <redirect view-id="/confirm.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/confirm.xhtml" - conversation-required="true"> - - <description>Confirm booking: #{booking.description}</description> - - <navigation from-action="#{hotelBooking.confirm}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <page view-id="*"> - - <navigation from-action="#{identity.logout}"> - <redirect view-id="/home.xhtml"/> - </navigation> - - <navigation from-action="#{hotelBooking.cancel}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <exception class="org.jboss.seam.security.NotLoggedInException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">You must be logged in to use this feature</message> - </redirect> - </exception> - - <exception class="javax.faces.application.ViewExpiredException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">Session expired, please log in again</message> - </redirect> - </exception> - -</pages> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/pages.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/pages.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/pages.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/pages.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> +<pages xmlns="http://jboss.com/products/seam/pages" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.3.xsd" + + no-conversation-view-id="/main.xhtml" + login-view-id="/home.xhtml"> + + <page view-id="/register.xhtml"> + + <action if="#{validation.failed}" execute="#{register.invalid}"/> + + <navigation> + <rule if="#{register.registered}"> + <redirect view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + <rule if-outcome="false"> + <render view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/password.xhtml" + login-required="true"> + + <navigation> + <rule if="#{changePassword.changed}"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/main.xhtml" + login-required="true"> + + <navigation from-action="#{hotelBooking.selectHotel(hot)}"> + <redirect view-id="/hotel.xhtml"/> + </navigation> + + </page> + + <page view-id="/hotel.xhtml" + conversation-required="true"> + + <description>View hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.bookHotel}"> + <redirect view-id="/book.xhtml"/> + </navigation> + + </page> + + <page view-id="/book.xhtml" + conversation-required="true"> + + <description>Book hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.setBookingDetails}"> + <rule if="#{hotelBooking.bookingValid}"> + <redirect view-id="/confirm.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/confirm.xhtml" + conversation-required="true"> + + <description>Confirm booking: #{booking.description}</description> + + <navigation from-action="#{hotelBooking.confirm}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <page view-id="*"> + + <navigation from-action="#{identity.logout}"> + <redirect view-id="/home.xhtml"/> + </navigation> + + <navigation from-action="#{hotelBooking.cancel}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <exception class="org.jboss.seam.security.NotLoggedInException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">You must be logged in to use this feature</message> + </redirect> + </exception> + + <exception class="javax.faces.application.ViewExpiredException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">Session expired, please log in again</message> + </redirect> + </exception> + +</pages> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/web.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/web.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.5" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - -  - - <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> - </listener> - - <filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <servlet> - <servlet-name>Seam Resource Servlet</servlet-name> - <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>Seam Resource Servlet</servlet-name> - <url-pattern>/seam/resource/*</url-pattern> - </servlet-mapping> - -  - - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.seam</url-pattern> - </servlet-mapping> - -  - - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</param-value> - </context-param> - - <session-config> - <session-timeout>10</session-timeout> - </session-config> - -</web-app> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/web.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/web.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/web.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + +  + + <listener> + <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + </listener> + + <filter> + <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>Seam Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <servlet> + <servlet-name>Seam Resource Servlet</servlet-name> + <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Seam Resource Servlet</servlet-name> + <url-pattern>/seam/resource/*</url-pattern> + </servlet-mapping> + +  + + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.seam</url-pattern> + </servlet-mapping> + +  + + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + + <session-config> + <session-timeout>10</session-timeout> + </session-config> + +</web-app> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/book.xhtml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/book.xhtml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/book.xhtml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,176 +0,0 @@ -<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:a="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich" - template="template.xhtml"> - - -<ui:define name="content"> -<div class="section"> - <h1>Book Hotel</h1> -</div> -<div class="section"> - <h:form id="booking"> - <fieldset> - <div class="entry"> - <div class="label">Name:</div> - <div class="output">#{hotel.name}</div> - </div> - <div class="entry"> - <div class="label">Address:</div> - <div class="output">#{hotel.address}</div> - </div> - <div class="entry"> - <div class="label">City, State:</div> - <div class="output">#{hotel.city}, #{hotel.state}</div> - </div> - <div class="entry"> - <div class="label">Zip:</div> - <div class="output">#{hotel.zip}</div> - </div> - <div class="entry"> - <div class="label">Country:</div> - <div class="output">#{hotel.country}</div> - </div> - <div class="entry"> - <div class="label">Nightly rate:</div> - <div class="output"> - <h:outputText value="#{hotel.price}"> - <f:convertNumber type="currency" - currencySymbol="$"/> - </h:outputText> - </div> - </div> - - <s:validateAll> - - <f:facet name="aroundInvalidField"> - <s:span id="Error" styleClass="errors"/> - </f:facet> - <f:facet name="afterInvalidField"> - <s:div id="Message" styleClass="errors"> - <s:message/> - </s:div> - </f:facet> - - <div class="entry"> - <div class="label"><h:outputLabel for="checkinDate">Check In Date:</h:outputLabel></div> - <div class="input"> - <s:decorate id="checkinDateDecorate"> - <rich:calendar id="checkinDate" value="#{booking.checkinDate}" required="true" datePattern="MM/dd/yyyy" event="onblur" reRender="checkinDateDecorate" style="width: auto;" /> - </s:decorate> - </div> - </div> - - <div class="entry"> - <div class="label"><h:outputLabel for="checkoutDate">Check Out Date:</h:outputLabel></div> - <div class="input"> - <s:decorate id="checkoutDateDecorate"> - <rich:calendar id="checkoutDate" value="#{booking.checkoutDate}" required="true" datePattern="MM/dd/yyyy" event="onblur" reRender="checkoutDateDecorate" style="width: auto;"/> - </s:decorate> - </div> - </div> - - <div class="entry"> - <div class="label"><h:outputLabel for="beds">Room Preference:</h:outputLabel></div> - <div class="input"> - <s:decorate id="bedsDecorate"> - <h:selectOneMenu id="beds" value="#{booking.beds}"> - <f:selectItem itemLabel="One king-size bed" itemValue="1"/> - <f:selectItem itemLabel="Two double beds" itemValue="2"/> - <f:selectItem itemLabel="Three beds" itemValue="3"/> - </h:selectOneMenu> - </s:decorate> - </div> - </div> - - <div class="entry"> - <div class="label"><h:outputLabel for="smoking">Smoking Preference:</h:outputLabel></div> - <div id="radio" class="input"> - <s:decorate id="smokingDecorate"> - <h:selectOneRadio id="smoking" value="#{booking.smoking}" layout="pageDirection"> - <f:selectItem itemLabel="Smoking" itemValue="true"/> - <f:selectItem itemLabel="Non Smoking" itemValue="false"/> - </h:selectOneRadio> - </s:decorate> - </div> - </div> - - <div class="entry"> - <div class="label"><h:outputLabel for="creditCard">Credit Card #:</h:outputLabel></div> - <div class="input"> - <s:decorate id="creditCardDecorate"> - <h:inputText id="creditCard" value="#{booking.creditCard}" required="true"> - <a:support event="onblur" reRender="creditCardDecorate"/> - </h:inputText> - </s:decorate> - </div> - </div> - - <div class="entry"> - <div class="label"><h:outputLabel for="creditCardName">Credit Card Name:</h:outputLabel></div> - <div class="input"> - <s:decorate id="creditCardNameDecorate"> - <h:inputText id="creditCardName" value="#{booking.creditCardName}" required="true"> - <a:support event="onblur" reRender="creditCardNameDecorate"/> - </h:inputText> - </s:decorate> - </div> - </div> - - <div class="entry"> - <div class="label"><h:outputLabel for="creditCardExpiryMonth">Credit Card Expiry:</h:outputLabel></div> - <div class="input"> - <s:decorate id="creditCardExpiryDecorate"> - <h:selectOneMenu id="creditCardExpiryMonth" value="#{booking.creditCardExpiryMonth}"> - <f:selectItem itemLabel="Jan" itemValue="1"/> - <f:selectItem itemLabel="Feb" itemValue="2"/> - <f:selectItem itemLabel="Mar" itemValue="3"/> - <f:selectItem itemLabel="Apr" itemValue="4"/> - <f:selectItem itemLabel="May" itemValue="5"/> - <f:selectItem itemLabel="Jun" itemValue="6"/> - <f:selectItem itemLabel="Jul" itemValue="7"/> - <f:selectItem itemLabel="Aug" itemValue="8"/> - <f:selectItem itemLabel="Sep" itemValue="9"/> - <f:selectItem itemLabel="Oct" itemValue="10"/> - <f:selectItem itemLabel="Nov" itemValue="11"/> - <f:selectItem itemLabel="Dec" itemValue="12"/> - </h:selectOneMenu> - <h:selectOneMenu id="creditCardExpiryYear" value="#{booking.creditCardExpiryYear}"> - <f:selectItem itemLabel="2005" itemValue="2005"/> - <f:selectItem itemLabel="2006" itemValue="2006"/> - <f:selectItem itemLabel="2007" itemValue="2007"/> - <f:selectItem itemLabel="2008" itemValue="2008"/> - <f:selectItem itemLabel="2009" itemValue="2009"/> - </h:selectOneMenu> - </s:decorate> - </div> - </div> - - </s:validateAll> - - <div class="entry errors"> - <h:messages globalOnly="true"/> - </div> - - <div class="entry"> - <div class="label"> </div> - <div class="input"> - <h:commandButton id="proceed" value="Proceed" action="#{hotelBooking.setBookingDetails}"/>  - <s:button id="cancel" value="Cancel" action="#{hotelBooking.cancel}"/> - </div> - </div> - </fieldset> - </h:form> -</div> -</ui:define> - - -<ui:define name="sidebar"> -</ui:define> - -</ui:composition> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/book.xhtml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/book.xhtml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/book.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/book.xhtml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,176 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:a="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich" + template="template.xhtml"> + + +<ui:define name="content"> +<div class="section"> + <h1>Book Hotel</h1> +</div> +<div class="section"> + <h:form id="booking"> + <fieldset> + <div class="entry"> + <div class="label">Name:</div> + <div class="output">#{hotel.name}</div> + </div> + <div class="entry"> + <div class="label">Address:</div> + <div class="output">#{hotel.address}</div> + </div> + <div class="entry"> + <div class="label">City, State:</div> + <div class="output">#{hotel.city}, #{hotel.state}</div> + </div> + <div class="entry"> + <div class="label">Zip:</div> + <div class="output">#{hotel.zip}</div> + </div> + <div class="entry"> + <div class="label">Country:</div> + <div class="output">#{hotel.country}</div> + </div> + <div class="entry"> + <div class="label">Nightly rate:</div> + <div class="output"> + <h:outputText value="#{hotel.price}"> + <f:convertNumber type="currency" + currencySymbol="$"/> + </h:outputText> + </div> + </div> + + <s:validateAll> + + <f:facet name="aroundInvalidField"> + <s:span id="Error" styleClass="errors"/> + </f:facet> + <f:facet name="afterInvalidField"> + <s:div id="Message" styleClass="errors"> + <s:message/> + </s:div> + </f:facet> + + <div class="entry"> + <div class="label"><h:outputLabel for="checkinDate">Check In Date:</h:outputLabel></div> + <div class="input"> + <s:decorate id="checkinDateDecorate"> + <rich:calendar id="checkinDate" value="#{booking.checkinDate}" required="true" datePattern="MM/dd/yyyy" event="onblur" reRender="checkinDateDecorate" style="width: auto;" /> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="checkoutDate">Check Out Date:</h:outputLabel></div> + <div class="input"> + <s:decorate id="checkoutDateDecorate"> + <rich:calendar id="checkoutDate" value="#{booking.checkoutDate}" required="true" datePattern="MM/dd/yyyy" event="onblur" reRender="checkoutDateDecorate" style="width: auto;"/> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="beds">Room Preference:</h:outputLabel></div> + <div class="input"> + <s:decorate id="bedsDecorate"> + <h:selectOneMenu id="beds" value="#{booking.beds}"> + <f:selectItem itemLabel="One king-size bed" itemValue="1"/> + <f:selectItem itemLabel="Two double beds" itemValue="2"/> + <f:selectItem itemLabel="Three beds" itemValue="3"/> + </h:selectOneMenu> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="smoking">Smoking Preference:</h:outputLabel></div> + <div id="radio" class="input"> + <s:decorate id="smokingDecorate"> + <h:selectOneRadio id="smoking" value="#{booking.smoking}" layout="pageDirection"> + <f:selectItem itemLabel="Smoking" itemValue="true"/> + <f:selectItem itemLabel="Non Smoking" itemValue="false"/> + </h:selectOneRadio> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="creditCard">Credit Card #:</h:outputLabel></div> + <div class="input"> + <s:decorate id="creditCardDecorate"> + <h:inputText id="creditCard" value="#{booking.creditCard}" required="true"> + <a:support event="onblur" reRender="creditCardDecorate"/> + </h:inputText> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="creditCardName">Credit Card Name:</h:outputLabel></div> + <div class="input"> + <s:decorate id="creditCardNameDecorate"> + <h:inputText id="creditCardName" value="#{booking.creditCardName}" required="true"> + <a:support event="onblur" reRender="creditCardNameDecorate"/> + </h:inputText> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="creditCardExpiryMonth">Credit Card Expiry:</h:outputLabel></div> + <div class="input"> + <s:decorate id="creditCardExpiryDecorate"> + <h:selectOneMenu id="creditCardExpiryMonth" value="#{booking.creditCardExpiryMonth}"> + <f:selectItem itemLabel="Jan" itemValue="1"/> + <f:selectItem itemLabel="Feb" itemValue="2"/> + <f:selectItem itemLabel="Mar" itemValue="3"/> + <f:selectItem itemLabel="Apr" itemValue="4"/> + <f:selectItem itemLabel="May" itemValue="5"/> + <f:selectItem itemLabel="Jun" itemValue="6"/> + <f:selectItem itemLabel="Jul" itemValue="7"/> + <f:selectItem itemLabel="Aug" itemValue="8"/> + <f:selectItem itemLabel="Sep" itemValue="9"/> + <f:selectItem itemLabel="Oct" itemValue="10"/> + <f:selectItem itemLabel="Nov" itemValue="11"/> + <f:selectItem itemLabel="Dec" itemValue="12"/> + </h:selectOneMenu> + <h:selectOneMenu id="creditCardExpiryYear" value="#{booking.creditCardExpiryYear}"> + <f:selectItem itemLabel="2005" itemValue="2005"/> + <f:selectItem itemLabel="2006" itemValue="2006"/> + <f:selectItem itemLabel="2007" itemValue="2007"/> + <f:selectItem itemLabel="2008" itemValue="2008"/> + <f:selectItem itemLabel="2009" itemValue="2009"/> + </h:selectOneMenu> + </s:decorate> + </div> + </div> + + </s:validateAll> + + <div class="entry errors"> + <h:messages globalOnly="true"/> + </div> + + <div class="entry"> + <div class="label"> </div> + <div class="input"> + <h:commandButton id="proceed" value="Proceed" action="#{hotelBooking.setBookingDetails}"/>  + <s:button id="cancel" value="Cancel" action="#{hotelBooking.cancel}"/> + </div> + </div> + </fieldset> + </h:form> +</div> +</ui:define> + + +<ui:define name="sidebar"> +</ui:define> + +</ui:composition> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/confirm.xhtml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/confirm.xhtml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/confirm.xhtml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,75 +0,0 @@ -<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - template="template.xhtml"> - - -<ui:define name="content"> -<div class="section"> - <h1>Confirm Hotel Booking</h1> -</div> -<div class="section"> - <h:form id="confirm"> - <fieldset> - <div class="entry"> - <div class="label">Name:</div> - <div class="output">#{hotel.name}</div> - </div> - <div class="entry"> - <div class="label">Address:</div> - <div class="output">#{hotel.address}</div> - </div> - <div class="entry"> - <div class="label">City, State:</div> - <div class="output">#{hotel.city}, #{hotel.state}</div> - </div> - <div class="entry"> - <div class="label">Zip:</div> - <div class="output">#{hotel.zip}</div> - </div> - <div class="entry"> - <div class="label">Country:</div> - <div class="output">#{hotel.country}</div> - </div> - <div class="entry"> - <div class="label">Total payment:</div> - <div class="output"> - <h:outputText value="#{booking.total}"> - <f:convertNumber type="currency" - currencySymbol="$"/> - </h:outputText> - </div> - </div> - <div class="entry"> - <div class="label">Check In Date:</div> - <div class="output"><h:outputText value="#{booking.checkinDate}"/></div> - </div> - <div class="entry"> - <div class="label">Check Out Date:</div> - <div class="output"><h:outputText value="#{booking.checkoutDate}"/></div> - </div> - <div class="entry"> - <div class="label">Credit Card #:</div> - <div class="output">#{booking.creditCard}</div> - </div> - <div class="entry"> - <div class="label"> </div> - <div class="input"> - <h:commandButton id="confirm" value="Confirm" action="#{hotelBooking.confirm}"/>  - <s:button id="revise" value="Revise" view="/book.xhtml"/>  - <h:commandButton id="cancel" value="Cancel" action="#{hotelBooking.cancel}"/> - </div> - </div> - </fieldset> - </h:form> -</div> -</ui:define> - - -<ui:define name="sidebar"> -</ui:define> - -</ui:composition> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/confirm.xhtml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/confirm.xhtml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/confirm.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/confirm.xhtml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,75 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + template="template.xhtml"> + + +<ui:define name="content"> +<div class="section"> + <h1>Confirm Hotel Booking</h1> +</div> +<div class="section"> + <h:form id="confirm"> + <fieldset> + <div class="entry"> + <div class="label">Name:</div> + <div class="output">#{hotel.name}</div> + </div> + <div class="entry"> + <div class="label">Address:</div> + <div class="output">#{hotel.address}</div> + </div> + <div class="entry"> + <div class="label">City, State:</div> + <div class="output">#{hotel.city}, #{hotel.state}</div> + </div> + <div class="entry"> + <div class="label">Zip:</div> + <div class="output">#{hotel.zip}</div> + </div> + <div class="entry"> + <div class="label">Country:</div> + <div class="output">#{hotel.country}</div> + </div> + <div class="entry"> + <div class="label">Total payment:</div> + <div class="output"> + <h:outputText value="#{booking.total}"> + <f:convertNumber type="currency" + currencySymbol="$"/> + </h:outputText> + </div> + </div> + <div class="entry"> + <div class="label">Check In Date:</div> + <div class="output"><h:outputText value="#{booking.checkinDate}"/></div> + </div> + <div class="entry"> + <div class="label">Check Out Date:</div> + <div class="output"><h:outputText value="#{booking.checkoutDate}"/></div> + </div> + <div class="entry"> + <div class="label">Credit Card #:</div> + <div class="output">#{booking.creditCard}</div> + </div> + <div class="entry"> + <div class="label"> </div> + <div class="input"> + <h:commandButton id="confirm" value="Confirm" action="#{hotelBooking.confirm}"/>  + <s:button id="revise" value="Revise" view="/book.xhtml"/>  + <h:commandButton id="cancel" value="Cancel" action="#{hotelBooking.cancel}"/> + </div> + </div> + </fieldset> + </h:form> +</div> +</ui:define> + + +<ui:define name="sidebar"> +</ui:define> + +</ui:composition> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/conversations.xhtml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/conversations.xhtml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/conversations.xhtml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,35 +0,0 @@ -<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:c="http://java.sun.com/jstl/core" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:s="http://jboss.com/products/seam/taglib"> -<div> -<div class="section"> - <h1><h:outputText rendered="#{not empty conversationList}" value="Workspaces"/></h1> -</div> - -<div class="section"> - <h:form id="ConversationListForm"> - <h:dataTable id="ConversationListDataTable" value="#{conversationList}" var="entry"> - <h:column id="column1"> - <h:commandLink id="EntryDescriptionLink" action="#{entry.select}" value="#{entry.description}"/> -   - <h:outputText id="CurrentEntry" value="[current]" rendered="#{entry.current}"/> - </h:column> - <h:column id="column2"> - <h:outputText id="EntryStartDateTime" value="#{entry.startDatetime}"> - <s:convertDateTime type="time" pattern="hh:mm"/> - </h:outputText> - - - <h:outputText id="EntryLastDateTime" value="#{entry.lastDatetime}"> - <s:convertDateTime type="time" pattern="hh:mm"/> - </h:outputText> - </h:column> - </h:dataTable> - </h:form> -</div> - -</div> -</ui:composition> \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/conversations.xhtml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/conversations.xhtml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/conversations.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/conversations.xhtml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,35 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:c="http://java.sun.com/jstl/core" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:s="http://jboss.com/products/seam/taglib"> +<div> +<div class="section"> + <h1><h:outputText rendered="#{not empty conversationList}" value="Workspaces"/></h1> +</div> + +<div class="section"> + <h:form id="ConversationListForm"> + <h:dataTable id="ConversationListDataTable" value="#{conversationList}" var="entry"> + <h:column id="column1"> + <h:commandLink id="EntryDescriptionLink" action="#{entry.select}" value="#{entry.description}"/> +   + <h:outputText id="CurrentEntry" value="[current]" rendered="#{entry.current}"/> + </h:column> + <h:column id="column2"> + <h:outputText id="EntryStartDateTime" value="#{entry.startDatetime}"> + <s:convertDateTime type="time" pattern="hh:mm"/> + </h:outputText> + - + <h:outputText id="EntryLastDateTime" value="#{entry.lastDatetime}"> + <s:convertDateTime type="time" pattern="hh:mm"/> + </h:outputText> + </h:column> + </h:dataTable> + </h:form> +</div> + +</div> +</ui:composition> \ No newline at end of file Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/css/screen.css =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/css/screen.css 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/css/screen.css 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,272 +0,0 @@ -/* Setup defaults since variable in browsers ------------------------------------------------ */ -body, div, dd, dt, dl, img, ul, ol, li, p, h1, h2, h3, h4, h5, form, hr, fieldset { - margin: 0; - padding: 0; -} -/* Element Defaults ------------------------------------------------ */ -html { - height: 100%; - background-color: #DBD4C6; -} -img { - border: 0; -} -body { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: small; - line-height: 1.25em; - color: #362F2D; - position: relative; - width: 760px; - height: 100%; - margin-left: auto; - margin-right: auto; -} -label { - font-weight: bold; - color: #5E5147; -} -input { - border: 1px solid #C3BBB6; - padding: 4px; - margin: 5px 0; - background: #fff url(../img/input.bg.gif) 0 0 repeat-x; -} -select { - border: 1px solid #C3BBB6; - padding: 4px; - margin: 5px 0; - background: #fff url(../img/input.bg.gif) 0 0 repeat-x; -}ol, ul { - margin: 10px 0px 10px 6px; -} -li { - margin: 10px 12px; -} -fieldset { - border: 0; -} -/* Layout ------------------------------------------------ */ -#document { - padding: 0 1px; - background: #fff url(../img/bg.gif) 0 0 repeat-y; - float: left; - border-bottom: 1px solid #C3BBB6; -} -#header { - float: left; - width: 758px; - height: 46px; - background: url(../img/hdr.bg.gif) 0 0 repeat-x; -} -#container { - float: left; - width: 758px; - background: url(../img/hdr.bar.jpg) 0 0 repeat-x; -} -#sidebar { - float: left; - width: 190px; - margin-top: 96px; - padding: 20px 10px 0 10px; - background: url(../img/sdb.bg.gif) 0 0 no-repeat; -} -#content { - float: left; - width: 548px; - margin-top: 75px; - padding-top: 5px; - background: #fff url(../img/cnt.bg.gif) 0 0 repeat-x; -} -#footer { - clear: both; - margin-top: 40px; - float: left; - padding: 20px; - border-top: 1px solid #C3BBB6; - background-color: #fff; - width: 718px; - text-align: right; -} -/* General ------------------------------------------------ */ -input[type="submit"], input[type="button"] { - font-weight: bold; - color: #fff; - border: 1px solid #5D1414; - height: 26px; - background: #fff url(../img/btn.bg.gif) 0 0 repeat-x; - border-style: none; -} -.center { - text-align: center; -} -.entry { - clear: both; - padding-top: 10px; -} -.entry .label { - float: left; - padding-top: 10px; - padding-right: 5px; - font-weight: bold; - width: 150px; - text-align: right; -} -.entry .output { - float: left; - width: 250px; - padding-top: 10px; - text-align: left; -} -.entry .input { - float: left; - width: 250px; - text-align: left; -} -/* Sidebar ------------------------------------------------ */ -.notes { - text-align: center; - font-size: small; -} -.subnotes { - margin-top: 1em; - font-size: small; -} -.errors { - font-size: small; - font-weight: bold; - text-align: center; - color: #600; -} -.errors div { - text-align: left; -} -.errors input { - border: 1px solid #600; -} -.errors ul { - list-style: none; -} -.buttonBox { - text-align: center; - padding: 5px 0; -} -#sidebar p { - font-size: small; - color: #8B7869; - line-height: 150%; - padding-bottom: 10px; -} -#sidebar li { - font-size: small; - color: #8B7869; -} -#sidebar h1 { - line-height: normal; - font-weight: bold; - font-size: small; -} -/* -#sidebar p:hover { - color: #362F2D; -} -*/ -/* Content ------------------------------------------------ */ -#content .section { - float: left; - width: 518px; - padding: 15px 15px 0 15px; -} -#content .section h1 { - font-family: "Trebuchet MS", Arial, sans-serif; - line-height: normal; - font-weight: normal; - font-size: large; -} -#content .section p { - line-height: 150%; - padding: 10px 0; - font-size: small; -} -#content table { - width: 100%; - border: 1px solid #D2C9C4; - border-collapse: collapse; -} -#content table caption { - padding-bottom: 6px; - text-align: left; - font-weight: bold; -} -#content table thead th { - border-left: 1px solid #D2C9C4; - background: #fff url(../img/th.bg.gif) 0 100% repeat-x; - border-bottom: 1px solid #D2C9C4; - padding: 6px; - text-align: left; - font-size: small; -} -#content table tbody td { - border-left: 1px solid #E4DBD5; - padding: 4px; - border-bottom: 1px solid #D2C9C4; - font-size: small; -} -#content dt { - font-weight: bold; - float: left; - width: 33%; -} -#content dd { - padding-left: 10px; - float: left; - width: 66%; -} -#radio table { - border: 0px; -} -#radio table tr td { - border: 0px; - border-left: 0px; - border-bottom: 0px; -} -/* Header ------------------------------------------------ */ -#title { - float: left; - padding: 1px 0 6px 15px; -} -#status { - color: #C7B299; - float: right; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-weight: bold; - font-size: x-small; - text-align: right; - padding-top: 14px; - padding-right: 15px; -} -#status a { - color: #C7B299; - text-decoration: none; -} -/* Homepage Modifications ------------------------------------------------ */ -#pgHome #container { - background: url(../img/hdr.ad.jpg) 0 0 repeat-x; -} -#pgHome #sidebar { - margin-top: 207px; -} -#pgHome #content { - margin-top: 183px; -} -#pgHome #sidebar input[type="submit"] { - height: 30px; -} Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/css/screen.css (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/css/screen.css) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/css/screen.css (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/css/screen.css 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,272 @@ +/* Setup defaults since variable in browsers +----------------------------------------------- */ +body, div, dd, dt, dl, img, ul, ol, li, p, h1, h2, h3, h4, h5, form, hr, fieldset { + margin: 0; + padding: 0; +} +/* Element Defaults +----------------------------------------------- */ +html { + height: 100%; + background-color: #DBD4C6; +} +img { + border: 0; +} +body { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: small; + line-height: 1.25em; + color: #362F2D; + position: relative; + width: 760px; + height: 100%; + margin-left: auto; + margin-right: auto; +} +label { + font-weight: bold; + color: #5E5147; +} +input { + border: 1px solid #C3BBB6; + padding: 4px; + margin: 5px 0; + background: #fff url(../img/input.bg.gif) 0 0 repeat-x; +} +select { + border: 1px solid #C3BBB6; + padding: 4px; + margin: 5px 0; + background: #fff url(../img/input.bg.gif) 0 0 repeat-x; +}ol, ul { + margin: 10px 0px 10px 6px; +} +li { + margin: 10px 12px; +} +fieldset { + border: 0; +} +/* Layout +----------------------------------------------- */ +#document { + padding: 0 1px; + background: #fff url(../img/bg.gif) 0 0 repeat-y; + float: left; + border-bottom: 1px solid #C3BBB6; +} +#header { + float: left; + width: 758px; + height: 46px; + background: url(../img/hdr.bg.gif) 0 0 repeat-x; +} +#container { + float: left; + width: 758px; + background: url(../img/hdr.bar.jpg) 0 0 repeat-x; +} +#sidebar { + float: left; + width: 190px; + margin-top: 96px; + padding: 20px 10px 0 10px; + background: url(../img/sdb.bg.gif) 0 0 no-repeat; +} +#content { + float: left; + width: 548px; + margin-top: 75px; + padding-top: 5px; + background: #fff url(../img/cnt.bg.gif) 0 0 repeat-x; +} +#footer { + clear: both; + margin-top: 40px; + float: left; + padding: 20px; + border-top: 1px solid #C3BBB6; + background-color: #fff; + width: 718px; + text-align: right; +} +/* General +----------------------------------------------- */ +input[type="submit"], input[type="button"] { + font-weight: bold; + color: #fff; + border: 1px solid #5D1414; + height: 26px; + background: #fff url(../img/btn.bg.gif) 0 0 repeat-x; + border-style: none; +} +.center { + text-align: center; +} +.entry { + clear: both; + padding-top: 10px; +} +.entry .label { + float: left; + padding-top: 10px; + padding-right: 5px; + font-weight: bold; + width: 150px; + text-align: right; +} +.entry .output { + float: left; + width: 250px; + padding-top: 10px; + text-align: left; +} +.entry .input { + float: left; + width: 250px; + text-align: left; +} +/* Sidebar +----------------------------------------------- */ +.notes { + text-align: center; + font-size: small; +} +.subnotes { + margin-top: 1em; + font-size: small; +} +.errors { + font-size: small; + font-weight: bold; + text-align: center; + color: #600; +} +.errors div { + text-align: left; +} +.errors input { + border: 1px solid #600; +} +.errors ul { + list-style: none; +} +.buttonBox { + text-align: center; + padding: 5px 0; +} +#sidebar p { + font-size: small; + color: #8B7869; + line-height: 150%; + padding-bottom: 10px; +} +#sidebar li { + font-size: small; + color: #8B7869; +} +#sidebar h1 { + line-height: normal; + font-weight: bold; + font-size: small; +} +/* +#sidebar p:hover { + color: #362F2D; +} +*/ +/* Content +----------------------------------------------- */ +#content .section { + float: left; + width: 518px; + padding: 15px 15px 0 15px; +} +#content .section h1 { + font-family: "Trebuchet MS", Arial, sans-serif; + line-height: normal; + font-weight: normal; + font-size: large; +} +#content .section p { + line-height: 150%; + padding: 10px 0; + font-size: small; +} +#content table { + width: 100%; + border: 1px solid #D2C9C4; + border-collapse: collapse; +} +#content table caption { + padding-bottom: 6px; + text-align: left; + font-weight: bold; +} +#content table thead th { + border-left: 1px solid #D2C9C4; + background: #fff url(../img/th.bg.gif) 0 100% repeat-x; + border-bottom: 1px solid #D2C9C4; + padding: 6px; + text-align: left; + font-size: small; +} +#content table tbody td { + border-left: 1px solid #E4DBD5; + padding: 4px; + border-bottom: 1px solid #D2C9C4; + font-size: small; +} +#content dt { + font-weight: bold; + float: left; + width: 33%; +} +#content dd { + padding-left: 10px; + float: left; + width: 66%; +} +#radio table { + border: 0px; +} +#radio table tr td { + border: 0px; + border-left: 0px; + border-bottom: 0px; +} +/* Header +----------------------------------------------- */ +#title { + float: left; + padding: 1px 0 6px 15px; +} +#status { + color: #C7B299; + float: right; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-weight: bold; + font-size: x-small; + text-align: right; + padding-top: 14px; + padding-right: 15px; +} +#status a { + color: #C7B299; + text-decoration: none; +} +/* Homepage Modifications +----------------------------------------------- */ +#pgHome #container { + background: url(../img/hdr.ad.jpg) 0 0 repeat-x; +} +#pgHome #sidebar { + margin-top: 207px; +} +#pgHome #content { + margin-top: 183px; +} +#pgHome #sidebar input[type="submit"] { + height: 30px; +} Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/css/trailblazer_main.css =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/css/trailblazer_main.css 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/css/trailblazer_main.css 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,148 +0,0 @@ -* { - margin: 0px; - padding: 0px; - border: none; -} - -body { - font: 1em verdana, arial, sans-serif; - background: #CCCCCC; -} - -div#main { - margin-left: 0px; - width: 751px; - background: #ecefdf; -} - -div#top,div#pictures{ -} - -div#pictures img { - float:left; -} - -img#head1 { - margin-right: 3px; -} - -img#head2 { - margin-right: 4px; -} - -div.trail { - clear:both; - margin-left: 50px; - margin-top: 0px; - margin-right: 50px -} - -div.foot { - margin-left: 50px; - margin-right: 50px; - margin-top: 50px; - text-align: center; - font-size: .5em; - height: 36px; -} - -div.trail h1 { - margin-top: -30px; - margin-left: -50px; - font-size: 1.2em; - font-weight: bold; - padding-left: .4em; -} - -div.trail h2 { - float: left; - font-size: 1em; - font-weight: bold; - padding-left: .4em; -} - -div.trail h3 { - float: left; - font-size: .8em; - font-weight: bold; - margin-left: -1.4em; - margin-bottom: 1em; -} - - -div.trail p { - clear: both; - margin-top: 20px; - font-size: .8em; - text-decoration: none; -} - -div#next_trail { - margin-left: 36px; -} - -div.numbox { - border: thin solid black; - margin-left: -.8em; - float: left; - background: #ffffff; - padding: .2em .35em .3em; - font-style: normal; - font-weight: bold; - font-size: 1.4em; -} - -div.figure { - text-align: center; - font-size: .6em; - margin-top: 30px; -} - -div.figure img { - display: block; - margin-right: auto; - margin-left: auto; -} - -code { - font: 1.1em "Courier New", Courier, mono; -} - -code.block { - white-space: pre; - font: 10pt "Courier New", Courier, mono; - display: block; - border-style: dashed; - border-width: thin; - padding: .5em; - background: #ffffff; - margin: 20px; -} - -div.foot_image { - float: left; - height: 86px; -} - -a:active { - color : #666666; - text-decoration: none; -} - -a:hover { - color : #000000; - background-color : #D6E0FE; - text-decoration: none; -} - -a:link { - color : #005EB6; - text-decoration: none; -} - -a:visited { - color : #888888; - text-decoration: none; -} - - Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/css/trailblazer_main.css (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/css/trailblazer_main.css) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/css/trailblazer_main.css (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/css/trailblazer_main.css 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,148 @@ +* { + margin: 0px; + padding: 0px; + border: none; +} + +body { + font: 1em verdana, arial, sans-serif; + background: #CCCCCC; +} + +div#main { + margin-left: 0px; + width: 751px; + background: #ecefdf; +} + +div#top,div#pictures{ +} + +div#pictures img { + float:left; +} + +img#head1 { + margin-right: 3px; +} + +img#head2 { + margin-right: 4px; +} + +div.trail { + clear:both; + margin-left: 50px; + margin-top: 0px; + margin-right: 50px +} + +div.foot { + margin-left: 50px; + margin-right: 50px; + margin-top: 50px; + text-align: center; + font-size: .5em; + height: 36px; +} + +div.trail h1 { + margin-top: -30px; + margin-left: -50px; + font-size: 1.2em; + font-weight: bold; + padding-left: .4em; +} + +div.trail h2 { + float: left; + font-size: 1em; + font-weight: bold; + padding-left: .4em; +} + +div.trail h3 { + float: left; + font-size: .8em; + font-weight: bold; + margin-left: -1.4em; + margin-bottom: 1em; +} + + +div.trail p { + clear: both; + margin-top: 20px; + font-size: .8em; + text-decoration: none; +} + +div#next_trail { + margin-left: 36px; +} + +div.numbox { + border: thin solid black; + margin-left: -.8em; + float: left; + background: #ffffff; + padding: .2em .35em .3em; + font-style: normal; + font-weight: bold; + font-size: 1.4em; +} + +div.figure { + text-align: center; + font-size: .6em; + margin-top: 30px; +} + +div.figure img { + display: block; + margin-right: auto; + margin-left: auto; +} + +code { + font: 1.1em "Courier New", Courier, mono; +} + +code.block { + white-space: pre; + font: 10pt "Courier New", Courier, mono; + display: block; + border-style: dashed; + border-width: thin; + padding: .5em; + background: #ffffff; + margin: 20px; +} + +div.foot_image { + float: left; + height: 86px; +} + +a:active { + color : #666666; + text-decoration: none; +} + +a:hover { + color : #000000; + background-color : #D6E0FE; + text-decoration: none; +} + +a:link { + color : #005EB6; + text-decoration: none; +} + +a:visited { + color : #888888; + text-decoration: none; +} + + Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/home.xhtml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/home.xhtml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/home.xhtml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,49 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <title>JBoss Suites: Seam Framework</title> - <link href="css/screen.css" rel="stylesheet" type="text/css" /> -</head> -<body id="pgHome"> -<f:view> -<div id="document"> - <div id="header"> - <div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div> - </div> - <div id="container"> - <div id="sidebar"> - <h:form id="login"> - <fieldset> - <div> - <h:outputLabel for="username">Login Name</h:outputLabel> - <h:inputText id="username" value="#{identity.username}" style="width: 175px;"/> - <div class="errors"><h:message for="username"/></div> - </div> - <div> - <h:outputLabel for="password">Password</h:outputLabel> - <h:inputSecret id="password" value="#{identity.password}" style="width: 175px;"/> - </div> - <div class="errors"><h:messages globalOnly="true"/></div> - <div class="buttonBox"><h:commandButton id="login" action="#{identity.quietLogin}" value="Account Login"/></div> - <div class="notes"><s:link id="register" view="/register.xhtml" value="Register New User"/></div> - <div class="subnotes"> - Or use a demo account: - <ul> - <li>gavin/foobar</li> - <li>demo/demo</li> - </ul> - </div> - </fieldset> - </h:form> - </div> - </div> - <div id="footer">Created with JBoss EJB 3.0, Seam, JSF (Mojarra), and Facelets</div> -</div> -</f:view> -</body> -</html> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/home.xhtml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/home.xhtml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/home.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/home.xhtml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,49 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> + <title>JBoss Suites: Seam Framework</title> + <link href="css/screen.css" rel="stylesheet" type="text/css" /> +</head> +<body id="pgHome"> +<f:view> +<div id="document"> + <div id="header"> + <div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div> + </div> + <div id="container"> + <div id="sidebar"> + <h:form id="login"> + <fieldset> + <div> + <h:outputLabel for="username">Login Name</h:outputLabel> + <h:inputText id="username" value="#{identity.username}" style="width: 175px;"/> + <div class="errors"><h:message for="username"/></div> + </div> + <div> + <h:outputLabel for="password">Password</h:outputLabel> + <h:inputSecret id="password" value="#{identity.password}" style="width: 175px;"/> + </div> + <div class="errors"><h:messages globalOnly="true"/></div> + <div class="buttonBox"><h:commandButton id="login" action="#{identity.quietLogin}" value="Account Login"/></div> + <div class="notes"><s:link id="register" view="/register.xhtml" value="Register New User"/></div> + <div class="subnotes"> + Or use a demo account: + <ul> + <li>gavin/foobar</li> + <li>demo/demo</li> + </ul> + </div> + </fieldset> + </h:form> + </div> + </div> + <div id="footer">Created with JBoss EJB 3.0, Seam, JSF (Mojarra), and Facelets</div> +</div> +</f:view> +</body> +</html> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/hotel.xhtml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/hotel.xhtml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/hotel.xhtml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,62 +0,0 @@ -<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - template="template.xhtml"> - - -<ui:define name="content"> -<div class="section"> - <h1>View Hotel</h1> -</div> -<div class="section"> - <div class="entry"> - <div class="label">Name:</div> - <div class="output">#{hotel.name}</div> - </div> - <div class="entry"> - <div class="label">Address:</div> - <div class="output">#{hotel.address}</div> - </div> - <div class="entry"> - <div class="label">City:</div> - <div class="output">#{hotel.city}</div> - </div> - <div class="entry"> - <div class="label">State:</div> - <div class="output">#{hotel.state}</div> - </div> - <div class="entry"> - <div class="label">Zip:</div> - <div class="output">#{hotel.zip}</div> - </div> - <div class="entry"> - <div class="label">Country:</div> - <div class="output">#{hotel.country}</div> - </div> - <div class="entry"> - <div class="label">Nightly rate:</div> - <div class="output"> - <h:outputText value="#{hotel.price}"> - <f:convertNumber type="currency" - currencySymbol="$"/> - </h:outputText> - </div> - </div> -</div> -<div class="section"> - <h:form id="hotel"> - <fieldset class="buttonBox"> - <h:commandButton id="bookHotel" action="#{hotelBooking.bookHotel}" value="Book Hotel"/>  - <h:commandButton id="cancel" action="#{hotelBooking.cancel}" value="Back to Search"/> - </fieldset> - </h:form> -</div> -</ui:define> - -<ui:define name="sidebar"> -</ui:define> - -</ui:composition> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/hotel.xhtml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/hotel.xhtml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/hotel.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/hotel.xhtml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,62 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + template="template.xhtml"> + + +<ui:define name="content"> +<div class="section"> + <h1>View Hotel</h1> +</div> +<div class="section"> + <div class="entry"> + <div class="label">Name:</div> + <div class="output">#{hotel.name}</div> + </div> + <div class="entry"> + <div class="label">Address:</div> + <div class="output">#{hotel.address}</div> + </div> + <div class="entry"> + <div class="label">City:</div> + <div class="output">#{hotel.city}</div> + </div> + <div class="entry"> + <div class="label">State:</div> + <div class="output">#{hotel.state}</div> + </div> + <div class="entry"> + <div class="label">Zip:</div> + <div class="output">#{hotel.zip}</div> + </div> + <div class="entry"> + <div class="label">Country:</div> + <div class="output">#{hotel.country}</div> + </div> + <div class="entry"> + <div class="label">Nightly rate:</div> + <div class="output"> + <h:outputText value="#{hotel.price}"> + <f:convertNumber type="currency" + currencySymbol="$"/> + </h:outputText> + </div> + </div> +</div> +<div class="section"> + <h:form id="hotel"> + <fieldset class="buttonBox"> + <h:commandButton id="bookHotel" action="#{hotelBooking.bookHotel}" value="Book Hotel"/>  + <h:commandButton id="cancel" action="#{hotelBooking.cancel}" value="Back to Search"/> + </fieldset> + </h:form> +</div> +</ui:define> + +<ui:define name="sidebar"> +</ui:define> + +</ui:composition> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/bg.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/bg.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/bg.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/btn.bg.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/btn.bg.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/btn.bg.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/cal-next.png =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/cal-next.png (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/cal-next.png) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/cal-prev.png =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/cal-prev.png (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/cal-prev.png) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/cnt.bg.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/cnt.bg.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/cnt.bg.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/dtpick.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/dtpick.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/dtpick.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/hdr.ad.jpg =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/hdr.ad.jpg (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/hdr.ad.jpg) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/hdr.bar.jpg =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/hdr.bar.jpg (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/hdr.bar.jpg) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/hdr.bg.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/hdr.bg.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/hdr.bg.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/hdr.title.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/hdr.title.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/hdr.title.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/header_line.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/header_line.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/header_line.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/input.bg.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/input.bg.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/input.bg.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/sdb.bg.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/sdb.bg.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/sdb.bg.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/spinner.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/spinner.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/spinner.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/th.bg.gif =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/th.bg.gif (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/img/th.bg.gif) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/index.html =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/index.html 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/index.html 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,5 +0,0 @@ -<html> -<head> - <meta http-equiv="Refresh" content="0; URL=home.seam"> -</head> -</html> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/index.html (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/index.html) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/index.html (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/index.html 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,5 @@ +<html> +<head> + <meta http-equiv="Refresh" content="0; URL=home.seam"> +</head> +</html> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/main.xhtml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/main.xhtml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/main.xhtml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,120 +0,0 @@ -<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:a="http://richfaces.org/a4j" - template="template.xhtml"> - - -<ui:define name="content"> - -<div class="section"> - <h:form id="main"> - - <span class="errors"> - <h:messages id="messages" globalOnly="true"/> - </span> - - <h1>Search Hotels</h1> - <fieldset> - <h:inputText id="searchString" value="#{hotelSearch.searchString}" style="width: 165px;"> - <a:support event="onkeyup" actionListener="#{hotelSearch.find}" reRender="searchResults" /> - </h:inputText> -   - <a:commandButton id="findHotels" value="Find Hotels" action="#{hotelSearch.find}" reRender="searchResults"/> -   - <a:status> - <f:facet name="start"> - <h:graphicImage id="Spinner" value="/img/spinner.gif"/> - </f:facet> - </a:status> - <br/> - <h:outputLabel for="pageSize">Maximum results:</h:outputLabel>  - <h:selectOneMenu value="#{hotelSearch.pageSize}" id="pageSize"> - <f:selectItem itemLabel="5" itemValue="5"/> - <f:selectItem itemLabel="10" itemValue="10"/> - <f:selectItem itemLabel="20" itemValue="20"/> - </h:selectOneMenu> - </fieldset> - - </h:form> -</div> - -<a:outputPanel id="searchResults"> - <div class="section"> - <h:outputText id="NoHotelsFoundMessage" value="No Hotels Found" rendered="#{hotels != null and hotels.rowCount==0}"/> - <h:dataTable id="hotels" value="#{hotels}" var="hot" rendered="#{hotels.rowCount>0}"> - <h:column> - <f:facet name="header">Name</f:facet> - #{hot.name} - </h:column> - <h:column> - <f:facet name="header">Address</f:facet> - #{hot.address} - </h:column> - <h:column> - <f:facet name="header">City, State</f:facet> - #{hot.city}, #{hot.state}, #{hot.country} - </h:column> - <h:column> - <f:facet name="header">Zip</f:facet> - #{hot.zip} - </h:column> - <h:column> - <f:facet name="header">Action</f:facet> - <s:link id="viewHotel" value="View Hotel" action="#{hotelBooking.selectHotel(hot)}"/> - </h:column> - </h:dataTable> - <s:link value="More results" action="#{hotelSearch.nextPage}" rendered="#{hotelSearch.nextPageAvailable}"/> - </div> -</a:outputPanel> - -<div class="section"> - <h1>Current Hotel Bookings</h1> -</div> -<div class="section"> - <h:form id="bookings"> - <h:outputText value="No Bookings Found" rendered="#{bookings.rowCount==0}"/> - <h:dataTable id="bookings" value="#{bookings}" var="book" rendered="#{bookings.rowCount>0}"> - <h:column> - <f:facet name="header">Name</f:facet> - #{book.hotel.name} - </h:column> - <h:column> - <f:facet name="header">Address</f:facet> - #{book.hotel.address} - </h:column> - <h:column> - <f:facet name="header">City, State</f:facet> - #{book.hotel.city}, #{book.hotel.state} - </h:column> - <h:column> - <f:facet name="header">Check in date</f:facet> - <h:outputText value="#{book.checkinDate}"/> - </h:column> - <h:column> - <f:facet name="header">Check out date</f:facet> - <h:outputText value="#{book.checkoutDate}"/> - </h:column> - <h:column> - <f:facet name="header">Confirmation number</f:facet> - #{book.id} - </h:column> - <h:column> - <f:facet name="header">Action</f:facet> - <h:commandLink id="cancel" value="Cancel" action="#{bookingList.cancel}"/> - </h:column> - </h:dataTable> - </h:form> -</div> - -</ui:define> - - -<ui:define name="sidebar"> - -</ui:define> - -</ui:composition> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/main.xhtml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/main.xhtml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/main.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/main.xhtml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,120 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:a="http://richfaces.org/a4j" + template="template.xhtml"> + + +<ui:define name="content"> + +<div class="section"> + <h:form id="main"> + + <span class="errors"> + <h:messages id="messages" globalOnly="true"/> + </span> + + <h1>Search Hotels</h1> + <fieldset> + <h:inputText id="searchString" value="#{hotelSearch.searchString}" style="width: 165px;"> + <a:support event="onkeyup" actionListener="#{hotelSearch.find}" reRender="searchResults" /> + </h:inputText> +   + <a:commandButton id="findHotels" value="Find Hotels" action="#{hotelSearch.find}" reRender="searchResults"/> +   + <a:status> + <f:facet name="start"> + <h:graphicImage id="Spinner" value="/img/spinner.gif"/> + </f:facet> + </a:status> + <br/> + <h:outputLabel for="pageSize">Maximum results:</h:outputLabel>  + <h:selectOneMenu value="#{hotelSearch.pageSize}" id="pageSize"> + <f:selectItem itemLabel="5" itemValue="5"/> + <f:selectItem itemLabel="10" itemValue="10"/> + <f:selectItem itemLabel="20" itemValue="20"/> + </h:selectOneMenu> + </fieldset> + + </h:form> +</div> + +<a:outputPanel id="searchResults"> + <div class="section"> + <h:outputText id="NoHotelsFoundMessage" value="No Hotels Found" rendered="#{hotels != null and hotels.rowCount==0}"/> + <h:dataTable id="hotels" value="#{hotels}" var="hot" rendered="#{hotels.rowCount>0}"> + <h:column> + <f:facet name="header">Name</f:facet> + #{hot.name} + </h:column> + <h:column> + <f:facet name="header">Address</f:facet> + #{hot.address} + </h:column> + <h:column> + <f:facet name="header">City, State</f:facet> + #{hot.city}, #{hot.state}, #{hot.country} + </h:column> + <h:column> + <f:facet name="header">Zip</f:facet> + #{hot.zip} + </h:column> + <h:column> + <f:facet name="header">Action</f:facet> + <s:link id="viewHotel" value="View Hotel" action="#{hotelBooking.selectHotel(hot)}"/> + </h:column> + </h:dataTable> + <s:link value="More results" action="#{hotelSearch.nextPage}" rendered="#{hotelSearch.nextPageAvailable}"/> + </div> +</a:outputPanel> + +<div class="section"> + <h1>Current Hotel Bookings</h1> +</div> +<div class="section"> + <h:form id="bookings"> + <h:outputText value="No Bookings Found" rendered="#{bookings.rowCount==0}"/> + <h:dataTable id="bookings" value="#{bookings}" var="book" rendered="#{bookings.rowCount>0}"> + <h:column> + <f:facet name="header">Name</f:facet> + #{book.hotel.name} + </h:column> + <h:column> + <f:facet name="header">Address</f:facet> + #{book.hotel.address} + </h:column> + <h:column> + <f:facet name="header">City, State</f:facet> + #{book.hotel.city}, #{book.hotel.state} + </h:column> + <h:column> + <f:facet name="header">Check in date</f:facet> + <h:outputText value="#{book.checkinDate}"/> + </h:column> + <h:column> + <f:facet name="header">Check out date</f:facet> + <h:outputText value="#{book.checkoutDate}"/> + </h:column> + <h:column> + <f:facet name="header">Confirmation number</f:facet> + #{book.id} + </h:column> + <h:column> + <f:facet name="header">Action</f:facet> + <h:commandLink id="cancel" value="Cancel" action="#{bookingList.cancel}"/> + </h:column> + </h:dataTable> + </h:form> +</div> + +</ui:define> + + +<ui:define name="sidebar"> + +</ui:define> + +</ui:composition> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/password.xhtml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/password.xhtml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/password.xhtml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,81 +0,0 @@ -<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<ui:composition xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - template="template.xhtml"> - - -<ui:define name="content"> -<div class="section"> - <h1>Change Your Password</h1> -</div> -<div class="section"> - <h:form id="setpassword"> - - <f:facet name="aroundInvalidField"> - <s:span id="Error" styleClass="errors"/> - </f:facet> - <f:facet name="afterInvalidField"> - <s:div styleClass="errors"> - <s:message id="Message" /> - </s:div> - </f:facet> - - <fieldset> - - <div class="entry"> - <div class="label"><h:outputLabel for="password">Password:</h:outputLabel></div> - <div class="input"> - <s:decorate id="PasswordDecorate"> - <h:inputSecret id="password" value="#{user.password}" required="true"> - <s:validate/> - </h:inputSecret> - </s:decorate> - </div> - </div> - - <div class="entry"> - <div class="label"><h:outputLabel for="verify">Verify:</h:outputLabel></div> - <div class="input"> - <s:decorate id="VerifyDecorate"> - <h:inputSecret id="verify" value="#{changePassword.verify}" required="true"/> - </s:decorate> - </div> - </div> - - <div class="entry errors"> - <h:messages globalOnly="true"/> - </div> - - <div class="entry"> - <div class="label"> </div> - <div class="input"> - <h:commandButton id="change" value="Change" action="#{changePassword.changePassword}"/>  - <s:button id="cancel" value="Cancel" view="/main.xhtml"/> - </div> - </div> - - </fieldset> - - </h:form> -</div> -</ui:define> - - -<ui:define name="sidebar"> -<h1>Simple things should be easy</h1> -<p> - (And so should some complex things.) You shouldn't have to write four different classes - just to change a password. Traditional J2EE architectures require that developers spend - more time writing code to make the frameworks happy, than they ever get to spend writing - code to make the user happy. Seam lets you reduce the size of your code dramatically. - And that reduces bugs. And it makes refactoring easier. And it makes delivering new - functionality quicker. Productivity matters. But with Seam, JSF, EJB 3.0 and jBPM, you - don't need to sacrifice the ability to handle complex problems just to achieve great - productivity. -</p> -</ui:define> - -</ui:composition> \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/password.xhtml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/password.xhtml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/password.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/password.xhtml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,81 @@ +<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + template="template.xhtml"> + + +<ui:define name="content"> +<div class="section"> + <h1>Change Your Password</h1> +</div> +<div class="section"> + <h:form id="setpassword"> + + <f:facet name="aroundInvalidField"> + <s:span id="Error" styleClass="errors"/> + </f:facet> + <f:facet name="afterInvalidField"> + <s:div styleClass="errors"> + <s:message id="Message" /> + </s:div> + </f:facet> + + <fieldset> + + <div class="entry"> + <div class="label"><h:outputLabel for="password">Password:</h:outputLabel></div> + <div class="input"> + <s:decorate id="PasswordDecorate"> + <h:inputSecret id="password" value="#{user.password}" required="true"> + <s:validate/> + </h:inputSecret> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="verify">Verify:</h:outputLabel></div> + <div class="input"> + <s:decorate id="VerifyDecorate"> + <h:inputSecret id="verify" value="#{changePassword.verify}" required="true"/> + </s:decorate> + </div> + </div> + + <div class="entry errors"> + <h:messages globalOnly="true"/> + </div> + + <div class="entry"> + <div class="label"> </div> + <div class="input"> + <h:commandButton id="change" value="Change" action="#{changePassword.changePassword}"/>  + <s:button id="cancel" value="Cancel" view="/main.xhtml"/> + </div> + </div> + + </fieldset> + + </h:form> +</div> +</ui:define> + + +<ui:define name="sidebar"> +<h1>Simple things should be easy</h1> +<p> + (And so should some complex things.) You shouldn't have to write four different classes + just to change a password. Traditional J2EE architectures require that developers spend + more time writing code to make the frameworks happy, than they ever get to spend writing + code to make the user happy. Seam lets you reduce the size of your code dramatically. + And that reduces bugs. And it makes refactoring easier. And it makes delivering new + functionality quicker. Productivity matters. But with Seam, JSF, EJB 3.0 and jBPM, you + don't need to sacrifice the ability to handle complex problems just to achieve great + productivity. +</p> +</ui:define> + +</ui:composition> \ No newline at end of file Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/register.xhtml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/register.xhtml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/register.xhtml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,104 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:s="http://jboss.com/products/seam/taglib" - xmlns:a="http://richfaces.org/a4j"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> - <title>JBoss Suites: Seam Framework</title> - <link href="css/screen.css" rel="stylesheet" type="text/css" /> -</head> -<body id="pgHome"> -<div id="document"> - <div id="header"> - <div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div> - </div> - <div id="container"> - <div id="sidebar"> - </div> - <div id="content"> - <div class="section"> - <h1>Register</h1> - </div> - <div class="section"> - - <h:form id="register"> - <fieldset> - - <s:validateAll> - - <f:facet name="aroundInvalidField"> - <s:span styleClass="errors"/> - </f:facet> - <f:facet name="afterInvalidField"> - <s:div styleClass="errors"> - <s:message id="message"/> - </s:div> - </f:facet> - - <div class="entry"> - <div class="label"><h:outputLabel for="username">Username:</h:outputLabel></div> - <div class="input"> - <s:decorate id="usernameDecorate"> - <h:inputText id="username" value="#{user.username}" required="true"> - <a:support event="onblur" reRender="usernameDecorate"/> - </h:inputText> - </s:decorate> - </div> - </div> - - <div class="entry"> - <div class="label"><h:outputLabel for="name">Real Name:</h:outputLabel></div> - <div class="input"> - <s:decorate id="nameDecorate"> - <h:inputText id="name" value="#{user.name}" required="true"> - <a:support event="onblur" reRender="nameDecorate"/> - </h:inputText> - </s:decorate> - </div> - </div> - - <div class="entry"> - <div class="label"><h:outputLabel for="password">Password:</h:outputLabel></div> - <div class="input"> - <s:decorate id="passwordDecorate"> - <h:inputSecret id="password" value="#{user.password}" required="true"/> - </s:decorate> - </div> - </div> - - <div class="entry"> - <div class="label"><h:outputLabel for="verify">Verify Password:</h:outputLabel></div> - <div class="input"> - <s:decorate id="verifyDecorate"> - <h:inputSecret id="verify" value="#{register.verify}" required="true"/> - </s:decorate> - </div> - </div> - - </s:validateAll> - - <div class="entry errors"> - <h:messages id="messages" globalOnly="true"/> - </div> - - <div class="entry"> - <div class="label"> </div> - <div class="input"> - <h:commandButton id="register" value="Register" action="#{register.register}"/>  - <s:button id="cancel" value="Cancel" view="/home.xhtml"/> - </div> - </div> - - </fieldset> - </h:form> - - </div> - </div> - </div> - <div id="footer">Created with JBoss EJB 3.0, Seam, JSF (Mojarra), and Facelets</div> -</div> -</body> -</html> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/register.xhtml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/register.xhtml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/register.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/register.xhtml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,104 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:s="http://jboss.com/products/seam/taglib" + xmlns:a="http://richfaces.org/a4j"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> + <title>JBoss Suites: Seam Framework</title> + <link href="css/screen.css" rel="stylesheet" type="text/css" /> +</head> +<body id="pgHome"> +<div id="document"> + <div id="header"> + <div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div> + </div> + <div id="container"> + <div id="sidebar"> + </div> + <div id="content"> + <div class="section"> + <h1>Register</h1> + </div> + <div class="section"> + + <h:form id="register"> + <fieldset> + + <s:validateAll> + + <f:facet name="aroundInvalidField"> + <s:span styleClass="errors"/> + </f:facet> + <f:facet name="afterInvalidField"> + <s:div styleClass="errors"> + <s:message id="message"/> + </s:div> + </f:facet> + + <div class="entry"> + <div class="label"><h:outputLabel for="username">Username:</h:outputLabel></div> + <div class="input"> + <s:decorate id="usernameDecorate"> + <h:inputText id="username" value="#{user.username}" required="true"> + <a:support event="onblur" reRender="usernameDecorate"/> + </h:inputText> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="name">Real Name:</h:outputLabel></div> + <div class="input"> + <s:decorate id="nameDecorate"> + <h:inputText id="name" value="#{user.name}" required="true"> + <a:support event="onblur" reRender="nameDecorate"/> + </h:inputText> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="password">Password:</h:outputLabel></div> + <div class="input"> + <s:decorate id="passwordDecorate"> + <h:inputSecret id="password" value="#{user.password}" required="true"/> + </s:decorate> + </div> + </div> + + <div class="entry"> + <div class="label"><h:outputLabel for="verify">Verify Password:</h:outputLabel></div> + <div class="input"> + <s:decorate id="verifyDecorate"> + <h:inputSecret id="verify" value="#{register.verify}" required="true"/> + </s:decorate> + </div> + </div> + + </s:validateAll> + + <div class="entry errors"> + <h:messages id="messages" globalOnly="true"/> + </div> + + <div class="entry"> + <div class="label"> </div> + <div class="input"> + <h:commandButton id="register" value="Register" action="#{register.register}"/>  + <s:button id="cancel" value="Cancel" view="/home.xhtml"/> + </div> + </div> + + </fieldset> + </h:form> + + </div> + </div> + </div> + <div id="footer">Created with JBoss EJB 3.0, Seam, JSF (Mojarra), and Facelets</div> +</div> +</body> +</html> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/template.xhtml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/template.xhtml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/template.xhtml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,35 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:s="http://jboss.com/products/seam/taglib"> -<head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>JBoss Suites: Seam Framework</title> - <link href="css/screen.css" rel="stylesheet" type="text/css" /> -</head> -<body> - -<div id="document"> - <div id="header"> - <div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div> - <div id="status"> - Welcome #{user.name} - | <s:link id="search" view="/main.xhtml" value="Search" propagation="none"/> - | <s:link id="settings" view="/password.xhtml" value="Settings" propagation="none"/> - | <s:link id="logout" action="#{identity.logout}" value="Logout"/> - </div> - </div> - <div id="container"> - <div id="sidebar"> - <ui:insert name="sidebar"/> - </div> - <div id="content"> - <ui:insert name="content"/> - <ui:include src="conversations.xhtml" /> - </div> - </div> - <div id="footer">Created with JBoss Seam, JSF 1.2, Hibernate 3 and Facelets</div> -</div> -</body> -</html> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/template.xhtml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/hibernate-web/src/main/webapp/template.xhtml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/template.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/template.xhtml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,35 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:s="http://jboss.com/products/seam/taglib"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>JBoss Suites: Seam Framework</title> + <link href="css/screen.css" rel="stylesheet" type="text/css" /> +</head> +<body> + +<div id="document"> + <div id="header"> + <div id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: seam framework demo"/></div> + <div id="status"> + Welcome #{user.name} + | <s:link id="search" view="/main.xhtml" value="Search" propagation="none"/> + | <s:link id="settings" view="/password.xhtml" value="Settings" propagation="none"/> + | <s:link id="logout" action="#{identity.logout}" value="Logout"/> + </div> + </div> + <div id="container"> + <div id="sidebar"> + <ui:insert name="sidebar"/> + </div> + <div id="content"> + <ui:insert name="content"/> + <ui:include src="conversations.xhtml" /> + </div> + </div> + <div id="footer">Created with JBoss Seam, JSF 1.2, Hibernate 3 and Facelets</div> +</div> +</body> +</html> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-jboss405.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/build-jboss405.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-jboss405.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,36 +0,0 @@ -<?xml version="1.0"?> - -<project name="Hibernate Booking" default="noejb.archive" basedir="."> - -  - <property name="Name" value="The Hibernate Example for JBoss 4.0.5"/> - <property name="example.name" value="jboss-seam-hibernate"/> - -  - <property name="resources.dir" value="resources-jboss" /> - <property name="dist.dir" value="dist-jboss405" /> - <property name="exploded-archives.dir" value="exploded-archives-jboss405" /> - -  - <property name="seam.ui.lib" value="true"/> - <property name="seam.debug.lib" value="true"/> - <property name="facelets.lib" value="true"/> - <property name="richfaces.lib" value="true"/> - <property name="el-ri.lib" value="true"/> - - <import file="../build.xml"/> - - <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> - <include name="lib/commons-beanutils.jar"/> - <include name="lib/commons-collections.jar"/> - <include name="lib/commons-digester.jar"/> - <include name="lib/commons-lang.jar"/> - <include name="lib/commons-logging.jar"/> - <include name="lib/jsf-api.jar"/> - <include name="lib/jsf-impl.jar"/> - <include name="lib/jstl.jar"/> - <include name="lib/el-api.jar"/> - </fileset> - -</project> - Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-jboss405.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/build-jboss405.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-jboss405.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-jboss405.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,36 @@ +<?xml version="1.0"?> + +<project name="Hibernate Booking" default="noejb.archive" basedir="."> + +  + <property name="Name" value="The Hibernate Example for JBoss 4.0.5"/> + <property name="example.name" value="jboss-seam-hibernate"/> + +  + <property name="resources.dir" value="resources-jboss" /> + <property name="dist.dir" value="dist-jboss405" /> + <property name="exploded-archives.dir" value="exploded-archives-jboss405" /> + +  + <property name="seam.ui.lib" value="true"/> + <property name="seam.debug.lib" value="true"/> + <property name="facelets.lib" value="true"/> + <property name="richfaces.lib" value="true"/> + <property name="el-ri.lib" value="true"/> + + <import file="../build.xml"/> + + <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> + <include name="lib/commons-beanutils.jar"/> + <include name="lib/commons-collections.jar"/> + <include name="lib/commons-digester.jar"/> + <include name="lib/commons-lang.jar"/> + <include name="lib/commons-logging.jar"/> + <include name="lib/jsf-api.jar"/> + <include name="lib/jsf-impl.jar"/> + <include name="lib/jstl.jar"/> + <include name="lib/el-api.jar"/> + </fileset> + +</project> + Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-tomcat55.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/build-tomcat55.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-tomcat55.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,57 +0,0 @@ -<?xml version="1.0"?> - -<project name="Hibernate Booking" default="noejb.archive" basedir="."> - -  - <property name="Name" value="The Hibernate Example for plain Tomcat 5.5"/> - <property name="example.name" value="jboss-seam-hibernate"/> - -  - <property name="resources.dir" value="resources-tomcat" /> - <property name="dist.dir" value="dist-tomcat55" /> - <property name="exploded-archives.dir" value="exploded-archives-tomcat55" /> - -  - <property name="seam.ui.lib" value="true"/> - <property name="seam.debug.lib" value="true"/> - <property name="facelets.lib" value="true"/> - <property name="richfaces.lib" value="true"/> - <property name="el-ri.lib" value="true"/> - - <import file="../build.xml"/> - - <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> - <include name="lib/commons-beanutils.jar"/> - <include name="lib/commons-collections.jar"/> - <include name="lib/commons-digester.jar"/> - <include name="lib/commons-lang.jar"/> - <include name="lib/commons-logging.jar"/> - <include name="lib/log4j.jar" /> - <include name="lib/jsf-api.jar"/> - <include name="lib/jsf-impl.jar"/> - <include name="lib/jstl.jar"/> - <include name="lib/dom4j.jar" /> - <include name="lib/hibernate-core.jar"/> - <include name="lib/hibernate-commons-annotations.jar"/> - <include name="lib/hibernate-annotations.jar"/> - <include name="lib/hibernate-entitymanager.jar"/> - <include name="lib/hibernate-validator.jar"/> - <include name="lib/javassist.jar"/> - <include name="lib/slf4j-api.jar"/> - <include name="lib/slf4j-log4j12.jar"/> - <include name="lib/persistence-api.jar" /> - <include name="lib/el-api.jar" /> - <include name="lib/cglib.jar"/> - <include name="lib/jta.jar"/> - <include name="lib/antlr.jar" /> -  - </fileset> - - <fileset id="noejb.war.extras" dir="${resources.dir}"> - <include name="META-INF/context.xml" /> - </fileset> - -</project> - Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-tomcat55.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/build-tomcat55.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-tomcat55.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-tomcat55.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,57 @@ +<?xml version="1.0"?> + +<project name="Hibernate Booking" default="noejb.archive" basedir="."> + +  + <property name="Name" value="The Hibernate Example for plain Tomcat 5.5"/> + <property name="example.name" value="jboss-seam-hibernate"/> + +  + <property name="resources.dir" value="resources-tomcat" /> + <property name="dist.dir" value="dist-tomcat55" /> + <property name="exploded-archives.dir" value="exploded-archives-tomcat55" /> + +  + <property name="seam.ui.lib" value="true"/> + <property name="seam.debug.lib" value="true"/> + <property name="facelets.lib" value="true"/> + <property name="richfaces.lib" value="true"/> + <property name="el-ri.lib" value="true"/> + + <import file="../build.xml"/> + + <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> + <include name="lib/commons-beanutils.jar"/> + <include name="lib/commons-collections.jar"/> + <include name="lib/commons-digester.jar"/> + <include name="lib/commons-lang.jar"/> + <include name="lib/commons-logging.jar"/> + <include name="lib/log4j.jar" /> + <include name="lib/jsf-api.jar"/> + <include name="lib/jsf-impl.jar"/> + <include name="lib/jstl.jar"/> + <include name="lib/dom4j.jar" /> + <include name="lib/hibernate-core.jar"/> + <include name="lib/hibernate-commons-annotations.jar"/> + <include name="lib/hibernate-annotations.jar"/> + <include name="lib/hibernate-entitymanager.jar"/> + <include name="lib/hibernate-validator.jar"/> + <include name="lib/javassist.jar"/> + <include name="lib/slf4j-api.jar"/> + <include name="lib/slf4j-log4j12.jar"/> + <include name="lib/persistence-api.jar" /> + <include name="lib/el-api.jar" /> + <include name="lib/cglib.jar"/> + <include name="lib/jta.jar"/> + <include name="lib/antlr.jar" /> +  + </fileset> + + <fileset id="noejb.war.extras" dir="${resources.dir}"> + <include name="META-INF/context.xml" /> + </fileset> + +</project> + Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-tomcat6.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/build-tomcat6.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-tomcat6.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,53 +0,0 @@ -<?xml version="1.0"?> - -<project name="Hibernate Booking" default="noejb.archive" basedir="."> - -  - <property name="Name" value="The Hibernate Example for plain Tomcat 6.0" /> - <property name="example.name" value="jboss-seam-hibernate" /> - -  - <property name="resources.dir" value="resources-tomcat" /> - <property name="dist.dir" value="dist-tomcat6" /> - <property name="exploded-archives.dir" value="exploded-archives-tomcat6" /> - -  - <property name="seam.ui.lib" value="true" /> - <property name="seam.debug.lib" value="true" /> - <property name="facelets.lib" value="true" /> - <property name="richfaces.lib" value="true" /> - - <import file="../build.xml" /> - - <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> - <include name="lib/commons-beanutils.jar"/> - <include name="lib/commons-collections.jar"/> - <include name="lib/commons-digester.jar"/> - <include name="lib/commons-lang.jar"/> - <include name="lib/commons-logging.jar"/> - <include name="lib/log4j.jar"/> - <include name="lib/jsf-api.jar" /> - <include name="lib/jsf-impl.jar" /> - <include name="lib/jstl.jar" /> - <include name="lib/dom4j.jar" /> - <include name="lib/hibernate-core.jar" /> - <include name="lib/hibernate-commons-annotations.jar" /> - <include name="lib/hibernate-annotations.jar" /> - <include name="lib/hibernate-entitymanager.jar" /> - <include name="lib/hibernate-validator.jar" /> - <include name="lib/slf4j-api.jar" /> - <include name="lib/slf4j-log4j12.jar" /> - <include name="lib/asm.jar" /> - <include name="lib/javassist.jar" /> - <include name="lib/persistence-api.jar" /> - <include name="lib/cglib.jar" /> - <include name="lib/jta.jar" /> - <include name="lib/antlr.jar" /> - </fileset> - - <fileset id="noejb.war.extras" dir="${resources.dir}"> - <include name="META-INF/context.xml" /> - </fileset> - -</project> - Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-tomcat6.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/build-tomcat6.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-tomcat6.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-tomcat6.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,53 @@ +<?xml version="1.0"?> + +<project name="Hibernate Booking" default="noejb.archive" basedir="."> + +  + <property name="Name" value="The Hibernate Example for plain Tomcat 6.0" /> + <property name="example.name" value="jboss-seam-hibernate" /> + +  + <property name="resources.dir" value="resources-tomcat" /> + <property name="dist.dir" value="dist-tomcat6" /> + <property name="exploded-archives.dir" value="exploded-archives-tomcat6" /> + +  + <property name="seam.ui.lib" value="true" /> + <property name="seam.debug.lib" value="true" /> + <property name="facelets.lib" value="true" /> + <property name="richfaces.lib" value="true" /> + + <import file="../build.xml" /> + + <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> + <include name="lib/commons-beanutils.jar"/> + <include name="lib/commons-collections.jar"/> + <include name="lib/commons-digester.jar"/> + <include name="lib/commons-lang.jar"/> + <include name="lib/commons-logging.jar"/> + <include name="lib/log4j.jar"/> + <include name="lib/jsf-api.jar" /> + <include name="lib/jsf-impl.jar" /> + <include name="lib/jstl.jar" /> + <include name="lib/dom4j.jar" /> + <include name="lib/hibernate-core.jar" /> + <include name="lib/hibernate-commons-annotations.jar" /> + <include name="lib/hibernate-annotations.jar" /> + <include name="lib/hibernate-entitymanager.jar" /> + <include name="lib/hibernate-validator.jar" /> + <include name="lib/slf4j-api.jar" /> + <include name="lib/slf4j-log4j12.jar" /> + <include name="lib/asm.jar" /> + <include name="lib/javassist.jar" /> + <include name="lib/persistence-api.jar" /> + <include name="lib/cglib.jar" /> + <include name="lib/jta.jar" /> + <include name="lib/antlr.jar" /> + </fileset> + + <fileset id="noejb.war.extras" dir="${resources.dir}"> + <include name="META-INF/context.xml" /> + </fileset> + +</project> + Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-weblogic92.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/build-weblogic92.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-weblogic92.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,60 +0,0 @@ -<?xml version="1.0"?> - -<project name="Hibernate Booking" default="noejb.archive" basedir="."> - -  - <property name="Name" value="The Hibernate Example for WebLogic 9.2"/> - <property name="example.name" value="jboss-seam-hibernate"/> - -  - <property name="resources.dir" value="resources-weblogic92" /> - <property name="dist.dir" value="dist-weblogic92" /> - <property name="exploded-archives.dir" value="exploded-archives-weblogic92" /> - -  - <property name="seam.ui.lib" value="true"/> - <property name="seam.debug.lib" value="true"/> - <property name="facelets.lib" value="true"/> - <property name="richfaces.lib" value="true"/> - <property name="el-ri.lib" value="true"/> - <property name="jboss-common-core.lib" value="true" /> - - <import file="../build.xml"/> - - <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> -  - <include name="lib/dom4j.jar" /> - <include name="lib/javassist.jar" /> - -  - <include name="lib/jta.jar" /> - <include name="lib/commons-beanutils.jar" /> - <include name="lib/commons-digester.jar" /> - <include name="lib/commons-collections.jar" /> - <include name="lib/commons-logging.jar" /> - -  - <include name="lib/jsf-api.jar" /> - <include name="lib/jsf-impl.jar" /> - <include name="lib/jstl.jar" /> - <include name="lib/el-api.jar" /> - -  - <include name="lib/hibernate-core.jar" /> - <include name="lib/hibernate-commons-annotations.jar" /> - <include name="lib/hibernate-annotations.jar" /> - <include name="lib/hibernate-entitymanager.jar" /> - <include name="lib/hibernate-validator.jar" /> - <include name="lib/persistence-api.jar" /> - <include name="lib/cglib.jar" /> - <include name="lib/antlr.jar" /> - <include name="lib/slf4j-api.jar"/> - <include name="lib/slf4j-log4j12.jar"/> - </fileset> - - <fileset id="noejb.war.extras" dir="${resources.dir}"> - <include name="WEB-INF/classes/**/*" /> - </fileset> - -</project> - Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-weblogic92.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/build-weblogic92.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-weblogic92.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-weblogic92.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,60 @@ +<?xml version="1.0"?> + +<project name="Hibernate Booking" default="noejb.archive" basedir="."> + +  + <property name="Name" value="The Hibernate Example for WebLogic 9.2"/> + <property name="example.name" value="jboss-seam-hibernate"/> + +  + <property name="resources.dir" value="resources-weblogic92" /> + <property name="dist.dir" value="dist-weblogic92" /> + <property name="exploded-archives.dir" value="exploded-archives-weblogic92" /> + +  + <property name="seam.ui.lib" value="true"/> + <property name="seam.debug.lib" value="true"/> + <property name="facelets.lib" value="true"/> + <property name="richfaces.lib" value="true"/> + <property name="el-ri.lib" value="true"/> + <property name="jboss-common-core.lib" value="true" /> + + <import file="../build.xml"/> + + <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> +  + <include name="lib/dom4j.jar" /> + <include name="lib/javassist.jar" /> + +  + <include name="lib/jta.jar" /> + <include name="lib/commons-beanutils.jar" /> + <include name="lib/commons-digester.jar" /> + <include name="lib/commons-collections.jar" /> + <include name="lib/commons-logging.jar" /> + +  + <include name="lib/jsf-api.jar" /> + <include name="lib/jsf-impl.jar" /> + <include name="lib/jstl.jar" /> + <include name="lib/el-api.jar" /> + +  + <include name="lib/hibernate-core.jar" /> + <include name="lib/hibernate-commons-annotations.jar" /> + <include name="lib/hibernate-annotations.jar" /> + <include name="lib/hibernate-entitymanager.jar" /> + <include name="lib/hibernate-validator.jar" /> + <include name="lib/persistence-api.jar" /> + <include name="lib/cglib.jar" /> + <include name="lib/antlr.jar" /> + <include name="lib/slf4j-api.jar"/> + <include name="lib/slf4j-log4j12.jar"/> + </fileset> + + <fileset id="noejb.war.extras" dir="${resources.dir}"> + <include name="WEB-INF/classes/**/*" /> + </fileset> + +</project> + Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-websphere61.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/build-websphere61.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-websphere61.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,59 +0,0 @@ -<?xml version="1.0"?> - -<project name="Hibernate Booking" default="noejb.archive" basedir="."> - -  - <property name="Name" value="The Hibernate Example for WebSphere 6.1.0.9" /> - <property name="example.name" value="jboss-seam-hibernate" /> - -  - <property name="resources.dir" value="resources-websphere61" /> - <property name="dist.dir" value="dist-websphere61" /> - <property name="exploded-archives.dir" value="exploded-archives-websphere61" /> - -  - <property name="seam.ui.lib" value="true" /> - <property name="seam.debug.lib" value="true" /> - <property name="facelets.lib" value="true" /> - <property name="richfaces.lib" value="true" /> - <property name="el-ri.lib" value="true"/> - <property name="jboss-common-core.lib" value="true" /> - - <import file="../build.xml" /> - - <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> -  - <include name="lib/dom4j.jar" /> - <include name="lib/javassist.jar"/> - -  - <include name="lib/commons-beanutils.jar"/> - <include name="lib/commons-digester.jar"/> - <include name="lib/commons-collections.jar"/> - -  - <include name="lib/jsf-api.jar"/> - <include name="lib/jsf-impl.jar"/> - <include name="lib/jstl.jar"/> - <include name="lib/el-api.jar" /> - -  - <include name="lib/hibernate-core.jar"/> - <include name="lib/hibernate-commons-annotations.jar"/> - <include name="lib/hibernate-annotations.jar"/> - <include name="lib/hibernate-entitymanager.jar"/> - <include name="lib/hibernate-validator.jar"/> - <include name="lib/persistence-api.jar" /> - <include name="lib/slf4j-api.jar"/> - <include name="lib/slf4j-log4j12.jar"/> - <include name="lib/cglib.jar"/> - <include name="lib/antlr.jar" /> - </fileset> - - <fileset id="noejb.war.extras" dir="${resources.dir}"> - <include name="WEB-INF/classes/**/*" /> - <include name="META-INF/*.taglib.xml" /> - </fileset> - -</project> - Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-websphere61.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/build-websphere61.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-websphere61.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/build-websphere61.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,59 @@ +<?xml version="1.0"?> + +<project name="Hibernate Booking" default="noejb.archive" basedir="."> + +  + <property name="Name" value="The Hibernate Example for WebSphere 6.1.0.9" /> + <property name="example.name" value="jboss-seam-hibernate" /> + +  + <property name="resources.dir" value="resources-websphere61" /> + <property name="dist.dir" value="dist-websphere61" /> + <property name="exploded-archives.dir" value="exploded-archives-websphere61" /> + +  + <property name="seam.ui.lib" value="true" /> + <property name="seam.debug.lib" value="true" /> + <property name="facelets.lib" value="true" /> + <property name="richfaces.lib" value="true" /> + <property name="el-ri.lib" value="true"/> + <property name="jboss-common-core.lib" value="true" /> + + <import file="../build.xml" /> + + <fileset id="noejb.war.lib.extras" dir="${seam.dir}"> +  + <include name="lib/dom4j.jar" /> + <include name="lib/javassist.jar"/> + +  + <include name="lib/commons-beanutils.jar"/> + <include name="lib/commons-digester.jar"/> + <include name="lib/commons-collections.jar"/> + +  + <include name="lib/jsf-api.jar"/> + <include name="lib/jsf-impl.jar"/> + <include name="lib/jstl.jar"/> + <include name="lib/el-api.jar" /> + +  + <include name="lib/hibernate-core.jar"/> + <include name="lib/hibernate-commons-annotations.jar"/> + <include name="lib/hibernate-annotations.jar"/> + <include name="lib/hibernate-entitymanager.jar"/> + <include name="lib/hibernate-validator.jar"/> + <include name="lib/persistence-api.jar" /> + <include name="lib/slf4j-api.jar"/> + <include name="lib/slf4j-log4j12.jar"/> + <include name="lib/cglib.jar"/> + <include name="lib/antlr.jar" /> + </fileset> + + <fileset id="noejb.war.extras" dir="${resources.dir}"> + <include name="WEB-INF/classes/**/*" /> + <include name="META-INF/*.taglib.xml" /> + </fileset> + +</project> + Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - - - - - - - - - - - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/> - </layout> - </appender> - -  - -  - -  - - <root> - <priority value="INFO"/> - <appender-ref ref="CONSOLE"/> - </root> - -</log4j:configuration> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/classes/log4j.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + + + + + + + + + + + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + +  + +  + +  + + <root> + <priority value="INFO"/> + <appender-ref ref="CONSOLE"/> + </root> + +</log4j:configuration> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/components.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/components.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,26 +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:persistence="http://jboss.com/products/seam/persistence" - xmlns:security="http://jboss.com/products/seam/security" - 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/persistence http://jboss.com/products/seam/persistence-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 debug="true"/> - - <core:manager conversation-timeout="120000" - concurrent-request-timeout="500" - conversation-id-parameter="cid"/> - - <persistence:hibernate-session-factory name="hibernateSessionFactory"/> - - <persistence:managed-hibernate-session name="bookingDatabase" - auto-create="true" - session-factory-jndi-name="bookingDatabase"/> - - <security:identity authenticate-method="#{authenticator.authenticate}"/> -</components> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/components.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/components.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/components.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:persistence="http://jboss.com/products/seam/persistence" + xmlns:security="http://jboss.com/products/seam/security" + 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/persistence http://jboss.com/products/seam/persistence-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 debug="true"/> + + <core:manager conversation-timeout="120000" + concurrent-request-timeout="500" + conversation-id-parameter="cid"/> + + <persistence:hibernate-session-factory name="hibernateSessionFactory"/> + + <persistence:managed-hibernate-session name="bookingDatabase" + auto-create="true" + session-factory-jndi-name="bookingDatabase"/> + + <security:identity authenticate-method="#{authenticator.authenticate}"/> +</components> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<faces-config version="1.2" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> - -  - - <application> - <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> - </application> - -</faces-config> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/faces-config.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="1.2" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + +  + + <application> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + </application> + +</faces-config> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/pages.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/pages.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pages xmlns="http://jboss.com/products/seam/pages" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.3.xsd" - - no-conversation-view-id="/main.xhtml" - login-view-id="/home.xhtml"> - - <page view-id="/register.xhtml"> - - <action if="#{validation.failed}" execute="#{register.invalid}"/> - - <navigation> - <rule if="#{register.registered}"> - <redirect view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> - - <navigation from-action="#{identity.isLoggedIn}"> - <rule if-outcome="true"> - <redirect view-id="/main.xhtml"/> - </rule> - <rule if-outcome="false"> - <render view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/password.xhtml" - login-required="true"> - - <navigation> - <rule if="#{changePassword.changed}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/main.xhtml" - login-required="true"> - - <navigation from-action="#{hotelBooking.selectHotel(hot)}"> - <redirect view-id="/hotel.xhtml"/> - </navigation> - - </page> - - <page view-id="/hotel.xhtml" - conversation-required="true"> - - <description>View hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.bookHotel}"> - <redirect view-id="/book.xhtml"/> - </navigation> - - </page> - - <page view-id="/book.xhtml" - conversation-required="true"> - - <description>Book hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.setBookingDetails}"> - <rule if="#{hotelBooking.bookingValid}"> - <redirect view-id="/confirm.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/confirm.xhtml" - conversation-required="true"> - - <description>Confirm booking: #{booking.description}</description> - - <navigation from-action="#{hotelBooking.confirm}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <page view-id="*"> - - <navigation from-action="#{identity.logout}"> - <redirect view-id="/home.xhtml"/> - </navigation> - - <navigation from-action="#{hotelBooking.cancel}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <exception class="org.jboss.seam.security.NotLoggedInException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">You must be logged in to use this feature</message> - </redirect> - </exception> - - <exception class="javax.faces.application.ViewExpiredException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">Session expired, please log in again</message> - </redirect> - </exception> - -</pages> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/pages.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/pages.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/pages.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/pages.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> +<pages xmlns="http://jboss.com/products/seam/pages" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.3.xsd" + + no-conversation-view-id="/main.xhtml" + login-view-id="/home.xhtml"> + + <page view-id="/register.xhtml"> + + <action if="#{validation.failed}" execute="#{register.invalid}"/> + + <navigation> + <rule if="#{register.registered}"> + <redirect view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + <rule if-outcome="false"> + <render view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/password.xhtml" + login-required="true"> + + <navigation> + <rule if="#{changePassword.changed}"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/main.xhtml" + login-required="true"> + + <navigation from-action="#{hotelBooking.selectHotel(hot)}"> + <redirect view-id="/hotel.xhtml"/> + </navigation> + + </page> + + <page view-id="/hotel.xhtml" + conversation-required="true"> + + <description>View hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.bookHotel}"> + <redirect view-id="/book.xhtml"/> + </navigation> + + </page> + + <page view-id="/book.xhtml" + conversation-required="true"> + + <description>Book hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.setBookingDetails}"> + <rule if="#{hotelBooking.bookingValid}"> + <redirect view-id="/confirm.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/confirm.xhtml" + conversation-required="true"> + + <description>Confirm booking: #{booking.description}</description> + + <navigation from-action="#{hotelBooking.confirm}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <page view-id="*"> + + <navigation from-action="#{identity.logout}"> + <redirect view-id="/home.xhtml"/> + </navigation> + + <navigation from-action="#{hotelBooking.cancel}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <exception class="org.jboss.seam.security.NotLoggedInException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">You must be logged in to use this feature</message> + </redirect> + </exception> + + <exception class="javax.faces.application.ViewExpiredException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">Session expired, please log in again</message> + </redirect> + </exception> + +</pages> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/web.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/web.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.5" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - -  - - <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> - </listener> - - <filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <servlet> - <servlet-name>Seam Resource Servlet</servlet-name> - <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>Seam Resource Servlet</servlet-name> - <url-pattern>/seam/resource/*</url-pattern> - </servlet-mapping> - -  - - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.seam</url-pattern> - </servlet-mapping> - -  - - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</param-value> - </context-param> - - <session-config> - <session-timeout>10</session-timeout> - </session-config> - -</web-app> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/web.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/web.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/WEB-INF/web.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + +  + + <listener> + <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + </listener> + + <filter> + <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>Seam Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <servlet> + <servlet-name>Seam Resource Servlet</servlet-name> + <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Seam Resource Servlet</servlet-name> + <url-pattern>/seam/resource/*</url-pattern> + </servlet-mapping> + +  + + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.seam</url-pattern> + </servlet-mapping> + +  + + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + + <session-config> + <session-timeout>10</session-timeout> + </session-config> + +</web-app> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/hibernate.cfg.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-weblogic92/hibernate.cfg.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/hibernate.cfg.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,20 +0,0 @@ -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> - -<hibernate-configuration> - <session-factory name="bookingDatabase"> - <property name="show_sql">false</property> - <property name="connection.datasource">examples-dataSource-demoPool</property> - <property name="hbm2ddl.auto">create-drop</property> - <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <property name="dialect">org.hibernate.dialect.PointbaseDialect</property> - <property name="transaction.flush_before_completion">true</property> - <property name="connection.release_mode">after_statement</property> - <property name="transaction.manager_lookup_class">org.hibernate.transaction.WeblogicTransactionManagerLookup</property> - <property name="transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> - <mapping class="org.jboss.seam.example.hibernate.Hotel"/> - <mapping class="org.jboss.seam.example.hibernate.User"/> - <mapping class="org.jboss.seam.example.hibernate.Booking"/> - </session-factory> -</hibernate-configuration> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/hibernate.cfg.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-weblogic92/hibernate.cfg.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/hibernate.cfg.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/hibernate.cfg.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,20 @@ +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory name="bookingDatabase"> + <property name="show_sql">false</property> + <property name="connection.datasource">examples-dataSource-demoPool</property> + <property name="hbm2ddl.auto">create-drop</property> + <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> + <property name="dialect">org.hibernate.dialect.PointbaseDialect</property> + <property name="transaction.flush_before_completion">true</property> + <property name="connection.release_mode">after_statement</property> + <property name="transaction.manager_lookup_class">org.hibernate.transaction.WeblogicTransactionManagerLookup</property> + <property name="transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> + <mapping class="org.jboss.seam.example.hibernate.Hotel"/> + <mapping class="org.jboss.seam.example.hibernate.User"/> + <mapping class="org.jboss.seam.example.hibernate.Booking"/> + </session-factory> +</hibernate-configuration> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/import.sql =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-weblogic92/import.sql 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/import.sql 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,22 +0,0 @@ -insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') -insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') -insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') -insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') -insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 130, 'Hotel Beaulac', ' Esplanade L�opold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') -insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') -insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') -insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') -insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 250, 'Meli� White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') -insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/import.sql (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-weblogic92/import.sql) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/import.sql (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/import.sql 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,22 @@ +insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') +insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') +insert into Hotel (id, price, name, address, city, state, zip, country) values (1, 120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (2, 180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (3, 450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (4, 450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (5, 250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (6, 300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (8, 300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (9, 80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (10, 90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (11, 160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (12, 200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') +insert into Hotel (id, price, name, address, city, state, zip, country) values (13, 210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') +insert into Hotel (id, price, name, address, city, state, zip, country) values (14, 240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') +insert into Hotel (id, price, name, address, city, state, zip, country) values (15, 130, 'Hotel Beaulac', ' Esplanade L�opold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') +insert into Hotel (id, price, name, address, city, state, zip, country) values (16, 140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') +insert into Hotel (id, price, name, address, city, state, zip, country) values (17, 230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') +insert into Hotel (id, price, name, address, city, state, zip, country) values (18, 460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') +insert into Hotel (id, price, name, address, city, state, zip, country) values (19, 220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') +insert into Hotel (id, price, name, address, city, state, zip, country) values (20, 250, 'Meli� White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') +insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/seam.properties =================================================================== Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-weblogic92/seam.properties (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-weblogic92/seam.properties) =================================================================== Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/ajax4jsf.taglib.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/ajax4jsf.taglib.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/ajax4jsf.taglib.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,233 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE facelet-taglib PUBLIC - "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" - "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> -<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet"> -<namespace>http://richfaces.org/a4j</namespace> - -<tag> - <tag-name>ajaxListener</tag-name> - <handler-class> - org.ajax4jsf.taglib.html.facelets.AjaxListenerHandler - </handler-class> - - </tag><tag> - <tag-name>facet</tag-name> - <handler-class> - org.ajax4jsf.taglib.html.facelets.FacetHandler - </handler-class> - - </tag><tag> - <tag-name>keepAlive</tag-name> - <handler-class> - org.ajax4jsf.taglib.html.facelets.KeepAliveHandler - </handler-class> - </tag><tag> - <tag-name>jsFunction</tag-name> - <component> - <component-type>org.ajax4jsf.Function</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxFunctionRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>status</tag-name> - <component> - <component-type>org.ajax4jsf.Status</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxStatusRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>portlet</tag-name> - <component> - <component-type>org.ajax4jsf.Portlet</component-type> - </component> - - </tag><tag> - <tag-name>push</tag-name> - <component> - <component-type>org.ajax4jsf.Push</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxPushRenderer - </renderer-type> - <handler-class> - org.ajax4jsf.taglib.html.facelets.AjaxPushHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>repeat</tag-name> - <component> - <component-type>org.ajax4jsf.Repeat</component-type> - <renderer-type> - org.ajax4jsf.components.RepeatRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>commandButton</tag-name> - <component> - <component-type>org.ajax4jsf.CommandButton</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxCommandButtonRenderer - </renderer-type> - <handler-class> - org.ajax4jsf.webapp.taglib.AjaxComponentHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>actionparam</tag-name> - <component> - <component-type>org.ajax4jsf.ActionParameter</component-type> - <handler-class> - org.ajax4jsf.taglib.html.facelets.ActionParamHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>loadScript</tag-name> - <component> - <component-type>org.ajax4jsf.LoadScript</component-type> - <renderer-type> - org.ajax4jsf.LoadScriptRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>outputPanel</tag-name> - <component> - <component-type>org.ajax4jsf.OutputPanel</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxOutputPanelRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>loadBundle</tag-name> - <component> - <component-type>org.ajax4jsf.Bundle</component-type> - </component> - - </tag><tag> - <tag-name>mediaOutput</tag-name> - <component> - <component-type>org.ajax4jsf.MediaOutput</component-type> - <renderer-type> - org.ajax4jsf.MediaOutputRenderer - </renderer-type> - <handler-class> - org.ajax4jsf.taglib.html.facelets.MediaOutputHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>log</tag-name> - <component> - <component-type>org.ajax4jsf.Log</component-type> - <renderer-type> - org.ajax4jsf.LogRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>region</tag-name> - <component> - <component-type>org.ajax4jsf.AjaxRegion</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxRegionRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>form</tag-name> - <component> - <component-type>org.ajax4jsf.Form</component-type> - <renderer-type> - org.ajax4jsf.FormRenderer - </renderer-type> - <handler-class> - org.ajax4jsf.webapp.taglib.AjaxComponentHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>htmlCommandLink</tag-name> - <component> - <component-type>javax.faces.HtmlCommandLink</component-type> - <renderer-type> - org.ajax4jsf.HtmlCommandLinkRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>commandLink</tag-name> - <component> - <component-type>org.ajax4jsf.CommandLink</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxCommandLinkRenderer - </renderer-type> - <handler-class> - org.ajax4jsf.webapp.taglib.AjaxComponentHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>support</tag-name> - <component> - <component-type>org.ajax4jsf.Support</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxSupportRenderer - </renderer-type> - <handler-class> - org.ajax4jsf.taglib.html.facelets.AjaxSupportHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>loadStyle</tag-name> - <component> - <component-type>org.ajax4jsf.LoadStyle</component-type> - <renderer-type> - org.ajax4jsf.LoadStyleRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>poll</tag-name> - <component> - <component-type>org.ajax4jsf.Poll</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxPollRenderer - </renderer-type> - <handler-class> - org.ajax4jsf.webapp.taglib.AjaxComponentHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>page</tag-name> - <component> - <component-type>org.ajax4jsf.components.Page</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxPageRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>include</tag-name> - <component> - <component-type>org.ajax4jsf.Include</component-type> - <renderer-type> - org.ajax4jsf.components.AjaxIncludeRenderer - </renderer-type> - <handler-class> - org.ajax4jsf.taglib.html.facelets.IncludeHandler - </handler-class> - </component> - - </tag> -</facelet-taglib> \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/ajax4jsf.taglib.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/ajax4jsf.taglib.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/ajax4jsf.taglib.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/ajax4jsf.taglib.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,233 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE facelet-taglib PUBLIC + "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" + "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> +<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet"> +<namespace>http://richfaces.org/a4j</namespace> + +<tag> + <tag-name>ajaxListener</tag-name> + <handler-class> + org.ajax4jsf.taglib.html.facelets.AjaxListenerHandler + </handler-class> + + </tag><tag> + <tag-name>facet</tag-name> + <handler-class> + org.ajax4jsf.taglib.html.facelets.FacetHandler + </handler-class> + + </tag><tag> + <tag-name>keepAlive</tag-name> + <handler-class> + org.ajax4jsf.taglib.html.facelets.KeepAliveHandler + </handler-class> + </tag><tag> + <tag-name>jsFunction</tag-name> + <component> + <component-type>org.ajax4jsf.Function</component-type> + <renderer-type> + org.ajax4jsf.components.AjaxFunctionRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>status</tag-name> + <component> + <component-type>org.ajax4jsf.Status</component-type> + <renderer-type> + org.ajax4jsf.components.AjaxStatusRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>portlet</tag-name> + <component> + <component-type>org.ajax4jsf.Portlet</component-type> + </component> + + </tag><tag> + <tag-name>push</tag-name> + <component> + <component-type>org.ajax4jsf.Push</component-type> + <renderer-type> + org.ajax4jsf.components.AjaxPushRenderer + </renderer-type> + <handler-class> + org.ajax4jsf.taglib.html.facelets.AjaxPushHandler + </handler-class> + </component> + + </tag><tag> + <tag-name>repeat</tag-name> + <component> + <component-type>org.ajax4jsf.Repeat</component-type> + <renderer-type> + org.ajax4jsf.components.RepeatRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>commandButton</tag-name> + <component> + <component-type>org.ajax4jsf.CommandButton</component-type> + <renderer-type> + org.ajax4jsf.components.AjaxCommandButtonRenderer + </renderer-type> + <handler-class> + org.ajax4jsf.webapp.taglib.AjaxComponentHandler + </handler-class> + </component> + + </tag><tag> + <tag-name>actionparam</tag-name> + <component> + <component-type>org.ajax4jsf.ActionParameter</component-type> + <handler-class> + org.ajax4jsf.taglib.html.facelets.ActionParamHandler + </handler-class> + </component> + + </tag><tag> + <tag-name>loadScript</tag-name> + <component> + <component-type>org.ajax4jsf.LoadScript</component-type> + <renderer-type> + org.ajax4jsf.LoadScriptRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>outputPanel</tag-name> + <component> + <component-type>org.ajax4jsf.OutputPanel</component-type> + <renderer-type> + org.ajax4jsf.components.AjaxOutputPanelRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>loadBundle</tag-name> + <component> + <component-type>org.ajax4jsf.Bundle</component-type> + </component> + + </tag><tag> + <tag-name>mediaOutput</tag-name> + <component> + <component-type>org.ajax4jsf.MediaOutput</component-type> + <renderer-type> + org.ajax4jsf.MediaOutputRenderer + </renderer-type> + <handler-class> + org.ajax4jsf.taglib.html.facelets.MediaOutputHandler + </handler-class> + </component> + + </tag><tag> + <tag-name>log</tag-name> + <component> + <component-type>org.ajax4jsf.Log</component-type> + <renderer-type> + org.ajax4jsf.LogRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>region</tag-name> + <component> + <component-type>org.ajax4jsf.AjaxRegion</component-type> + <renderer-type> + org.ajax4jsf.components.AjaxRegionRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>form</tag-name> + <component> + <component-type>org.ajax4jsf.Form</component-type> + <renderer-type> + org.ajax4jsf.FormRenderer + </renderer-type> + <handler-class> + org.ajax4jsf.webapp.taglib.AjaxComponentHandler + </handler-class> + </component> + + </tag><tag> + <tag-name>htmlCommandLink</tag-name> + <component> + <component-type>javax.faces.HtmlCommandLink</component-type> + <renderer-type> + org.ajax4jsf.HtmlCommandLinkRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>commandLink</tag-name> + <component> + <component-type>org.ajax4jsf.CommandLink</component-type> + <renderer-type> + org.ajax4jsf.components.AjaxCommandLinkRenderer + </renderer-type> + <handler-class> + org.ajax4jsf.webapp.taglib.AjaxComponentHandler + </handler-class> + </component> + + </tag><tag> + <tag-name>support</tag-name> + <component> + <component-type>org.ajax4jsf.Support</component-type> + <renderer-type> + org.ajax4jsf.components.AjaxSupportRenderer + </renderer-type> + <handler-class> + org.ajax4jsf.taglib.html.facelets.AjaxSupportHandler + </handler-class> + </component> + + </tag><tag> + <tag-name>loadStyle</tag-name> + <component> + <component-type>org.ajax4jsf.LoadStyle</component-type> + <renderer-type> + org.ajax4jsf.LoadStyleRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>poll</tag-name> + <component> + <component-type>org.ajax4jsf.Poll</component-type> + <renderer-type> + org.ajax4jsf.components.AjaxPollRenderer + </renderer-type> + <handler-class> + org.ajax4jsf.webapp.taglib.AjaxComponentHandler + </handler-class> + </component> + + </tag><tag> + <tag-name>page</tag-name> + <component> + <component-type>org.ajax4jsf.components.Page</component-type> + <renderer-type> + org.ajax4jsf.components.AjaxPageRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>include</tag-name> + <component> + <component-type>org.ajax4jsf.Include</component-type> + <renderer-type> + org.ajax4jsf.components.AjaxIncludeRenderer + </renderer-type> + <handler-class> + org.ajax4jsf.taglib.html.facelets.IncludeHandler + </handler-class> + </component> + + </tag> +</facelet-taglib> \ No newline at end of file Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-core.taglib.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-core.taglib.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-core.taglib.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,26 +0,0 @@ -<?xml version="1.0"?> - - - -<!DOCTYPE facelet-taglib PUBLIC - "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" - "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> - -<facelet-taglib> - <library-class>com.sun.facelets.tag.jsf.core.CoreLibrary</library-class> -</facelet-taglib> \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-core.taglib.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-core.taglib.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-core.taglib.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-core.taglib.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,26 @@ +<?xml version="1.0"?> + + + +<!DOCTYPE facelet-taglib PUBLIC + "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" + "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> + +<facelet-taglib> + <library-class>com.sun.facelets.tag.jsf.core.CoreLibrary</library-class> +</facelet-taglib> \ No newline at end of file Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-html.taglib.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-html.taglib.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-html.taglib.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,26 +0,0 @@ -<?xml version="1.0"?> - - - -<!DOCTYPE facelet-taglib PUBLIC - "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" - "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> - -<facelet-taglib> - <library-class>com.sun.facelets.tag.jsf.html.HtmlLibrary</library-class> -</facelet-taglib> \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-html.taglib.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-html.taglib.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-html.taglib.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-html.taglib.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,26 @@ +<?xml version="1.0"?> + + + +<!DOCTYPE facelet-taglib PUBLIC + "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" + "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> + +<facelet-taglib> + <library-class>com.sun.facelets.tag.jsf.html.HtmlLibrary</library-class> +</facelet-taglib> \ No newline at end of file Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-ui.taglib.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-ui.taglib.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-ui.taglib.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,26 +0,0 @@ -<?xml version="1.0"?> - - - -<!DOCTYPE facelet-taglib PUBLIC - "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" - "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> - -<facelet-taglib> - <library-class>com.sun.facelets.tag.ui.UILibrary</library-class> -</facelet-taglib> \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-ui.taglib.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-ui.taglib.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-ui.taglib.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/jsf-ui.taglib.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,26 @@ +<?xml version="1.0"?> + + + +<!DOCTYPE facelet-taglib PUBLIC + "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" + "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> + +<facelet-taglib> + <library-class>com.sun.facelets.tag.ui.UILibrary</library-class> +</facelet-taglib> \ No newline at end of file Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/rich.taglib.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/rich.taglib.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/rich.taglib.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,546 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE facelet-taglib PUBLIC - "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" - "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> -<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet"> -<namespace>http://richfaces.org/rich</namespace> - -<tag> - <tag-name>dndParam</tag-name> - <component> - <component-type>org.richfaces.DndParam</component-type> - </component> - - </tag><tag> - <tag-name>dropSupport</tag-name> - <component> - <component-type>org.richfaces.DropSupport</component-type> - <renderer-type> - org.richfaces.DropSupportRenderer - </renderer-type> - <handler-class> - org.richfaces.taglib.DropSupportHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>dragIndicator</tag-name> - <component> - <component-type>org.richfaces.DragIndicator</component-type> - <renderer-type> - org.richfaces.DragIndicatorRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>dragSupport</tag-name> - <component> - <component-type>org.richfaces.DragSupport</component-type> - <renderer-type> - org.richfaces.DragSupportRenderer - </renderer-type> - <handler-class> - org.richfaces.taglib.DragSupportHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>dropListener</tag-name> - <handler-class> - org.richfaces.taglib.DropListenerHandler - </handler-class> - - </tag><tag> - <tag-name>dragListener</tag-name> - <handler-class> - org.richfaces.taglib.DragListenerHandler - </handler-class> - - </tag><tag> - <tag-name>effect</tag-name> - <component> - <component-type>org.richfaces.Effect</component-type> - <renderer-type> - org.richfaces.EffectRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>panel</tag-name> - <component> - <component-type>org.richfaces.panel</component-type> - <renderer-type> - org.richfaces.PanelRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>panelBar</tag-name> - <component> - <component-type>org.richfaces.PanelBar</component-type> - <renderer-type> - org.richfaces.PanelBarRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>panelBarItem</tag-name> - <component> - <component-type>org.richfaces.PanelBarItem</component-type> - <renderer-type> - org.richfaces.PanelBarItemRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>dataFilterSlider</tag-name> - <component> - <component-type>org.richfaces.DataFilterSlider</component-type> - <renderer-type> - org.richfaces.DataFilterSliderRenderer - </renderer-type> - <handler-class> - org.richfaces.taglib.DataFilterSliderTagHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>sliderListener</tag-name> - <handler-class> - org.richfaces.taglib.DataFilterSliderListenerTagHandler - </handler-class> - - </tag><tag> - <tag-name>gmap</tag-name> - <component> - <component-type>org.richfaces.Gmap</component-type> - <renderer-type> - org.richfaces.GmapRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>virtualEarth</tag-name> - <component> - <component-type>org.richfaces.VirtualEarth</component-type> - <renderer-type> - org.richfaces.VirtualEarthRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>separator</tag-name> - <component> - <component-type>org.richfaces.separator</component-type> - <renderer-type> - org.richfaces.SeparatorRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>spacer</tag-name> - <component> - <component-type>org.richfaces.spacer</component-type> - <renderer-type> - org.richfaces.SpacerRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>paint2D</tag-name> - <component> - <component-type>org.richfaces.Paint2D</component-type> - <renderer-type> - org.richfaces.Paint2DRenderer - </renderer-type> - <handler-class> - org.richfaces.taglib.Paint2DTagHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>togglePanel</tag-name> - <component> - <component-type>org.richfaces.TogglePanel</component-type> - <renderer-type> - org.richfaces.TogglePanelRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>toggleControl</tag-name> - <component> - <component-type>org.richfaces.ToggleControl</component-type> - <renderer-type> - org.richfaces.ToggleControlRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>tabPanel</tag-name> - <component> - <component-type>org.richfaces.TabPanel</component-type> - <renderer-type> - org.richfaces.TabPanelRenderer - </renderer-type> - <handler-class> - org.richfaces.taglib.TabPanelTagHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>tab</tag-name> - <component> - <component-type>org.richfaces.Tab</component-type> - <renderer-type> - org.richfaces.TabRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>simpleTogglePanel</tag-name> - <component> - <component-type>org.richfaces.SimpleTogglePanel</component-type> - <renderer-type> - org.richfaces.SimpleTogglePanelRenderer - </renderer-type> - <handler-class> - org.richfaces.taglib.SimpleTogglePanelTagHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>toolBar</tag-name> - <component> - <component-type>org.richfaces.ToolBar</component-type> - <renderer-type> - org.richfaces.ToolBarRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>toolBarGroup</tag-name> - <component> - <component-type>org.richfaces.ToolBarGroup</component-type> - <renderer-type> - org.richfaces.ToolBarGroupRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>inputNumberSlider</tag-name> - <component> - <component-type>org.richfaces.inputNumberSlider</component-type> - <renderer-type> - org.richfaces.InputNumberSliderRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>inputNumberSpinner</tag-name> - <component> - <component-type>org.richfaces.inputNumberSpinner</component-type> - <renderer-type> - org.richfaces.InputNumberSpinnerRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>tree</tag-name> - <component> - <component-type>org.richfaces.Tree</component-type> - <renderer-type> - org.richfaces.TreeRenderer - </renderer-type> - <handler-class> - org.richfaces.taglib.TreeTagHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>treeNode</tag-name> - <component> - <component-type>org.richfaces.TreeNode</component-type> - <renderer-type> - org.richfaces.TreeNodeRenderer - </renderer-type> - <handler-class> - org.richfaces.taglib.TreeNodeTagHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>dropListener</tag-name> - <handler-class> - org.richfaces.taglib.DropListenerHandler - </handler-class> - - </tag><tag> - <tag-name>dragListener</tag-name> - <handler-class> - org.richfaces.taglib.DragListenerHandler - </handler-class> - - </tag><tag> - <tag-name>changeExpandListener</tag-name> - <handler-class> - org.richfaces.taglib.ChangeExpandListenerTagHandler - </handler-class> - - </tag><tag> - <tag-name>nodeSelectListener</tag-name> - <handler-class> - org.richfaces.taglib.NodeSelectListenerTagHandler - </handler-class> - - </tag><tag> - <tag-name>suggestionbox</tag-name> - <component> - <component-type>org.richfaces.SuggestionBox</component-type> - <renderer-type> - org.richfaces.SuggestionBox - </renderer-type> - <handler-class> - org.richfaces.taglib.SuggestionBoxTagHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>subTable</tag-name> - <component> - <component-type>org.richfaces.SubTable</component-type> - <renderer-type> - org.richfaces.SubTableRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>column</tag-name> - <component> - <component-type>org.richfaces.Column</component-type> - <renderer-type> - org.richfaces.ColumnRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>dataList</tag-name> - <component> - <component-type>org.richfaces.DataList</component-type> - <renderer-type> - org.richfaces.DataListRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>dataOrderedList</tag-name> - <component> - <component-type>org.richfaces.DataOrderedList</component-type> - <renderer-type> - org.richfaces.DataOrderedListRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>dataDefinitionList</tag-name> - <component> - <component-type>org.richfaces.DataDefinitionList</component-type> - <renderer-type> - org.richfaces.DataDefinitionListRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>dataGrid</tag-name> - <component> - <component-type>org.richfaces.DataGrid</component-type> - <renderer-type> - org.richfaces.DataGridRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>dataTable</tag-name> - <component> - <component-type>org.richfaces.DataTable</component-type> - <renderer-type> - org.richfaces.DataTableRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>columnGroup</tag-name> - <component> - <component-type>org.richfaces.ColumnGroup</component-type> - <renderer-type> - org.richfaces.ColumnGroupRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>modalPanel</tag-name> - <component> - <component-type>org.richfaces.ModalPanel</component-type> - <renderer-type> - org.richfaces.ModalPanelRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>datascroller</tag-name> - <component> - <component-type>org.richfaces.Datascroller</component-type> - <renderer-type> - org.richfaces.DataScrollerRenderer - </renderer-type> - <handler-class> - org.richfaces.taglib.DataScrollerTagHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>scrollerListener</tag-name> - <handler-class> - org.richfaces.taglib.DataScrollerListenerTagHandler - </handler-class> - - </tag><tag> - <tag-name>menuGroup</tag-name> - <component> - <component-type>org.richfaces.MenuGroup</component-type> - <renderer-type> - org.richfaces.MenuGroupRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>menuItem</tag-name> - <component> - <component-type>org.richfaces.MenuItem</component-type> - <renderer-type> - org.richfaces.MenuItemRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>menuSeparator</tag-name> - <component> - <component-type>org.richfaces.MenuSeparator</component-type> - <renderer-type> - org.richfaces.MenuSeparatorRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>dropDownMenu</tag-name> - <component> - <component-type>org.richfaces.DropDownMenu</component-type> - <renderer-type> - org.richfaces.DropDownMenuRenderer - </renderer-type> - <handler-class> - org.richfaces.taglib.DropDownMenuTagHandler - </handler-class> - </component> - - </tag><tag> - <tag-name>toolTip</tag-name> - <component> - <component-type>org.richfaces.component.ToolTip</component-type> - <renderer-type> - org.richfaces.renderkit.html.ToolTipRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>panelMenu</tag-name> - <component> - <component-type>org.richfaces.PanelMenu</component-type> - <renderer-type> - org.richfaces.PanelMenuRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>panelMenuGroup</tag-name> - <component> - <component-type>org.richfaces.PanelMenuGroup</component-type> - <renderer-type> - org.richfaces.PanelMenuGroupRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>panelMenuItem</tag-name> - <component> - <component-type>org.richfaces.PanelMenuItem</component-type> - <renderer-type> - org.richfaces.PanelMenuItemRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>calendar</tag-name> - <component> - <component-type>org.richfaces.Calendar</component-type> - <renderer-type> - org.richfaces.CalendarRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>currentDateChangeListener</tag-name> - <handler-class> - org.richfaces.taglib.CurrentDateChangeListenerTagHandler - </handler-class> - - </tag><tag> - <tag-name>treeNodesAdaptor</tag-name> - <component> - <component-type>org.richfaces.TreeNodesAdaptor</component-type> - </component> - - </tag><tag> - <tag-name>recursiveTreeNodesAdaptor</tag-name> - <component> - <component-type>org.richfaces.RecursiveTreeNodesAdaptor</component-type> - </component> - - </tag><tag> - <tag-name>message</tag-name> - <component> - <component-type>org.richfaces.component.RichMessage</component-type> - <renderer-type> - org.richfaces.RichMessageRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>messages</tag-name> - <component> - <component-type>org.richfaces.component.RichMessages</component-type> - <renderer-type> - org.richfaces.RichMessagesRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>scrollableDataTable</tag-name> - <component> - <component-type>org.richfaces.component.ScrollableDataTable</component-type> - <renderer-type> - org.richfaces.renderkit.html.ScrollableDataTableRenderer - </renderer-type> - </component> - - </tag><tag> - <tag-name>insert</tag-name> - <component> - <component-type>org.richfaces.ui.Insert</component-type> - <renderer-type> - org.richfaces.ui.InsertRenderer - </renderer-type> - </component> - - </tag> -</facelet-taglib> \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/rich.taglib.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/rich.taglib.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/rich.taglib.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/rich.taglib.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,546 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE facelet-taglib PUBLIC + "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" + "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> +<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet"> +<namespace>http://richfaces.org/rich</namespace> + +<tag> + <tag-name>dndParam</tag-name> + <component> + <component-type>org.richfaces.DndParam</component-type> + </component> + + </tag><tag> + <tag-name>dropSupport</tag-name> + <component> + <component-type>org.richfaces.DropSupport</component-type> + <renderer-type> + org.richfaces.DropSupportRenderer + </renderer-type> + <handler-class> + org.richfaces.taglib.DropSupportHandler + </handler-class> + </component> + + </tag><tag> + <tag-name>dragIndicator</tag-name> + <component> + <component-type>org.richfaces.DragIndicator</component-type> + <renderer-type> + org.richfaces.DragIndicatorRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>dragSupport</tag-name> + <component> + <component-type>org.richfaces.DragSupport</component-type> + <renderer-type> + org.richfaces.DragSupportRenderer + </renderer-type> + <handler-class> + org.richfaces.taglib.DragSupportHandler + </handler-class> + </component> + + </tag><tag> + <tag-name>dropListener</tag-name> + <handler-class> + org.richfaces.taglib.DropListenerHandler + </handler-class> + + </tag><tag> + <tag-name>dragListener</tag-name> + <handler-class> + org.richfaces.taglib.DragListenerHandler + </handler-class> + + </tag><tag> + <tag-name>effect</tag-name> + <component> + <component-type>org.richfaces.Effect</component-type> + <renderer-type> + org.richfaces.EffectRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>panel</tag-name> + <component> + <component-type>org.richfaces.panel</component-type> + <renderer-type> + org.richfaces.PanelRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>panelBar</tag-name> + <component> + <component-type>org.richfaces.PanelBar</component-type> + <renderer-type> + org.richfaces.PanelBarRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>panelBarItem</tag-name> + <component> + <component-type>org.richfaces.PanelBarItem</component-type> + <renderer-type> + org.richfaces.PanelBarItemRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>dataFilterSlider</tag-name> + <component> + <component-type>org.richfaces.DataFilterSlider</component-type> + <renderer-type> + org.richfaces.DataFilterSliderRenderer + </renderer-type> + <handler-class> + org.richfaces.taglib.DataFilterSliderTagHandler + </handler-class> + </component> + + </tag><tag> + <tag-name>sliderListener</tag-name> + <handler-class> + org.richfaces.taglib.DataFilterSliderListenerTagHandler + </handler-class> + + </tag><tag> + <tag-name>gmap</tag-name> + <component> + <component-type>org.richfaces.Gmap</component-type> + <renderer-type> + org.richfaces.GmapRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>virtualEarth</tag-name> + <component> + <component-type>org.richfaces.VirtualEarth</component-type> + <renderer-type> + org.richfaces.VirtualEarthRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>separator</tag-name> + <component> + <component-type>org.richfaces.separator</component-type> + <renderer-type> + org.richfaces.SeparatorRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>spacer</tag-name> + <component> + <component-type>org.richfaces.spacer</component-type> + <renderer-type> + org.richfaces.SpacerRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>paint2D</tag-name> + <component> + <component-type>org.richfaces.Paint2D</component-type> + <renderer-type> + org.richfaces.Paint2DRenderer + </renderer-type> + <handler-class> + org.richfaces.taglib.Paint2DTagHandler + </handler-class> + </component> + + </tag><tag> + <tag-name>togglePanel</tag-name> + <component> + <component-type>org.richfaces.TogglePanel</component-type> + <renderer-type> + org.richfaces.TogglePanelRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>toggleControl</tag-name> + <component> + <component-type>org.richfaces.ToggleControl</component-type> + <renderer-type> + org.richfaces.ToggleControlRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>tabPanel</tag-name> + <component> + <component-type>org.richfaces.TabPanel</component-type> + <renderer-type> + org.richfaces.TabPanelRenderer + </renderer-type> + <handler-class> + org.richfaces.taglib.TabPanelTagHandler + </handler-class> + </component> + + </tag><tag> + <tag-name>tab</tag-name> + <component> + <component-type>org.richfaces.Tab</component-type> + <renderer-type> + org.richfaces.TabRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>simpleTogglePanel</tag-name> + <component> + <component-type>org.richfaces.SimpleTogglePanel</component-type> + <renderer-type> + org.richfaces.SimpleTogglePanelRenderer + </renderer-type> + <handler-class> + org.richfaces.taglib.SimpleTogglePanelTagHandler + </handler-class> + </component> + + </tag><tag> + <tag-name>toolBar</tag-name> + <component> + <component-type>org.richfaces.ToolBar</component-type> + <renderer-type> + org.richfaces.ToolBarRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>toolBarGroup</tag-name> + <component> + <component-type>org.richfaces.ToolBarGroup</component-type> + <renderer-type> + org.richfaces.ToolBarGroupRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>inputNumberSlider</tag-name> + <component> + <component-type>org.richfaces.inputNumberSlider</component-type> + <renderer-type> + org.richfaces.InputNumberSliderRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>inputNumberSpinner</tag-name> + <component> + <component-type>org.richfaces.inputNumberSpinner</component-type> + <renderer-type> + org.richfaces.InputNumberSpinnerRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>tree</tag-name> + <component> + <component-type>org.richfaces.Tree</component-type> + <renderer-type> + org.richfaces.TreeRenderer + </renderer-type> + <handler-class> + org.richfaces.taglib.TreeTagHandler + </handler-class> + </component> + + </tag><tag> + <tag-name>treeNode</tag-name> + <component> + <component-type>org.richfaces.TreeNode</component-type> + <renderer-type> + org.richfaces.TreeNodeRenderer + </renderer-type> + <handler-class> + org.richfaces.taglib.TreeNodeTagHandler + </handler-class> + </component> + + </tag><tag> + <tag-name>dropListener</tag-name> + <handler-class> + org.richfaces.taglib.DropListenerHandler + </handler-class> + + </tag><tag> + <tag-name>dragListener</tag-name> + <handler-class> + org.richfaces.taglib.DragListenerHandler + </handler-class> + + </tag><tag> + <tag-name>changeExpandListener</tag-name> + <handler-class> + org.richfaces.taglib.ChangeExpandListenerTagHandler + </handler-class> + + </tag><tag> + <tag-name>nodeSelectListener</tag-name> + <handler-class> + org.richfaces.taglib.NodeSelectListenerTagHandler + </handler-class> + + </tag><tag> + <tag-name>suggestionbox</tag-name> + <component> + <component-type>org.richfaces.SuggestionBox</component-type> + <renderer-type> + org.richfaces.SuggestionBox + </renderer-type> + <handler-class> + org.richfaces.taglib.SuggestionBoxTagHandler + </handler-class> + </component> + + </tag><tag> + <tag-name>subTable</tag-name> + <component> + <component-type>org.richfaces.SubTable</component-type> + <renderer-type> + org.richfaces.SubTableRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>column</tag-name> + <component> + <component-type>org.richfaces.Column</component-type> + <renderer-type> + org.richfaces.ColumnRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>dataList</tag-name> + <component> + <component-type>org.richfaces.DataList</component-type> + <renderer-type> + org.richfaces.DataListRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>dataOrderedList</tag-name> + <component> + <component-type>org.richfaces.DataOrderedList</component-type> + <renderer-type> + org.richfaces.DataOrderedListRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>dataDefinitionList</tag-name> + <component> + <component-type>org.richfaces.DataDefinitionList</component-type> + <renderer-type> + org.richfaces.DataDefinitionListRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>dataGrid</tag-name> + <component> + <component-type>org.richfaces.DataGrid</component-type> + <renderer-type> + org.richfaces.DataGridRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>dataTable</tag-name> + <component> + <component-type>org.richfaces.DataTable</component-type> + <renderer-type> + org.richfaces.DataTableRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>columnGroup</tag-name> + <component> + <component-type>org.richfaces.ColumnGroup</component-type> + <renderer-type> + org.richfaces.ColumnGroupRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>modalPanel</tag-name> + <component> + <component-type>org.richfaces.ModalPanel</component-type> + <renderer-type> + org.richfaces.ModalPanelRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>datascroller</tag-name> + <component> + <component-type>org.richfaces.Datascroller</component-type> + <renderer-type> + org.richfaces.DataScrollerRenderer + </renderer-type> + <handler-class> + org.richfaces.taglib.DataScrollerTagHandler + </handler-class> + </component> + + </tag><tag> + <tag-name>scrollerListener</tag-name> + <handler-class> + org.richfaces.taglib.DataScrollerListenerTagHandler + </handler-class> + + </tag><tag> + <tag-name>menuGroup</tag-name> + <component> + <component-type>org.richfaces.MenuGroup</component-type> + <renderer-type> + org.richfaces.MenuGroupRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>menuItem</tag-name> + <component> + <component-type>org.richfaces.MenuItem</component-type> + <renderer-type> + org.richfaces.MenuItemRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>menuSeparator</tag-name> + <component> + <component-type>org.richfaces.MenuSeparator</component-type> + <renderer-type> + org.richfaces.MenuSeparatorRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>dropDownMenu</tag-name> + <component> + <component-type>org.richfaces.DropDownMenu</component-type> + <renderer-type> + org.richfaces.DropDownMenuRenderer + </renderer-type> + <handler-class> + org.richfaces.taglib.DropDownMenuTagHandler + </handler-class> + </component> + + </tag><tag> + <tag-name>toolTip</tag-name> + <component> + <component-type>org.richfaces.component.ToolTip</component-type> + <renderer-type> + org.richfaces.renderkit.html.ToolTipRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>panelMenu</tag-name> + <component> + <component-type>org.richfaces.PanelMenu</component-type> + <renderer-type> + org.richfaces.PanelMenuRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>panelMenuGroup</tag-name> + <component> + <component-type>org.richfaces.PanelMenuGroup</component-type> + <renderer-type> + org.richfaces.PanelMenuGroupRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>panelMenuItem</tag-name> + <component> + <component-type>org.richfaces.PanelMenuItem</component-type> + <renderer-type> + org.richfaces.PanelMenuItemRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>calendar</tag-name> + <component> + <component-type>org.richfaces.Calendar</component-type> + <renderer-type> + org.richfaces.CalendarRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>currentDateChangeListener</tag-name> + <handler-class> + org.richfaces.taglib.CurrentDateChangeListenerTagHandler + </handler-class> + + </tag><tag> + <tag-name>treeNodesAdaptor</tag-name> + <component> + <component-type>org.richfaces.TreeNodesAdaptor</component-type> + </component> + + </tag><tag> + <tag-name>recursiveTreeNodesAdaptor</tag-name> + <component> + <component-type>org.richfaces.RecursiveTreeNodesAdaptor</component-type> + </component> + + </tag><tag> + <tag-name>message</tag-name> + <component> + <component-type>org.richfaces.component.RichMessage</component-type> + <renderer-type> + org.richfaces.RichMessageRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>messages</tag-name> + <component> + <component-type>org.richfaces.component.RichMessages</component-type> + <renderer-type> + org.richfaces.RichMessagesRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>scrollableDataTable</tag-name> + <component> + <component-type>org.richfaces.component.ScrollableDataTable</component-type> + <renderer-type> + org.richfaces.renderkit.html.ScrollableDataTableRenderer + </renderer-type> + </component> + + </tag><tag> + <tag-name>insert</tag-name> + <component> + <component-type>org.richfaces.ui.Insert</component-type> + <renderer-type> + org.richfaces.ui.InsertRenderer + </renderer-type> + </component> + + </tag> +</facelet-taglib> \ No newline at end of file Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/s.taglib.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/s.taglib.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/s.taglib.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,196 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE facelet-taglib PUBLIC - "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" - "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> -<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet"> - <namespace>http://jboss.com/products/seam/taglib</namespace> - - - - <tag> - <tag-name>button</tag-name> - <component> - <component-type>org.jboss.seam.ui.Button</component-type> - <renderer-type>org.jboss.seam.ui.ButtonRenderer</renderer-type> - </component> - </tag> - <tag> - <tag-name>cache</tag-name> - <component> - <component-type>org.jboss.seam.ui.Cache</component-type> - <renderer-type>org.jboss.seam.ui.CacheRenderer</renderer-type> - </component> - </tag> - <tag> - <tag-name>conversationId</tag-name> - <component> - <component-type>org.jboss.seam.ui.ConversationId</component-type> - </component> - </tag> - <tag> - <tag-name>conversationPropagation</tag-name> - <component> - <component-type>org.jboss.seam.ui.ConversationPropagation</component-type> - </component> - </tag> - <tag> - <tag-name>decorate</tag-name> - <component> - <component-type>org.jboss.seam.ui.Decorate</component-type> - <renderer-type>org.jboss.seam.ui.DecorateRenderer</renderer-type> - <handler-class>org.jboss.seam.ui.handler.DecorateHandler</handler-class> - </component> - </tag> - <tag> - <tag-name>div</tag-name> - <component> - <component-type>org.jboss.seam.ui.Div</component-type> - <renderer-type>org.jboss.seam.ui.DivRenderer</renderer-type> - </component> - </tag> - <tag> - <tag-name>enumItem</tag-name> - <component> - <component-type>org.jboss.seam.ui.EnumItem</component-type> - </component> - </tag> - <tag> - <tag-name>fileUpload</tag-name> - <component> - <component-type>org.jboss.seam.ui.FileUpload</component-type> - <renderer-type>org.jboss.seam.ui.FileUploadRenderer</renderer-type> - </component> - </tag> - <tag> - <tag-name>formattedText</tag-name> - <component> - <component-type>org.jboss.seam.ui.FormattedText</component-type> - <renderer-type>org.jboss.seam.ui.FormattedTextRenderer</renderer-type> - </component> - </tag> - <tag> - <tag-name>fragment</tag-name> - <component> - <component-type>org.jboss.seam.ui.Fragment</component-type> - <renderer-type>org.jboss.seam.ui.FragmentRenderer</renderer-type> - </component> - </tag> - <tag> - <tag-name>graphicImage</tag-name> - <component> - <component-type>org.jboss.seam.ui.graphicImage.GraphicImage</component-type> - <renderer-type>org.jboss.seam.ui.GraphicImageRenderer</renderer-type> - </component> - </tag> - <tag> - <tag-name>label</tag-name> - <component> - <component-type>org.jboss.seam.ui.Label</component-type> - </component> - </tag> - <tag> - <tag-name>link</tag-name> - <component> - <component-type>org.jboss.seam.ui.Link</component-type> - <renderer-type>org.jboss.seam.ui.LinkRenderer</renderer-type> - </component> - </tag> - <tag> - <tag-name>loadStyle</tag-name> - <component> - <component-type>org.jboss.seam.ui.LoadStyle</component-type> - </component> - </tag> - <tag> - <tag-name>message</tag-name> - <component> - <component-type>org.jboss.seam.ui.Message</component-type> - </component> - </tag> - <tag> - <tag-name>selectDate</tag-name> - <component> - <component-type>org.jboss.seam.ui.SelectDate</component-type> - <renderer-type>org.jboss.seam.ui.SelectDateRenderer</renderer-type> - </component> - </tag> - <tag> - <tag-name>selection</tag-name> - <component> - <component-type>org.jboss.seam.ui.Selection</component-type> - </component> - </tag> - <tag> - <tag-name>selectItems</tag-name> - <component> - <component-type>org.jboss.seam.ui.SelectItems</component-type> - </component> - </tag> - <tag> - <tag-name>span</tag-name> - <component> - <component-type>org.jboss.seam.ui.Span</component-type> - <renderer-type>org.jboss.seam.ui.SpanRenderer</renderer-type> - </component> - </tag> - <tag> - <tag-name>taskId</tag-name> - <component> - <component-type>org.jboss.seam.ui.TaskId</component-type> - </component> - </tag> - <tag> - <tag-name>transformImageBlur</tag-name> - <component> - <component-type>org.jboss.seam.ui.graphicImage.TransformImageBlur</component-type> - </component> - </tag> - <tag> - <tag-name>transformImageSize</tag-name> - <component> - <component-type>org.jboss.seam.ui.graphicImage.TransformImageSize</component-type> - </component> - </tag> - <tag> - <tag-name>transformImageType</tag-name> - <component> - <component-type>org.jboss.seam.ui.graphicImage.TransformImageType</component-type> - </component> - </tag> - <tag> - <tag-name>validateAll</tag-name> - <component> - <component-type>org.jboss.seam.ui.ValidateAll</component-type> - <renderer-type>org.jboss.seam.ui.ValidateAllRenderer</renderer-type> - </component> - </tag> - - <tag> - <tag-name>validate</tag-name> - <validator> - <validator-id>org.jboss.seam.ui.ModelValidator</validator-id> - </validator> - </tag> - - <tag> - <tag-name>convertDateTime</tag-name> - <converter> - <converter-id>org.jboss.seam.ui.DateTimeConverter</converter-id> - </converter> - </tag> - <tag> - <tag-name>convertEntity</tag-name> - <converter> - <converter-id>org.jboss.seam.ui.EntityConverter</converter-id> - </converter> - </tag> - <tag> - <tag-name>convertEnum</tag-name> - <converter> - <converter-id>org.jboss.seam.ui.EnumConverter</converter-id> - </converter> - </tag> - - - -</facelet-taglib> \ No newline at end of file Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/s.taglib.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/s.taglib.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/s.taglib.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/META-INF/s.taglib.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,196 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE facelet-taglib PUBLIC + "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN" + "http://java.sun.com/dtd/facelet-taglib_1_0.dtd"> +<facelet-taglib xmlns="http://java.sun.com/JSF/Facelet"> + <namespace>http://jboss.com/products/seam/taglib</namespace> + + + + <tag> + <tag-name>button</tag-name> + <component> + <component-type>org.jboss.seam.ui.Button</component-type> + <renderer-type>org.jboss.seam.ui.ButtonRenderer</renderer-type> + </component> + </tag> + <tag> + <tag-name>cache</tag-name> + <component> + <component-type>org.jboss.seam.ui.Cache</component-type> + <renderer-type>org.jboss.seam.ui.CacheRenderer</renderer-type> + </component> + </tag> + <tag> + <tag-name>conversationId</tag-name> + <component> + <component-type>org.jboss.seam.ui.ConversationId</component-type> + </component> + </tag> + <tag> + <tag-name>conversationPropagation</tag-name> + <component> + <component-type>org.jboss.seam.ui.ConversationPropagation</component-type> + </component> + </tag> + <tag> + <tag-name>decorate</tag-name> + <component> + <component-type>org.jboss.seam.ui.Decorate</component-type> + <renderer-type>org.jboss.seam.ui.DecorateRenderer</renderer-type> + <handler-class>org.jboss.seam.ui.handler.DecorateHandler</handler-class> + </component> + </tag> + <tag> + <tag-name>div</tag-name> + <component> + <component-type>org.jboss.seam.ui.Div</component-type> + <renderer-type>org.jboss.seam.ui.DivRenderer</renderer-type> + </component> + </tag> + <tag> + <tag-name>enumItem</tag-name> + <component> + <component-type>org.jboss.seam.ui.EnumItem</component-type> + </component> + </tag> + <tag> + <tag-name>fileUpload</tag-name> + <component> + <component-type>org.jboss.seam.ui.FileUpload</component-type> + <renderer-type>org.jboss.seam.ui.FileUploadRenderer</renderer-type> + </component> + </tag> + <tag> + <tag-name>formattedText</tag-name> + <component> + <component-type>org.jboss.seam.ui.FormattedText</component-type> + <renderer-type>org.jboss.seam.ui.FormattedTextRenderer</renderer-type> + </component> + </tag> + <tag> + <tag-name>fragment</tag-name> + <component> + <component-type>org.jboss.seam.ui.Fragment</component-type> + <renderer-type>org.jboss.seam.ui.FragmentRenderer</renderer-type> + </component> + </tag> + <tag> + <tag-name>graphicImage</tag-name> + <component> + <component-type>org.jboss.seam.ui.graphicImage.GraphicImage</component-type> + <renderer-type>org.jboss.seam.ui.GraphicImageRenderer</renderer-type> + </component> + </tag> + <tag> + <tag-name>label</tag-name> + <component> + <component-type>org.jboss.seam.ui.Label</component-type> + </component> + </tag> + <tag> + <tag-name>link</tag-name> + <component> + <component-type>org.jboss.seam.ui.Link</component-type> + <renderer-type>org.jboss.seam.ui.LinkRenderer</renderer-type> + </component> + </tag> + <tag> + <tag-name>loadStyle</tag-name> + <component> + <component-type>org.jboss.seam.ui.LoadStyle</component-type> + </component> + </tag> + <tag> + <tag-name>message</tag-name> + <component> + <component-type>org.jboss.seam.ui.Message</component-type> + </component> + </tag> + <tag> + <tag-name>selectDate</tag-name> + <component> + <component-type>org.jboss.seam.ui.SelectDate</component-type> + <renderer-type>org.jboss.seam.ui.SelectDateRenderer</renderer-type> + </component> + </tag> + <tag> + <tag-name>selection</tag-name> + <component> + <component-type>org.jboss.seam.ui.Selection</component-type> + </component> + </tag> + <tag> + <tag-name>selectItems</tag-name> + <component> + <component-type>org.jboss.seam.ui.SelectItems</component-type> + </component> + </tag> + <tag> + <tag-name>span</tag-name> + <component> + <component-type>org.jboss.seam.ui.Span</component-type> + <renderer-type>org.jboss.seam.ui.SpanRenderer</renderer-type> + </component> + </tag> + <tag> + <tag-name>taskId</tag-name> + <component> + <component-type>org.jboss.seam.ui.TaskId</component-type> + </component> + </tag> + <tag> + <tag-name>transformImageBlur</tag-name> + <component> + <component-type>org.jboss.seam.ui.graphicImage.TransformImageBlur</component-type> + </component> + </tag> + <tag> + <tag-name>transformImageSize</tag-name> + <component> + <component-type>org.jboss.seam.ui.graphicImage.TransformImageSize</component-type> + </component> + </tag> + <tag> + <tag-name>transformImageType</tag-name> + <component> + <component-type>org.jboss.seam.ui.graphicImage.TransformImageType</component-type> + </component> + </tag> + <tag> + <tag-name>validateAll</tag-name> + <component> + <component-type>org.jboss.seam.ui.ValidateAll</component-type> + <renderer-type>org.jboss.seam.ui.ValidateAllRenderer</renderer-type> + </component> + </tag> + + <tag> + <tag-name>validate</tag-name> + <validator> + <validator-id>org.jboss.seam.ui.ModelValidator</validator-id> + </validator> + </tag> + + <tag> + <tag-name>convertDateTime</tag-name> + <converter> + <converter-id>org.jboss.seam.ui.DateTimeConverter</converter-id> + </converter> + </tag> + <tag> + <tag-name>convertEntity</tag-name> + <converter> + <converter-id>org.jboss.seam.ui.EntityConverter</converter-id> + </converter> + </tag> + <tag> + <tag-name>convertEnum</tag-name> + <converter> + <converter-id>org.jboss.seam.ui.EnumConverter</converter-id> + </converter> + </tag> + + + +</facelet-taglib> \ No newline at end of file Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/GlassfishDerbyDialect.class =================================================================== (Binary files differ) Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/GlassfishDerbyDialect.class (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/GlassfishDerbyDialect.class) =================================================================== (Binary files differ) Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> - - - - - - - - - - - -<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - - <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> - <param name="Target" value="System.out"/> - - <layout class="org.apache.log4j.PatternLayout"> - <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/> - </layout> - </appender> - -  - -  - -  - - <root> - <priority value="INFO"/> - <appender-ref ref="CONSOLE"/> - </root> - -</log4j:configuration> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/classes/log4j.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd"> + + + + + + + + + + + +<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> + + <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender"> + <param name="Target" value="System.out"/> + + <layout class="org.apache.log4j.PatternLayout"> + <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n"/> + </layout> + </appender> + +  + +  + +  + + <root> + <priority value="INFO"/> + <appender-ref ref="CONSOLE"/> + </root> + +</log4j:configuration> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/components.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/components.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,31 +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:persistence="http://jboss.com/products/seam/persistence" - xmlns:security="http://jboss.com/products/seam/security" - xmlns:web="http://jboss.com/products/seam/web" - 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/persistence http://jboss.com/products/seam/persistence-2.3.xsd - http://jboss.com/products/seam/web http://jboss.com/products/seam/web-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 debug="true"/> - - <core:manager conversation-timeout="120000" - concurrent-request-timeout="500" - conversation-id-parameter="cid"/> - - <persistence:hibernate-session-factory name="hibernateSessionFactory"/> - - <persistence:managed-hibernate-session name="bookingDatabase" - auto-create="true" - session-factory-jndi-name="bookingDatabase"/> - - <security:identity authenticate-method="#{authenticator.authenticate}"/> - -  - <web:ajax4jsf-filter disabled="true" /> -</components> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/components.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/components.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/components.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<components xmlns="http://jboss.com/products/seam/components" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:persistence="http://jboss.com/products/seam/persistence" + xmlns:security="http://jboss.com/products/seam/security" + xmlns:web="http://jboss.com/products/seam/web" + 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/persistence http://jboss.com/products/seam/persistence-2.3.xsd + http://jboss.com/products/seam/web http://jboss.com/products/seam/web-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 debug="true"/> + + <core:manager conversation-timeout="120000" + concurrent-request-timeout="500" + conversation-id-parameter="cid"/> + + <persistence:hibernate-session-factory name="hibernateSessionFactory"/> + + <persistence:managed-hibernate-session name="bookingDatabase" + auto-create="true" + session-factory-jndi-name="bookingDatabase"/> + + <security:identity authenticate-method="#{authenticator.authenticate}"/> + +  + <web:ajax4jsf-filter disabled="true" /> +</components> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/faces-config.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/faces-config.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<faces-config version="1.2" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> - -  - - <application> - <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> - </application> - -</faces-config> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/faces-config.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/faces-config.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/faces-config.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/faces-config.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="1.2" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> + +  + + <application> + <view-handler>com.sun.facelets.FaceletViewHandler</view-handler> + </application> + +</faces-config> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/pages.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/pages.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,113 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<pages xmlns="http://jboss.com/products/seam/pages" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.3.xsd" - - no-conversation-view-id="/main.xhtml" - login-view-id="/home.xhtml"> - - <page view-id="/register.xhtml"> - - <action if="#{validation.failed}" execute="#{register.invalid}"/> - - <navigation> - <rule if="#{register.registered}"> - <redirect view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> - - <navigation from-action="#{identity.isLoggedIn}"> - <rule if-outcome="true"> - <redirect view-id="/main.xhtml"/> - </rule> - <rule if-outcome="false"> - <render view-id="/home.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/password.xhtml" - login-required="true"> - - <navigation> - <rule if="#{changePassword.changed}"> - <redirect view-id="/main.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/main.xhtml" - login-required="true"> - - <navigation from-action="#{hotelBooking.selectHotel(hot)}"> - <redirect view-id="/hotel.xhtml"/> - </navigation> - - </page> - - <page view-id="/hotel.xhtml" - conversation-required="true"> - - <description>View hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.bookHotel}"> - <redirect view-id="/book.xhtml"/> - </navigation> - - </page> - - <page view-id="/book.xhtml" - conversation-required="true"> - - <description>Book hotel: #{hotel.name}</description> - - <navigation from-action="#{hotelBooking.setBookingDetails}"> - <rule if="#{hotelBooking.bookingValid}"> - <redirect view-id="/confirm.xhtml"/> - </rule> - </navigation> - - </page> - - <page view-id="/confirm.xhtml" - conversation-required="true"> - - <description>Confirm booking: #{booking.description}</description> - - <navigation from-action="#{hotelBooking.confirm}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <page view-id="*"> - - <navigation from-action="#{identity.logout}"> - <redirect view-id="/home.xhtml"/> - </navigation> - - <navigation from-action="#{hotelBooking.cancel}"> - <redirect view-id="/main.xhtml"/> - </navigation> - - </page> - - <exception class="org.jboss.seam.security.NotLoggedInException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">You must be logged in to use this feature</message> - </redirect> - </exception> - - <exception class="javax.faces.application.ViewExpiredException"> - <redirect view-id="/home.xhtml"> - <message severity="warn">Session expired, please log in again</message> - </redirect> - </exception> - -</pages> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/pages.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/pages.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/pages.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/pages.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> +<pages xmlns="http://jboss.com/products/seam/pages" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.3.xsd" + + no-conversation-view-id="/main.xhtml" + login-view-id="/home.xhtml"> + + <page view-id="/register.xhtml"> + + <action if="#{validation.failed}" execute="#{register.invalid}"/> + + <navigation> + <rule if="#{register.registered}"> + <redirect view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/home.xhtml" action="#{identity.isLoggedIn}"> + + <navigation from-action="#{identity.isLoggedIn}"> + <rule if-outcome="true"> + <redirect view-id="/main.xhtml"/> + </rule> + <rule if-outcome="false"> + <render view-id="/home.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/password.xhtml" + login-required="true"> + + <navigation> + <rule if="#{changePassword.changed}"> + <redirect view-id="/main.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/main.xhtml" + login-required="true"> + + <navigation from-action="#{hotelBooking.selectHotel(hot)}"> + <redirect view-id="/hotel.xhtml"/> + </navigation> + + </page> + + <page view-id="/hotel.xhtml" + conversation-required="true"> + + <description>View hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.bookHotel}"> + <redirect view-id="/book.xhtml"/> + </navigation> + + </page> + + <page view-id="/book.xhtml" + conversation-required="true"> + + <description>Book hotel: #{hotel.name}</description> + + <navigation from-action="#{hotelBooking.setBookingDetails}"> + <rule if="#{hotelBooking.bookingValid}"> + <redirect view-id="/confirm.xhtml"/> + </rule> + </navigation> + + </page> + + <page view-id="/confirm.xhtml" + conversation-required="true"> + + <description>Confirm booking: #{booking.description}</description> + + <navigation from-action="#{hotelBooking.confirm}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <page view-id="*"> + + <navigation from-action="#{identity.logout}"> + <redirect view-id="/home.xhtml"/> + </navigation> + + <navigation from-action="#{hotelBooking.cancel}"> + <redirect view-id="/main.xhtml"/> + </navigation> + + </page> + + <exception class="org.jboss.seam.security.NotLoggedInException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">You must be logged in to use this feature</message> + </redirect> + </exception> + + <exception class="javax.faces.application.ViewExpiredException"> + <redirect view-id="/home.xhtml"> + <message severity="warn">Session expired, please log in again</message> + </redirect> + </exception> + +</pages> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/web.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/web.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,84 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<web-app id="WebApp_ID" version="2.5" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee - http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - -  - <filter> - <display-name>RichFaces Filter</display-name> - <filter-name>richfaces</filter-name> - <filter-class>org.ajax4jsf.Filter</filter-class> - </filter> - - <filter-mapping> - <filter-name>richfaces</filter-name> - <servlet-name>Faces Servlet</servlet-name> - <dispatcher>REQUEST</dispatcher> - <dispatcher>FORWARD</dispatcher> - <dispatcher>INCLUDE</dispatcher> - </filter-mapping> - -  - <listener> - <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> - </listener> - <filter> - <filter-name>Seam Filter</filter-name> - <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>Seam Filter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <servlet> - <servlet-name>Seam Resource Servlet</servlet-name> - <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>Seam Resource Servlet</servlet-name> - <url-pattern>/seam/resource/*</url-pattern> - </servlet-mapping> - - -  - - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - -  - - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.seam</url-pattern> - </servlet-mapping> - -  - - <context-param> - <param-name>javax.faces.DEFAULT_SUFFIX</param-name> - <param-value>.xhtml</param-value> - </context-param> - - <context-param> - <param-name>facelets.DEVELOPMENT</param-name> - <param-value>true</param-value> - </context-param> - - <listener> - <listener-class>com.sun.faces.config.ConfigureListener</listener-class> - </listener> - - <session-config> - <session-timeout>10</session-timeout> - </session-config> - - -</web-app> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/web.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/web.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/WEB-INF/web.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,84 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app id="WebApp_ID" version="2.5" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee + http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + +  + <filter> + <display-name>RichFaces Filter</display-name> + <filter-name>richfaces</filter-name> + <filter-class>org.ajax4jsf.Filter</filter-class> + </filter> + + <filter-mapping> + <filter-name>richfaces</filter-name> + <servlet-name>Faces Servlet</servlet-name> + <dispatcher>REQUEST</dispatcher> + <dispatcher>FORWARD</dispatcher> + <dispatcher>INCLUDE</dispatcher> + </filter-mapping> + +  + <listener> + <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + </listener> + <filter> + <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> + + <filter-mapping> + <filter-name>Seam Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <servlet> + <servlet-name>Seam Resource Servlet</servlet-name> + <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Seam Resource Servlet</servlet-name> + <url-pattern>/seam/resource/*</url-pattern> + </servlet-mapping> + + +  + + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + +  + + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.seam</url-pattern> + </servlet-mapping> + +  + + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + + <listener> + <listener-class>com.sun.faces.config.ConfigureListener</listener-class> + </listener> + + <session-config> + <session-timeout>10</session-timeout> + </session-config> + + +</web-app> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/hibernate.cfg.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/hibernate.cfg.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/hibernate.cfg.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,20 +0,0 @@ -<!DOCTYPE hibernate-configuration PUBLIC - "-//Hibernate/Hibernate Configuration DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> - -<hibernate-configuration> - <session-factory name="bookingDatabase"> - <property name="show_sql">false</property> - <property name="connection.datasource">DefaultDatasource</property> - <property name="hbm2ddl.auto">create-drop</property> - <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> - <property name="dialect">GlassfishDerbyDialect</property> - <property name="transaction.flush_before_completion">true</property> - <property name="connection.release_mode">after_statement</property> - <property name="transaction.manager_lookup_class">org.hibernate.transaction.WebSphereTransactionManagerLookup</property> - <property name="transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> - <mapping class="org.jboss.seam.example.hibernate.Hotel"/> - <mapping class="org.jboss.seam.example.hibernate.User"/> - <mapping class="org.jboss.seam.example.hibernate.Booking"/> - </session-factory> -</hibernate-configuration> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/hibernate.cfg.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/hibernate.cfg.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/hibernate.cfg.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/hibernate.cfg.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,20 @@ +<!DOCTYPE hibernate-configuration PUBLIC + "-//Hibernate/Hibernate Configuration DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> + +<hibernate-configuration> + <session-factory name="bookingDatabase"> + <property name="show_sql">false</property> + <property name="connection.datasource">DefaultDatasource</property> + <property name="hbm2ddl.auto">create-drop</property> + <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> + <property name="dialect">GlassfishDerbyDialect</property> + <property name="transaction.flush_before_completion">true</property> + <property name="connection.release_mode">after_statement</property> + <property name="transaction.manager_lookup_class">org.hibernate.transaction.WebSphereTransactionManagerLookup</property> + <property name="transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> + <mapping class="org.jboss.seam.example.hibernate.Hotel"/> + <mapping class="org.jboss.seam.example.hibernate.User"/> + <mapping class="org.jboss.seam.example.hibernate.Booking"/> + </session-factory> +</hibernate-configuration> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/import.sql =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/import.sql 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/import.sql 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,22 +0,0 @@ -insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') -insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') -insert into Hotel (price, name, address, city, state, zip, country) values (120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') -insert into Hotel (price, name, address, city, state, zip, country) values (210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') -insert into Hotel (price, name, address, city, state, zip, country) values (240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') -insert into Hotel (price, name, address, city, state, zip, country) values (130, 'Hotel Beaulac', ' Esplanade Lopold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') -insert into Hotel (price, name, address, city, state, zip, country) values (140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') -insert into Hotel (price, name, address, city, state, zip, country) values (230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') -insert into Hotel (price, name, address, city, state, zip, country) values (460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') -insert into Hotel (price, name, address, city, state, zip, country) values (220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') -insert into Hotel (price, name, address, city, state, zip, country) values (250, 'Meli White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') -insert into Hotel (price, name, address, city, state, zip, country) values (210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/import.sql (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/import.sql) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/import.sql (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/import.sql 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,22 @@ +insert into Customer (username, password, name) values ('gavin', 'foobar', 'Gavin King') +insert into Customer (username, password, name) values ('demo', 'demo', 'Demo User') +insert into Hotel (price, name, address, city, state, zip, country) values (120, 'Marriott Courtyard', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (180, 'Doubletree', 'Tower Place, Buckhead', 'Atlanta', 'GA', '30305', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (450, 'W Hotel', 'Union Square, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (450, 'W Hotel', 'Lexington Ave, Manhattan', 'NY', 'NY', '10011', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (250, 'Hotel Rouge', '1315 16th Street NW', 'Washington', 'DC', '20036', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (300, '70 Park Avenue Hotel', '70 Park Avenue', 'NY', 'NY', '10011', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (300, 'Conrad Miami', '1395 Brickell Ave', 'Miami', 'FL', '33131', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (80, 'Sea Horse Inn', '2106 N Clairemont Ave', 'Eau Claire', 'WI', '54703', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (90, 'Super 8 Eau Claire Campus Area', '1151 W Macarthur Ave', 'Eau Claire', 'WI', '54701', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (160, 'Marriot Downtown', '55 Fourth Street', 'San Francisco', 'CA', '94103', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (200, 'Hilton Diagonal Mar', 'Passeig del Taulat 262-264', 'Barcelona', 'Catalunya', '08019', 'Spain') +insert into Hotel (price, name, address, city, state, zip, country) values (210, 'Hilton Tel Aviv', 'Independence Park', 'Tel Aviv', '', '63405', 'Israel') +insert into Hotel (price, name, address, city, state, zip, country) values (240, 'InterContinental Tokyo Bay', 'Takeshiba Pier', 'Tokyo', '', '105', 'Japan') +insert into Hotel (price, name, address, city, state, zip, country) values (130, 'Hotel Beaulac', ' Esplanade Lopold-Robert 2', 'Neuchatel', '', '2000', 'Switzerland') +insert into Hotel (price, name, address, city, state, zip, country) values (140, 'Conrad Treasury Place', 'William & George Streets', 'Brisbane', 'QLD', '4001', 'Australia') +insert into Hotel (price, name, address, city, state, zip, country) values (230, 'Ritz Carlton', '1228 Sherbrooke St', 'West Montreal', 'Quebec', 'H3G1H6', 'Canada') +insert into Hotel (price, name, address, city, state, zip, country) values (460, 'Ritz Carlton', 'Peachtree Rd, Buckhead', 'Atlanta', 'GA', '30326', 'USA') +insert into Hotel (price, name, address, city, state, zip, country) values (220, 'Swissotel', '68 Market Street', 'Sydney', 'NSW', '2000', 'Australia') +insert into Hotel (price, name, address, city, state, zip, country) values (250, 'Meli White House', 'Albany Street', 'Regents Park London', '', 'NW13UP', 'Great Britain') +insert into Hotel (price, name, address, city, state, zip, country) values (210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA') Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/seam.properties =================================================================== Copied: branches/community/Seam_2_3/examples-ee6/hibernate/other-configurations/resources-websphere61/seam.properties (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/other-configurations/resources-websphere61/seam.properties) =================================================================== Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/pom.xml =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/pom.xml 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/pom.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,27 +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"> - - <parent> - <groupId>org.jboss.seam</groupId> - <artifactId>examples-ee6</artifactId> - <version>2.3.0.Beta1-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.seam.examples-ee6</groupId> - <artifactId>hibernate</artifactId> - <version>2.3.0.Beta1-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>Hibernate Example (EE6)</name> - - <properties> - <example.name>hibernate</example.name> - </properties> - - <modules> - <module>hibernate-web</module> - <module>hibernate-tests</module> - </modules> -</project> Copied: branches/community/Seam_2_3/examples-ee6/hibernate/pom.xml (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/pom.xml) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/pom.xml 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,27 @@ +<?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> + <groupId>org.jboss.seam</groupId> + <artifactId>examples-ee6</artifactId> + <version>2.3.0.Beta1-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>hibernate</artifactId> + <version>2.3.0.Beta1-SNAPSHOT</version> + <packaging>pom</packaging> + + <name>Hibernate Example (EE6)</name> + + <properties> + <example.name>hibernate</example.name> + </properties> + + <modules> + <module>hibernate-web</module> + <module>hibernate-tests</module> + </modules> +</project> Deleted: branches/community/Seam_2_3/examples-ee6/hibernate/readme.txt =================================================================== --- branches/community/Seam_2_3Beta2/examples-ee6/hibernate/readme.txt 2012-04-02 22:45:04 UTC (rev 14479) +++ branches/community/Seam_2_3/examples-ee6/hibernate/readme.txt 2012-04-03 16:16:16 UTC (rev 14493) @@ -1,30 +0,0 @@ -Seam Hibernate Example -====================== - -This is the Hotel Booking example implemented in Seam and Hibernate POJOs. -This application runs on JBoss AS 4.2, 5 and 6, Tomcat with JBoss Embedded -and Glassfish V2. - -To deploy the example to JBossAS 5 or 6, follow these steps: - -* In the example root directory run: - - mvn clean package - -* Set JBOSS_HOME environment property. - -* In the hibernate-web directory run: - - mvn jboss:hard-deploy - -The following is a list of profiles which you should use to build the -application for various application servers. - -JBoss AS 4.2 -> -Pjbossas42 (i.e. mvn clean package -Pjbossas42) -Glassfish V2 -> -Pglassfish2 -Tomcat with JBoss Embedded -> -Ptomcat - -Furthermore, when you're targeting a different application server than -JBossAS 5 or 6, you have to deploy the application manually. - -* Open this URL in a web browser: http://localhost:8080/jboss-seam-hibernate Copied: branches/community/Seam_2_3/examples-ee6/hibernate/readme.txt (from rev 14479, branches/community/Seam_2_3Beta2/examples-ee6/hibernate/readme.txt) =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/readme.txt (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/readme.txt 2012-04-03 16:16:16 UTC (rev 14493) @@ -0,0 +1,30 @@ +Seam Hibernate Example +====================== + +This is the Hotel Booking example implemented in Seam and Hibernate POJOs. +This application runs on JBoss AS 4.2, 5 and 6, Tomcat with JBoss Embedded +and Glassfish V2. + +To deploy the example to JBossAS 5 or 6, follow these steps: + +* In the example root directory run: + + mvn clean package + +* Set JBOSS_HOME environment property. + +* In the hibernate-web directory run: + + mvn jboss:hard-deploy + +The following is a list of profiles which you should use to build the +application for various application servers. + +JBoss AS 4.2 -> -Pjbossas42 (i.e. mvn clean package -Pjbossas42) +Glassfish V2 -> -Pglassfish2 +Tomcat with JBoss Embedded -> -Ptomcat + +Furthermore, when you're targeting a different application server than +JBossAS 5 or 6, you have to deploy the application manually. + +* Open this URL in a web browser: http://localhost:8080/jboss-seam-hibernate

12 years, 1 month

1
0
0 / 0

Seam SVN: r14492 - in branches/community/Seam_2_3: bom and 1 other directory.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-04-03 12:04:01 -0400 (Tue, 03 Apr 2012) New Revision: 14492 Added: branches/community/Seam_2_3/bom/ branches/community/Seam_2_3/bom/pom.xml Log: JBSEAM-4927 created Seam 2 BOM file Added: branches/community/Seam_2_3/bom/pom.xml =================================================================== --- branches/community/Seam_2_3/bom/pom.xml (rev 0) +++ branches/community/Seam_2_3/bom/pom.xml 2012-04-03 16:04:01 UTC (rev 14492) @@ -0,0 +1,1048 @@ +<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> + + <groupId>org.jboss.seam</groupId> + <artifactId>bom</artifactId> + <name>Seam 2 Bill Of Materials </name> + <version>2.3.0.Beta2-SNAPSHOT</version> + <packaging>pom</packaging> + + <licenses> + <license> + <name>LGPL</name> + <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html</url> + </license> + </licenses> + + <developers> + <developer> + <name>JBoss Seam committers</name> + </developer> + </developers> + + <mailingLists> + <mailingList> + <archive>http://lists.jboss.org/pipermail/seam-dev/</archive> + <name>Seam Developer List</name> + </mailingList> + </mailingLists> + <description>Seam 2 BOM file for importing dependency management for Seam 2 applications</description> + <url>http://seamframework.org/Seam2</url> + + <properties> +  + <version.seam>2.3.0.Beta2-SNAPSHOT</version.seam> + <version.arquillian_core>1.0.0.CR7</version.arquillian_core> + <version.wicket>1.4.14</version.wicket> + <version.drools>5.1.1</version.drools> + <version.resteasy>2.0.1.GA</version.resteasy> + <version.spring>2.5.6.SEC03</version.spring> + <version.jbossembedded>beta3.SP15</version.jbossembedded> + <version.jbossas7>7.1.1.Final</version.jbossas7> + <version.jsf2>2.1.7</version.jsf2> + <version.webdriver>0.9.7376</version.webdriver> + + + +  +  +  + <jboss.releases.repo.url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</jboss.releases.repo.url> + <jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/</jboss.snapshots.repo.url> + <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format> + </properties> + + <dependencyManagement> +  + <dependencies> + + <dependency> + <groupId>org.jboss.bom</groupId> + <artifactId>jboss-javaee-6.0-with-hibernate</artifactId> + <version>1.0.0.M6</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <dependency> + <groupId>org.jboss.arquillian</groupId> + <artifactId>arquillian-bom</artifactId> + <version>${version.arquillian_core}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <version>${version.seam}</version> + <type>ejb</type> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-gen</artifactId> + <version>${version.seam}</version> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ioc</artifactId> + <version>${version.seam}</version> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-mail</artifactId> + <version>${version.seam}</version> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-pdf</artifactId> + <version>${version.seam}</version> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-remoting</artifactId> + <version>${version.seam}</version> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-resteasy</artifactId> + <version>${version.seam}</version> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui</artifactId> + <version>${version.seam}</version> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-debug</artifactId> + <version>${version.seam}</version> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-jul</artifactId> + <version>${version.seam}</version> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-flex</artifactId> + <version>${version.seam}</version> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-excel</artifactId> + <version>${version.seam}</version> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-rss</artifactId> + <version>${version.seam}</version> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-wicket</artifactId> + <version>${version.seam}</version> + </dependency> + +  + <dependency> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> + <version>2.7.6</version> + </dependency> + + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-jpdl</artifactId> + <version>3.2.10.SP3_seam2</version> + <exclusions> + <exclusion> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-cache</artifactId> + <version>1.4.1.SP9</version> + </dependency> + + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + <version>1.2.3</version> + <exclusions> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jaxrs</artifactId> + <version>${version.resteasy}</version> + <exclusions> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </exclusion> + <exclusion> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>tjws</groupId> + <artifactId>webserver</artifactId> + </exclusion> + <exclusion> + <groupId>org.scannotation</groupId> + <artifactId>scannotation</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jaxb-provider</artifactId> + <version>${version.resteasy}</version> + <exclusions> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.xml.stream</groupId> + <artifactId>sjsxp</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jettison-provider</artifactId> + <version>${version.resteasy}</version> + </dependency> + + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-atom-provider</artifactId> + <version>${version.resteasy}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>net.jcip</groupId> + <artifactId>jcip-annotations</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.3.1</version> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.3</version> + </dependency> + + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.2</version> + </dependency> + + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1-jbossorg-1</version> + </dependency> + + <dependency> + <groupId>jboss</groupId> + <artifactId>jbossxb</artifactId> + <version>1.0.0.CR8</version> + <exclusions> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jboss-logging-spi</artifactId> + </exclusion> + <exclusion> + <groupId>jboss</groupId> + <artifactId>jboss-common-core</artifactId> + </exclusion> + <exclusion> + <groupId>apache-xerces</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>apache-slide</groupId> + <artifactId>webdavlib</artifactId> + </exclusion> + <exclusion> + <groupId>oswego-concurrent</groupId> + <artifactId>concurrent</artifactId> + </exclusion> + <exclusion> + <groupId>wutka-dtdparser</groupId> + <artifactId>dtdparser121</artifactId> + </exclusion> + <exclusion> + <groupId>apache-xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaf</groupId> + <artifactId>activation</artifactId> + </exclusion> + </exclusions> + </dependency> + +  + <dependency> + <groupId>net.sourceforge.jexcelapi</groupId> + <artifactId>jxl</artifactId> + <version>2.6.8-seam</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>net.sourceforge.yarfraw</groupId> + <artifactId>yarfraw</artifactId> + <version>0.92</version> + <exclusions> + <exclusion> + <groupId>javax.xml</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.12.0.GA</version> + </dependency> + + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>1.0</version> + </dependency> + + <dependency> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + <version>1.4</version> + </dependency> + + <dependency> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + <version>2.1</version> + </dependency> + + <dependency> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + <version>1.3</version> + </dependency> + + <dependency> + <groupId>javax.annotation</groupId> + <artifactId>jsr250-api</artifactId> + <version>1.0</version> + </dependency> + + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>1.5.4</version> + <exclusions> +  + <exclusion> + <groupId>bsf</groupId> + <artifactId>bsf</artifactId> + </exclusion> + <exclusion> + <groupId>commons-cli</groupId> + <artifactId>commons-cli</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + <exclusion> + <groupId>mx4j</groupId> + <artifactId>mx4j</artifactId> + </exclusion> + <exclusion> + <groupId>xml-resolver</groupId> + <artifactId>xml-resolver</artifactId> + </exclusion> + <exclusion> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + </exclusion> + <exclusion> + <groupId>mockobjects</groupId> + <artifactId>mockobjects-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.ant</groupId> + <artifactId>ant-launcher</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.ant</groupId> + <artifactId>ant-junit</artifactId> + </exclusion> + <exclusion> + <groupId>castor</groupId> + <artifactId>castor</artifactId> + </exclusion> + <exclusion> + <groupId>openejb</groupId> + <artifactId>openejb</artifactId> + </exclusion> + <exclusion> + <groupId>openejb</groupId> + <artifactId>openejb-loader</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + <exclusion> + <groupId>jline</groupId> + <artifactId>jline</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> + + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-core</artifactId> + <version>${version.drools}</version> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + <exclusion> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + </exclusion> + <exclusion> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-decisiontables</artifactId> + <version>${version.drools}</version> + <exclusions> + <exclusion> + <groupId>jexcelapi</groupId> + <artifactId>jxl</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-api</artifactId> + <version>${version.drools}</version> + </dependency> + + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-templates</artifactId> + <version>${version.drools}</version> + </dependency> + + <dependency> + <groupId>org.drools</groupId> + <artifactId>drools-compiler</artifactId> + <version>${version.drools}</version> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + <exclusion> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + </exclusion> + <exclusion> + <groupId>com.thoughtworks.xstream</groupId> + <artifactId>xstream</artifactId> + </exclusion> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.jboss.el</groupId> + <artifactId>jboss-el</artifactId> + <version>1.0_02.CR6</version> + </dependency> + + <dependency> + <groupId>org.jboss.seam.embedded</groupId> + <artifactId>jboss-embedded-api</artifactId> + <version>${version.jbossembedded}</version> + </dependency> + + <dependency> + <groupId>org.opensymphony.quartz</groupId> + <artifactId>quartz</artifactId> + <version>1.6.5</version> + </dependency> + + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring</artifactId> + <version>${version.spring}</version> + <exclusions> +  + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>com.google.code.guice</groupId> + <artifactId>guice</artifactId> + <version>1.0</version> + </dependency> + + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib-nodep</artifactId> + <version>2.2</version> + </dependency> + + <dependency> + <groupId>com.adobe.blazeds</groupId> + <artifactId>blazeds-common</artifactId> + <version>3.2.0.3978</version> + </dependency> + + <dependency> + <groupId>com.adobe.blazeds</groupId> + <artifactId>blazeds-proxy</artifactId> + <version>3.2.0.3978</version> + </dependency> + + <dependency> + <groupId>com.adobe.blazeds</groupId> + <artifactId>blazeds-core</artifactId> + <version>3.2.0.3978</version> + </dependency> + + <dependency> + <groupId>com.adobe.blazeds</groupId> + <artifactId>blazeds-remoting</artifactId> + <version>3.2.0.3978</version> + </dependency> + + <dependency> + <groupId>com.lowagie</groupId> + <artifactId>itext</artifactId> + <version>2.1.2</version> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + + <exclusion> + <groupId>bouncycastle</groupId> + <artifactId>bcmail-jdk14</artifactId> + </exclusion> + <exclusion> + <groupId>bouncycastle</groupId> + <artifactId>bcprov-jdk14</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>com.lowagie</groupId> + <artifactId>itext-rtf</artifactId> + <version>2.1.2</version> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + + <exclusion> + <groupId>bouncycastle</groupId> + <artifactId>bcmail-jdk14</artifactId> + </exclusion> + <exclusion> + <groupId>bouncycastle</groupId> + <artifactId>bcprov-jdk14</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + <version>1.0.13</version> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.openid4java</groupId> + <artifactId>openid4java-consumer</artifactId> + <version>0.9.6</version> + <type>pom</type> + </dependency> + + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <version>1.5.2</version> + </dependency> + + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <version>1.5.2</version> + </dependency> + + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1-brew</version> + <exclusions> + <exclusion> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.beanshell</groupId> + <artifactId>bsh</artifactId> + <version>2.0b4</version> + </dependency> + + <dependency> + <groupId>org.tuckey</groupId> + <artifactId>urlrewritefilter</artifactId> + <version>3.0.4</version> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.dbunit</groupId> + <artifactId>dbunit</artifactId> + <version>2.2</version> + <exclusions> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + <exclusion> + <groupId>junit-addons</groupId> + <artifactId>junit-addons</artifactId> + </exclusion> + <exclusion> + <groupId>poi</groupId> + <artifactId>poi</artifactId> + </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket</artifactId> + <version>${version.wicket}</version> + <exclusions> + <exclusion> + <groupId>cglib</groupId> + <artifactId>cglib-nodep</artifactId> + </exclusion> + <exclusion> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-ioc</artifactId> + <version>${version.wicket}</version> + <exclusions> + <exclusion> + <groupId>cglib</groupId> + <artifactId>cglib-nodep</artifactId> + </exclusion> + <exclusion> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-extensions</artifactId> + <version>${version.wicket}</version> + <exclusions> + <exclusion> + <groupId>cglib</groupId> + <artifactId>cglib-nodep</artifactId> + </exclusion> + <exclusion> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + </exclusion> + <exclusion> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.apache.wicket</groupId> + <artifactId>wicket-datetime</artifactId> + <version>${version.wicket}</version> + </dependency> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>${version.testng}</version> + <classifier>jdk15</classifier> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${version.junit}</version> + </dependency> + + <dependency> + <groupId>org.seleniumhq.selenium.server</groupId> + <artifactId>selenium-server</artifactId> + <version>1.0.1</version> + <classifier>standalone</classifier> + <exclusions> + <exclusion> + <groupId>org.seleniumhq.selenium.core</groupId> + <artifactId>selenium-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.seleniumhq.selenium.server</groupId> + <artifactId>selenium-server-coreless</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.ant</groupId> + <artifactId>ant-trax</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.ant</groupId> + <artifactId>ant-nodeps</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.seleniumhq.selenium.client-drivers</groupId> + <artifactId>selenium-java-client-driver</artifactId> + <version>1.0.1</version> + <exclusions> + <exclusion> + <groupId>org.codehaus.groovy.maven.runtime</groupId> + <artifactId>gmaven-runtime-default</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>org.seleniumhq.webdriver</groupId> + <artifactId>webdriver-firefox</artifactId> + <version>${version.webdriver}</version> + </dependency> + + <dependency> + <groupId>org.seleniumhq.webdriver</groupId> + <artifactId>webdriver-support</artifactId> + <version>${version.webdriver}</version> + </dependency> + + <dependency> + <groupId>org.seleniumhq.webdriver</groupId> + <artifactId>webdriver-ie</artifactId> + <version>${version.webdriver}</version> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>functional-tests</artifactId> + <version>${version.seam}</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>2.1</version> + </dependency> + + <dependency> + <groupId>org.eclipse.jdt</groupId> + <artifactId>core</artifactId> + <version>3.4.2.v_883_R34x</version> + </dependency> + + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2.1</version> + </dependency> + + <dependency> + <groupId>org.codehaus.jettison</groupId> + <artifactId>jettison</artifactId> + <version>1.1</version> + <exclusions> + <exclusion> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>${version.jsf2}</version> + </dependency> + + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-arquillian-container-managed</artifactId> + <version>${version.jbossas7}</version> + </dependency> + + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-arquillian-container-remote</artifactId> + <version>${version.jbossas7}</version> + </dependency> + + </dependencies> + </dependencyManagement> + + <issueManagement> + <system>JIRA</system> + <url>http://issues.jboss.org/browse/JBSEAM</url> + </issueManagement> + + <ciManagement> + <system>Hudson</system> + <url>http://hudson.jboss.org/hudson/view/Seam/</url> + </ciManagement> + + <scm> + <connection>scm:svn:https://svn.jboss.org/repos/seam/branches/community/Seam_2_3</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/seam/branches/community/Seam_2_3</developerConnection> + <url>scm:svn:https://svn.jboss.org/repos/seam/branches/community/Seam_2_3</url> + </scm> + + <organization> + <name>Seam Framework</name> + <url>http://seamframework.org</url> + </organization> + + + <distributionManagement> + <repository> + <id>jboss-releases-repository</id> + <name>JBoss Releases Repository</name> + <url>${jboss.releases.repo.url}</url> + </repository> + <snapshotRepository> + <id>jboss-snapshots-repository</id> + <name>JBoss Snapshots Repository</name> + <url>${jboss.snapshots.repo.url}</url> + </snapshotRepository> + </distributionManagement> + +</project>

12 years, 1 month

1
0
0 / 0

Seam SVN: r14491 - in branches/community/Seam_2_3/examples-ee6: drools and 8 other directories.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2012-04-03 12:01:03 -0400 (Tue, 03 Apr 2012) New Revision: 14491 Added: branches/community/Seam_2_3/examples-ee6/drools/drools-ear/src/main/application/META-INF/ branches/community/Seam_2_3/examples-ee6/drools/drools-ear/src/main/application/META-INF/jboss-deployment-structure.xml branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/resources-integration/arquillian.xml Modified: branches/community/Seam_2_3/examples-ee6/drools/drools-ear/pom.xml branches/community/Seam_2_3/examples-ee6/drools/drools-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/java/org/jboss/seam/example/numberguess/test/DroolsNumberGuessTest.java branches/community/Seam_2_3/examples-ee6/drools/drools-web/pom.xml branches/community/Seam_2_3/examples-ee6/drools/pom.xml branches/community/Seam_2_3/examples-ee6/pom.xml Log: fixed Drools example and added it to global examples-ee6 pom.xml file Modified: branches/community/Seam_2_3/examples-ee6/drools/drools-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/drools/drools-ear/pom.xml 2012-04-03 15:32:11 UTC (rev 14490) +++ branches/community/Seam_2_3/examples-ee6/drools/drools-ear/pom.xml 2012-04-03 16:01:03 UTC (rev 14491) @@ -9,7 +9,7 @@ <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.drools</groupId> <artifactId>drools-ear</artifactId> <packaging>ear</packaging> <name>Drools EAR Module (EE6)</name> @@ -21,33 +21,42 @@ <dependencies> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.drools</groupId> <artifactId>drools-web</artifactId> - <version>${project.version}</version> <type>war</type> </dependency> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.drools</groupId> <artifactId>drools-ejb</artifactId> - <version>${project.version}</version> <type>ejb</type> </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>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-jpdl</artifactId> + <exclusions> + <exclusion> + <artifactId>jackrabbit-core</artifactId> + <groupId>org.apache.jackrabbit</groupId> + </exclusion> + <exclusion> + <artifactId>cglib</artifactId> + <groupId>cglib</groupId> + </exclusion> + <exclusion> + <artifactId>hibernate-ehcache</artifactId> + <groupId>org.hibernate</groupId> + </exclusion> + <exclusion> + <artifactId>dom4j</artifactId> + <groupId>dom4j</groupId> + </exclusion> + </exclusions> + </dependency> </dependencies> <build> @@ -56,62 +65,39 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-ear-plugin</artifactId> - <version>2.3.2</version> <configuration> - <version>5</version> <defaultLibBundleDir>lib</defaultLibBundleDir>  <earSourceExcludes>**/application.xml, **/jboss-app.xml</earSourceExcludes>  <generateApplicationXml>true</generateApplicationXml> <filtering>true</filtering> - <jboss> - <version>4.2</version> - <loader-repository>seam.jboss.org:loader=seam-drools</loader-repository> - </jboss> <modules> <webModule> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.drools</groupId> <artifactId>drools-web</artifactId> <contextRoot>/seam-drools</contextRoot> <bundleFileName>drools-web.war</bundleFileName> </webModule> <ejbModule> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.drools</groupId> <artifactId>drools-ejb</artifactId> <bundleFileName>drools-ejb.jar</bundleFileName> </ejbModule> + <ejbModule> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</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.1.Final</version> <executions> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  <execution> - <phase>install</phase> + <phase></phase> <goals> <goal>deploy</goal> </goals> @@ -139,7 +125,7 @@ <configuration> <artifactItems> <artifactItem> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.drools</groupId> <artifactId>drools-ear</artifactId> <type>ear</type> <overWrite>true</overWrite> @@ -147,7 +133,7 @@ </outputDirectory> </artifactItem> <artifactItem> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.drools</groupId> <artifactId>drools-web</artifactId> <type>war</type> <overWrite>true</overWrite> @@ -156,7 +142,7 @@ </outputDirectory> </artifactItem> <artifactItem> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.drools</groupId> <artifactId>drools-ejb</artifactId> <type>jar</type> <overWrite>true</overWrite> Added: branches/community/Seam_2_3/examples-ee6/drools/drools-ear/src/main/application/META-INF/jboss-deployment-structure.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/drools/drools-ear/src/main/application/META-INF/jboss-deployment-structure.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/drools/drools-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-04-03 16:01:03 UTC (rev 14491) @@ -0,0 +1,14 @@ +<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0"> + <deployment> + <dependencies> + <module name="org.apache.log4j" export="true"/> + <module name="org.javassist" export="true"/> + <module name="org.hibernate" export="true"/> + <module name="org.dom4j" export="true"/> + <module name="org.apache.commons.logging" export="true"/> + <module name="org.apache.commons.collections" export="true"/> + <module name="javax.faces.api" export="true"/> + <module name="com.sun.jsf-impl" export="true"/> + </dependencies> + </deployment> +</jboss-deployment-structure> Modified: branches/community/Seam_2_3/examples-ee6/drools/drools-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/drools/drools-ejb/pom.xml 2012-04-03 15:32:11 UTC (rev 14490) +++ branches/community/Seam_2_3/examples-ee6/drools/drools-ejb/pom.xml 2012-04-03 16:01:03 UTC (rev 14491) @@ -9,7 +9,7 @@ <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.drools</groupId> <artifactId>drools-ejb</artifactId> <packaging>ejb</packaging> <name>Drools EJB Module (EE6)</name> @@ -48,10 +48,12 @@ <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> <type>ejb</type> + <scope>provided</scope> </dependency> <dependency> - <groupId>javax.persistence</groupId> - <artifactId>persistence-api</artifactId> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.drools</groupId> @@ -76,24 +78,20 @@ <artifactId>drools-templates</artifactId> </dependency> <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <groupId>org.jboss.spec.javax.servlet</groupId> + <artifactId>jboss-servlet-api_3.0_spec</artifactId> <scope>provided</scope> </dependency> <dependency> - <groupId>javax.ejb</groupId> - <artifactId>ejb-api</artifactId> + <groupId>org.jboss.spec.javax.ejb</groupId> + <artifactId>jboss-ejb-api_3.1_spec</artifactId> + <scope>provided</scope> </dependency> <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>2.1</version> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jbpm</groupId> - <artifactId>jbpm-jpdl</artifactId> - <version>3.2.3</version> - </dependency> </dependencies> </project> Modified: branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml 2012-04-03 15:32:11 UTC (rev 14490) +++ branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml 2012-04-03 16:01:03 UTC (rev 14491) @@ -9,7 +9,7 @@ <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.drools</groupId> <artifactId>drools-tests</artifactId> <name>Drools Integration Tests Module (EE6)</name> @@ -20,7 +20,7 @@ <classifier>jdk15</classifier> </dependency> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.drools</groupId> <artifactId>drools-ejb</artifactId> <type>ejb</type> <scope>test</scope> @@ -32,11 +32,14 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - <scope>provided</scope> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.0_spec</artifactId> </dependency> <dependency> + <groupId>org.jboss.spec.javax.el</groupId> + <artifactId>jboss-el-api_2.2_spec</artifactId> + </dependency> + <dependency> <groupId>org.seleniumhq.selenium.server</groupId> <artifactId>selenium-server</artifactId> <classifier>standalone</classifier> @@ -68,6 +71,10 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.jbpm.jbpm3</groupId> + <artifactId>jbpm-jpdl</artifactId> + </dependency> </dependencies> <build> Modified: branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/java/org/jboss/seam/example/numberguess/test/DroolsNumberGuessTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/java/org/jboss/seam/example/numberguess/test/DroolsNumberGuessTest.java 2012-04-03 15:32:11 UTC (rev 14490) +++ branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/java/org/jboss/seam/example/numberguess/test/DroolsNumberGuessTest.java 2012-04-03 16:01:03 UTC (rev 14491) @@ -1,19 +1,46 @@ //$Id: DroolsNumberGuessTest.java 6415 2007-10-07 22:27:57Z pmuir $ package org.jboss.seam.example.numberguess.test; +import java.io.File; + +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.pageflow.Pageflow; import org.jboss.seam.example.numberguess.Game; import org.jboss.seam.example.numberguess.Guess; import org.jboss.seam.example.numberguess.RandomNumber; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.seam.pageflow.Pageflow; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +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.junit.Test; +import org.junit.runner.RunWith; -public class DroolsNumberGuessTest extends SeamTest +(a)RunWith(Arquillian.class) +public class DroolsNumberGuessTest extends JUnitSeamTest { private int guessedValue; + + @Deployment(name="RenderTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-drools.ear").importFrom(new File("../drools-ear/target/seam-drools.ear")) + .as(EnterpriseArchive.class); + WebArchive web = er.getAsType(WebArchive.class, "drools-web.war"); + web.addAsWebInfResource(new StringAsset("org.jboss.seam.mock.MockFacesContextFactory"), "classes/META-INF/services/javax.faces.context.FacesContextFactory"); + web.addClasses(DroolsNumberGuessTest.class); + + return er; + } + @Test public void testNumberGuessWin() throws Exception { Added: branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/resources-integration/arquillian.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/resources-integration/arquillian.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/resources-integration/arquillian.xml 2012-04-03 16:01:03 UTC (rev 14491) @@ -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> Modified: branches/community/Seam_2_3/examples-ee6/drools/drools-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/drools/drools-web/pom.xml 2012-04-03 15:32:11 UTC (rev 14490) +++ branches/community/Seam_2_3/examples-ee6/drools/drools-web/pom.xml 2012-04-03 16:01:03 UTC (rev 14491) @@ -8,14 +8,14 @@ <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.drools</groupId> <artifactId>drools-web</artifactId> <packaging>war</packaging> <name>Drools Web Module (EE6)</name> <dependencies> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.drools</groupId> <artifactId>drools-ejb</artifactId> <type>ejb</type> <scope>provided</scope> @@ -24,6 +24,7 @@ <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> <type>ejb</type> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.seam</groupId> Modified: branches/community/Seam_2_3/examples-ee6/drools/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/drools/pom.xml 2012-04-03 15:32:11 UTC (rev 14490) +++ branches/community/Seam_2_3/examples-ee6/drools/pom.xml 2012-04-03 16:01:03 UTC (rev 14491) @@ -27,19 +27,19 @@ <dependencyManagement> <dependencies> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.drools</groupId> <artifactId>drools-ejb</artifactId> <version>${project.version}</version> <type>ejb</type> </dependency> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.drools</groupId> <artifactId>drools-web</artifactId> <version>${project.version}</version> <type>war</type> </dependency> <dependency> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.drools</groupId> <artifactId>drools-ear</artifactId> <version>${project.version}</version> </dependency> Modified: branches/community/Seam_2_3/examples-ee6/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-04-03 15:32:11 UTC (rev 14490) +++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-04-03 16:01:03 UTC (rev 14491) @@ -18,7 +18,7 @@  <module>booking</module>  -  + <module>drools</module>  <module>excel</module> <module>mail</module>

12 years, 1 month

1
0
0 / 0

Seam SVN: r14490 - branches/community/Seam_2_3/examples-ee6.

by seam-commits＠lists.jboss.org

Author: maschmid Date: 2012-04-03 11:32:11 -0400 (Tue, 03 Apr 2012) New Revision: 14490 Modified: branches/community/Seam_2_3/examples-ee6/pom.xml Log: enable rss example Modified: branches/community/Seam_2_3/examples-ee6/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/pom.xml 2012-04-03 15:07:09 UTC (rev 14489) +++ branches/community/Seam_2_3/examples-ee6/pom.xml 2012-04-03 15:32:11 UTC (rev 14490) @@ -32,6 +32,7 @@ <module>remoting/helloworld</module> <module>remoting/progressbar</module> <module>restbay</module> + <module>rss</module> <module>seambay</module> <module>seampay</module> <module>seamspace</module> @@ -243,6 +244,7 @@ <excludes> <exclude>**/selenium/*</exclude> <exclude>**/webdriver/*</exclude> + <exclude>**/xml/*</exclude> </excludes> <systemProperties>

12 years, 1 month

1
0
0 / 0

Seam SVN: r14489 - in branches/community/Seam_2_3/examples-ee6: rss and 34 other directories.

by seam-commits＠lists.jboss.org

Author: maschmid Date: 2012-04-03 11:07:09 -0400 (Tue, 03 Apr 2012) New Revision: 14489 Added: branches/community/Seam_2_3/examples-ee6/rss/ branches/community/Seam_2_3/examples-ee6/rss/pom.xml branches/community/Seam_2_3/examples-ee6/rss/readme.txt branches/community/Seam_2_3/examples-ee6/rss/rss-ear/ branches/community/Seam_2_3/examples-ee6/rss/rss-ear/pom.xml branches/community/Seam_2_3/examples-ee6/rss/rss-ear/src/ branches/community/Seam_2_3/examples-ee6/rss/rss-ear/src/main/ branches/community/Seam_2_3/examples-ee6/rss/rss-ear/src/main/application/ branches/community/Seam_2_3/examples-ee6/rss/rss-ear/src/main/application/META-INF/ branches/community/Seam_2_3/examples-ee6/rss/rss-ear/src/main/application/META-INF/jboss-deployment-structure.xml branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/ branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/pom.xml branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/ branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/ branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/java/ branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/java/org/ branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/java/org/jboss/seam/rss/ branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/java/org/jboss/seam/rss/Entry.java branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/java/org/jboss/seam/rss/Feed.java branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/java/org/jboss/seam/rss/RSSTest.java branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/resources/ branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/resources/META-INF/ branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/resources/META-INF/ejb-jar.xml branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/resources/META-INF/persistence.xml branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/resources/seam.properties branches/community/Seam_2_3/examples-ee6/rss/rss-tests/ branches/community/Seam_2_3/examples-ee6/rss/rss-tests/pom.xml branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/ branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/ branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/java/ branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/java/org/ branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/java/org/jboss/ branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/java/org/jboss/seam/ branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/java/org/jboss/seam/example/ branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/java/org/jboss/seam/example/rss/ branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/java/org/jboss/seam/example/rss/test/ branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/java/org/jboss/seam/example/rss/test/xml/ branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/java/org/jboss/seam/example/rss/test/xml/SeamXMLRSSTest.java branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/resources-ftest/ branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/resources-ftest/testng.xml branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/resources/ branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/resources/WEB-INF/ branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/resources/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/resources/seam.properties branches/community/Seam_2_3/examples-ee6/rss/rss-web/ branches/community/Seam_2_3/examples-ee6/rss/rss-web/pom.xml branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/ branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/ branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/ branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/WEB-INF/ branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/WEB-INF/faces-config.xml branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/WEB-INF/pages.xml branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/WEB-INF/web.xml branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/index.html branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/rss.xhtml Log: add rss example to the ee6 examples Added: branches/community/Seam_2_3/examples-ee6/rss/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/pom.xml 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +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"> + <parent> + <artifactId>examples-ee6</artifactId> + <groupId>org.jboss.seam</groupId> + <version>2.3.0.Beta2-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.jboss.seam.examples-ee6</groupId> + <artifactId>rss</artifactId> + <packaging>pom</packaging> + <name>Rss Example (EE6)</name> + + <modules> + <module>rss-ejb</module> + <module>rss-web</module> + <module>rss-ear</module> + <module>rss-tests</module> + </modules> + + <properties> + <example.name>rss</example.name> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6.rss</groupId> + <artifactId>rss-ejb</artifactId> + <version>${project.version}</version> + <type>ejb</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6.rss</groupId> + <artifactId>rss-web</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6.rss</groupId> + <artifactId>rss-ear</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + +</project> Added: branches/community/Seam_2_3/examples-ee6/rss/readme.txt =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/readme.txt (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/readme.txt 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +1,29 @@ +Seam RSS Example +================ + +This example demonstrates the Seam RSS functionality. It runs on both JBoss AS +as an EAR and Tomcat with Embedded JBoss as a WAR. + +To deploy the example to JBossAS, follow these steps: + +* In the example root directory run: + + mvn clean package + +* Set JBOSS_HOME environment property. + +* In the rss-ear directory run: + + mvn jboss:hard-deploy + +* Open this URL in a web browser: http://localhost:8080/seam-rss + +To deploy the example to Tomcat with Embedded JBoss, follow these steps: + +* In the example root directory run: + + mvn clean package -Ptomcat + +* Deploy the resulting WAR from rss-web/target directory to Tomcat manually. + +* Open this URL in a web browser: http://localhost:8080/jboss-seam-rss Added: branches/community/Seam_2_3/examples-ee6/rss/rss-ear/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-ear/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-ear/pom.xml 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +1,119 @@ +<?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>rss</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6.rss</groupId> + <artifactId>rss-ear</artifactId> + <packaging>ear</packaging> + <name>Rss EAR Module (EE6)</name> + + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6.rss</groupId> + <artifactId>rss-web</artifactId> + <type>war</type> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6.rss</groupId> + <artifactId>rss-ejb</artifactId> + <type>ejb</type> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>compile</scope> + </dependency> + </dependencies> + + <build> + <finalName>seam-rss</finalName> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-ear-plugin</artifactId> + <configuration> + <version>6</version> + <defaultLibBundleDir>lib</defaultLibBundleDir> +  + <earSourceExcludes>**/application.xml, **/jboss-app.xml</earSourceExcludes> +  + <generateApplicationXml>true</generateApplicationXml> + <filtering>true</filtering> + <modules> + <webModule> + <groupId>org.jboss.seam.examples-ee6.rss</groupId> + <artifactId>rss-web</artifactId> + <contextRoot>/seam-rss</contextRoot> + <bundleFileName>rss-web.war</bundleFileName> + </webModule> + <ejbModule> + <groupId>org.jboss.seam.examples-ee6.rss</groupId> + <artifactId>rss-ejb</artifactId> + <bundleFileName>rss-ejb.jar</bundleFileName> + </ejbModule> + <ejbModule> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <bundleFileName>jboss-seam.jar</bundleFileName> + </ejbModule> + </modules> + </configuration> + </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.rss</groupId> + <artifactId>rss-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.rss</groupId> + <artifactId>rss-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.rss</groupId> + <artifactId>rss-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> Added: branches/community/Seam_2_3/examples-ee6/rss/rss-ear/src/main/application/META-INF/jboss-deployment-structure.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-ear/src/main/application/META-INF/jboss-deployment-structure.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +1,10 @@ +<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0"> + <deployment> + <dependencies> + <module name="org.dom4j" export="true"/> + <module name="com.sun.xml.bind" export="true"/> + <module name="org.apache.commons.collections" export="true"/> + <module name="javax.faces.api" export="true"/> + </dependencies> + </deployment> +</jboss-deployment-structure> Added: branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/pom.xml 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +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> + <parent> + <artifactId>rss</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6.rss</groupId> + <artifactId>rss-ejb</artifactId> + <packaging>ejb</packaging> + <name>Rss EJB Module (EE6)</name> + + <dependencies> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <exclusions> + <exclusion> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + <exclusion> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-entitymanager</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> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + +</project> Added: branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/java/org/jboss/seam/rss/Entry.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/java/org/jboss/seam/rss/Entry.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/java/org/jboss/seam/rss/Entry.java 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +1,84 @@ +package org.jboss.seam.rss; + +import java.util.Date; + +public class Entry +{ + private String uid; + private String title; + private String link; + private String author; + private String summary; + private Date published; + private Date updated; + + public String getUid() + { + return uid; + } + + public void setUid(String uid) + { + this.uid = uid; + } + + public String getTitle() + { + return title; + } + + public void setTitle(String title) + { + this.title = title; + } + + public String getLink() + { + return link; + } + + public void setLink(String link) + { + this.link = link; + } + + public String getAuthor() + { + return author; + } + + public void setAuthor(String author) + { + this.author = author; + } + + public String getSummary() + { + return summary; + } + + public void setSummary(String summary) + { + this.summary = summary; + } + + public Date getPublished() + { + return published; + } + + public void setPublished(Date published) + { + this.published = published; + } + + public Date getUpdated() + { + return updated; + } + + public void setUpdated(Date updated) + { + this.updated = updated; + } +} Added: branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/java/org/jboss/seam/rss/Feed.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/java/org/jboss/seam/rss/Feed.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/java/org/jboss/seam/rss/Feed.java 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +1,75 @@ +package org.jboss.seam.rss; + +import java.util.Date; +import java.util.List; + +public class Feed +{ + private String uid; + private String title; + private String subtitle; + private Date updated; + private String link; + private List<Entry> entries; + + public String getUid() + { + return uid; + } + + public void setUid(String uid) + { + this.uid = uid; + } + + public String getTitle() + { + return title; + } + + public void setTitle(String title) + { + this.title = title; + } + + public String getSubtitle() + { + return subtitle; + } + + public void setSubtitle(String subtitle) + { + this.subtitle = subtitle; + } + + public Date getUpdated() + { + return updated; + } + + public void setUpdated(Date updated) + { + this.updated = updated; + } + + public String getLink() + { + return link; + } + + public void setLink(String link) + { + this.link = link; + } + + public List<Entry> getEntries() + { + return entries; + } + + public void setEntries(List<Entry> entries) + { + this.entries = entries; + } + +} Added: branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/java/org/jboss/seam/rss/RSSTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/java/org/jboss/seam/rss/RSSTest.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/java/org/jboss/seam/rss/RSSTest.java 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +1,49 @@ +package org.jboss.seam.rss; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.UUID; + +import org.jboss.seam.ScopeType; +import org.jboss.seam.annotations.Create; +import org.jboss.seam.annotations.Name; +import org.jboss.seam.annotations.Scope; + +@Name("rss") +(a)Scope(ScopeType.SESSION) +public class RSSTest +{ + private Feed feed; + + @Create + public void create() + { + feed = new Feed(); + List<Entry> entries = new ArrayList<Entry>(); + for (int i = 0; i < 5; i++) + { + Entry entry = new Entry(); + entry.setAuthor("Author " + i); + entry.setLink("Link " + i); + entry.setPublished(new Date(0)); + entry.setSummary("Summary <b>" + i + "</b>"); + entry.setTitle("Title <i>" + i + "</i>"); + entry.setUid(UUID.randomUUID().toString()); + entry.setUpdated(new Date()); + entries.add(entry); + } + feed.setEntries(entries); + feed.setLink("Link Feed"); + feed.setSubtitle("Subtitle feed"); + feed.setTitle("Title Feed"); + feed.setUid(UUID.randomUUID().toString()); + feed.setUpdated(new Date()); + } + + public Feed getFeed() + { + return feed; + } + +} Added: branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/resources/META-INF/ejb-jar.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/resources/META-INF/ejb-jar.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/resources/META-INF/ejb-jar.xml 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" + version="3.0"> + + <interceptors> + <interceptor> + <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> + </interceptor> + </interceptors> + + <assembly-descriptor> + <interceptor-binding> + <ejb-name>*</ejb-name> + <interceptor-class>org.jboss.seam.ejb.SeamInterceptor</interceptor-class> + </interceptor-binding> + </assembly-descriptor> +</ejb-jar> Added: branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/resources/META-INF/persistence.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/resources/META-INF/persistence.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/resources/META-INF/persistence.xml 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<persistence xmlns="http://java.sun.com/xml/ns/persistence" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" + version="1.0"> + <persistence-unit name="userDatabase"> + <provider>org.hibernate.ejb.HibernatePersistence</provider> + <jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source> + <properties> + <property name="hibernate.hbm2ddl.auto" value="create-drop"/> + <property name="hibernate.show_sql" value="true"/> + <property name="jboss.entity.manager.factory.jndi.name" + value="java:/seamrssEntityManagerFactory"/> + </properties> + </persistence-unit> +</persistence> Added: branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/resources/seam.properties =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/resources/seam.properties (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-ejb/src/main/resources/seam.properties 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +1 @@ + Added: branches/community/Seam_2_3/examples-ee6/rss/rss-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-tests/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-tests/pom.xml 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +1,123 @@ +<?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>rss</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6.rss</groupId> + <artifactId>rss-tests</artifactId> + <name>Rss Integration Tests Module (EE6)</name> + + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>org.jboss.seam.examples-ee6.rss</groupId> + <artifactId>rss-ejb</artifactId> + <type>ejb</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.0_spec</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> + </dependencies> + + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> + + <profiles> + <profile> + <id>ftest-jbossas</id> + <properties> + <example.context.path>/seam-rss</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-rss</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> Added: branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/java/org/jboss/seam/example/rss/test/xml/SeamXMLRSSTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/java/org/jboss/seam/example/rss/test/xml/SeamXMLRSSTest.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/java/org/jboss/seam/example/rss/test/xml/SeamXMLRSSTest.java 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +1,67 @@ +package org.jboss.seam.example.rss.test.xml; + +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertTrue; + +import java.io.IOException; +import java.util.Iterator; +import java.util.List; + +import javax.xml.namespace.NamespaceContext; +import javax.xml.parsers.ParserConfigurationException; +import javax.xml.xpath.XPathExpressionException; + +import org.jboss.seam.example.common.test.xml.NodeCondition; +import org.jboss.seam.example.common.test.xml.SeamXMLTest; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.xml.sax.SAXException; + +public class SeamXMLRSSTest extends SeamXMLTest +{ + public static final String HOME_PAGE = "/rss.seam"; + public static final String HOME_PAGE_TITLE = "Title Feed"; + public static final String TITLE_XPATH = "/feed/title"; + + public static final String ATOM_NS_URI = "http://www.w3.org/2005/Atom"; + + private Document doc; + + @BeforeMethod + public void setDocument() throws IOException, SAXException + { + doc = db.parse(BROWSER_URL + CONTEXT_PATH + HOME_PAGE); + } + + /** + * Verifies that example deploys and has title + * + * @throws XPathExpressionException If XPath expression cannot be compiled or + * executed + */ + @Test + public void testRSSTitle() throws XPathExpressionException + { + List<Node> list = evaluateXPath(doc.getDocumentElement(), TITLE_XPATH); + assertEquals("There is only on title", 1, list.size()); + assertTrue("Document title equals to \"Title Feed\"", evaluateCondition(list, titleCondition)); + } + + private final NodeCondition titleCondition = new NodeCondition() + { + + public boolean match(Node node) + { + if (node instanceof Element) + { + Element element = (Element) node; + return HOME_PAGE_TITLE.equals(element.getTextContent()); + } + return false; + } + }; +} Added: branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/resources/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/resources/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/resources/WEB-INF/components.xml 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +1,16 @@ +<components xmlns="http://jboss.com/products/seam/components" + xmlns:excel="http://jboss.com/products/seam/excel" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:framework="http://jboss.com/products/seam/framework" + xmlns:document="http://jboss.com/products/seam/document" + 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/framework http://jboss.com/products/seam/framework-2.3.xsd + http://jboss.com/products/seam/document http://jboss.com/products/seam/document-2.3.xsd + http://jboss.com/products/seam/excel http://jboss.com/products/seam/excel-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" /> + +</components> Added: branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/resources/seam.properties =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/resources/seam.properties (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/resources/seam.properties 2012-04-03 15:07:09 UTC (rev 14489) @@ -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 Added: branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/resources-ftest/testng.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/resources-ftest/testng.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/resources-ftest/testng.xml 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +1,27 @@ + +  +<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > +<suite name="RSS example" verbose="2" parallel="false"> + <test name="rss_tests"> + <parameter name="PROPERTY_FILE" value="" /> + <parameter name="xml.namespace.aware" value="false" /> + <classes> + <class name="org.jboss.seam.example.rss.test.xml.SeamXMLRSSTest" /> + </classes> + </test> +</suite> Property changes on: branches/community/Seam_2_3/examples-ee6/rss/rss-tests/src/test/resources-ftest/testng.xml ___________________________________________________________________ Added: svn:executable + * Added: branches/community/Seam_2_3/examples-ee6/rss/rss-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-web/pom.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-web/pom.xml 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +1,136 @@ +<?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>rss</artifactId> + <groupId>org.jboss.seam.examples-ee6</groupId> + <version>2.3.0.Beta2-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <groupId>org.jboss.seam.examples-ee6.rss</groupId> + <artifactId>rss-web</artifactId> + <packaging>war</packaging> + <name>Rss Web Module (EE6)</name> + + <properties> +  + <jndiPattern>java:app/rss-ejb/#{ejbName}</jndiPattern> + </properties> + + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6.rss</groupId> + <artifactId>rss-ejb</artifactId> + <type>ejb</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <type>ejb</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui</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> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-rss</artifactId> + <exclusions> + <exclusion> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-debug</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> +  + <jndiPattern>#{ejbName}/local</jndiPattern> + </properties> + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6.rss</groupId> + <artifactId>rss-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> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + </dependency> + </dependencies> + <build> + <finalName>jboss-seam-rss</finalName> + </build> + </profile> + </profiles> + +</project> Added: branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/WEB-INF/components.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/WEB-INF/components.xml 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +1,16 @@ +<components xmlns="http://jboss.com/products/seam/components" + xmlns:excel="http://jboss.com/products/seam/excel" + xmlns:core="http://jboss.com/products/seam/core" + xmlns:framework="http://jboss.com/products/seam/framework" + xmlns:document="http://jboss.com/products/seam/document" + 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/framework http://jboss.com/products/seam/framework-2.3.xsd + http://jboss.com/products/seam/document http://jboss.com/products/seam/document-2.3.xsd + http://jboss.com/products/seam/excel http://jboss.com/products/seam/excel-2.3.xsd + http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.3.xsd"> + + + <core:init debug="true" jndi-pattern="@jndiPattern@" /> + +</components> Added: branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faces-config version="2.1" + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_1.xsd"> + +</faces-config> Added: branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/WEB-INF/pages.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/WEB-INF/pages.xml 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<pages xmlns="http://jboss.com/products/seam/pages" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://jboss.com/products/seam/pages http://jboss.com/products/seam/pages-2.0.xsd" > + + + +</pages> Added: branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/WEB-INF/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/WEB-INF/web.xml 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://java.sun.com/xml/ns/javaee" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" + version="3.0"> + <listener> + <listener-class>org.jboss.seam.servlet.SeamListener</listener-class> + </listener> + <filter> + <filter-name>Seam Filter</filter-name> + <filter-class>org.jboss.seam.servlet.SeamFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>Seam Filter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <servlet> + <servlet-name>Seam Resource Servlet</servlet-name> + <servlet-class>org.jboss.seam.servlet.SeamResourceServlet</servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>Seam Resource Servlet</servlet-name> + <url-pattern>/seam/resource/*</url-pattern> + </servlet-mapping> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.seam</url-pattern> + </servlet-mapping> + <context-param> + <param-name>javax.faces.DEFAULT_SUFFIX</param-name> + <param-value>.xhtml</param-value> + </context-param> + <context-param> + <param-name>webAppRootKey</param-name> + <param-value>seam-rss</param-value> + </context-param> + <context-param> + <param-name>facelets.DEVELOPMENT</param-name> + <param-value>true</param-value> + </context-param> + <session-config> + <session-timeout>10</session-timeout> + </session-config> +</web-app> Added: branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/index.html =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/index.html (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/index.html 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +1,5 @@ +<html> +<head> + <meta http-equiv="Refresh" content="0; URL=rss.seam"> +</head> +</html> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/rss.xhtml =================================================================== --- branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/rss.xhtml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/rss/rss-web/src/main/webapp/rss.xhtml 2012-04-03 15:07:09 UTC (rev 14489) @@ -0,0 +1,21 @@ +<r:feed + xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:r="http://jboss.com/products/seam/rss" + title="#{rss.feed.title}" + uid="#{rss.feed.uid}" + subtitle="#{rss.feed.subtitle}" + updated="#{rss.feed.updated}" + link="#{rss.feed.link}"> + <ui:repeat value="#{rss.feed.entries}" var="entry"> + <r:entry + uid="#{entry.uid}" + title="#{entry.title}" + link="#{entry.link}" + author="#{entry.author}" + summary="#{entry.summary}" + published="#{entry.published}" + updated="#{entry.updated}" + /> + </ui:repeat> +</r:feed>

12 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits April 2012