[seam-commits] Seam SVN: r14612 - in branches/community/Seam_2_3/examples-ee6/groovybooking: groovybooking-tests and 6 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Fri Apr 20 03:38:43 EDT 2012
Author: maschmid
Date: 2012-04-20 03:38:42 -0400 (Fri, 20 Apr 2012)
New Revision: 14612
Added:
branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-seam-groovybooking-ds.xml
Removed:
branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/jbossas/
branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-web.xml
Modified:
branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/groovybooking.properties
branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml
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/webapp/WEB-INF/faces-config.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/main.xhtml
branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/register.xhtml
branches/community/Seam_2_3/examples-ee6/groovybooking/pom.xml
Log:
groovybooking example fixes
Modified: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/pom.xml 2012-04-20 06:48:03 UTC (rev 14611)
+++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/pom.xml 2012-04-20 07:38:42 UTC (rev 14612)
@@ -10,7 +10,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.groovybooking</groupId>
<artifactId>groovybooking-tests</artifactId>
<name>Groovy Booking Integration Tests Module (EE6)</name>
@@ -28,11 +28,6 @@
<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>
@@ -147,23 +142,12 @@
<profile>
<id>ftest-jbossas</id>
<properties>
- <example.context.path>seam-messages</example.context.path>
+ <example.context.path>jboss-seam-groovybooking</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>
@@ -177,27 +161,5 @@
</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>
Modified: 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/groovybooking.properties 2012-04-20 06:48:03 UTC (rev 14611)
+++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/groovybooking.properties 2012-04-20 07:38:42 UTC (rev 14612)
@@ -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/groovybooking/groovybooking-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml 2012-04-20 06:48:03 UTC (rev 14611)
+++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/pom.xml 2012-04-20 07:38:42 UTC (rev 14612)
@@ -10,7 +10,7 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.jboss.seam.examples-ee6</groupId>
+ <groupId>org.jboss.seam.examples-ee6.groovybooking</groupId>
<artifactId>groovybooking-web</artifactId>
<packaging>war</packaging>
<name>Groovy Booking Web Module (EE6)</name>
@@ -20,6 +20,7 @@
<jndiPattern>java:app/groovybooking-ejb/#{ejbName}</jndiPattern>
<debug>true</debug>
<loadPersistenceUnits>false</loadPersistenceUnits>
+ <gmaven.runtime>1.5</gmaven.runtime>
</properties>
<dependencies>
@@ -39,10 +40,12 @@
</exclusion>
</exclusions>
</dependency>
+<!--
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam-debug</artifactId>
</dependency>
+-->
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
@@ -53,35 +56,21 @@
</exclusion>
</exclusions>
</dependency>
- <!--<dependency>-->
- <!--<groupId>com.sun.facelets</groupId>-->
- <!--<artifactId>jsf-facelets</artifactId>-->
- <!--</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>
+ <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>
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -122,21 +111,20 @@
<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>
+ <groupId>org.jboss.spec.javax.faces</groupId>
+ <artifactId>jboss-jsf-api_2.0_spec</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
<build>
@@ -270,19 +258,6 @@
<!--</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>
@@ -308,11 +283,5 @@
</plugins>
</build>
</profile>
- <profile>
- <id>jbossas42</id>
- <properties>
- <loadPersistenceUnits>true</loadPersistenceUnits>
- </properties>
- </profile>
</profiles>
</project>
Modified: 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/META-INF/persistence.xml 2012-04-20 06:48:03 UTC (rev 14611)
+++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/resources/META-INF/persistence.xml 2012-04-20 07:38:42 UTC (rev 14612)
@@ -7,7 +7,7 @@
<persistence-unit name="groovy" transaction-type="JTA">
<provider>org.hibernate.ejb.HibernatePersistence</provider>
- <jta-data-source>java:/groovyDatasource</jta-data-source>
+ <jta-data-source>java:/groovybookingDatasource</jta-data-source>
<properties>
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.show_sql" value="true"/>
Modified: 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/faces-config.xml 2012-04-20 06:48:03 UTC (rev 14611)
+++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/faces-config.xml 2012-04-20 07:38:42 UTC (rev 14612)
@@ -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/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-deployment-structure.xml 2012-04-20 07:38:42 UTC (rev 14612)
@@ -0,0 +1,12 @@
+<jboss-deployment-structure>
+ <deployment>
+ <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"/>
+ <module name="com.sun.jsf-impl"/>-->
+ </dependencies>
+ </deployment>
+</jboss-deployment-structure>
Added: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-seam-groovybooking-ds.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-seam-groovybooking-ds.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-seam-groovybooking-ds.xml 2012-04-20 07:38:42 UTC (rev 14612)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<datasources xmlns="http://www.jboss.org/ironjacamar/schema">
+ <datasource
+ jndi-name="java:/groovybookingDatasource"
+ enabled="true"
+ use-java-context="true" pool-name="groovybookingdb">
+ <connection-url>jdbc:h2:mem:groovybookingdb;DB_CLOSE_DELAY=-1</connection-url>
+ <driver>h2</driver>
+ <security>
+ <user-name>sa</user-name>
+ <password>sa</password>
+ </security>
+ </datasource>
+</datasources>
Deleted: branches/community/Seam_2_3/examples-ee6/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 2012-04-20 06:48:03 UTC (rev 14611)
+++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/jboss-web.xml 2012-04-20 07:38:42 UTC (rev 14612)
@@ -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>
Modified: 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/WEB-INF/web.xml 2012-04-20 06:48:03 UTC (rev 14611)
+++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/WEB-INF/web.xml 2012-04-20 07:38:42 UTC (rev 14612)
@@ -1,8 +1,8 @@
<?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">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+ version="3.0">
<context-param>
<param-name>org.richfaces.SKIN</param-name>
Modified: 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/book.xhtml 2012-04-20 06:48:03 UTC (rev 14611)
+++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/book.xhtml 2012-04-20 07:38:42 UTC (rev 14612)
@@ -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/groovybooking/groovybooking-web/src/main/webapp/main.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/main.xhtml 2012-04-20 06:48:03 UTC (rev 14611)
+++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/main.xhtml 2012-04-20 07:38:42 UTC (rev 14612)
@@ -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>
 
<a:commandButton id="findHotels" value="Find Hotels" action="#{hotelSearch.find}" reRender="searchResults"/>
Modified: 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/register.xhtml 2012-04-20 06:48:03 UTC (rev 14611)
+++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-web/src/main/webapp/register.xhtml 2012-04-20 07:38:42 UTC (rev 14612)
@@ -41,7 +41,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>
@@ -52,7 +52,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>
Modified: branches/community/Seam_2_3/examples-ee6/groovybooking/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/groovybooking/pom.xml 2012-04-20 06:48:03 UTC (rev 14611)
+++ branches/community/Seam_2_3/examples-ee6/groovybooking/pom.xml 2012-04-20 07:38:42 UTC (rev 14612)
@@ -23,7 +23,7 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.jboss.seam.examples</groupId>
+ <groupId>org.jboss.seam.examples-ee6.groovybooking</groupId>
<artifactId>groovybooking-web</artifactId>
<version>${project.version}</version>
<type>war</type>
More information about the seam-commits
mailing list