[seam-commits] Seam SVN: r15072 - in branches/community/Seam_2_3/examples-ee6/icefaces: icefaces-ear/src/main/application/META-INF and 6 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Thu Aug 23 10:27:35 EDT 2012
Author: manaRH
Date: 2012-08-23 10:27:35 -0400 (Thu, 23 Aug 2012)
New Revision: 15072
Removed:
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/WEB-INF/faces-config.xml
Modified:
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ear/pom.xml
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ear/src/main/application/META-INF/jboss-deployment-structure.xml
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ejb/src/main/resources/META-INF/persistence.xml
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ejb/src/main/resources/import.sql
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/pom.xml
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/WEB-INF/web.xml
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/book.xhtml
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/home.xhtml
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/main.xhtml
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/password.xhtml
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/register.xhtml
branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/template.xhtml
Log:
JBSEAM-5019 reworked icefaces example
Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ear/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ear/pom.xml 2012-08-23 14:27:11 UTC (rev 15071)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ear/pom.xml 2012-08-23 14:27:35 UTC (rev 15072)
@@ -26,6 +26,26 @@
<version>${project.version}</version>
<type>ejb</type>
</dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <scope>runtime</scope>
+ <type>ejb</type>
+ <exclusions>
+ <exclusion>
+ <artifactId>testng</artifactId>
+ <groupId>org.testng</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>el-api</artifactId>
+ <groupId>javax.el</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
</dependencies>
<build>
Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ear/src/main/application/META-INF/jboss-deployment-structure.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-08-23 14:27:11 UTC (rev 15071)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-08-23 14:27:35 UTC (rev 15072)
@@ -5,11 +5,8 @@
<module name="org.dom4j" export="true"/>
<module name="org.apache.commons.logging" export="true"/>
<module name="org.apache.commons.collections" export="true"/>
- <module name="org.slf4j" export="true"/>
- <module name="org.hibernate" export="true"/>
- <module name="org.hibernate.validator" export="true"/>
<module name="javax.faces.api" export="true"/>
- <module name="com.sun.jsf-impl" export="true"/>
+ <module name="com.sun.jsf-impl" export="true"/>
</dependencies>
</deployment>
</jboss-deployment-structure>
Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ejb/pom.xml 2012-08-23 14:27:11 UTC (rev 15071)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ejb/pom.xml 2012-08-23 14:27:35 UTC (rev 15072)
@@ -19,11 +19,22 @@
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
<type>ejb</type>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>testng</artifactId>
+ <groupId>org.testng</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
@@ -45,10 +56,10 @@
<artifactId>hibernate-jpa-2.0-api</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.jbpm</groupId>
- <artifactId>jbpm-jpdl</artifactId>
- <version>3.2.3</version>
- </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/icefaces/icefaces-ejb/src/main/resources/META-INF/persistence.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ejb/src/main/resources/META-INF/persistence.xml 2012-08-23 14:27:11 UTC (rev 15071)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ejb/src/main/resources/META-INF/persistence.xml 2012-08-23 14:27:35 UTC (rev 15072)
@@ -10,7 +10,6 @@
<property name="hibernate.hbm2ddl.auto" value="create-drop"/>
<property name="hibernate.show_sql" value="true"/>
<!-- These are the default for JBoss EJB3, but not for HEM: -->
- <property name="hibernate.cache.provider_class" value="org.hibernate.cache.HashtableCacheProvider"/>
<property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup"/>
</properties>
</persistence-unit>
Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ejb/src/main/resources/import.sql
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ejb/src/main/resources/import.sql 2012-08-23 14:27:11 UTC (rev 15071)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-ejb/src/main/resources/import.sql 2012-08-23 14:27:35 UTC (rev 15072)
@@ -9,7 +9,7 @@
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 (11, 160, 'Marriott 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')
@@ -19,4 +19,4 @@
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')
\ No newline at end of file
+insert into Hotel (id, price, name, address, city, state, zip, country) values (21, 210, 'Hotel Allegro', '171 West Randolph Street', 'Chicago', 'IL', '60601', 'USA')
Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/pom.xml 2012-08-23 14:27:11 UTC (rev 15071)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/pom.xml 2012-08-23 14:27:35 UTC (rev 15072)
@@ -36,14 +36,34 @@
<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>
+ <exclusion>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam-debug</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.el</groupId>
- <artifactId>jboss-el</artifactId>
- </dependency>
- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<scope>provided</scope>
@@ -55,19 +75,15 @@
</dependency>
<dependency>
<groupId>org.icefaces</groupId>
- <artifactId>icefaces</artifactId>
+ <artifactId>icefaces-compat</artifactId>
<version>3.0.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>javax.faces</artifactId>
+ <groupId>org.glassfish</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
- <dependency>
- <groupId>org.icefaces</groupId>
- <artifactId>icefaces-ace</artifactId>
- <version>3.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.icefaces</groupId>
- <artifactId>icepush</artifactId>
- <version>3.0.1</version>
- </dependency>
</dependencies>
<build>
Deleted: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/WEB-INF/faces-config.xml 2012-08-23 14:27:11 UTC (rev 15071)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/WEB-INF/faces-config.xml 2012-08-23 14:27:35 UTC (rev 15072)
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<faces-config 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"
- version="2.1">
- ...
-</faces-config>
- <!--<application>-->
- <!--<message-bundle>messages</message-bundle>-->
- <!--<view-handler>com.icesoft.faces.facelets.D2DSeamFaceletViewHandler</view-handler>-->
- <!--</application>-->
-
- <!--<managed-bean>-->
-
- <!--<managed-bean-name>highlight</managed-bean-name>-->
-
- <!--<managed-bean-class>com.icesoft.faces.context.effects.Highlight</managed-bean-class>-->
-
- <!--<managed-bean-scope>application</managed-bean-scope>-->
-
- <!--</managed-bean>-->
Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/WEB-INF/web.xml 2012-08-23 14:27:11 UTC (rev 15071)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/WEB-INF/web.xml 2012-08-23 14:27:35 UTC (rev 15072)
@@ -11,10 +11,6 @@
<listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
</listener>
- <!--<listener>-->
- <!--<listener-class>com.icesoft.faces.util.event.servlet.ContextEventRepeater</listener-class>-->
- <!--</listener>-->
-
<!-- filters -->
<servlet>
<servlet-name>Seam Resource Servlet</servlet-name>
@@ -44,7 +40,12 @@
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
<param-value>server</param-value>
</context-param>
-
+
+ <context-param>
+ <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
<context-param>
<param-name>facelets.DEVELOPMENT</param-name>
<param-value>true</param-value>
@@ -55,78 +56,20 @@
<param-value>.xhtml</param-value>
</context-param>
- <!--<context-param>-->
- <!--<param-name>com.icesoft.faces.actionURLSuffix</param-name>-->
- <!--<param-value>.seam</param-value>-->
- <!--</context-param>-->
-
- <!--<context-param>-->
- <!--<param-name>com.icesoft.faces.synchronousUpdate</param-name>-->
- <!--<param-value>false</param-value>-->
- <!--</context-param>-->
-
- <!--<context-param> -->
- <!--<param-name>com.icesoft.faces.doJSFStateManagement</param-name>-->
- <!--<param-value>true</param-value>-->
- <!--</context-param> -->
-
- <!--<context-param>-->
- <!--<param-name>com.icesoft.faces.standardRequestScope</param-name>-->
- <!--<param-value>true</param-value>-->
- <!--</context-param>-->
- <!---->
- <!--<context-param>-->
- <!--<param-name>com.icesoft.faces.concurrentDOMViews</param-name>-->
- <!--<param-value>true</param-value>-->
- <!--</context-param>-->
-
- <!-- this is only for JBoss AS 6 - it contains JSF RI 2.0.2 which has a bug
- Remove this if you have upgraded to 2.0.3 -->
- <context-param>
- <param-name>org.jboss.jbossfaces.JSF_CONFIG_NAME</param-name>
- <param-value>Mojarra-1.2</param-value>
- </context-param>
-
- <!-- servlets -->
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
- <!--<servlet>-->
- <!--<servlet-name>Persistent Faces Servlet</servlet-name>-->
- <!--<servlet-class>com.icesoft.faces.webapp.xmlhttp.PersistentFacesServlet</servlet-class>-->
- <!--<load-on-startup> 1 </load-on-startup>-->
- <!--</servlet>-->
- <!--<servlet>-->
- <!--<servlet-name>Blocking Servlet</servlet-name>-->
- <!--<servlet-class>com.icesoft.faces.webapp.xmlhttp.BlockingServlet</servlet-class>-->
- <!--<load-on-startup> 1 </load-on-startup>-->
- <!--</servlet> -->
- <!---->
-
-<!-- servlet mappings -->
- <!--<servlet-mapping>-->
- <!--<servlet-name>Persistent Faces Servlet</servlet-name>-->
- <!--<url-pattern>*.seam</url-pattern>-->
- <!--</servlet-mapping>-->
-
- <!--<servlet-mapping>-->
- <!--<servlet-name>Persistent Faces Servlet</servlet-name>-->
- <!--<url-pattern>/xmlhttp/*</url-pattern>-->
- <!--</servlet-mapping>-->
- <!---->
- <!--<!– Blocking Servlet Mapping –>-->
- <!--<servlet-mapping>-->
- <!--<servlet-name>Blocking Servlet</servlet-name>-->
- <!--<url-pattern>/block/*</url-pattern>-->
- <!--</servlet-mapping>-->
-
+ <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>
Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/book.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/book.xhtml 2012-08-23 14:27:11 UTC (rev 15071)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/book.xhtml 2012-08-23 14:27:35 UTC (rev 15072)
@@ -1,4 +1,3 @@
-<!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"
Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/home.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/home.xhtml 2012-08-23 14:27:11 UTC (rev 15071)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/home.xhtml 2012-08-23 14:27:35 UTC (rev 15072)
@@ -1,16 +1,16 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<h:html xmlns="http://www.w3.org/1999/xhtml"
+<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:ice="http://www.icesoft.com/icefaces/component"
xmlns:s="http://jboss.org/schema/seam/taglib">
<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" />
+ <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" />
</h:head>
-<h:body id="pgHome">
+<body>
<f:view>
<div id="document">
<div id="header">
@@ -30,7 +30,7 @@
<h:inputSecret id="password" value="#{identity.password}" style="width: 165px;"/>
</div>
<div class="errors"><h:messages globalOnly="true"/></div>
- <div class="buttonBox"><ice:commandButton id="login" action="#{identity.login}" value="Account Login"
+ <div class="buttonBox"><h:commandButton id="login" action="#{identity.login()}" value="Account Login"
styleClass="button"/></div>
<div class="notes"><s:link id="register" view="/register.xhtml" value="Register New User"/></div>
<div class="subnotes">
@@ -76,8 +76,8 @@
</div>
</div>
</div>
- <div id="footer">Created with JBoss EJB 3.0, Seam, ICEFaces, and Facelets</div>
+ <div id="footer">Created with JBoss EJB 3, Seam, JSF 2 and ICEFaces</div>
</div>
</f:view>
-</h:body>
-</h:html>
+</body>
+</html>
Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/main.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/main.xhtml 2012-08-23 14:27:11 UTC (rev 15071)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/main.xhtml 2012-08-23 14:27:35 UTC (rev 15072)
@@ -1,4 +1,3 @@
-<!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"
@@ -20,7 +19,7 @@
<h:form id="searchCriteria">
<fieldset>
- <ice:selectInputText id="searchString"
+ <ice:selectInputText id="searchString"
valueChangeListener="#{hotelSearch.handleSearchStringChange}"
value="#{hotelSearch.searchString}"/>
 
Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/password.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/password.xhtml 2012-08-23 14:27:11 UTC (rev 15071)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/password.xhtml 2012-08-23 14:27:35 UTC (rev 15072)
@@ -1,106 +1,68 @@
-<!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.org/schema/seam/taglib"
- xmlns:ice="http://www.icesoft.com/icefaces/component"
- template="template.xhtml">
-
-<!-- content -->
+ 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.org/schema/seam/taglib"
+ xmlns:ice="http://www.icesoft.com/icefaces/component"
+ template="template.xhtml">
-<ui:define name="content">
+ <!-- content -->
+ <ui:define name="content">
+ <div class="section">
+ <h1>Change Your Password</h1>
+ </div>
-<div class="section">
+ <div class="section">
- <h1>Change Your Password</h1>
-
-</div>
-
-
-<div class="section">
-
-
- <div class="entry errors">
- <h:messages id="messages" globalOnly="true"/>
- </div>
-
- <h:form id="setpassword">
-
-
-
- <fieldset>
-
-
-
- <s:decorate id="PasswordDecorate" template="edit.xhtml">
-
- <ui:define name="label">Password:</ui:define>
-
- <ice:inputSecret id="password" value="#{user.password}"
- redisplay="true" required="true"/>
- </s:decorate>
-
-
-
- <s:decorate id="VerifyDecorate" template="edit.xhtml">
- <ui:define name="label">Verify:</ui:define>
- <ice:inputSecret id="verify" value="#{changePassword.verify}"
- redisplay="true" required="true"/>
- </s:decorate>
- <div class="buttonBox">
-
- <h:commandButton id="change" value="Change" action="#{changePassword.changePassword}"/>
-  
-
- <s:button id="cancel" value="Cancel" view="/main.xhtml"/>
-
+ <div class="entry errors">
+ <h:messages id="messages" globalOnly="true" />
</div>
+ <h:form id="setpassword">
+ <fieldset>
+ <s:decorate id="PasswordDecorate" template="edit.xhtml">
+ <ui:define name="label">Password:</ui:define>
+ <ice:inputSecret id="password" value="#{user.password}"
+ redisplay="true" required="true" />
+ </s:decorate>
-
+ <s:decorate id="VerifyDecorate" template="edit.xhtml">
+ <ui:define name="label">Verify:</ui:define>
+ <ice:inputSecret id="verify" value="#{changePassword.verify}"
+ redisplay="true" required="true" />
+ </s:decorate>
+ <div class="buttonBox">
- </fieldset>
+ <h:commandButton id="change" value="Change"
+ action="#{changePassword.changePassword}" />
+  
-
+ <s:button id="cancel" value="Cancel" view="/main.xhtml" />
- </h:form>
+ </div>
+ </fieldset>
-</div>
+ </h:form>
+ </div>
+ </ui:define>
-</ui:define>
+ <!-- sidebar -->
+ <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>
-<!-- sidebar -->
+ </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>
Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/register.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/register.xhtml 2012-08-23 14:27:11 UTC (rev 15071)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/register.xhtml 2012-08-23 14:27:35 UTC (rev 15072)
@@ -1,10 +1,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<h: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.org/schema/seam/taglib"
- xmlns:ice="http://www.icesoft.com/icefaces/component" >
+<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.org/schema/seam/taglib"
+ xmlns:ice="http://www.icesoft.com/icefaces/component">
<h:head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -12,91 +12,97 @@
<link href="css/screen.css" rel="stylesheet" type="text/css" />
</h:head>
-<h:body id="pgHome">
+<body id="pgHome">
-<ice:panelGroup id="document">
+ <ice:panelGroup id="document">
- <div id="header">
- <ice:panelGroup id="title"><img src="img/hdr.title.gif" alt="JBoss Suites: ICEfaces-seam framework demo"/></ice:panelGroup>
- </div>
-
- <ice:panelGroup id="container">
-
- <div id="sidebar">
- <h1>Integrated multi-layer validation</h1>
- <p>
- Robust applications need data validation in several different places. Seam integrates Hibernate Validator,
- a set of annotations for expressing data model constraints in your domain model classes. Then, these
- constraints are applied almost completely transparently at three levels of the application: by Seam when
- the user first enters data, by EJB before persisting data to the database, and, if you use Hibernate to
- generate your database schema, by the database constraints themselves. Multi-layer validation hardens
- your application and protects your data. Even better, it's self-documenting, and easy to change when
- your business rules change.
- </p>
- <p>
- <a href="#" onclick="window.open('exp/registerExp.html','exp','width=752,height=500,scrollbars=yes');">
- What happens when I register?
- </a>
- </p>
+ <div id="header">
+ <ice:panelGroup id="title">
+ <img src="img/hdr.title.gif"
+ alt="JBoss Suites: ICEfaces-seam framework demo" />
+ </ice:panelGroup>
</div>
-
- <ice:panelGroup id="content">
-
- <div class="section">
- <h1>Register</h1>
+
+ <ice:panelGroup id="container">
+
+ <div id="sidebar">
+ <h1>Integrated multi-layer validation</h1>
+ <p>Robust applications need data validation in several different
+ places. Seam integrates Hibernate Validator, a set of annotations
+ for expressing data model constraints in your domain model classes.
+ Then, these constraints are applied almost completely transparently
+ at three levels of the application: by Seam when the user first
+ enters data, by EJB before persisting data to the database, and, if
+ you use Hibernate to generate your database schema, by the database
+ constraints themselves. Multi-layer validation hardens your
+ application and protects your data. Even better, it's
+ self-documenting, and easy to change when your business rules
+ change.</p>
+ <p>
+ <a href="#"
+ onclick="window.open('exp/registerExp.html','exp','width=752,height=500,scrollbars=yes');">
+ What happens when I register? </a>
+ </p>
</div>
-
- <div class="section" style="overflow:auto">
- <div class="entry errors">
- <h:messages id="messages" globalOnly="true"/>
+
+ <ice:panelGroup id="content">
+
+ <div class="section">
+ <h1>Register</h1>
</div>
- <h:form id="registration">
- <fieldset>
-
- <s:decorate id="usernameDecorate" template="edit.xhtml">
- <ui:define name="label">Username:</ui:define>
- <ice:inputText id="username" value="#{user.username}"
- required="true" partialSubmit="true"/>
- </s:decorate>
-
- <s:decorate id="nameDecorate" template="edit.xhtml">
- <ui:define name="label">Real Name:</ui:define>
- <ice:inputText id="name" value="#{user.name}"
- required="true" partialSubmit="true"/>
- </s:decorate>
-
- <s:decorate id="passwordDecorate" template="edit.xhtml">
- <ui:define name="label">Password:</ui:define>
- <ice:inputSecret id="password" value="#{user.password}"
- redisplay="true" partialSubmit="true" required="true"/>
- </s:decorate>
-
- <s:decorate id="verifyDecorate" template="edit.xhtml">
- <ui:define name="label">Verify Password:</ui:define>
- <ice:inputSecret id="verify" value="#{register.verify}"
- redisplay="true" partialSubmit="true" required="true"/>
- </s:decorate>
-
- <div class="buttonBox">
- <ice:commandButton id="register" value="Register" action="#{register.register}"/>
-  
- <s:button id="cancel" value="Cancel" view="/home.xhtml"/>
+ <div class="section" style="overflow: auto">
+ <div class="entry errors">
+ <h:messages id="messages" globalOnly="true" />
</div>
-
- </fieldset>
- </h:form>
-
- </div>
-
+
+ <h:form id="registration">
+ <fieldset>
+
+ <s:decorate id="usernameDecorate" template="edit.xhtml">
+ <ui:define name="label">Username:</ui:define>
+ <ice:inputText id="username" value="#{user.username}"
+ required="true" partialSubmit="true" />
+ </s:decorate>
+
+ <s:decorate id="nameDecorate" template="edit.xhtml">
+ <ui:define name="label">Real Name:</ui:define>
+ <ice:inputText id="name" value="#{user.name}" required="true"
+ partialSubmit="true" />
+ </s:decorate>
+
+ <s:decorate id="passwordDecorate" template="edit.xhtml">
+ <ui:define name="label">Password:</ui:define>
+ <ice:inputSecret id="password" value="#{user.password}"
+ redisplay="true" partialSubmit="true" required="true" />
+ </s:decorate>
+
+ <s:decorate id="verifyDecorate" template="edit.xhtml">
+ <ui:define name="label">Verify Password:</ui:define>
+ <ice:inputSecret id="verify" value="#{register.verify}"
+ redisplay="true" partialSubmit="true" required="true" />
+ </s:decorate>
+
+ <div class="buttonBox">
+ <ice:commandButton id="register" value="Register"
+ action="#{register.register}" />
+  
+ <s:button id="cancel" value="Cancel" view="/home.xhtml" />
+ </div>
+
+ </fieldset>
+ </h:form>
+
+ </div>
+
+ </ice:panelGroup>
+
</ice:panelGroup>
-
+
+ <div id="footer">Created with JBoss EJB 3, Seam, JSF 2 (Mojarra)</div>
+
</ice:panelGroup>
-
- <div id="footer">Created with JBoss EJB 3.0, Seam, JSF (Mojarra), and Facelets</div>
-
-</ice:panelGroup>
-</h:body>
+</body>
-</h:html>
+</html>
Modified: branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/template.xhtml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/template.xhtml 2012-08-23 14:27:11 UTC (rev 15071)
+++ branches/community/Seam_2_3/examples-ee6/icefaces/icefaces-web/src/main/webapp/template.xhtml 2012-08-23 14:27:35 UTC (rev 15072)
@@ -1,19 +1,14 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<h:html xmlns="http://www.w3.org/1999/xhtml"
+<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.org/schema/seam/taglib"
- xmlns:ice="http://www.icesoft.com/icefaces/component">
+ xmlns:s="http://jboss.org/schema/seam/taglib">
<h:head>
- <ice:outputDeclaration doctypeRoot="HTML"
- doctypePublic="-//W3C//DTD XHTML 1.0 Transitional//EN"
- doctypeSystem="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>JBoss Suites: Seam Framework</title>
- <link rel='stylesheet' type='text/css' href='./xmlhttp/css/xp/xp.css'/>
<link href="css/screen.css" rel="stylesheet" type="text/css" />
</h:head>
-<h:body>
+<body>
<div id="document">
<div id="header">
@@ -34,7 +29,7 @@
<ui:include src="conversations.xhtml" />
</div>
</div>
- <div id="footer">Created with JBoss EJB 3.0, Seam, JSF (Mojarra), ICEfaces and Facelets</div>
+ <div id="footer">Created with JBoss EJB 3, Seam, JSF 2, ICEfaces</div>
</div>
-</h:body>
-</h:html>
+</body>
+</html>
More information about the seam-commits
mailing list