Author: maschmid Date: 2012-04-20 04:42:20 -0400 (Fri, 20 Apr 2012) New Revision: 14616 Added: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml Removed: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/jboss/ Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom.xml branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources/hibernate.properties branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/pom.xml 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/webapp/WEB-INF/faces-config.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/home.xhtml 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/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/pom.xml Log: hibernate example fixes Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom.xml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/pom.xml 2012-04-20 08:42:20 UTC (rev 14616) @@ -7,14 +7,13 @@ <parent> <artifactId>hibernate</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> + <version>2.3.0.Beta2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.hibernate</groupId> <artifactId>hibernate-tests</artifactId> <name>Hibernate Integration Tests Module (EE6)</name> - <version>2.3.0.Beta1-SNAPSHOT</version> <dependencies> <dependency> @@ -27,11 +26,6 @@ <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> @@ -39,27 +33,15 @@ <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> @@ -78,6 +60,11 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.0_spec</artifactId> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.jboss.arquillian.junit</groupId> @@ -185,39 +172,6 @@ <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> Modified: 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/hibernate.properties 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-tests/src/test/resources/hibernate.properties 2012-04-20 08:42:20 UTC (rev 14616) @@ -29,7 +29,7 @@ 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_LENGTH_MESSAGE size must be between PASSWORD_PASSWORD id=setpassword:PasswordDecorate:password PASSWORD_VERIFY id=setpassword:VerifyDecorate:verify PASSWORD_SUBMIT id=setpassword:change @@ -66,7 +66,7 @@ REGISTRATION_VERIFY_MESSAGE id=register:verifyDecorate:message REGISTRATION_SUBMIT id=register:register REGISTRATION_REENTER_MESSAGE verify -REGISTRATION_LENGTH_MESSAGE length must be between +REGISTRATION_LENGTH_MESSAGE size must be between REGISTRATION_SUCCESSFUL_MESSAGE Successfully registered as {0} REGISTRATION_USER_EXISTS_MESSAGE Username {0} already exists NOT_LOGGED_IN_MESSAGE Please log in first @@ -81,4 +81,4 @@ 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 +SPINNER id\=main\:Spinner Modified: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/pom.xml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/pom.xml 2012-04-20 08:42:20 UTC (rev 14616) @@ -6,13 +6,12 @@ <parent> <artifactId>hibernate</artifactId> <groupId>org.jboss.seam.examples-ee6</groupId> - <version>2.3.0.Beta1-SNAPSHOT</version> + <version>2.3.0.Beta2-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <groupId>org.jboss.seam.examples-ee6</groupId> + <groupId>org.jboss.seam.examples-ee6.hibernate</groupId> <artifactId>hibernate-web</artifactId> - <version>2.3.0.Beta1-SNAPSHOT</version> <packaging>war</packaging> <name>Hibernate Web Module (EE6)</name> @@ -32,18 +31,6 @@ </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> @@ -53,16 +40,6 @@ <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> @@ -75,12 +52,6 @@ </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> @@ -95,46 +66,14 @@ </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> @@ -142,321 +81,26 @@ <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> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.0_spec</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-impl</artifactId> + </dependency> + <dependency> + <groupId>org.richfaces.core</groupId> + <artifactId>richfaces-core-api</artifactId> + </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> Modified: 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/hibernate.cfg.xml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/resources/hibernate.cfg.xml 2012-04-20 08:42:20 UTC (rev 14616) @@ -5,7 +5,7 @@ <hibernate-configuration> <session-factory name="java:/bookingDatabase"> <property name="show_sql">false</property> - <property name="connection.datasource">java:/DefaultDS</property> + <property name="connection.datasource">java:jboss/datasources/ExampleDS</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> Modified: 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/faces-config.xml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-20 08:42:20 UTC (rev 14616) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<faces-config version="1.2" +<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"> Added: branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml 2012-04-20 08:42:20 UTC (rev 14616) @@ -0,0 +1,9 @@ +<jboss-deployment-structure> + <deployment> + <dependencies> + <module name="org.javassist" export="true"/> + <module name="org.dom4j" export="true"/> + <module name="org.hibernate" export="true"/> + </dependencies> + </deployment> +</jboss-deployment-structure> Modified: 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/WEB-INF/web.xml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/WEB-INF/web.xml 2012-04-20 08:42:20 UTC (rev 14616) @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.5" +<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> <!-- Seam --> Modified: 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/book.xhtml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/book.xhtml 2012-04-20 08:42:20 UTC (rev 14616) @@ -105,7 +105,7 @@ <div class="input"> <s:decorate id="creditCardDecorate"> <h:inputText id="creditCard" value="#{booking.creditCard}" required="true"> - <a:support event="onblur" reRender="creditCardDecorate"/> + <a:ajax event="blur" render="creditCardDecorate"/> </h:inputText> </s:decorate> </div> @@ -116,7 +116,7 @@ <div class="input"> <s:decorate id="creditCardNameDecorate"> <h:inputText id="creditCardName" value="#{booking.creditCardName}" required="true"> - <a:support event="onblur" reRender="creditCardNameDecorate"/> + <a:ajax event="blur" render="creditCardNameDecorate"/> </h:inputText> </s:decorate> </div> Modified: 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/home.xhtml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/home.xhtml 2012-04-20 08:42:20 UTC (rev 14616) @@ -4,12 +4,12 @@ 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> +<h: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"> +</h:head> +<h:body id="pgHome"> <f:view> <div id="document"> <div id="header"> @@ -45,5 +45,5 @@ <div id="footer">Created with JBoss EJB 3.0, Seam, JSF (Mojarra), and Facelets</div> </div> </f:view> -</body> +</h:body> </html> Modified: 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/main.xhtml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/main.xhtml 2012-04-20 08:42:20 UTC (rev 14616) @@ -20,7 +20,7 @@ <h1>Search Hotels</h1> <fieldset> <h:inputText id="searchString" value="#{hotelSearch.searchString}" style="width: 165px;"> - <a:support event="onkeyup" actionListener="#{hotelSearch.find}" reRender="searchResults" /> + <a:ajax event="keyup" listener="#{hotelSearch.find}" render="searchResults" /> </h:inputText> &#160; <a:commandButton id="findHotels" value="Find Hotels" action="#{hotelSearch.find}" reRender="searchResults"/> Modified: 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/register.xhtml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/register.xhtml 2012-04-20 08:42:20 UTC (rev 14616) @@ -5,12 +5,12 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:s="http://jboss.com/products/seam/taglib" xmlns:a="http://richfaces.org/a4j"> -<head> +<h: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"> +</h:head> +<h: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> @@ -43,7 +43,7 @@ <div class="input"> <s:decorate id="usernameDecorate"> <h:inputText id="username" value="#{user.username}" required="true"> - <a:support event="onblur" reRender="usernameDecorate"/> + <a:ajax event="blur" render="usernameDecorate"/> </h:inputText> </s:decorate> </div> @@ -54,7 +54,7 @@ <div class="input"> <s:decorate id="nameDecorate"> <h:inputText id="name" value="#{user.name}" required="true"> - <a:support event="onblur" reRender="nameDecorate"/> + <a:ajax event="blur" render="nameDecorate"/> </h:inputText> </s:decorate> </div> @@ -100,5 +100,5 @@ </div> <div id="footer">Created with JBoss EJB 3.0, Seam, JSF (Mojarra), and Facelets</div> </div> -</body> +</h:body> </html> Modified: branches/community/Seam_2_3/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 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/hibernate-web/src/main/webapp/template.xhtml 2012-04-20 08:42:20 UTC (rev 14616) @@ -3,12 +3,12 @@ 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> +<h: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> +</h:head> +<h:body> <div id="document"> <div id="header"> @@ -31,5 +31,5 @@ </div> <div id="footer">Created with JBoss Seam, JSF 1.2, Hibernate 3 and Facelets</div> </div> -</body> +</h:body> </html> Modified: branches/community/Seam_2_3/examples-ee6/hibernate/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/hibernate/pom.xml 2012-04-20 08:08:12 UTC (rev 14615) +++ branches/community/Seam_2_3/examples-ee6/hibernate/pom.xml 2012-04-20 08:42:20 UTC (rev 14616) @@ -5,13 +5,12 @@ <parent> <groupId>org.jboss.seam</groupId> <artifactId>examples-ee6</artifactId> - <version>2.3.0.Beta1-SNAPSHOT</version> + <version>2.3.0.Beta2-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> @@ -24,4 +23,16 @@ <module>hibernate-web</module> <module>hibernate-tests</module> </modules> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.jboss.seam.examples-ee6.hibernate</groupId> + <artifactId>hibernate-web</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + </dependencies> + </dependencyManagement> + </project>