Seam SVN: r8339 - trunk/src/main/org/jboss/seam/annotations/security.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-06-06 11:20:22 -0400 (Fri, 06 Jun 2008)
New Revision: 8339
Added:
trunk/src/main/org/jboss/seam/annotations/security/TokenUsername.java
trunk/src/main/org/jboss/seam/annotations/security/TokenValue.java
Log:
JBSEAM-2079
Added: trunk/src/main/org/jboss/seam/annotations/security/TokenUsername.java
===================================================================
--- trunk/src/main/org/jboss/seam/annotations/security/TokenUsername.java (rev 0)
+++ trunk/src/main/org/jboss/seam/annotations/security/TokenUsername.java 2008-06-06 15:20:22 UTC (rev 8339)
@@ -0,0 +1,24 @@
+package org.jboss.seam.annotations.security;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Flags an entity field or method as representing the username for an authentication token
+ *
+ * @author Shane Bryzak
+ */
+@Target({METHOD,FIELD})
+@Documented
+@Retention(RUNTIME)
+@Inherited
+public @interface TokenUsername
+{
+
+}
Added: trunk/src/main/org/jboss/seam/annotations/security/TokenValue.java
===================================================================
--- trunk/src/main/org/jboss/seam/annotations/security/TokenValue.java (rev 0)
+++ trunk/src/main/org/jboss/seam/annotations/security/TokenValue.java 2008-06-06 15:20:22 UTC (rev 8339)
@@ -0,0 +1,24 @@
+package org.jboss.seam.annotations.security;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * Flags an entity field or method as representing the value for an authentication token
+ *
+ * @author Shane Bryzak
+ */
+@Target({METHOD,FIELD})
+@Documented
+@Retention(RUNTIME)
+@Inherited
+public @interface TokenValue
+{
+
+}
16 years, 7 months
- 1
- 0
Seam SVN: r8338 - trunk/build and 1 other directory.
by seam-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-06-06 11:11:30 -0400 (Fri, 06 Jun 2008)
New Revision: 8338
Modified:
branches/Seam_2_0/build/build.xml
branches/Seam_2_0/build/readme.txt
branches/Seam_2_0/build/utilities.build.xml
trunk/build/build.xml
trunk/build/readme.txt
trunk/build/utilities.build.xml
Log:
Added a new release target of "deployReleaseWithSourcesAndJavaDoc" that will deploy a new/updated seam dependency to the offline repository. Also updated related document in readme.txt
Modified: branches/Seam_2_0/build/build.xml
===================================================================
--- branches/Seam_2_0/build/build.xml 2008-06-06 15:06:42 UTC (rev 8337)
+++ branches/Seam_2_0/build/build.xml 2008-06-06 15:11:30 UTC (rev 8338)
@@ -23,10 +23,17 @@
<deploy pom="${pom.file}" jar="${jar}" repositoryId="snapshots.jboss.org" />
</target>
- <target name="deployRelease" description="Deploy a jar (generating the pom) to snapshots.jboss.org" depends="initdav">
+ <target name="deployRelease" description="Deploy a jar (generating the pom) to to the offline repository" depends="initdav">
<pomfile name="pom.file" value="${pom}" />
<deploy pom="${pom.file}" jar="${jar}" repositoryId="offline.repository.jboss.org" />
</target>
+
+ <target name="deployReleaseWithSourcesAndJavaDoc" description="Deploy a jar (generating the pom), sourcejar and javadoc jar to the offline repository" depends="initdav">
+ <pomfile name="pom.file" value="${pom}" />
+ <deployWithSourcesAndJavadoc pom="${pom.file}" jar="${jar}"
+ srcjar="${srcjar}" docjar="${docjar}"
+ repositoryId="offline.repository.jboss.org" />
+ </target>
<target name="releaseSeam" description="Deploy Seam and JBoss EL to your local copy of repository.jboss.org" depends="initpoms">
<fail unless="offline.repository.jboss.org" message="Please set the offline.repository.jboss.org property"/>
Modified: branches/Seam_2_0/build/readme.txt
===================================================================
--- branches/Seam_2_0/build/readme.txt 2008-06-06 15:06:42 UTC (rev 8337)
+++ branches/Seam_2_0/build/readme.txt 2008-06-06 15:11:30 UTC (rev 8338)
@@ -50,7 +50,9 @@
1) Checkout repository.jboss.org/maven2 from svn (https://svn.jboss.org/repos/repository.jboss.org)
2) Set the offline.repository.jboss.org property in build/build.properties to
the directory you checked out to.
- 3) Run ant -Dpom=foo.pom -Djar=foo.jar deployRelease
+ 3) Run "ant -Dpom=foo.pom -Djar=foo.jar deployRelease"
+ - if the new dependency also has a source and javadoc jar you can run:
+ - "ant -Dpom=foo.pom -Djar=foo.jar -Dsrcjar=foo-src.jar -Ddocjar=foo-doc.jar deployReleaseWithSourcesAndJavaDoc"
4) Check in the changed files to SVN (they'll be under a path of
artifactId/groupId/version)
Modified: branches/Seam_2_0/build/utilities.build.xml
===================================================================
--- branches/Seam_2_0/build/utilities.build.xml 2008-06-06 15:06:42 UTC (rev 8337)
+++ branches/Seam_2_0/build/utilities.build.xml 2008-06-06 15:11:30 UTC (rev 8338)
@@ -103,6 +103,25 @@
</artifact:deploy>
</sequential>
</macrodef>
+
+ <macrodef name="deployWithSourcesAndJavadoc">
+ <attribute name="pom" default="" />
+ <attribute name="jar" default="" />
+ <attribute name="srcjar" />
+ <attribute name="docjar" />
+ <attribute name="repositoryId" default="" />
+ <element name="credentials" implicit="true" optional="true" />
+ <sequential>
+ <artifact:deploy file="@{jar}" settingsFile="${maven.settings.xml}">
+ <pom file="@{pom}" settingsFile="${maven.settings.xml}" />
+ <remoteRepository refId="@{repositoryId}">
+ <credentials />
+ </remoteRepository>
+ <attach file="@{srcjar}" classifier="sources" />
+ <attach file="@{docjar}" classifier="javadoc" />
+ </artifact:deploy>
+ </sequential>
+ </macrodef>
<macrodef name="deployWithAttachment">
<attribute name="pom" default="" />
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2008-06-06 15:06:42 UTC (rev 8337)
+++ trunk/build/build.xml 2008-06-06 15:11:30 UTC (rev 8338)
@@ -27,6 +27,13 @@
<pomfile name="pom.file" value="${pom}" />
<deploy pom="${pom.file}" jar="${jar}" repositoryId="offline.repository.jboss.org" />
</target>
+
+ <target name="deployReleaseWithSourcesAndJavaDoc" description="Deploy a jar (generating the pom), source jar and javadoc jar to the offline repository" depends="initdav">
+ <pomfile name="pom.file" value="${pom}" />
+ <deployWithSourcesAndJavadoc pom="${pom.file}" jar="${jar}"
+ srcjar="${srcjar}" docjar="${docjar}"
+ repositoryId="offline.repository.jboss.org" />
+ </target>
<target name="releaseSeam" description="Deploy Seam and JBoss EL to your local copy of repository.jboss.org" depends="initpoms">
<fail unless="offline.repository.jboss.org" message="Please set the offline.repository.jboss.org property"/>
Modified: trunk/build/readme.txt
===================================================================
--- trunk/build/readme.txt 2008-06-06 15:06:42 UTC (rev 8337)
+++ trunk/build/readme.txt 2008-06-06 15:11:30 UTC (rev 8338)
@@ -51,6 +51,8 @@
2) Set the offline.repository.jboss.org property in build/build.properties to
the directory you checked out to.
3) Run ant -Dpom=foo.pom -Djar=foo.jar deployRelease
+ - if the new dependency also has a source and javadoc jar you can run:
+ - "ant -Dpom=foo.pom -Djar=foo.jar -Dsrcjar=foo-src.jar -Ddocjar=foo-doc.jar deployReleaseWithSourcesAndJavaDoc"
4) Check in the changed files to SVN (they'll be under a path of
artifactId/groupId/version)
Modified: trunk/build/utilities.build.xml
===================================================================
--- trunk/build/utilities.build.xml 2008-06-06 15:06:42 UTC (rev 8337)
+++ trunk/build/utilities.build.xml 2008-06-06 15:11:30 UTC (rev 8338)
@@ -114,6 +114,25 @@
</artifact:deploy>
</sequential>
</macrodef>
+
+ <macrodef name="deployWithSourcesAndJavadoc">
+ <attribute name="pom" default="" />
+ <attribute name="jar" default="" />
+ <attribute name="srcjar" />
+ <attribute name="docjar" />
+ <attribute name="repositoryId" default="" />
+ <element name="credentials" implicit="true" optional="true" />
+ <sequential>
+ <artifact:deploy file="@{jar}" settingsFile="${maven.settings.xml}">
+ <pom file="@{pom}" settingsFile="${maven.settings.xml}" />
+ <remoteRepository refId="@{repositoryId}">
+ <credentials />
+ </remoteRepository>
+ <attach file="@{srcjar}" classifier="sources" />
+ <attach file="@{docjar}" classifier="javadoc" />
+ </artifact:deploy>
+ </sequential>
+ </macrodef>
<macrodef name="deployWithAttachment">
<attribute name="pom" default="" />
16 years, 7 months
- 1
- 0
Seam SVN: r8337 - trunk/build and 1 other directory.
by seam-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2008-06-06 11:06:42 -0400 (Fri, 06 Jun 2008)
New Revision: 8337
Modified:
branches/Seam_2_0/build/root.pom.xml
trunk/build/root.pom.xml
Log:
JBSEAM-3066, JBAS-5211 - updated version of facelets to 1.1.15.B1 for AS5 support.
Modified: branches/Seam_2_0/build/root.pom.xml
===================================================================
--- branches/Seam_2_0/build/root.pom.xml 2008-06-06 14:50:39 UTC (rev 8336)
+++ branches/Seam_2_0/build/root.pom.xml 2008-06-06 15:06:42 UTC (rev 8337)
@@ -300,7 +300,7 @@
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
- <version>1.1.14</version>
+ <version>1.1.15.B1</version>
</dependency>
<dependency>
Modified: trunk/build/root.pom.xml
===================================================================
--- trunk/build/root.pom.xml 2008-06-06 14:50:39 UTC (rev 8336)
+++ trunk/build/root.pom.xml 2008-06-06 15:06:42 UTC (rev 8337)
@@ -322,7 +322,7 @@
<dependency>
<groupId>com.sun.facelets</groupId>
<artifactId>jsf-facelets</artifactId>
- <version>1.1.14</version>
+ <version>1.1.15.B1</version>
</dependency>
<dependency>
16 years, 7 months
- 1
- 0
Seam SVN: r8336 - trunk/src/main/org/jboss/seam/security/management.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-06-06 10:50:39 -0400 (Fri, 06 Jun 2008)
New Revision: 8336
Modified:
trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java
Log:
minor
Modified: trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java 2008-06-06 14:45:00 UTC (rev 8335)
+++ trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java 2008-06-06 14:50:39 UTC (rev 8336)
@@ -90,14 +90,9 @@
@Create
public void init()
- {
+ {
if (userClass == null)
{
-
- }
-
- if (userClass == null)
- {
log.debug("No userClass set, JpaIdentityStore will be unavailable.");
return;
}
16 years, 7 months
- 1
- 0
Seam SVN: r8335 - trunk/src/main/org/jboss/seam/security/permission.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-06-06 10:45:00 -0400 (Fri, 06 Jun 2008)
New Revision: 8335
Modified:
trunk/src/main/org/jboss/seam/security/permission/JpaPermissionStore.java
Log:
fixed namespace
Modified: trunk/src/main/org/jboss/seam/security/permission/JpaPermissionStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/permission/JpaPermissionStore.java 2008-06-06 14:42:46 UTC (rev 8334)
+++ trunk/src/main/org/jboss/seam/security/permission/JpaPermissionStore.java 2008-06-06 14:45:00 UTC (rev 8335)
@@ -41,7 +41,7 @@
*
* @author Shane Bryzak
*/
-@Name("org.jboss.seam.security.permission.jpaPermissionStore")
+@Name("org.jboss.seam.security.jpaPermissionStore")
@Install(precedence = BUILT_IN, value=false)
@Scope(APPLICATION)
@BypassInterceptors
16 years, 7 months
- 1
- 0
Seam SVN: r8334 - trunk/src/main/org/jboss/seam/security/management.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-06-06 10:42:46 -0400 (Fri, 06 Jun 2008)
New Revision: 8334
Modified:
trunk/src/main/org/jboss/seam/security/management/IdentityManager.java
trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java
trunk/src/main/org/jboss/seam/security/management/LdapIdentityStore.java
trunk/src/main/org/jboss/seam/security/management/PasswordHash.java
Log:
fixed component namespaces
Modified: trunk/src/main/org/jboss/seam/security/management/IdentityManager.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/management/IdentityManager.java 2008-06-06 08:59:55 UTC (rev 8333)
+++ trunk/src/main/org/jboss/seam/security/management/IdentityManager.java 2008-06-06 14:42:46 UTC (rev 8334)
@@ -25,7 +25,7 @@
* @author Shane Bryzak
*/
@Scope(EVENT)
-@Name("org.jboss.seam.security.management.identityManager")
+@Name("org.jboss.seam.security.identityManager")
@Install(precedence = BUILT_IN)
@BypassInterceptors
public class IdentityManager implements Serializable
Modified: trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java 2008-06-06 08:59:55 UTC (rev 8333)
+++ trunk/src/main/org/jboss/seam/security/management/JpaIdentityStore.java 2008-06-06 14:42:46 UTC (rev 8334)
@@ -42,7 +42,7 @@
*
* @author Shane Bryzak
*/
-@Name("org.jboss.seam.security.management.jpaIdentityStore")
+@Name("org.jboss.seam.security.jpaIdentityStore")
@Install(precedence = BUILT_IN, value=false)
@Scope(APPLICATION)
@BypassInterceptors
@@ -93,6 +93,11 @@
{
if (userClass == null)
{
+
+ }
+
+ if (userClass == null)
+ {
log.debug("No userClass set, JpaIdentityStore will be unavailable.");
return;
}
@@ -570,7 +575,7 @@
private String generatePasswordHash(String password, String salt)
{
- String algorithm = ((UserPassword) userPasswordProperty.getAnnotation()).hash();
+ String algorithm = userPasswordProperty.getAnnotation().hash();
if (algorithm == null || "".equals(algorithm))
{
Modified: trunk/src/main/org/jboss/seam/security/management/LdapIdentityStore.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/management/LdapIdentityStore.java 2008-06-06 08:59:55 UTC (rev 8333)
+++ trunk/src/main/org/jboss/seam/security/management/LdapIdentityStore.java 2008-06-06 14:42:46 UTC (rev 8334)
@@ -35,7 +35,7 @@
*
* @author Shane Bryzak
*/
-@Name("org.jboss.seam.security.management.ldapIdentityStore")
+@Name("org.jboss.seam.security.ldapIdentityStore")
@Install(precedence = BUILT_IN, value=false)
@Scope(APPLICATION)
@BypassInterceptors
Modified: trunk/src/main/org/jboss/seam/security/management/PasswordHash.java
===================================================================
--- trunk/src/main/org/jboss/seam/security/management/PasswordHash.java 2008-06-06 08:59:55 UTC (rev 8333)
+++ trunk/src/main/org/jboss/seam/security/management/PasswordHash.java 2008-06-06 14:42:46 UTC (rev 8334)
@@ -19,7 +19,7 @@
* @author Shane Bryzak
*/
@Scope(STATELESS)
-@Name("org.jboss.seam.security.management.passwordHash")
+@Name("org.jboss.seam.security.passwordHash")
@Install(precedence = BUILT_IN)
@BypassInterceptors
public class PasswordHash
16 years, 7 months
- 1
- 0
Seam SVN: r8333 - trunk/ui/src/main/java/org/jboss/seam/ui/validator.
by seam-commits＠lists.jboss.org
Author: christian.bauer(a)jboss.com
Date: 2008-06-06 04:59:55 -0400 (Fri, 06 Jun 2008)
New Revision: 8333
Modified:
trunk/ui/src/main/java/org/jboss/seam/ui/validator/FormattedTextValidator.java
Log:
Minor
Modified: trunk/ui/src/main/java/org/jboss/seam/ui/validator/FormattedTextValidator.java
===================================================================
--- trunk/ui/src/main/java/org/jboss/seam/ui/validator/FormattedTextValidator.java 2008-06-06 07:42:35 UTC (rev 8332)
+++ trunk/ui/src/main/java/org/jboss/seam/ui/validator/FormattedTextValidator.java 2008-06-06 08:59:55 UTC (rev 8333)
@@ -132,7 +132,7 @@
*/
public String getNoViableAltErrorMessage(String originalMessage, String location) {
return location != null
- ? "Text parsing error at '..." + location.trim() + "...'."
+ ? "Text parsing error at '..." + location.trim() + "...'"
: "Text parsing error, " + originalMessage.replace("\uFFFF",END_OF_TEXT);
}
@@ -145,7 +145,7 @@
*/
public String getMismatchedTokenErrorMessage(String originalMessage, String location) {
return location != null
- ? "Text parsing error at '..." + location.trim() + "...'."
+ ? "Text parsing error at '..." + location.trim() + "...'"
: "Text parsing error, " + originalMessage.replace("\uFFFF",END_OF_TEXT);
}
@@ -156,7 +156,7 @@
* @return a message that is thrown by this validator
*/
public String getSemanticErrorMessage(String originalMessage) {
- return "Text parsing error, " + originalMessage.replace("\uFFFF",END_OF_TEXT) + ".";
+ return "Text parsing error, " + originalMessage.replace("\uFFFF",END_OF_TEXT);
}
/**
16 years, 7 months
- 1
- 0
Seam SVN: r8332 - in branches/Seam_2_0: src/main/org/jboss/seam/security and 1 other directory.
by seam-commits＠lists.jboss.org
Author: shane.bryzak(a)jboss.com
Date: 2008-06-06 03:42:35 -0400 (Fri, 06 Jun 2008)
New Revision: 8332
Modified:
branches/Seam_2_0/build/root.pom.xml
branches/Seam_2_0/src/main/org/jboss/seam/security/RuleBasedIdentity.java
Log:
JBSEAM-3064
Modified: branches/Seam_2_0/build/root.pom.xml
===================================================================
--- branches/Seam_2_0/build/root.pom.xml 2008-06-05 19:03:20 UTC (rev 8331)
+++ branches/Seam_2_0/build/root.pom.xml 2008-06-06 07:42:35 UTC (rev 8332)
@@ -39,7 +39,7 @@
<!-- Externalize some version numbers here -->
<properties>
<version.richfaces>3.1.4.GA</version.richfaces>
- <version.drools>4.0.6</version.drools>
+ <version.drools>4.0.7</version.drools>
</properties>
<dependencyManagement>
Modified: branches/Seam_2_0/src/main/org/jboss/seam/security/RuleBasedIdentity.java
===================================================================
--- branches/Seam_2_0/src/main/org/jboss/seam/security/RuleBasedIdentity.java 2008-06-05 19:03:20 UTC (rev 8331)
+++ branches/Seam_2_0/src/main/org/jboss/seam/security/RuleBasedIdentity.java 2008-06-06 07:42:35 UTC (rev 8332)
@@ -164,12 +164,15 @@
{
if (securityContext != null)
{
- Iterator<Role> iter = securityContext.iterateObjects(new ClassObjectFilter(Role.class));
-
- while (iter.hasNext())
+ synchronized(securityContext)
{
- Role r = iter.next();
- if (r.getName().equals(role)) return true;
+ Iterator<Role> iter = securityContext.iterateObjects(new ClassObjectFilter(Role.class));
+
+ while (iter.hasNext())
+ {
+ Role r = iter.next();
+ if (r.getName().equals(role)) return true;
+ }
}
}
16 years, 7 months
- 1
- 0
Seam SVN: r8331 - in branches/Seam_2_0/examples/dvdstore/view: admin and 1 other directories.
by seam-commits＠lists.jboss.org
Author: stan.silvert(a)jboss.com
Date: 2008-06-05 15:03:20 -0400 (Thu, 05 Jun 2008)
New Revision: 8331
Modified:
branches/Seam_2_0/examples/dvdstore/view/admin/accept.xhtml
branches/Seam_2_0/examples/dvdstore/view/admin/admin.xhtml
branches/Seam_2_0/examples/dvdstore/view/admin/process.xhtml
branches/Seam_2_0/examples/dvdstore/view/admin/ship.xhtml
branches/Seam_2_0/examples/dvdstore/view/browse.xhtml
branches/Seam_2_0/examples/dvdstore/view/checkout.xhtml
branches/Seam_2_0/examples/dvdstore/view/complete.xhtml
branches/Seam_2_0/examples/dvdstore/view/confirm.xhtml
branches/Seam_2_0/examples/dvdstore/view/dvd.xhtml
branches/Seam_2_0/examples/dvdstore/view/home.xhtml
branches/Seam_2_0/examples/dvdstore/view/newuser/account.xhtml
branches/Seam_2_0/examples/dvdstore/view/newuser/card.xhtml
branches/Seam_2_0/examples/dvdstore/view/newuser/complete.xhtml
branches/Seam_2_0/examples/dvdstore/view/newuser/contact.xhtml
branches/Seam_2_0/examples/dvdstore/view/showorders.xhtml
Log:
JBSEAM-3048
Modified: branches/Seam_2_0/examples/dvdstore/view/admin/accept.xhtml
===================================================================
--- branches/Seam_2_0/examples/dvdstore/view/admin/accept.xhtml 2008-06-05 01:55:47 UTC (rev 8330)
+++ branches/Seam_2_0/examples/dvdstore/view/admin/accept.xhtml 2008-06-05 19:03:20 UTC (rev 8331)
@@ -23,70 +23,71 @@
<p>Please accept or reject the order.</p>
<div class="cntInfo">
- <h:panelGrid columns="2">
- <h:outputText value="Order" />
- <h:outputText value="#{order.orderId}" />
+ <h:panelGrid id="AcceptancePanel" columns="2">
+ <h:outputText id="OrderText" value="Order" />
+ <h:outputText id="OrderIdValue" value="#{order.orderId}" />
- <h:outputText value="Order date:" />
- <h:outputText value="#{order.orderDate}">
+ <h:outputText id="OrderDateText" value="Order date:" />
+ <h:outputText id="OrderDateValue" value="#{order.orderDate}">
<s:convertDateTime type="both" dateStyle="full"/>
</h:outputText>
- <h:outputText value="Net Amount:" />
- <h:outputText value="#{order.netAmount}">
+ <h:outputText id="NetAmountText" value="Net Amount:" />
+ <h:outputText id="NetAmountValue" value="#{order.netAmount}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
- <h:outputText value="Tax:" />
- <h:outputText value="#{order.tax}">
+ <h:outputText id="TaxText" value="Tax:" />
+ <h:outputText id="TaxValue" value="#{order.tax}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
- <h:outputText value="Total Amount:" />
- <h:outputText value="#{order.totalAmount}">
+ <h:outputText id="TotalAmountText" value="Total Amount:" />
+ <h:outputText id="TotalAmountValue" value="#{order.totalAmount}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
</h:panelGrid>
<div class="cntInfo">
- <h:dataTable value="#{order.orderLines}"
+ <h:dataTable id="OrderLinesDataTable"
+ value="#{order.orderLines}"
var="item"
styleClass="dvdtable"
headerClass="dvdtablehead"
rowClasses="dvdtableodd,dvdtableeven"
columnClasses="dvdtablecol">
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartQuantityColumn}" />
+ <h:column id="column1">
+ <f:facet id="QuantityFacet" name="header">
+ <h:outputText id="QuantityText" value="#{messages.cartQuantityColumn}" />
</f:facet>
- <h:outputText value="#{item.quantity}" />
+ <h:outputText id="QuantityValue" value="#{item.quantity}" />
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartTitleColumn}" />
+ <h:column id="column2">
+ <f:facet id="TitleFacet" name="header">
+ <h:outputText id="TitleText" value="#{messages.cartTitleColumn}" />
</f:facet>
- <h:outputText value="#{item.product.title}" />
+ <h:outputText id="TitleValue" value="#{item.product.title}" />
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartActorColumn}" />
+ <h:column id="column3">
+ <f:facet id="ActorFacet" name="header">
+ <h:outputText id="ActorText" value="#{messages.cartActorColumn}" />
</f:facet>
- <h:outputText value="#{item.product.actors[0].name}" />
+ <h:outputText id="ActorValue" value="#{item.product.actors[0].name}" />
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartPriceColumn}" />
+ <h:column id="column4">
+ <f:facet id="PriceFacet" name="header">
+ <h:outputText id="PriceText" value="#{messages.cartPriceColumn}" />
</f:facet>
- <h:outputText value="#{item.product.price}">
+ <h:outputText id="PriceValue" value="#{item.product.price}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
</h:column>
</h:dataTable>
</div>
- <h:form>
- <h:commandButton action="#{accept.reject}" value="Reject Order" />
- <h:commandButton action="#{accept.accept}" value="Accept Order" />
+ <h:form id="AcceptRejectForm">
+ <h:commandButton id="AcceptOrderButton" action="#{accept.reject}" value="Reject Order" />
+ <h:commandButton id="RejectOrderButton" action="#{accept.accept}" value="Accept Order" />
</h:form>
</div>
Modified: branches/Seam_2_0/examples/dvdstore/view/admin/admin.xhtml
===================================================================
--- branches/Seam_2_0/examples/dvdstore/view/admin/admin.xhtml 2008-06-05 01:55:47 UTC (rev 8330)
+++ branches/Seam_2_0/examples/dvdstore/view/admin/admin.xhtml 2008-06-05 19:03:20 UTC (rev 8331)
@@ -60,33 +60,34 @@
<p>There are no pooled tasks to be assigned.</p>
</f:subview>
- <h:dataTable rendered="#{not empty pooledTaskInstanceList}"
+ <h:dataTable id="TaskAssignmentDataTable"
+ rendered="#{not empty pooledTaskInstanceList}"
value="#{pooledTaskInstanceList}"
var="task"
styleClass="dvdtable"
headerClass="dvdtablehead"
rowClasses="dvdtableodd,dvdtableeven"
columnClasses="dvdtablecol">
- <h:column>
- <f:facet name="header">Order Id</f:facet>
+ <h:column id="column1">
+ <f:facet id="OrderIdFacet" name="header">Order Id</f:facet>
#{task.variables['orderId']}
</h:column>
- <h:column>
- <f:facet name="header">Task</f:facet>
- <h:outputText value="#{task.description}" />
+ <h:column id="column2">
+ <f:facet id="TaskFacet" name="header">Task</f:facet>
+ <h:outputText id="TaskDescription" value="#{task.description}" />
</h:column>
- <h:column>
- <f:facet name="header">Order Amount</f:facet>
- <h:outputText value="#{task.variables['amount']}">
+ <h:column id="column3">
+ <f:facet id="OrderAmountFacet" name="header">Order Amount</f:facet>
+ <h:outputText id="OrderAmountValue" value="#{task.variables['amount']}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
</h:column>
- <h:column>
- <f:facet name="header">Customer</f:facet>
- <h:outputText value="#{task.variables['customer']}" />
+ <h:column id="column4">
+ <f:facet id="CustomerFacet" name="header">Customer</f:facet>
+ <h:outputText id="CustomerValue" value="#{task.variables['customer']}" />
</h:column>
- <h:column>
- <s:button action="#{pooledTask.assignToCurrentActor}" taskInstance="#{task}"
+ <h:column id="column5">
+ <s:button id="AssignButton" action="#{pooledTask.assignToCurrentActor}" taskInstance="#{task}"
value="Assign"/>
</h:column>
</h:dataTable>
@@ -97,29 +98,30 @@
<p>There are no orders to be accepted.</p>
</f:subview>
- <h:dataTable rendered="#{not empty taskInstanceListForType['approve']}"
+ <h:dataTable id="OrderAcceptanceDataTable"
+ rendered="#{not empty taskInstanceListForType['approve']}"
value="#{taskInstanceListForType['approve']}"
var="task"
styleClass="dvdtable"
headerClass="dvdtablehead"
rowClasses="dvdtableodd,dvdtableeven"
columnClasses="dvdtablecol">
- <h:column>
- <f:facet name="header">Order Id</f:facet>
+ <h:column id="column1">
+ <f:facet id="AcceptanceIdFacet" name="header">Order Id</f:facet>
#{task.variables['orderId']}
</h:column>
- <h:column>
- <f:facet name="header">Order Amount</f:facet>
- <h:outputText value="#{task.variables['amount']}">
+ <h:column id="column2">
+ <f:facet id="AcceptanceAmountFacet" name="header">Order Amount</f:facet>
+ <h:outputText id="AcceptanceAmountValue" value="#{task.variables['amount']}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
</h:column>
- <h:column>
- <f:facet name="header">Customer</f:facet>
- <h:outputText value="#{task.variables['customer']}" />
+ <h:column id="column3">
+ <f:facet id="AcceptanceCustomerFacet" name="header">Customer</f:facet>
+ <h:outputText id="AcceptanceCustomerValue" value="#{task.variables['customer']}" />
</h:column>
- <h:column>
- <s:button action="#{accept.viewTask}" taskInstance="#{task}"
+ <h:column id="column4">
+ <s:button id="AcceptanceTaskButton" action="#{accept.viewTask}" taskInstance="#{task}"
value="Review"/>
</h:column>
</h:dataTable>
@@ -128,29 +130,30 @@
<f:subview id="no_shipping" rendered="#{empty taskInstanceListForType['ship']}">
<p>There are no orders to be shipped.</p>
</f:subview>
- <h:dataTable rendered="#{not empty taskInstanceListForType['ship']}"
+ <h:dataTable id="ShippingDataTable"
+ rendered="#{not empty taskInstanceListForType['ship']}"
value="#{taskInstanceListForType['ship']}"
var="task"
styleClass="dvdtable"
headerClass="dvdtablehead"
rowClasses="dvdtableodd,dvdtableeven"
columnClasses="dvdtablecol">
- <h:column>
- <f:facet name="header">Order Id</f:facet>
+ <h:column id="column1">
+ <f:facet id="ShippingIdFacet" name="header">Order Id</f:facet>
#{task.variables['orderId']}
</h:column>
- <h:column>
- <f:facet name="header">Order Amount</f:facet>
- <h:outputText value="#{task.variables['amount']}">
+ <h:column id="column2">
+ <f:facet id="ShippingAmountFacet" name="header">Order Amount</f:facet>
+ <h:outputText id="ShippingAmountValue" value="#{task.variables['amount']}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
</h:column>
- <h:column>
- <f:facet name="header">Customer</f:facet>
- <h:outputText value="#{task.variables['customer']}" />
+ <h:column id="column3">
+ <f:facet id="ShippingCustomerFacet" name="header">Customer</f:facet>
+ <h:outputText id="ShippingCustomerValue" value="#{task.variables['customer']}" />
</h:column>
- <h:column>
- <s:button action="#{ship.viewTask}" taskInstance="#{task}"
+ <h:column id="column4">
+ <s:button id="ShipButton" action="#{ship.viewTask}" taskInstance="#{task}"
value="Ship"/>
</h:column>
</h:dataTable>
Modified: branches/Seam_2_0/examples/dvdstore/view/admin/process.xhtml
===================================================================
--- branches/Seam_2_0/examples/dvdstore/view/admin/process.xhtml 2008-06-05 01:55:47 UTC (rev 8330)
+++ branches/Seam_2_0/examples/dvdstore/view/admin/process.xhtml 2008-06-05 19:03:20 UTC (rev 8331)
@@ -26,30 +26,31 @@
<p>There are no active processes.</p>
</f:subview>
- <h:dataTable value="#{processInstanceList}"
+ <h:dataTable id="ProcessListDataTable"
+ value="#{processInstanceList}"
var="process"
styleClass="dvdtable"
headerClass="dvdtablehead"
rowClasses="dvdtableodd,dvdtableeven"
columnClasses="dvdtablecol"
rendered="#{not empty processInstanceList}">
- <h:column>
- <f:facet name="header">Process Definition</f:facet>
+ <h:column id="column1">
+ <f:facet id="ProcessDefFacet" name="header">Process Definition</f:facet>
#{process.processDefinition.name}
</h:column>
- <h:column>
- <f:facet name="header">Process Start</f:facet>
- <h:outputText value="#{process.start}">
+ <h:column id="column2">
+ <f:facet id="ProcessStartFacet" name="header">Process Start</f:facet>
+ <h:outputText id="ProcessStartTime" value="#{process.start}">
<s:convertDateTime type="both"/>
</h:outputText>
</h:column>
- <h:column>
- <f:facet name="header">Current Node</f:facet>
+ <h:column id="column3">
+ <f:facet id="CurrentNodeFacet" name="header">Current Node</f:facet>
#{process.rootToken.node.name}
</h:column>
- <h:column>
- <f:facet name="header">Current Node Enter</f:facet>
- <h:outputText value="#{process.rootToken.nodeEnter}">
+ <h:column id="column4">
+ <f:facet id="CurrentNodeEnterFacet" name="header">Current Node Enter</f:facet>
+ <h:outputText id="CurrentNodeEnterTime" value="#{process.rootToken.nodeEnter}">
<s:convertDateTime type="both"/>
</h:outputText>
</h:column>
Modified: branches/Seam_2_0/examples/dvdstore/view/admin/ship.xhtml
===================================================================
--- branches/Seam_2_0/examples/dvdstore/view/admin/ship.xhtml 2008-06-05 01:55:47 UTC (rev 8330)
+++ branches/Seam_2_0/examples/dvdstore/view/admin/ship.xhtml 2008-06-05 19:03:20 UTC (rev 8331)
@@ -23,77 +23,78 @@
<p>Please enter the tracking number below.</p>
<div class="cntInfo">
- <h:form>
- <h:panelGrid columns="2">
- <h:outputText value="Order Number:" />
- <h:outputText value="#{order.orderId}" />
+ <h:form id="ShippingForm">
+ <h:panelGrid id="ShippingDetailPanel" columns="2">
+ <h:outputText id="OrderIdText" value="Order Number:" />
+ <h:outputText id="OrderIdValue" value="#{order.orderId}" />
- <h:outputText value="Order date:" />
- <h:outputText value="#{order.orderDate}">
+ <h:outputText id="OrderDateText" value="Order date:" />
+ <h:outputText id="OrderDateValue" value="#{order.orderDate}">
<s:convertDateTime type="both" dateStyle="full"/>
</h:outputText>
- <h:outputText value="Net Amount:" />
- <h:outputText value="#{order.netAmount}">
+ <h:outputText id="NetAmountText" value="Net Amount:" />
+ <h:outputText id="NetAmountValue" value="#{order.netAmount}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
- <h:outputText value="Tax:" />
- <h:outputText value="#{order.tax}">
+ <h:outputText id="TaxText" value="Tax:" />
+ <h:outputText id="TaxValue" value="#{order.tax}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
- <h:outputText value="Total Amount:" />
- <h:outputText value="#{order.totalAmount}">
+ <h:outputText id="TotalAmountText" value="Total Amount:" />
+ <h:outputText id="TotalAmountValue" value="#{order.totalAmount}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
- <h:outputText value="Tracking number:" />
- <h:panelGroup>
+ <h:outputText id="TrackingNumberText" value="Tracking number:" />
+ <h:panelGroup id="TrackingNumberPanel">
<!-- required, min length=4 -->
<h:inputText id="trackingNumber" value="#{ship.track}" required="true"/>
- <h:message for="trackingNumber" styleClass="cntError" />
+ <h:message id="message" for="trackingNumber" styleClass="cntError" />
</h:panelGroup>
</h:panelGrid>
<div class="cntInfo">
- <h:dataTable value="#{order.orderLines}"
+ <h:dataTable id="OrderLinesDataTable"
+ value="#{order.orderLines}"
var="item"
styleClass="dvdtable"
headerClass="dvdtablehead"
rowClasses="dvdtableodd,dvdtableeven"
columnClasses="dvdtablecol">
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartQuantityColumn}" />
+ <h:column id="column1">
+ <f:facet id="QuantityFacet" name="header">
+ <h:outputText id="QuantityText" value="#{messages.cartQuantityColumn}" />
</f:facet>
- <h:outputText value="#{item.quantity}"/>
+ <h:outputText id="QuantityValue" value="#{item.quantity}"/>
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartTitleColumn}" />
+ <h:column id="column2">
+ <f:facet id="TitleFacet" name="header">
+ <h:outputText id="TitleText" value="#{messages.cartTitleColumn}" />
</f:facet>
- <h:outputText value="#{item.product.title}" />
+ <h:outputText id="TitleValue" value="#{item.product.title}" />
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartActorColumn}" />
+ <h:column id="column3">
+ <f:facet id="ActorFacet" name="header">
+ <h:outputText id="ActorText" value="#{messages.cartActorColumn}" />
</f:facet>
- <h:outputText value="#{item.product.actors[0].name}" />
+ <h:outputText id="ActorValue" value="#{item.product.actors[0].name}" />
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartPriceColumn}" />
+ <h:column id="column4">
+ <f:facet id="PriceFacet" name="header">
+ <h:outputText id="PriceText" value="#{messages.cartPriceColumn}" />
</f:facet>
- <h:outputText value="#{item.product.price}">
+ <h:outputText id="PriceValue" value="#{item.product.price}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
</h:column>
</h:dataTable>
</div>
- <h:commandButton action="#{ship.ship}" value="Ship" />
+ <h:commandButton id="ShipButton" action="#{ship.ship}" value="Ship" />
</h:form>
</div>
</ui:define>
Modified: branches/Seam_2_0/examples/dvdstore/view/browse.xhtml
===================================================================
--- branches/Seam_2_0/examples/dvdstore/view/browse.xhtml 2008-06-05 01:55:47 UTC (rev 8330)
+++ branches/Seam_2_0/examples/dvdstore/view/browse.xhtml 2008-06-05 19:03:20 UTC (rev 8331)
@@ -35,14 +35,14 @@
<ui:repeat value="#{topProducts}" var="item">
<div class="bestinner">
<div class="besttitle">
- <s:link view="/dvd.xhtml">
+ <s:link id="TitleLink" view="/dvd.xhtml">
#{fn:length(item.title) gt 14 ? fn:substring(item.title,0,13) : item.title}
- <f:param name="id" value="#{item.productId}"/>
+ <f:param id="ProductIdForTextLink" name="id" value="#{item.productId}"/>
</s:link>
</div>
<div class="bestimage">
- <s:link view="/dvd.xhtml">
- <f:param name="id" value="#{item.productId}"/>
+ <s:link id="ImageLink" view="/dvd.xhtml">
+ <f:param id="ProductIdForImage" name="id" value="#{item.productId}"/>
<img src="#{item.imageURL}" />
</s:link>
</div>
@@ -53,21 +53,21 @@
<f:subview id="searchresults" rendered="#{searchResults.rowCount == 0}">
<h2>
- <h:outputText value="#{messages.noSearchResultsHeader}" />
+ <h:outputText id="NoResultsMessage" value="#{messages.noSearchResultsHeader}" />
</h2>
</f:subview>
- <h:form rendered="#{searchResults.rowCount > 0}">
+ <h:form id="SearchResultsForm" rendered="#{searchResults.rowCount > 0}">
<div class="controlBar">
<div class="buttonbox">
<div class="button">
- <h:commandLink action="#{search.nextPage}" rendered="#{!search.lastPage}">
+ <h:commandLink id="NextPageLink" action="#{search.nextPage}" rendered="#{!search.lastPage}">
<img src="img/arrow-r.png" />
</h:commandLink>
 
</div>
<div class="button">
- <h:commandLink action="#{search.prevPage}" rendered="#{!search.firstPage}">
+ <h:commandLink id="PreviousPageLink" action="#{search.prevPage}" rendered="#{!search.firstPage}">
<img src="img/arrow-l.png" />
</h:commandLink>
 
@@ -77,46 +77,48 @@
<div class="message">#{messages.searchResultsHeader}</div>
</div>
- <h:dataTable value="#{searchResults}"
+ <h:dataTable id="SearchResultsTable"
+ value="#{searchResults}"
var="product"
styleClass="dvdtable"
headerClass="dvdtablehead"
rowClasses="results"
columnClasses="dvdtablecol">
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.searchResultsAdd}" />
+ <h:column id="column1">
+ <f:facet id="AddToCartFacet" name="header">
+ <h:outputText id="AddToCartText" value="#{messages.searchResultsAdd}" />
</f:facet>
- <h:selectBooleanCheckbox value="#{searchSelections[product]}"/>
+ <h:selectBooleanCheckbox id="AddToCartCheckbox" value="#{searchSelections[product]}"/>
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.searchResultsTitle}" />
+ <h:column id="column2">
+ <f:facet id="TitleFacet" name="header">
+ <h:outputText id="TitleText" value="#{messages.searchResultsTitle}" />
</f:facet>
- <s:link view="/dvd.xhtml" value="#{product.title}">
- <f:param name="id" value="#{product.productId}"/>
+ <s:link id="TitleLink" view="/dvd.xhtml" value="#{product.title}">
+ <f:param id="ProductId" name="id" value="#{product.productId}"/>
</s:link>
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Starring" />
+ <h:column id="column3">
+ <f:facet id="StarringFacet" name="header">
+ <h:outputText id="StarringText" value="Starring" />
</f:facet>
- <h:outputText value="#{product.actors[0].name}" />
+ <h:outputText id="StarringValue" value="#{product.actors[0].name}" />
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.searchResultsPrice}" />
+ <h:column id="column4">
+ <f:facet id="PriceFacet" name="header">
+ <h:outputText id="PriceText" value="#{messages.searchResultsPrice}" />
</f:facet>
- <h:outputText value="#{product.price}">
+ <h:outputText id="PriceValue" value="#{product.price}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
</h:column>
</h:dataTable>
- <h:commandButton action="#{search.addAllToCart}"
+ <h:commandButton id="SearchUpdateButton"
+ action="#{search.addAllToCart}"
value="#{messages.searchUpdateButton}"/>
</h:form>
Modified: branches/Seam_2_0/examples/dvdstore/view/checkout.xhtml
===================================================================
--- branches/Seam_2_0/examples/dvdstore/view/checkout.xhtml 2008-06-05 01:55:47 UTC (rev 8330)
+++ branches/Seam_2_0/examples/dvdstore/view/checkout.xhtml 2008-06-05 19:03:20 UTC (rev 8331)
@@ -29,85 +29,90 @@
<f:subview id="emptycart" rendered="#{empty cart.cart}">
<p>Your cart is empty.</p>
- <h:form>
- <h:commandButton action="browse" value="Continue Shopping" />
+ <h:form id="EmptyCartForm">
+ <h:commandButton id="ContinueShoppingButton" action="browse" value="Continue Shopping" />
</h:form>
</f:subview>
<f:subview id="cartdetails" rendered="#{not empty cart.cart}">
- <h:form>
- <h:dataTable value="#{cart.cart}" var="item"
+ <h:form id="CartDetailsForm">
+ <h:dataTable id="CartItemsTable"
+ value="#{cart.cart}" var="item"
styleClass="dvdtable"
headerClass="dvdtablehead"
rowClasses="dvdtableodd,dvdtableeven"
columnClasses="dvdtablecol">
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartRemoveColumn}" />
+ <h:column id="column1">
+ <f:facet id="CartRemoveFacet" name="header">
+ <h:outputText id="CartRemoveText" value="#{messages.cartRemoveColumn}" />
</f:facet>
- <h:selectBooleanCheckbox value="#{cart.cartSelection[item]}"/>
+ <h:selectBooleanCheckbox id="CartRemoveCheckbox" value="#{cart.cartSelection[item]}"/>
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartTitleColumn}" />
+ <h:column id="column2">
+ <f:facet id="TitleFacet" name="header">
+ <h:outputText id="TitleText" value="#{messages.cartTitleColumn}" />
</f:facet>
- <h:outputText value="#{item.product.title}" />
+ <h:outputText id="TitleValueText" value="#{item.product.title}" />
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartActorColumn}" />
+ <h:column id="column3">
+ <f:facet id="ActorFacet" name="header">
+ <h:outputText id="ActorText" value="#{messages.cartActorColumn}" />
</f:facet>
- <h:outputText value="#{item.product.actors[0].name}" />
+ <h:outputText id="ActorValueText" value="#{item.product.actors[0].name}" />
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartPriceColumn}" />
+ <h:column id="column4">
+ <f:facet id="PriceFacet" name="header">
+ <h:outputText id="PriceText" value="#{messages.cartPriceColumn}" />
</f:facet>
- <h:outputText value="#{item.product.price}">
+ <h:outputText id="PriceValueText" value="#{item.product.price}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartQuantityColumn}" />
+ <h:column id="column5">
+ <f:facet id="QuantityFacet" name="header">
+ <h:outputText id="QuantityText" value="#{messages.cartQuantityColumn}" />
</f:facet>
- <h:inputText value="#{item.quantity}" size="6" />
+ <h:inputText id="QuantityValueText" value="#{item.quantity}" size="6" />
</h:column>
</h:dataTable>
- <h:commandButton action="browse"
+ <h:commandButton id="ContinueShoppingButton"
+ action="browse"
value="Continue Shopping" />
 
- <h:commandButton action="#{cart.resetCart}"
+ <h:commandButton id="ResetCartButton"
+ action="#{cart.resetCart}"
value="Empty Cart" />
 
- <h:commandButton action="#{cart.updateCart}"
+ <h:commandButton id="UpdateCartButton"
+ action="#{cart.updateCart}"
value="#{messages.checkoutUpdateButton}" />
</h:form>
<div style="width: 100%;">
<div class="cntInfo" style="float:right;">
- <h:panelGrid columns="2">
- <h:outputText value="#{messages.checkoutSubtotal}" />
- <h:outputText value="#{cart.subtotal}">
+ <h:panelGrid id="CostSummary" columns="2">
+ <h:outputText id="CartSubtotalText" value="#{messages.checkoutSubtotal}" />
+ <h:outputText id="CartSubtotalValue" value="#{cart.subtotal}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
- <h:outputText value="#{messages.checkoutTax}" />
- <h:outputText value="#{cart.tax}">
+ <h:outputText id="CartTaxText" value="#{messages.checkoutTax}" />
+ <h:outputText id="CartTaxValue" value="#{cart.tax}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
- <h:outputText value="#{messages.checkoutTotal}" />
- <h:outputText value="#{cart.total}">
+ <h:outputText id="CartTotalText" value="#{messages.checkoutTotal}" />
+ <h:outputText id="CartTotalValue" value="#{cart.total}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
</h:panelGrid>
<f:subview id="purchaseaction" rendered="#{identity.loggedIn}">
- <h:form>
- <h:commandButton action="#{checkout.createOrder}"
+ <h:form id="PurchaseActionForm">
+ <h:commandButton id="PurchaseButton"
+ action="#{checkout.createOrder}"
value="#{messages.checkoutPurchaseButton}" />
</h:form>
</f:subview>
Modified: branches/Seam_2_0/examples/dvdstore/view/complete.xhtml
===================================================================
--- branches/Seam_2_0/examples/dvdstore/view/complete.xhtml 2008-06-05 01:55:47 UTC (rev 8330)
+++ branches/Seam_2_0/examples/dvdstore/view/complete.xhtml 2008-06-05 19:03:20 UTC (rev 8331)
@@ -20,50 +20,51 @@
<f:subview id="no_order" rendered="#{completedOrder == null}">
<p>Your order could not be completed.</p>
- <h:form>
- <h:commandButton action="browse" value="Continue Shopping" />
+ <h:form id="NoOrderForm">
+ <h:commandButton id="ContinueShoppingButton" action="browse" value="Continue Shopping" />
</h:form>
</f:subview>
<f:subview id="orderdetail" rendered="#{completedOrder != null}">
<h2>#{messages.checkoutCompleteHeader}</h2>
- <h:form>
- <h:dataTable value="#{completedOrder.orderLines}"
+ <h:form id="OrderDetailForm">
+ <h:dataTable id="OrderDetailDataTable"
+ value="#{completedOrder.orderLines}"
var="item"
styleClass="dvdtable"
headerClass="dvdtablehead"
rowClasses="dvdtableodd,dvdtableeven"
columnClasses="dvdtablecol">
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartItemColumn}" />
+ <h:column id="column1">
+ <f:facet id="ItemFacet" name="header">
+ <h:outputText id="ItemText" value="#{messages.cartItemColumn}" />
</f:facet>
- <h:outputText value="#{item.position}" />
+ <h:outputText id="ItemValue" value="#{item.position}" />
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartQuantityColumn}" />
+ <h:column id="column2">
+ <f:facet id="QuantityFacet" name="header">
+ <h:outputText id="QuantityText" value="#{messages.cartQuantityColumn}" />
</f:facet>
- <h:outputText value="#{item.quantity}" />
+ <h:outputText id="QuantityValue" value="#{item.quantity}" />
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartTitleColumn}" />
+ <h:column id="column3">
+ <f:facet id="TitleFacet" name="header">
+ <h:outputText id="TitleText" value="#{messages.cartTitleColumn}" />
</f:facet>
- <h:outputText value="#{item.product.title}" />
+ <h:outputText id="TitleValue" value="#{item.product.title}" />
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartActorColumn}" />
+ <h:column id="column4">
+ <f:facet id="ActorFacet" name="header">
+ <h:outputText id="ActorText" value="#{messages.cartActorColumn}" />
</f:facet>
- <h:outputText value="#{item.product.actors[0].name}" />
+ <h:outputText id="ActorValue" value="#{item.product.actors[0].name}" />
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartPriceColumn}" />
+ <h:column id="column5">
+ <f:facet id="PriceFacet" name="header">
+ <h:outputText id="PriceText" value="#{messages.cartPriceColumn}" />
</f:facet>
- <h:outputText value="#{item.product.price}">
+ <h:outputText id="PriceValue" value="#{item.product.price}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
</h:column>
@@ -73,19 +74,19 @@
<div style="width: 100%;">
<div class="cntInfo" style="float: right;">
- <h:panelGrid columns="2">
- <h:outputText value="#{messages.checkoutSubtotal}" />
- <h:outputText value="#{completedOrder.netAmount}">
+ <h:panelGrid id="CheckoutSummary" columns="2">
+ <h:outputText id="CartSubtotalText" value="#{messages.checkoutSubtotal}" />
+ <h:outputText id="CartSubtotalValue" value="#{completedOrder.netAmount}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
- <h:outputText value="#{messages.checkoutTax}" />
- <h:outputText value="#{completedOrder.tax}">
+ <h:outputText id="CartTaxText" value="#{messages.checkoutTax}" />
+ <h:outputText id="CartTaxValue" value="#{completedOrder.tax}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
- <h:outputText value="#{messages.checkoutTotal}" />
- <h:outputText value="#{completedOrder.totalAmount}">
+ <h:outputText id="CartTotalText" value="#{messages.checkoutTotal}" />
+ <h:outputText id="CartTotalValue" value="#{completedOrder.totalAmount}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
</h:panelGrid>
@@ -97,12 +98,12 @@
<p class="orderBox cntAlert">
Thank you for ordering.
- <h:outputText value="#{completedOrder.totalAmount}">
+ <h:outputText id="TotalAmountValue" value="#{completedOrder.totalAmount}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
- charged was to your <h:outputText value="#{completedOrder.customer.creditCardTypeString}" />.
+ charged was to your <h:outputText id="CreditCartType" value="#{completedOrder.customer.creditCardTypeString}" />.
Your order number is
- <h:outputText value="#{completedOrder.orderId}" />.
+ <h:outputText id="OrderId" value="#{completedOrder.orderId}" />.
</p>
</f:subview>
</ui:define>
Modified: branches/Seam_2_0/examples/dvdstore/view/confirm.xhtml
===================================================================
--- branches/Seam_2_0/examples/dvdstore/view/confirm.xhtml 2008-06-05 01:55:47 UTC (rev 8330)
+++ branches/Seam_2_0/examples/dvdstore/view/confirm.xhtml 2008-06-05 19:03:20 UTC (rev 8331)
@@ -24,62 +24,63 @@
</f:subview>
<f:subview id="orderdetail" rendered="#{currentOrder != null}">
- <h:form>
- <h:dataTable value="#{currentOrder.orderLines}" var="line"
+ <h:form id="OrderDetailForm">
+ <h:dataTable id="OrderDetailDataTable"
+ value="#{currentOrder.orderLines}" var="line"
styleClass="dvdtable"
headerClass="dvdtablehead"
rowClasses="dvdtableodd,dvdtableeven"
columnClasses="dvdtablecol">
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartTitleColumn}" />
+ <h:column id="column1">
+ <f:facet id="TitleFacet" name="header">
+ <h:outputText id="TitleText" value="#{messages.cartTitleColumn}" />
</f:facet>
- <h:outputText value="#{line.product.title}" />
+ <h:outputText id="TitleValue" value="#{line.product.title}" />
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartActorColumn}" />
+ <h:column id="column2">
+ <f:facet id="ActorFacet" name="header">
+ <h:outputText id="ActorText" value="#{messages.cartActorColumn}" />
</f:facet>
- <h:outputText value="#{line.product.actors[0].name}" />
+ <h:outputText id="ActorValue" value="#{line.product.actors[0].name}" />
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartPriceColumn}" />
+ <h:column id="column3">
+ <f:facet id="PriceFacet" name="header">
+ <h:outputText id="PriceText" value="#{messages.cartPriceColumn}" />
</f:facet>
- <h:outputText value="#{line.product.price}">
+ <h:outputText id="PriceValue" value="#{line.product.price}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartQuantityColumn}" />
+ <h:column id="column4">
+ <f:facet id="QuantityFacet" name="header">
+ <h:outputText id="QuantityText" value="#{messages.cartQuantityColumn}" />
</f:facet>
- <h:outputText value="#{line.quantity}"/>
+ <h:outputText id="QuantityValue" value="#{line.quantity}"/>
</h:column>
</h:dataTable>
</h:form>
<div style="width: 100%;">
<div class="cntInfo" style="float:right;">
- <h:panelGrid columns="2">
- <h:outputText value="#{messages.checkoutSubtotal}" />
- <h:outputText value="#{currentOrder.netAmount}">
+ <h:panelGrid id="CostSummary" columns="2">
+ <h:outputText id="CartSubtotalText" value="#{messages.checkoutSubtotal}" />
+ <h:outputText id="CartSubtotalValue" value="#{currentOrder.netAmount}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
- <h:outputText value="#{messages.checkoutTax}" />
- <h:outputText value="#{currentOrder.tax}">
+ <h:outputText id="CartTaxText" value="#{messages.checkoutTax}" />
+ <h:outputText id="CartTaxValue" value="#{currentOrder.tax}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
- <h:outputText value="#{messages.checkoutTotal}" />
- <h:outputText value="#{currentOrder.totalAmount}">
+ <h:outputText id="CartTotalText" value="#{messages.checkoutTotal}" />
+ <h:outputText id="CartTotalValue" value="#{currentOrder.totalAmount}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
</h:panelGrid>
- <h:form>
+ <h:form id="ConfirmOrCancelForm">
<h:commandButton action="purchase" value="Confirm" />
 
<h:commandButton action="cancel" value="Cancel" />
Modified: branches/Seam_2_0/examples/dvdstore/view/dvd.xhtml
===================================================================
--- branches/Seam_2_0/examples/dvdstore/view/dvd.xhtml 2008-06-05 01:55:47 UTC (rev 8330)
+++ branches/Seam_2_0/examples/dvdstore/view/dvd.xhtml 2008-06-05 19:03:20 UTC (rev 8331)
@@ -28,19 +28,19 @@
</f:subview>
<div class="productinfo">
- <h:panelGrid columns="2">
- <h:outputText value="Title:" />
- <h:outputText value="#{dvd.title}" />
+ <h:panelGrid id="ItemInfo" columns="2">
+ <h:outputText id="TitleText" value="Title:" />
+ <h:outputText id="TitleValue" value="#{dvd.title}" />
- <h:outputText value="Starring:" />
- <h:panelGroup>
+ <h:outputText id="StarringText" value="Starring:" />
+ <h:panelGroup id="Actors">
<ui:repeat value="#{dvd.actors}" var="starring">
[#{starring.name}]
</ui:repeat>
</h:panelGroup>
- <h:outputText value="Price:" />
- <h:outputText value="#{dvd.price}" />
+ <h:outputText id="PriceText" value="Price:" />
+ <h:outputText id="PriceValue" value="#{dvd.price}" />
</h:panelGrid>
</div>
@@ -49,9 +49,9 @@
</div>
<div class="productbuttons">
- <s:button action="#{search.addToCart}" value="Add to Cart"/>
+ <s:button id="AddToCartButton" action="#{search.addToCart}" value="Add to Cart"/>
 
- <s:button view="/browse.xhtml" value="Back to Search"/>
+ <s:button id="BackToSearchButton" view="/browse.xhtml" value="Back to Search"/>
</div>
</div>
</ui:define>
Modified: branches/Seam_2_0/examples/dvdstore/view/home.xhtml
===================================================================
--- branches/Seam_2_0/examples/dvdstore/view/home.xhtml 2008-06-05 01:55:47 UTC (rev 8330)
+++ branches/Seam_2_0/examples/dvdstore/view/home.xhtml 2008-06-05 19:03:20 UTC (rev 8331)
@@ -50,7 +50,7 @@
</p>
- <s:button view="/browse.xhtml" value="Start Shopping" />
+ <s:button id="StartShoppingButton" view="/browse.xhtml" value="Start Shopping" />
</ui:define>
</ui:composition>
Modified: branches/Seam_2_0/examples/dvdstore/view/newuser/account.xhtml
===================================================================
--- branches/Seam_2_0/examples/dvdstore/view/newuser/account.xhtml 2008-06-05 01:55:47 UTC (rev 8330)
+++ branches/Seam_2_0/examples/dvdstore/view/newuser/account.xhtml 2008-06-05 19:03:20 UTC (rev 8331)
@@ -18,9 +18,9 @@
</ui:define>
<ui:define name="body">
- <h2><h:outputText value="#{messages.newCustomerHeader}" /></h2>
+ <h2><h:outputText id="NewCustomerHeader" value="#{messages.newCustomerHeader}" /></h2>
- <p><em><h:outputText value="#{messages.newCustomerInfo}" /></em></p>
+ <p><em><h:outputText id="NewCustomerInfo" value="#{messages.newCustomerInfo}" /></em></p>
<p>
@@ -31,17 +31,17 @@
</p>
<div class="cntInfo">
- <h:form>
+ <h:form id="NewAccountForm">
<table border="0">
<tr>
<td class="cntForm">#{messages.newCustomerUN}</td>
<td class="cntForm">
<h:inputText id="userName" required="true"
value="#{customer.userName}">
- <s:validate />
+ <s:validate/>
</h:inputText> *
</td>
- <td><h:message for="userName" styleClass="cntError" /></td>
+ <td><h:message id="MessageForUserName" for="userName" styleClass="cntError" /></td>
</tr>
<tr>
@@ -52,7 +52,7 @@
<s:validate />
</h:inputSecret> *
</td>
- <td><h:message for="password" styleClass="cntError" /></td>
+ <td><h:message id="MessageForPassword" for="password" styleClass="cntError" /></td>
</tr>
<tr>
@@ -62,11 +62,11 @@
value="#{editCustomer.passwordVerify}">
</h:inputSecret> *
</td>
- <td><h:message for="passwordVerify" styleClass="cntError" /></td>
+ <td><h:message id="MessageForPasswordVerify" for="passwordVerify" styleClass="cntError" /></td>
</tr>
</table>
- <h:commandButton action="next" value="Continue" />
+ <h:commandButton id="ContinueButton" action="next" value="Continue" />
</h:form>
</div>
</ui:define>
Modified: branches/Seam_2_0/examples/dvdstore/view/newuser/card.xhtml
===================================================================
--- branches/Seam_2_0/examples/dvdstore/view/newuser/card.xhtml 2008-06-05 01:55:47 UTC (rev 8330)
+++ branches/Seam_2_0/examples/dvdstore/view/newuser/card.xhtml 2008-06-05 19:03:20 UTC (rev 8331)
@@ -18,17 +18,17 @@
</ui:define>
<ui:define name="body">
- <h2><h:outputText value="#{messages.newCustomerHeader}" /></h2>
+ <h2><h:outputText id="NewCustomerHeaderText" value="#{messages.newCustomerHeader}" /></h2>
- <p><em><h:outputText value="#{messages.newCustomerInfo}" /></em></p>
+ <p><em><h:outputText id="NewCustomerInfoText" value="#{messages.newCustomerInfo}" /></em></p>
<h:form>
<table border="0">
<tr>
<td>#{messages.newCustomerCCT}</td>
<td>
- <h:selectOneMenu value="#{customer.creditCardType}">
- <f:selectItems value="#{editCustomer.creditCardTypes}" />
+ <h:selectOneMenu id="CreditCardMenu" value="#{customer.creditCardType}">
+ <f:selectItems id="CreditCardTypes" value="#{editCustomer.creditCardTypes}" />
</h:selectOneMenu>
</td>
</tr>
@@ -39,41 +39,41 @@
<h:inputText id="creditCard" required="true"
value="#{customer.creditCard}" />
<f:verbatim>*</f:verbatim>
- <h:message for="creditCard" styleClass="cntError" />
+ <h:message id="MessageForCreditCard" for="creditCard" styleClass="cntError" />
</td>
</tr>
<tr>
<td>#{messages.newCustomerCCE}</td>
<td>
- <h:selectOneMenu value="#{customer.creditCardMonth}">
- <f:selectItem itemValue="1" itemLabel="#{messages.mo_1}" />
- <f:selectItem itemValue="2" itemLabel="#{messages.mo_2}" />
- <f:selectItem itemValue="3" itemLabel="#{messages.mo_3}" />
- <f:selectItem itemValue="4" itemLabel="#{messages.mo_4}" />
- <f:selectItem itemValue="5" itemLabel="#{messages.mo_5}" />
- <f:selectItem itemValue="6" itemLabel="#{messages.mo_6}" />
- <f:selectItem itemValue="7" itemLabel="#{messages.mo_7}" />
- <f:selectItem itemValue="8" itemLabel="#{messages.mo_8}" />
- <f:selectItem itemValue="9" itemLabel="#{messages.mo_9}" />
- <f:selectItem itemValue="10" itemLabel="#{messages.mo_10}" />
- <f:selectItem itemValue="11" itemLabel="#{messages.mo_11}" />
- <f:selectItem itemValue="12" itemLabel="#{messages.mo_12}" />
+ <h:selectOneMenu id="CreditCardMonthMenu" value="#{customer.creditCardMonth}">
+ <f:selectItem id="Jan" itemValue="1" itemLabel="#{messages.mo_1}" />
+ <f:selectItem id="Feb" itemValue="2" itemLabel="#{messages.mo_2}" />
+ <f:selectItem id="Mar" itemValue="3" itemLabel="#{messages.mo_3}" />
+ <f:selectItem id="Apr" itemValue="4" itemLabel="#{messages.mo_4}" />
+ <f:selectItem id="May" itemValue="5" itemLabel="#{messages.mo_5}" />
+ <f:selectItem id="Jun" itemValue="6" itemLabel="#{messages.mo_6}" />
+ <f:selectItem id="Jul" itemValue="7" itemLabel="#{messages.mo_7}" />
+ <f:selectItem id="Aug" itemValue="8" itemLabel="#{messages.mo_8}" />
+ <f:selectItem id="Sep" itemValue="9" itemLabel="#{messages.mo_9}" />
+ <f:selectItem id="Oct" itemValue="10" itemLabel="#{messages.mo_10}" />
+ <f:selectItem id="Nov" itemValue="11" itemLabel="#{messages.mo_11}" />
+ <f:selectItem id="Dec" itemValue="12" itemLabel="#{messages.mo_12}" />
</h:selectOneMenu>
- <h:selectOneMenu value="#{customer.creditCardYear}">
- <f:selectItem itemValue="2005" />
- <f:selectItem itemValue="2006" />
- <f:selectItem itemValue="2007" />
- <f:selectItem itemValue="2008" />
- <f:selectItem itemValue="2009" />
- <f:selectItem itemValue="2010" />
+ <h:selectOneMenu id="CreditCardYearMenu" value="#{customer.creditCardYear}">
+ <f:selectItem id="Year2005" itemValue="2005" />
+ <f:selectItem id="Year2006" itemValue="2006" />
+ <f:selectItem id="Year2007" itemValue="2007" />
+ <f:selectItem id="Year2008" itemValue="2008" />
+ <f:selectItem id="Year2009" itemValue="2009" />
+ <f:selectItem id="Year2010" itemValue="2010" />
</h:selectOneMenu>
</td>
</tr>
</table>
- <h:commandButton action="next" value="#{messages.newCustomerSubmit}" />
+ <h:commandButton id="SubmitNewCustomerButton" action="next" value="#{messages.newCustomerSubmit}" />
</h:form>
</ui:define>
Modified: branches/Seam_2_0/examples/dvdstore/view/newuser/complete.xhtml
===================================================================
--- branches/Seam_2_0/examples/dvdstore/view/newuser/complete.xhtml 2008-06-05 01:55:47 UTC (rev 8330)
+++ branches/Seam_2_0/examples/dvdstore/view/newuser/complete.xhtml 2008-06-05 19:03:20 UTC (rev 8331)
@@ -22,7 +22,7 @@
<h1>Welcome to the DVD Store</h1>
<p>Your account has been created, and you have been automatically logged in.
- You can <s:link view="/browse.xhtml">start shopping</s:link> immediately.
+ You can <s:link id="StartShoppingLink" view="/browse.xhtml">start shopping</s:link> immediately.
</p>
</f:subview>
Modified: branches/Seam_2_0/examples/dvdstore/view/newuser/contact.xhtml
===================================================================
--- branches/Seam_2_0/examples/dvdstore/view/newuser/contact.xhtml 2008-06-05 01:55:47 UTC (rev 8330)
+++ branches/Seam_2_0/examples/dvdstore/view/newuser/contact.xhtml 2008-06-05 19:03:20 UTC (rev 8331)
@@ -18,12 +18,12 @@
</ui:define>
<ui:define name="body">
- <h2><h:outputText value="#{messages.newCustomerHeader}" /></h2>
+ <h2><h:outputText id="CustomerHeaderText" value="#{messages.newCustomerHeader}" /></h2>
- <p><em><h:outputText value="#{messages.newCustomerInfo}" /></em></p>
+ <p><em><h:outputText id="NewCustomerInfoText" value="#{messages.newCustomerInfo}" /></em></p>
- <h:form>
- <s:validateAll>
+ <h:form id="NewAccountForm">
+ <s:validateAll id="ValidateAll">
<table border="0">
<tr>
<td class="cntForm">#{messages.newCustomerFN}</td>
@@ -31,7 +31,7 @@
<h:inputText id="firstName" required="true"
value="#{customer.firstName}" /> *
</td>
- <td><h:message for="firstName" styleClass="cntError" /></td>
+ <td><h:message id="MessageForFirstName" for="firstName" styleClass="cntError" /></td>
</tr>
<tr>
@@ -40,7 +40,7 @@
<h:inputText id="lastName" required="true"
value="#{customer.lastName}" /> *
</td>
- <td><h:message for="lastName" styleClass="cntError" /></td>
+ <td><h:message id="MessageForLastName" for="lastName" styleClass="cntError" /></td>
</tr>
<tr>
@@ -50,7 +50,7 @@
value="#{customer.address1}" /> *
</td>
<td>
- <h:message for="address1" styleClass="cntError" />
+ <h:message id="MessageForAddress1" for="address1" styleClass="cntError" />
</td>
</tr>
@@ -58,7 +58,7 @@
<tr>
<td>#{messages.newCustomerA2}</td>
<td>
- <h:inputText value="#{customer.address2}" />
+ <h:inputText id="Address2" value="#{customer.address2}" />
</td>
<td> </td>
</tr>
@@ -70,7 +70,7 @@
value="#{customer.city}" /> *
</td>
<td>
- <h:message for="city" styleClass="cntError" />
+ <h:message id="MessageForCity" for="city" styleClass="cntError" />
</td>
</tr>
@@ -82,7 +82,7 @@
value="#{customer.state}" /> *
</td>
<td>
- <h:message for="state" styleClass="cntError" />
+ <h:message id="MessageForState" for="state" styleClass="cntError" />
</td>
</tr>
@@ -93,7 +93,7 @@
value="#{customer.zip}" /> *
</td>
<td>
- <h:message for="zip" styleClass="cntError" />
+ <h:message id="MessageForZip" for="zip" styleClass="cntError" />
</td>
</tr>
@@ -103,7 +103,7 @@
<h:inputText id="email" value="#{customer.email}" required="true"/> *
</td>
<td>
- <h:message for="email" styleClass="cntError" />
+ <h:message id="MessageForEmail" for="email" styleClass="cntError" />
</td>
</tr>
@@ -113,14 +113,14 @@
<h:inputText id="phone" value="#{customer.phone}" />
</td>
<td>
- <h:message for="phone" styleClass="cntError" />
+ <h:message id="MessageForPhone" for="phone" styleClass="cntError" />
</td>
</tr>
</table>
</s:validateAll>
- <ui:remove><h:commandButton action="prev" value="Back" /></ui:remove>
- <h:commandButton action="next" value="Continue" />
+ <ui:remove><h:commandButton id="BackButton" action="prev" value="Back" /></ui:remove>
+ <h:commandButton id="ContinueButton" action="next" value="Continue" />
</h:form>
</ui:define>
Modified: branches/Seam_2_0/examples/dvdstore/view/showorders.xhtml
===================================================================
--- branches/Seam_2_0/examples/dvdstore/view/showorders.xhtml 2008-06-05 01:55:47 UTC (rev 8330)
+++ branches/Seam_2_0/examples/dvdstore/view/showorders.xhtml 2008-06-05 19:03:20 UTC (rev 8331)
@@ -27,31 +27,32 @@
<f:subview id="ordersummary" rendered="#{orders.rowAvailable}">
- <h:dataTable value="#{orders}" var="item"
+ <h:dataTable id="OrdersDataTable"
+ value="#{orders}" var="item"
styleClass="dvdtable"
headerClass="dvdtablehead"
rowClasses="dvdtableodd,dvdtableeven"
columnClasses="dvdtablecol">
- <h:column>
- <f:facet name="header">Order Id</f:facet>
+ <h:column id="column1">
+ <f:facet id="OrderIdFacet" name="header">Order Id</f:facet>
#{item.orderId}
</h:column>
- <h:column>
- <f:facet name="header">Date</f:facet>
- <h:outputText value="#{item.orderDate}">
+ <h:column id="column2">
+ <f:facet id="OrderDateFacet" name="header">Date</f:facet>
+ <h:outputText id="OrderDateValue" value="#{item.orderDate}">
<s:convertDateTime type="both" dateStyle="full"/>
</h:outputText>
</h:column>
- <h:column>
- <f:facet name="header">Status</f:facet>
+ <h:column id="column3">
+ <f:facet id="StatusFacet" name="header">Status</f:facet>
#{item.status}
</h:column>
- <h:column>
- <s:button action="#{showorders.detailOrder}" value="Show Details" />
+ <h:column id="column4">
+ <s:button id="ShowDetailsButton" action="#{showorders.detailOrder}" value="Show Details" />
</h:column>
- <h:column>
- <s:button action="#{showorders.cancelOrder}" value="Cancel" rendered="#{item.open}"/>
+ <h:column id="column5">
+ <s:button id="CancelButton" action="#{showorders.cancelOrder}" value="Cancel" rendered="#{item.open}"/>
</h:column>
</h:dataTable>
@@ -59,68 +60,70 @@
<div class="cntInfo">
<h2>Order Details</h2>
- <h:panelGrid columns="2">
- <h:outputText value="Order Id:" />
- <h:outputText value="#{myorder.orderId}" />
+ <h:panelGrid id="OrderDetailsPanel" columns="2">
+ <h:outputText id="OrderIdText" value="Order Id:" />
+ <h:outputText id="OrderIdValue" value="#{myorder.orderId}" />
- <h:outputText value="Status:" />
- <h:panelGroup>
- <h:outputText value="#{myorder.status}" />
- <h:outputText value="(Tracking Number: #{myorder.trackingNumber})"
+ <h:outputText id="StatusText" value="Status:" />
+ <h:panelGroup id="StatusPanel">
+ <h:outputText id="StatusValue" value="#{myorder.status}" />
+ <h:outputText id="TrackingNumber"
+ value="(Tracking Number: #{myorder.trackingNumber})"
rendered="#{myorder.statusCode==3}"/>
</h:panelGroup>
- <h:outputText value="Order date:" />
- <h:outputText value="#{myorder.orderDate}">
+ <h:outputText id="OrderDateText" value="Order date:" />
+ <h:outputText id="OrderDateValue" value="#{myorder.orderDate}">
<s:convertDateTime type="both" dateStyle="full"/>
</h:outputText>
- <h:outputText value="Net Amount:" />
- <h:outputText value="#{myorder.netAmount}">
+ <h:outputText id="NetAmountText" value="Net Amount:" />
+ <h:outputText id="NetAmountValue" value="#{myorder.netAmount}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
- <h:outputText value="Tax:" />
- <h:outputText value="#{myorder.tax}">
+ <h:outputText id="TaxText" value="Tax:" />
+ <h:outputText id="TaxValue" value="#{myorder.tax}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
- <h:outputText value="Total Amount:" />
- <h:outputText value="#{myorder.totalAmount}">
+ <h:outputText id="TotalAmountText" value="Total Amount:" />
+ <h:outputText id="TotalAmountValue" value="#{myorder.totalAmount}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
</h:panelGrid>
<div class="cntInfo">
- <h:dataTable value="#{myorder.orderLines}" var="item"
+ <h:dataTable id="OrderLinesDataTable"
+ value="#{myorder.orderLines}" var="item"
styleClass="dvdtable"
headerClass="dvdtablehead"
rowClasses="dvdtableodd,dvdtableeven"
columnClasses="dvdtablecol">
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartTitleColumn}" />
+ <h:column id="column1">
+ <f:facet id="TitleFacet" name="header">
+ <h:outputText id="TitleText" value="#{messages.cartTitleColumn}" />
</f:facet>
- <h:outputText value="#{item.product.title}" />
+ <h:outputText id="TitleValue" value="#{item.product.title}" />
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartActorColumn}" />
+ <h:column id="column2">
+ <f:facet id="ActorFacet" name="header">
+ <h:outputText id="ActorText" value="#{messages.cartActorColumn}" />
</f:facet>
- <h:outputText value="#{item.product.actors[0].name}" />
+ <h:outputText id="ActorValue" value="#{item.product.actors[0].name}" />
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartQuantityColumn}" />
+ <h:column id="column3">
+ <f:facet id="QuantityFacet" name="header">
+ <h:outputText id="QuantityText" value="#{messages.cartQuantityColumn}" />
</f:facet>
- <h:outputText value="#{item.quantity}" />
+ <h:outputText id="QuantityValue" value="#{item.quantity}" />
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="#{messages.cartPriceColumn}" />
+ <h:column id="column4">
+ <f:facet id="PriceFacet" name="header">
+ <h:outputText id="PriceText" value="#{messages.cartPriceColumn}" />
</f:facet>
- <h:outputText value="#{item.product.price}">
+ <h:outputText id="PriceValue" value="#{item.product.price}">
<f:convertNumber type="currency" currencySymbol="$" />
</h:outputText>
</h:column>
16 years, 7 months
- 1
- 0
Seam SVN: r8330 - branches/Seam_2_0/examples/numberguess/view.
by seam-commits＠lists.jboss.org
Author: stan.silvert(a)jboss.com
Date: 2008-06-04 21:55:47 -0400 (Wed, 04 Jun 2008)
New Revision: 8330
Modified:
branches/Seam_2_0/examples/numberguess/view/cheat.jspx
branches/Seam_2_0/examples/numberguess/view/confirm.jspx
branches/Seam_2_0/examples/numberguess/view/giveup.jspx
branches/Seam_2_0/examples/numberguess/view/numberGuess.jspx
branches/Seam_2_0/examples/numberguess/view/win.jspx
Log:
JBSEAM-3048
Modified: branches/Seam_2_0/examples/numberguess/view/cheat.jspx
===================================================================
--- branches/Seam_2_0/examples/numberguess/view/cheat.jspx 2008-06-04 22:53:43 UTC (rev 8329)
+++ branches/Seam_2_0/examples/numberguess/view/cheat.jspx 2008-06-05 01:55:47 UTC (rev 8330)
@@ -17,9 +17,9 @@
<body>
<h1>You cheater!</h1>
<f:view>
- <h:form styleClass="niceform">
- (The answer is <h:outputText value="#{numberGuess.randomNumber}"/>.)
- <h:commandButton value="Done"/>
+ <h:form id="cheat" styleClass="niceform">
+ (The answer is <h:outputText id="RandomNumber" value="#{numberGuess.randomNumber}"/>.)
+ <h:commandButton id="DoneButton" value="Done"/>
</h:form>
</f:view>
</body>
Modified: branches/Seam_2_0/examples/numberguess/view/confirm.jspx
===================================================================
--- branches/Seam_2_0/examples/numberguess/view/confirm.jspx 2008-06-04 22:53:43 UTC (rev 8329)
+++ branches/Seam_2_0/examples/numberguess/view/confirm.jspx 2008-06-05 01:55:47 UTC (rev 8330)
@@ -17,10 +17,10 @@
<body>
<h1>Do you really want to cheat?</h1>
<f:view>
- <h:form styleClass="niceform">
+ <h:form id="confirm" styleClass="niceform">
I'll be really disappointed if you do this...
- <h:commandButton value="Yes" action="yes"/>
- <h:commandButton value="No" action="no"/>
+ <h:commandButton id="YesButton" value="Yes" action="yes"/>
+ <h:commandButton id="NoButton" value="No" action="no"/>
</h:form>
</f:view>
</body>
Modified: branches/Seam_2_0/examples/numberguess/view/giveup.jspx
===================================================================
--- branches/Seam_2_0/examples/numberguess/view/giveup.jspx 2008-06-04 22:53:43 UTC (rev 8329)
+++ branches/Seam_2_0/examples/numberguess/view/giveup.jspx 2008-06-05 01:55:47 UTC (rev 8330)
@@ -17,10 +17,10 @@
<body>
<h1>Do you really want to give up now?</h1>
<f:view>
- <h:form styleClass="niceform">
- You still have <h:outputText value="#{numberGuess.remainingGuesses}"/> guesses remaining.
- <h:commandButton value="Yes" action="yes"/>
- <h:commandButton value="No" action="no"/>
+ <h:form id="giveup" styleClass="niceform">
+ You still have <h:outputText id="RemainingGuesses" value="#{numberGuess.remainingGuesses}"/> guesses remaining.
+ <h:commandButton id="YesButton" value="Yes" action="yes"/>
+ <h:commandButton id="NoButton" value="No" action="no"/>
</h:form>
</f:view>
</body>
Modified: branches/Seam_2_0/examples/numberguess/view/numberGuess.jspx
===================================================================
--- branches/Seam_2_0/examples/numberguess/view/numberGuess.jspx 2008-06-04 22:53:43 UTC (rev 8329)
+++ branches/Seam_2_0/examples/numberguess/view/numberGuess.jspx 2008-06-05 01:55:47 UTC (rev 8330)
@@ -18,44 +18,46 @@
<body>
<h1>Guess a number...</h1>
<f:view>
- <h:form styleClass="niceform">
+ <h:form id="NumberGuessMain" styleClass="niceform">
<div>
- <h:messages globalOnly="true"/>
- <h:outputText value="Higher!"
+ <h:messages id="messages" globalOnly="true"/>
+ <h:outputText id="Higher"
+ value="Higher!"
rendered="#{numberGuess.randomNumber gt numberGuess.currentGuess}"/>
- <h:outputText value="Lower!"
+ <h:outputText id="Lower"
+ value="Lower!"
rendered="#{numberGuess.randomNumber lt numberGuess.currentGuess}"/>
</div>
<div>
- I'm thinking of a number between <h:outputText value="#{numberGuess.smallest}"/> and
- <h:outputText value="#{numberGuess.biggest}"/>. You have
- <h:outputText value="#{numberGuess.remainingGuesses}"/> guesses.
+ I'm thinking of a number between <h:outputText id="Smalles" value="#{numberGuess.smallest}"/> and
+ <h:outputText id="Biggest" value="#{numberGuess.biggest}"/>. You have
+ <h:outputText id="RemainingGuesses" value="#{numberGuess.remainingGuesses}"/> guesses.
</div>
<div>
Your guess:
- <h:inputText value="#{numberGuess.currentGuess}" id="inputGuess" required="true" size="3"
+ <h:inputText id="inputGuess" value="#{numberGuess.currentGuess}" required="true" size="3"
rendered="#{(numberGuess.biggest-numberGuess.smallest) gt 20}">
<f:validateLongRange maximum="#{numberGuess.biggest}"
minimum="#{numberGuess.smallest}"/>
</h:inputText>
- <h:selectOneMenu value="#{numberGuess.currentGuess}" id="selectGuessMenu" required="true"
+ <h:selectOneMenu id="selectGuessMenu" value="#{numberGuess.currentGuess}" required="true"
rendered="#{(numberGuess.biggest-numberGuess.smallest) le 20 and (numberGuess.biggest-numberGuess.smallest) gt 4}">
- <s:selectItems value="#{numberGuess.possibilities}" var="i" label="#{i}"/>
+ <s:selectItems id="PossibilitiesMenuItems" value="#{numberGuess.possibilities}" var="i" label="#{i}"/>
</h:selectOneMenu>
- <h:selectOneRadio value="#{numberGuess.currentGuess}" id="selectGuessRadio" required="true"
+ <h:selectOneRadio id="selectGuessRadio" value="#{numberGuess.currentGuess}" required="true"
rendered="#{(numberGuess.biggest-numberGuess.smallest) le 4}">
- <s:selectItems value="#{numberGuess.possibilities}" var="i" label="#{i}"/>
+ <s:selectItems id="PossibilitiesRadioItems" value="#{numberGuess.possibilities}" var="i" label="#{i}"/>
</h:selectOneRadio>
- <h:commandButton value="Guess" action="guess"/>
- <s:button value="Cheat" action="cheat"/>
- <s:button value="Give up" action="giveup"/>
+ <h:commandButton id="GuessButton" value="Guess" action="guess"/>
+ <s:button id="CheatButton" value="Cheat" action="cheat"/>
+ <s:button id="GiveUpButton" value="Give up" action="giveup"/>
</div>
<div>
- <h:message for="inputGuess" style="color: red"/>
+ <h:message id="message" for="inputGuess" style="color: red"/>
</div>
</h:form>
Modified: branches/Seam_2_0/examples/numberguess/view/win.jspx
===================================================================
--- branches/Seam_2_0/examples/numberguess/view/win.jspx 2008-06-04 22:53:43 UTC (rev 8329)
+++ branches/Seam_2_0/examples/numberguess/view/win.jspx 2008-06-05 01:55:47 UTC (rev 8330)
@@ -16,9 +16,9 @@
<body>
<h1>You won!</h1>
<f:view>
- Yes, the answer was <h:outputText value="#{numberGuess.currentGuess}" />.
- It took you <h:outputText value="#{numberGuess.guessCount}" /> guesses.
- <h:outputText value="But you cheated, so it doesn't count!" rendered="#{numberGuess.cheat}"/>
+ Yes, the answer was <h:outputText id="CurrentGuess" value="#{numberGuess.currentGuess}" />.
+ It took you <h:outputText id="GuessCount" value="#{numberGuess.guessCount}" /> guesses.
+ <h:outputText id="CheatedMessage" value="But you cheated, so it doesn't count!" rendered="#{numberGuess.cheat}"/>
Would you like to <a href="numberGuess.seam">play again</a>?
</f:view>
</body>
16 years, 7 months
- 1
- 0