August 2008 - seam-commits - Jboss List Archives

Seam SVN: r8691 - trunk/src/main/org/jboss/seam/web.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-08-15 03:23:25 -0400 (Fri, 15 Aug 2008) New Revision: 8691 Modified: trunk/src/main/org/jboss/seam/web/AbstractFilter.java Log: finer-grained path control Modified: trunk/src/main/org/jboss/seam/web/AbstractFilter.java =================================================================== --- trunk/src/main/org/jboss/seam/web/AbstractFilter.java 2008-08-15 01:17:43 UTC (rev 8690) +++ trunk/src/main/org/jboss/seam/web/AbstractFilter.java 2008-08-15 07:23:25 UTC (rev 8691) @@ -97,7 +97,8 @@ { return true; } - String path = ((HttpServletRequest) request).getServletPath(); + + String path = ((HttpServletRequest) request).getRequestURI().replaceFirst(servletContext.getContextPath(), ""); String urlPattern = getUrlPattern(); Pattern regexPattern = getPattern(); if (urlPattern != null)

17 years, 8 months

1
0
0 / 0

Seam SVN: r8690 - trunk/src/wicket/org/jboss/seam/wicket.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-08-14 21:17:43 -0400 (Thu, 14 Aug 2008) New Revision: 8690 Modified: trunk/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java Log: JBSEAM-2992 Propagate temporary conversation across redirect Modified: trunk/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java =================================================================== --- trunk/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java 2008-08-14 12:38:03 UTC (rev 8689) +++ trunk/src/wicket/org/jboss/seam/wicket/SeamWebApplication.java 2008-08-15 01:17:43 UTC (rev 8690) @@ -1,5 +1,6 @@ package org.jboss.seam.wicket; +import org.apache.wicket.IRedirectListener; import org.apache.wicket.Request; import org.apache.wicket.RequestCycle; import org.apache.wicket.Response; @@ -83,6 +84,18 @@ stringBuilder.append("&" + Manager.instance().getConversationIdParameter() + "=" + Conversation.instance().getId()); url = stringBuilder.subSequence(0, stringBuilder.length()); } + else if ( IRedirectListener.INTERFACE.getName().equals(name) ) + { + if (!Manager.instance().isLongRunningConversation()) + { + Manager.instance().beforeRedirect(); + } + + StringBuilder stringBuilder = new StringBuilder(url); + stringBuilder.append("&" + Manager.instance().getConversationIdParameter() + "=" + Conversation.instance().getId()); + url = stringBuilder.subSequence(0, stringBuilder.length()); + } + return url; } @@ -97,7 +110,6 @@ } return stringBuilder.subSequence(0, stringBuilder.length()); } - }; } };

17 years, 8 months

1
0
0 / 0

Seam SVN: r8689 - tags.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2008-08-14 08:38:03 -0400 (Thu, 14 Aug 2008) New Revision: 8689 Added: tags/Seam_FP_CR1/ Log: Copied: tags/Seam_FP_CR1 (from rev 8688, branches/Seam_2_0_FP)

17 years, 8 months

1
0
0 / 0

Seam SVN: r8688 - tags.

by seam-commits＠lists.jboss.org

Author: manaRH Date: 2008-08-14 08:12:56 -0400 (Thu, 14 Aug 2008) New Revision: 8688 Removed: tags/Seam_FP_CR1/ Log: removing tag for FP CR1

17 years, 8 months

1
0
0 / 0

Seam SVN: r8687 - in trunk/examples/wiki: src/main/org/jboss/seam/wiki/core/ui and 3 other directories.

by seam-commits＠lists.jboss.org

Author: christian.bauer(a)jboss.com Date: 2008-08-14 07:01:37 -0400 (Thu, 14 Aug 2008) New Revision: 8687 Added: trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/Unarchiver.java Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/plugin/metamodel/ProfilePluginModule.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiRedirect.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/upload/importers/ZipImporter.java trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiUtil.java trunk/examples/wiki/view/userProfile_d.xhtml Log: Minor fixes Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/plugin/metamodel/ProfilePluginModule.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/plugin/metamodel/ProfilePluginModule.java 2008-08-13 22:04:48 UTC (rev 8686) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/plugin/metamodel/ProfilePluginModule.java 2008-08-14 11:01:37 UTC (rev 8687) @@ -44,7 +44,7 @@ } public int compareTo(Object o) { - int result = new Integer(((ProfilePluginModule)o).getPriority()).compareTo(this.getPriority()); + int result = new Integer(this.getPriority()).compareTo( ((ProfilePluginModule)(o)).getPriority() ); return result == 0 ? this.getKey().compareTo( ((ProfilePluginModule)o).getKey() ) : result; Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiRedirect.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiRedirect.java 2008-08-13 22:04:48 UTC (rev 8686) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/ui/WikiRedirect.java 2008-08-14 11:01:37 UTC (rev 8687) @@ -11,6 +11,7 @@ import org.jboss.seam.annotations.Logger; import org.jboss.seam.ScopeType; import org.jboss.seam.Component; +import org.jboss.seam.core.Manager; import org.jboss.seam.log.Log; import org.jboss.seam.faces.RedirectException; import org.jboss.seam.wiki.core.model.WikiDocument; @@ -88,7 +89,8 @@ : urlRenderer.renderURL(getWikiDocument()); // TODO: Fragile? - if (propagateConversation) url = url + "?cid=" + org.jboss.seam.core.Conversation.instance().getId(); + String conversationIdParam = Manager.instance().getConversationIdParameter(); + if (propagateConversation) url = url + "?"+conversationIdParam+"=" + org.jboss.seam.core.Conversation.instance().getId(); if (getFragment() != null) url = url + "#" + fragment; Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/upload/importers/ZipImporter.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/upload/importers/ZipImporter.java 2008-08-13 22:04:48 UTC (rev 8686) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/core/upload/importers/ZipImporter.java 2008-08-14 11:01:37 UTC (rev 8687) @@ -30,6 +30,11 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; +/** + * TODO: Delegate code to util.Unarchiver + * + * @author Christian Bauer + */ @Name("zipImporter") @UploadImporter( handledMimeTypes = {"application/zip", "application/java-archive"}, Added: trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/Unarchiver.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/Unarchiver.java (rev 0) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/Unarchiver.java 2008-08-14 11:01:37 UTC (rev 8687) @@ -0,0 +1,89 @@ +package org.jboss.seam.wiki.util; + +import org.jboss.seam.wiki.core.model.WikiUpload; +import org.jboss.seam.log.Log; +import org.jboss.seam.log.Logging; + +import java.util.HashMap; +import java.util.Map; +import java.util.zip.ZipInputStream; +import java.util.zip.ZipEntry; +import java.io.BufferedInputStream; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; + +/** + * @author Christian Bauer + */ +public class Unarchiver { + + Log log = Logging.getLog(Unarchiver.class); + + protected Handler handler; + + public Unarchiver(Handler handler) { + this.handler = handler; + } + + public void extract(WikiUpload zipFile) { + if (zipFile == null) { + throw new IllegalArgumentException("Archive must not be null"); + } + + if (zipFile.getData().length == 0) return; + + Map<String, Object> newObjects = new HashMap<String, Object>(); + + ByteArrayInputStream byteStream = null; + ZipInputStream zipInputStream = null; + try { + byteStream = new ByteArrayInputStream(zipFile.getData()); + zipInputStream = new ZipInputStream(new BufferedInputStream(byteStream)); + + int bufferSize = 1024; + ZipEntry ze; + ByteArrayOutputStream baos; + byte[] buffer = new byte[bufferSize]; + byte[] uncompressedBytes; + int bytesRead; + + while ((ze = zipInputStream.getNextEntry()) != null) { + log.trace("extracting zip entry: " + ze.getName()); + + if (!handler.beforeUncompress(zipFile, ze)) continue; + + baos = new ByteArrayOutputStream(); + while ((bytesRead = zipInputStream.read(buffer, 0, bufferSize)) > 0) { + baos.write(buffer, 0, bytesRead); + } + baos.close(); + uncompressedBytes = baos.toByteArray(); + + Object newObject = handler.createNewObject(zipFile, ze, uncompressedBytes); + if (newObject != null) { + newObjects.put(ze.getName(), newObject); + } + + zipInputStream.closeEntry(); + } + + } catch (Exception ex) { + throw new RuntimeException(ex); + } finally { + try { + if (zipInputStream != null) zipInputStream.close(); + if (byteStream != null) byteStream.close(); + } catch (Exception e) { + e.printStackTrace(System.err); + } + } + + handler.handleNewObjects(zipFile, newObjects); + } + + public interface Handler<T> { + public boolean beforeUncompress(WikiUpload zipFile, ZipEntry zipEntry); + public T createNewObject(WikiUpload zipFile, ZipEntry zipEntry, byte[] uncompressedBytes); + public abstract void handleNewObjects(WikiUpload zipFile, Map<String, T> newObjects); + } +} Modified: trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiUtil.java =================================================================== --- trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiUtil.java 2008-08-13 22:04:48 UTC (rev 8686) +++ trunk/examples/wiki/src/main/org/jboss/seam/wiki/util/WikiUtil.java 2008-08-14 11:01:37 UTC (rev 8687) @@ -376,4 +376,22 @@ return msgId.toString(); } + public static String convertUnderscoreToCamelCase(String s) { + StringBuilder sb = new StringBuilder(); + boolean uppercaseNextChar = false; + for (char c : s.toCharArray()) { + if (c == '_') { + uppercaseNextChar = true; + } else { + if (uppercaseNextChar) { + sb.append(Character.toString(c).toUpperCase()); + uppercaseNextChar = false; + } else { + sb.append(c); + } + } + } + return sb.toString(); + } + } Modified: trunk/examples/wiki/view/userProfile_d.xhtml =================================================================== --- trunk/examples/wiki/view/userProfile_d.xhtml 2008-08-13 22:04:48 UTC (rev 8686) +++ trunk/examples/wiki/view/userProfile_d.xhtml 2008-08-14 11:01:37 UTC (rev 8687) @@ -33,6 +33,7 @@ <s:div> <c:forEach var="pm" items="#{pluginRegistry.profilePluginModulesAsList}"> <ui:include src="/#{pm.plugin.getPackageDefaultTemplatePath(pm.template)}"/> + <br/> </c:forEach> </s:div>

17 years, 8 months

1
0
0 / 0

Seam SVN: r8686 - in branches/Seam_2_0/seam-gen/icefaces: view and 2 other directories.

by seam-commits＠lists.jboss.org

Author: jguglielmin Date: 2008-08-13 18:04:48 -0400 (Wed, 13 Aug 2008) New Revision: 8686 Modified: branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components-war.xml branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components.xml branches/Seam_2_0/seam-gen/icefaces/view/action.xhtml branches/Seam_2_0/seam-gen/icefaces/view/conversation.xhtml branches/Seam_2_0/seam-gen/icefaces/view/edit.xhtml branches/Seam_2_0/seam-gen/icefaces/view/edit.xhtml.ftl branches/Seam_2_0/seam-gen/icefaces/view/editproperty.xhtml.ftl branches/Seam_2_0/seam-gen/icefaces/view/form.xhtml branches/Seam_2_0/seam-gen/icefaces/view/home.xhtml branches/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml branches/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml.ftl branches/Seam_2_0/seam-gen/icefaces/view/layout/template.xhtml branches/Seam_2_0/seam-gen/icefaces/view/list.xhtml branches/Seam_2_0/seam-gen/icefaces/view/list.xhtml.ftl branches/Seam_2_0/seam-gen/icefaces/view/login.xhtml branches/Seam_2_0/seam-gen/icefaces/view/query.xhtml branches/Seam_2_0/seam-gen/icefaces/view/stylesheet/theme.css branches/Seam_2_0/seam-gen/icefaces/view/view.xhtml.ftl Log: update icefaces for styling, add resizable columns in dataTable, etc ICE-3407 Modified: branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components-war.xml =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components-war.xml 2008-08-13 21:54:45 UTC (rev 8685) +++ branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components-war.xml 2008-08-13 22:04:48 UTC (rev 8686) @@ -34,8 +34,7 @@ <drools:rule-files><value>/security.drl</value></drools:rule-files> </drools:rule-base> - <security:identity authenticate-method="#{authenticator.authenticate}" - remember-me="true"/> + <security:identity authenticate-method="#{authenticator.authenticate}" remember-me="true"/> <event type="org.jboss.seam.security.notLoggedIn"> <action execute="#{redirect.captureCurrentView}"/> Modified: branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components.xml =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components.xml 2008-08-13 21:54:45 UTC (rev 8685) +++ branches/Seam_2_0/seam-gen/icefaces/resources/WEB-INF/components.xml 2008-08-13 22:04:48 UTC (rev 8686) @@ -28,12 +28,10 @@ persistence-unit-jndi-name="java:/@projectName@EntityManagerFactory"/> <drools:rule-base name="securityRules"> - <drools:rule-files> - <value>/security.drl</value> - </drools:rule-files> + <drools:rule-files><value>/security.drl</value></drools:rule-files> </drools:rule-base> - <security:identity authenticate-method="#{authenticator.authenticate}"/> + <security:identity authenticate-method="#{authenticator.authenticate}" remember-me="true"/> <event type="org.jboss.seam.security.notLoggedIn"> <action execute="#{redirect.captureCurrentView}"/> Modified: branches/Seam_2_0/seam-gen/icefaces/view/action.xhtml =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/view/action.xhtml 2008-08-13 21:54:45 UTC (rev 8685) +++ branches/Seam_2_0/seam-gen/icefaces/view/action.xhtml 2008-08-13 22:04:48 UTC (rev 8686) @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" - xmlns:ice="http://www.icesoft.com/icefaces/component" + xmlns:ice="http://www.icesoft.com/icefaces/component" template="layout/template.xhtml"> <ui:define name="body"> Modified: branches/Seam_2_0/seam-gen/icefaces/view/conversation.xhtml =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/view/conversation.xhtml 2008-08-13 21:54:45 UTC (rev 8685) +++ branches/Seam_2_0/seam-gen/icefaces/view/conversation.xhtml 2008-08-13 22:04:48 UTC (rev 8686) @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf" xmlns:h="http://java.sun.com/jsf/html" - xmlns:ice="http://www.icesoft.com/icefaces/component" + xmlns:ice="http://www.icesoft.com/icefaces/component" template="layout/template.xhtml"> <ui:define name="body"> Modified: branches/Seam_2_0/seam-gen/icefaces/view/edit.xhtml =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/view/edit.xhtml 2008-08-13 21:54:45 UTC (rev 8685) +++ branches/Seam_2_0/seam-gen/icefaces/view/edit.xhtml 2008-08-13 22:04:48 UTC (rev 8686) @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" - xmlns:ice="http://www.icesoft.com/icefaces/component" + xmlns:ice="http://www.icesoft.com/icefaces/component" template="layout/template.xhtml"> <ui:define name="body"> Modified: branches/Seam_2_0/seam-gen/icefaces/view/edit.xhtml.ftl =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/view/edit.xhtml.ftl 2008-08-13 21:54:45 UTC (rev 8685) +++ branches/Seam_2_0/seam-gen/icefaces/view/edit.xhtml.ftl 2008-08-13 22:04:48 UTC (rev 8686) @@ -11,7 +11,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" - xmlns:ice="http://www.icesoft.com/icefaces/component" + xmlns:ice="http://www.icesoft.com/icefaces/component" template="layout/template.xhtml"> <ui:define name="body"> Modified: branches/Seam_2_0/seam-gen/icefaces/view/editproperty.xhtml.ftl =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/view/editproperty.xhtml.ftl 2008-08-13 21:54:45 UTC (rev 8685) +++ branches/Seam_2_0/seam-gen/icefaces/view/editproperty.xhtml.ftl 2008-08-13 22:04:48 UTC (rev 8686) @@ -11,54 +11,54 @@ <ui:define name="label">${componentProperty.name}</ui:define> <#if isDate(componentProperty)> <ice:selectInputDate id="${componentProperty.name}Id" - renderAsPopup="true" + renderAsPopup="true" <#if propertyIsId> - disabled="${'#'}{${homeName}.managed}" + disabled="${'#'}{${homeName}.managed}" </#if> <#if !column.nullable> - required="true" + required="true" </#if> - value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"> value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"> - + value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"> + <s:convertDateTime type="date"/> </ice:selectInputDate> <#elseif isTime(componentProperty)> <ice:inputText id="${componentProperty.name}Id" size="5" <#if !column.nullable> - required="true" + required="true" </#if> - value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"> - <s:convertDateTime type="time"/> + value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"> + <s:convertDateTime type="time"/> </ice:inputText> <#elseif isTimestamp(componentProperty)> <ice:inputText id="${componentProperty.name}Id" size="16" <#if !column.nullable> - required="true" + required="true" </#if> - value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"> + value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"> <s:convertDateTime type="both" dateStyle="short"/> </ice:inputText> <#elseif isBigDecimal(componentProperty)> <ice:inputText id="${componentProperty.name}Id" - partialSubmit="true" + partialSubmit="true" <#if !column.nullable> - required="true" + required="true" </#if> - value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}" - size="${column.precision+7}"> + value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}" + size="${column.precision+7}"> </ice:inputText> <#elseif isBigInteger(componentProperty)> <ice:inputText id="${componentProperty.name}Id" - partialSubmit="true" + partialSubmit="true" <#if propertyIsId> - disabled="${'#'}{${homeName}.managed}" + disabled="${'#'}{${homeName}.managed}" </#if> <#if !column.nullable> - required="true" + required="true" </#if> - value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}" - size="${column.precision+6}"> + value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}" + size="${column.precision+6}"> </ice:inputText> <#elseif isBoolean(componentProperty)> <h:selectBooleanCheckbox id="${componentProperty.name}" @@ -68,7 +68,7 @@ <#if propertyIsId> disabled="${'#'}{${homeName}.managed}" </#if> - value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"/> + value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"/> <#elseif isString(componentProperty)> <#if column.length gt 160> <#if column.length gt 800> @@ -76,16 +76,16 @@ <#else> <#assign rows = (column.length/80)?int> </#if> - <h:inputTextarea id="${componentProperty.name}" + <ice:inputTextarea id="${componentProperty.name}" cols="80" rows="${rows}" <#if propertyIsId> - disabled="${'#'}{${homeName}.managed}" + disabled="${'#'}{${homeName}.managed}" </#if> <#if !column.nullable> - required="true" + required="true" </#if> - value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"/> + value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"/> <#else> <#if column.length gt 100> <#assign size = 100> @@ -94,15 +94,15 @@ </#if> <ice:inputText id="${componentProperty.name}" <#if propertyIsId> - disabled="${'#'}{${homeName}.managed}" + disabled="${'#'}{${homeName}.managed}" </#if> <#if !column.nullable> - required="true" + required="true" </#if> size="${size}" - maxlength="${column.length}" - partialSubmit="true" - value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"> + maxlength="${column.length}" + partialSubmit="true" + value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"> </ice:inputText> </#if> <#else> @@ -126,15 +126,16 @@ <ui:define name="label">${property.name}</ui:define> <#if isDate(property)> <ice:selectInputDate id="${property.name}Id" - renderAsPopup="true" + renderAsPopup="true" <#if propertyIsId> - disabled="${'#'}{${homeName}.managed}" + disabled="${'#'}{${homeName}.managed}" </#if> <#if !column.nullable> - required="true" + required="true" </#if> - value="${'#'}{${homeName}.instance.${property.name}}"> + value="${'#'}{${homeName}.instance.${property.name}}"> + <s:convertDateTime type="date"/> </ice:selectInputDate> <#elseif isTime(property)> <ice:inputText id="${property.name}Id" @@ -193,16 +194,16 @@ <#else> <#assign rows = (column.length/80)?int> </#if> - <h:inputTextarea id="${property.name}" + <ice:inputTextarea id="${property.name}" cols="80" rows="${rows}" <#if propertyIsId> - disabled="${'#'}{${homeName}.managed}" + disabled="${'#'}{${homeName}.managed}" </#if> <#if !column.nullable> - required="true" + required="true" </#if> - value="${'#'}{${homeName}.instance.${property.name}}"/> + value="${'#'}{${homeName}.instance.${property.name}}"/> <#else> <#if column.length gt 100> <#assign size = 100> @@ -210,28 +211,28 @@ <#assign size = column.length> </#if> <ice:inputText id="${property.name}Id" - partialSubmit="true" + partialSubmit="true" <#if propertyIsId> - disabled="${'#'}{${homeName}.managed}" + disabled="${'#'}{${homeName}.managed}" </#if> <#if !column.nullable> - required="true" + required="true" </#if> - size="${size}" - maxlength="${column.length}" - value="${'#'}{${homeName}.instance.${property.name}}"> + size="${size}" + maxlength="${column.length}" + value="${'#'}{${homeName}.instance.${property.name}}"> </ice:inputText> </#if> <#else> <ice:inputText id="${property.name}Id" - partialSubmit="true" + partialSubmit="true" <#if !column.nullable> - required="true" + required="true" </#if> <#if propertyIsId> - disabled="${'#'}{${homeName}.managed}" + disabled="${'#'}{${homeName}.managed}" </#if> - value="${'#'}{${homeName}.instance.${property.name}}"> + value="${'#'}{${homeName}.instance.${property.name}}"> </ice:inputText> </#if> </s:decorate> Modified: branches/Seam_2_0/seam-gen/icefaces/view/form.xhtml =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/view/form.xhtml 2008-08-13 21:54:45 UTC (rev 8685) +++ branches/Seam_2_0/seam-gen/icefaces/view/form.xhtml 2008-08-13 22:04:48 UTC (rev 8686) @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" - xmlns:ice="http://www.icesoft.com/icefaces/component" + xmlns:ice="http://www.icesoft.com/icefaces/component" template="layout/template.xhtml"> <ui:define name="body"> Modified: branches/Seam_2_0/seam-gen/icefaces/view/home.xhtml =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/view/home.xhtml 2008-08-13 21:54:45 UTC (rev 8685) +++ branches/Seam_2_0/seam-gen/icefaces/view/home.xhtml 2008-08-13 22:04:48 UTC (rev 8686) @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" - xmlns:ice="http://www.icesoft.com/icefaces/component" + xmlns:ice="http://www.icesoft.com/icefaces/component" template="layout/template.xhtml"> <ui:define name="body"> Modified: branches/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml 2008-08-13 21:54:45 UTC (rev 8685) +++ branches/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml 2008-08-13 22:04:48 UTC (rev 8686) @@ -5,6 +5,10 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ice="http://www.icesoft.com/icefaces/component" xmlns:s="http://jboss.com/products/seam/taglib"> + <ice:panelGroup id="menuPanelGroup" styleClass="formBorderHighlight"> + <table width="100%" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td class="iceDatTblColHdr2"> <ice:panelGrid id="menuPanelGrid" columns="2" columnClasses="leftMenu,rightMenu"> <ice:panelGroup id="menuPanelGroupLeft" > <h:outputText id="menuProjectName" value="#{projectName}:"/> @@ -18,5 +22,9 @@ <s:link id="menuLogoutId" view="/home.xhtml" action="#{identity.logout}" value="Logout" rendered="#{identity.loggedIn}"/> </ice:panelGroup> </ice:panelGrid> + </td> + </tr> + </table> + </ice:panelGroup> </div> Modified: branches/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml.ftl =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml.ftl 2008-08-13 21:54:45 UTC (rev 8685) +++ branches/Seam_2_0/seam-gen/icefaces/view/layout/menu.xhtml.ftl 2008-08-13 22:04:48 UTC (rev 8686) @@ -5,7 +5,10 @@ xmlns:f="http://java.sun.com/jsf/core" xmlns:ice="http://www.icesoft.com/icefaces/component" xmlns:s="http://jboss.com/products/seam/taglib"> - + <ice:panelGroup id="menuPanelGroup" styleClass="formBorderHighlight"> + <table width="100%" border="0" cellspacing="0" cellpadding="0"> + <tr> + <td class="iceDatTblColHdr2"> <ice:panelGrid id="menuPanelGrid" columns="2" columnClasses="leftMenu,rightMenu"> <ice:panelGroup id="leftMenuId" > <ice:outputText id="menuProjectNameId" value="${'#'}{projectName}:"/> @@ -24,6 +27,9 @@ <s:link view="/home.xhtml" id="menulogoutId" action="${'#'}{identity.logout}" value="Logout" rendered="${'#'}{identity.loggedIn}"/> </ice:panelGroup> </ice:panelGrid> - + </td> + </tr> + </table> + </ice:panelGroup> </div> Modified: branches/Seam_2_0/seam-gen/icefaces/view/layout/template.xhtml =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/view/layout/template.xhtml 2008-08-13 21:54:45 UTC (rev 8685) +++ branches/Seam_2_0/seam-gen/icefaces/view/layout/template.xhtml 2008-08-13 22:04:48 UTC (rev 8686) @@ -12,12 +12,11 @@ doctypeSystem="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title>@projectName@</title> - <link rel='stylesheet' type='text/css' href='./xmlhttp/css/xp/xp.css'/> + <link rel='stylesheet' type='text/css' href='./xmlhttp/css/rime/rime.css'/> <link href="stylesheet/theme.css" rel="stylesheet" type="text/css" /> </head> - <body> <ui:include src="menu.xhtml"> @@ -29,65 +28,25 @@ <ui:insert name="body"/> </div> - <div class="footer"> - Powered by   <a href="http://jboss.com/products/seam">Seam</a>   and   - <a href="http://icefaces.org">ICEfaces</a>   Generated by icefaces-seam-gen <br> - </br> - <ice:form id="timerForm"> -  - <table width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td> -  - <table border="0" cellspacing="0" cellpadding="0"> - <tr> - <td class="tabbedContainerHeaderControl" > - <ice:commandButton - id="templateExpandPanelButtonId" - partialSubmit="true" - image="img/orange-toggle-#{timer.expanded}.gif" - immediate="true" - action="#{timer.toggleExpanded}" - style="width: 20px; height: 20px;"/> - </td> - <td class="iceDatTblColHdr2"> - <ice:outputText id="templatePanelId" value="Timer and Program Info Panel"/> - </td> - </tr> - </table> - </td> - </tr> - <tr> - <td colspan="1" align="left" class="tabbedContainerContent"> - <ice:panelGroup id="templatePanelGroupId" effect="#{timer.expandEffect}" visible="#{timer.visibility}" > - <table width="100%" border="1" cellspacing="0" cellpadding="1"> - <tr> - <td> - Current time is: - <ice:outputText id="templateTimeId" value="#{timer.currentTime}"/> - </td> - <td>Synchronous Render Mode:  - <ice:outputText id="templateRenderModeId" value="#{timer.renderMode}"/> - </td> - </tr> - <tr> - <td>Current Conversation Id: - <ice:outputText id="templateConversationId" - value="#{timer.currentConversation}"/> - </td> - <td>Is Long Running? - <ice:outputText id="timerLongRunningId" value="#{timer.longRunning}"/> - </td> - </tr> - </table> - - </ice:panelGroup> - </td> - </tr> - </table> - - </ice:form> + <div class="footer"> + <div style="margin-bottom: 5px;"> + Powered by + #{_}<a href="http://jboss.com/products/seam">Seam</a> and + #{_}<a href="http://icefaces.org">ICEfaces</a> + - Generated by icefaces-seam-gen + <ice:panelGroup rendered="#{identity.loggedIn}"> + #{_} + [#{identity.username}] + </ice:panelGroup> + <ice:panelGroup rendered="#{init.debug}"> + <br /> + <s:link view="/debug.xhtml" propagation="none" value="Debug Console"/> + #{' - '} +  + <br/> + <strong>conversation:</strong> id = #{conversation.id}, long running? #{conversation.longRunning}, nested? #{conversation.nested ? 'yes' : 'no'}, parent id = #{conversation.nested ? conversation.parentId : 'n/a'} + </ice:panelGroup> + </div> <table width="100%" cellpadding="0" cellspacing="0"> <tr> <td class="showcaseFooter">ICEsoft Technologies @@ -96,6 +55,5 @@ </tr> </table> </div> - -</body> + </body> </html> Modified: branches/Seam_2_0/seam-gen/icefaces/view/list.xhtml =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/view/list.xhtml 2008-08-13 21:54:45 UTC (rev 8685) +++ branches/Seam_2_0/seam-gen/icefaces/view/list.xhtml 2008-08-13 22:04:48 UTC (rev 8686) @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" - xmlns:ice="http://www.icesoft.com/icefaces/component" + xmlns:ice="http://www.icesoft.com/icefaces/component" template="layout/template.xhtml"> <ui:define name="body"> Modified: branches/Seam_2_0/seam-gen/icefaces/view/list.xhtml.ftl =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/view/list.xhtml.ftl 2008-08-13 21:54:45 UTC (rev 8685) +++ branches/Seam_2_0/seam-gen/icefaces/view/list.xhtml.ftl 2008-08-13 22:04:48 UTC (rev 8686) @@ -14,7 +14,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" - xmlns:ice="http://www.icesoft.com/icefaces/component" + xmlns:ice="http://www.icesoft.com/icefaces/component" template="layout/template.xhtml"> <ui:define name="body"> @@ -41,7 +41,7 @@ <ui:define name="label">${componentProperty.name}</ui:define> <ice:inputText id="${componentProperty.name}TextId" value="${'#'}{${listName}.${componentName}.${property.name}.${componentProperty.name}}" - partialSubmit="true"/> + partialSubmit="true"/> </s:decorate> </#if> @@ -52,7 +52,7 @@ <ui:define name="label">${property.name}</ui:define> <ice:inputText id="list${property.name}TextId" value="${'#'}{${listName}.${componentName}.${property.name}}" - partialSubmit="true"/> + partialSubmit="true"/> </s:decorate> </#if> Modified: branches/Seam_2_0/seam-gen/icefaces/view/login.xhtml =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/view/login.xhtml 2008-08-13 21:54:45 UTC (rev 8685) +++ branches/Seam_2_0/seam-gen/icefaces/view/login.xhtml 2008-08-13 22:04:48 UTC (rev 8686) @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" - xmlns:ice="http://www.icesoft.com/icefaces/component" + xmlns:ice="http://www.icesoft.com/icefaces/component" template="layout/template.xhtml"> <ui:define name="body"> @@ -23,26 +23,26 @@ </table> - <p>Please login using any username and password</p> + <p>Please login using any username and password</p> - <div class="dialog"> - <h:panelGrid id="loginPanelGridId" columns="2" rowClasses="prop" columnClasses="name,value"> + <div class="dialog"> + <ice:panelGrid id="loginPanelGridId" columns="2" rowClasses="prop" columnClasses="name,value"> <h:outputLabel for="username">Username</h:outputLabel> - <h:inputText id="username" + <ice:inputText id="username" value="#{identity.username}"/> <h:outputLabel for="password">Password</h:outputLabel> - <h:inputSecret id="password" + <ice:inputSecret id="password" value="#{identity.password}"/> <h:outputLabel for="rememberMe">Remember me</h:outputLabel> - <h:selectBooleanCheckbox id="rememberMe" + <ice:selectBooleanCheckbox id="rememberMe" value="#{identity.rememberMe}"/> - </h:panelGrid> + </ice:panelGrid> </div> </ice:panelGroup> - <div class="actionButtons"> - <h:commandButton id="loginButtonId" value="Login" action="#{identity.login}"/> - </div> + <div class="actionButtons"> + <ice:commandButton id="loginButtonId" value="Login" action="#{identity.login}"/> + </div> </ice:form> </ui:define> Modified: branches/Seam_2_0/seam-gen/icefaces/view/query.xhtml =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/view/query.xhtml 2008-08-13 21:54:45 UTC (rev 8685) +++ branches/Seam_2_0/seam-gen/icefaces/view/query.xhtml 2008-08-13 22:04:48 UTC (rev 8686) @@ -5,7 +5,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" - xmlns:ice="http://www.icesoft.com/icefaces/component" + xmlns:ice="http://www.icesoft.com/icefaces/component" template="layout/template.xhtml"> <ui:define name="body"> @@ -15,14 +15,14 @@ <h:messages globalOnly="true" styleClass="message"/> <ice:form id="queryFormId"> - <h:outputText value="No results from search" + <ice:outputText value="No results from search" id="queryOutputTextId" - rendered="#{empty @componentName@.resultList}"/> - <f:subview id="queryResultsId" rendered="#{not empty @componentName@.resultList}"> + rendered="#{empty @componentName@.resultList}"/> + <f:subview id="queryResultsId" rendered="#{not empty @componentName@.resultList}"> <ice:dataTable id="@componentName@Table" - var="item" - columnClasses="allCols" - value="#{@componentName@.resultList}"> + var="item" + columnClasses="allCols" + value="#{@componentName@.resultList}"> <ice:column id="column@componentName@list"> <f:facet name="header">Result</f:facet> #{item} Modified: branches/Seam_2_0/seam-gen/icefaces/view/stylesheet/theme.css =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/view/stylesheet/theme.css 2008-08-13 21:54:45 UTC (rev 8685) +++ branches/Seam_2_0/seam-gen/icefaces/view/stylesheet/theme.css 2008-08-13 22:04:48 UTC (rev 8686) @@ -7,17 +7,17 @@ } input, textarea { - border: 1px solid #BBBBBB; +/* border: 1px solid #BBBBBB; font-size: 10px; - background: #F0F8FF; + background: #F0F8FF; */ color: black; } input[type='submit'], input[type='button'] { - background: #4477AA; +/* background: #4477AA; color: white; margin: 5px; - border-color: gray; + border-color: gray; */ } .errorImg { @@ -43,12 +43,13 @@ vertical-align: top; /*width: 100%;*/ border: 1px solid #bed6f8; padding: 5px; + margin-top: 2px; /* give some space between search panel and list */ } .menuButtons { font-size: 12px; font-weight: bold; border-colour: #bed6f8; - background-color: #BED6F8; + /* background-color: #BED6F8; */ background-position: top left; } @@ -62,14 +63,14 @@ padding-right: 15px; } -.searchResults { +/*.searchResults { border-top: 1px solid #bed6f8; border-bottom:1px solid #bed6f8; border-left:1px solid #bed6f8; border-right:1px solid #bed6f8; padding: 5px; -} +}*/ /* looks better without this border */ .leftMenu { padding: 5px; vertical-align: middle; @@ -84,7 +85,7 @@ } .menuButtons a:hover { font-family: Arial,sans-serif; - background-color: white; + background-color: #bed6f8; color: #0066ff; /*#8CAFCD*/ } @@ -101,7 +102,7 @@ .footer { text-align: center; - font-size: 0.8em; + /*font-size: 0.8em;*/ /* removed to prevent blindness */ } .actionButtons { @@ -126,6 +127,20 @@ .iceDataTblOutline { width: 98%; } +/* BEGIN: make the resizable handle prettier */ +.iceDatTblResHdlr, .iceDatTblResBor, .iceDatTblBlkTd { + width: 1px; + background-color: #FFFFFF; +} +.iceDatTblBlkTd { + /*border-top: none;*/ + border-right: 1px solid #CCCCCC; + /*border-bottom: none;*/ +} +.iceDatTblBlkTd img { + display: none; +} +/* END */ .iceTblHeader { font-size:11px; color: #000000; @@ -170,11 +185,11 @@ margin: 0px; font-family: Arial,sans-serif; color: #616161; - font-size: 11px; + font-size: 12px; /* changed to prevent blindness */ } .body { - padding: 30px; + padding: 0 30px 30px 30px; } @@ -208,7 +223,7 @@ .dialog { padding: 15px; - background-color: #F0F0F0; + background-color: #e6e6e6; margin: 10px; } .dialog table @@ -225,7 +240,8 @@ .columnHeader:hover { - color: white; + /*color: white;*/ /* breaks theme */ + text-decoration: underline; } .message { @@ -255,12 +271,12 @@ color: red; text-align: left; } -.prop .errors { +/*.prop .errors { color: red; text-align: left; -} +}*/ -.errors input { +.errors input, .errors textarea { border: 1px solid red; } @@ -311,3 +327,12 @@ .iceSelInpDate { width: 90px; } +.icePnlTlTip { + background:#EDDDDD none repeat scroll; +} +.icePnlTlTipHdr{ + background:#CDBBBB url() repeat-x; +} +.iceCmdBtn{ + font-size: 16px; +} Modified: branches/Seam_2_0/seam-gen/icefaces/view/view.xhtml.ftl =================================================================== --- branches/Seam_2_0/seam-gen/icefaces/view/view.xhtml.ftl 2008-08-13 21:54:45 UTC (rev 8685) +++ branches/Seam_2_0/seam-gen/icefaces/view/view.xhtml.ftl 2008-08-13 22:04:48 UTC (rev 8686) @@ -11,7 +11,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:h="http://java.sun.com/jsf/html" - xmlns:ice="http://www.icesoft.com/icefaces/component" + xmlns:ice="http://www.icesoft.com/icefaces/component" template="layout/template.xhtml"> <ui:define name="body"> @@ -76,11 +76,11 @@ rendered="${'#'}{${homeName}.instance.${property.name} == null}"/> <ice:dataTable var="${parentName}" - value="${'#'}{${homeName}.instance.${property.name}}" - rendered="${'#'}{${homeName}.instance.${property.name} != null}" - rowClasses="rvgRowOne,rvgRowTwo" - columnClasses="allCols" - id="view${property.name}TableId"> + value="${'#'}{${homeName}.instance.${property.name}}" + rendered="${'#'}{${homeName}.instance.${property.name} != null}" + rowClasses="rvgRowOne,rvgRowTwo" + columnClasses="allCols" + id="view${property.name}TableId"> <#foreach parentProperty in parentPojo.allPropertiesIterator> <#if !c2h.isCollection(parentProperty) && !c2h.isManyToOne(parentProperty) && parentProperty != parentPojo.versionProperty!> <#if parentPojo.isComponent(parentProperty)> @@ -150,11 +150,11 @@ rendered="${'#'}{empty ${homeName}.${property.name}}"/> <ice:dataTable value="${'#'}{${homeName}.${property.name}}" - var="${childName}" - rendered="${'#'}{not empty ${homeName}.${property.name}}" - rowClasses="rvgRowOne,rvgRowTwo" - columnClasses="allCols" - id="view${property.name}TableId"> + var="${childName}" + rendered="${'#'}{not empty ${homeName}.${property.name}}" + rowClasses="rvgRowOne,rvgRowTwo" + columnClasses="allCols" + id="view${property.name}TableId"> <#foreach childProperty in childPojo.allPropertiesIterator> <#if !c2h.isCollection(childProperty) && !c2h.isManyToOne(childProperty) && childProperty != childPojo.versionProperty!> <#if childPojo.isComponent(childProperty)>

17 years, 8 months

1
0
0 / 0

Seam SVN: r8685 - trunk/src/remoting/org/jboss/seam/remoting.

by seam-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2008-08-13 17:54:45 -0400 (Wed, 13 Aug 2008) New Revision: 8685 Modified: trunk/src/remoting/org/jboss/seam/remoting/remote.js Log: JBSEAM-3261 Modified: trunk/src/remoting/org/jboss/seam/remoting/remote.js =================================================================== --- trunk/src/remoting/org/jboss/seam/remoting/remote.js 2008-08-13 18:27:29 UTC (rev 8684) +++ trunk/src/remoting/org/jboss/seam/remoting/remote.js 2008-08-13 21:54:45 UTC (rev 8685) @@ -667,7 +667,32 @@ if (inScope) Seam.Remoting.log("Response packet:\n" + req.responseText); if (callback) - callback(req.responseXML); + { + // The following code deals with a Firefox security issue. It reparses the XML + // response if accessing the documentElement throws an exception + try + { + req.responseXML.documentElement; + callback(req.responseXML); + } + catch (ex) + { + try + { + // Try it the IE way first... + var doc = new ActiveXObject("Microsoft.XMLDOM"); + doc.async = "false"; + doc.loadXML(req.responseText); + callback(doc); + } + catch (e) + { + // If that fails, use standards + var parser = new DOMParser(); + callback(parser.parseFromString(req.responseText, "text/xml")); + } + } + } } else alert("There was an error processing your request. Error code: " + req.status);

17 years, 8 months

1
0
0 / 0

Seam SVN: r8684 - in trunk/examples/dvdstore/view: admin and 1 other directories.

by seam-commits＠lists.jboss.org

Author: stan.silvert(a)jboss.com Date: 2008-08-13 14:27:29 -0400 (Wed, 13 Aug 2008) New Revision: 8684 Modified: trunk/examples/dvdstore/view/admin/accept.xhtml trunk/examples/dvdstore/view/admin/admin.xhtml trunk/examples/dvdstore/view/admin/process.xhtml trunk/examples/dvdstore/view/admin/ship.xhtml trunk/examples/dvdstore/view/browse.xhtml trunk/examples/dvdstore/view/checkout.xhtml trunk/examples/dvdstore/view/complete.xhtml trunk/examples/dvdstore/view/confirm.xhtml trunk/examples/dvdstore/view/dvd.xhtml trunk/examples/dvdstore/view/home.xhtml trunk/examples/dvdstore/view/newuser/account.xhtml trunk/examples/dvdstore/view/newuser/card.xhtml trunk/examples/dvdstore/view/newuser/complete.xhtml trunk/examples/dvdstore/view/newuser/contact.xhtml trunk/examples/dvdstore/view/showorders.xhtml Log: JBSEAM-3099 - Port JBSEAM-3048 to trunk "Add id attribute to markup for JSF components in Seam examples" Modified: trunk/examples/dvdstore/view/admin/accept.xhtml =================================================================== --- trunk/examples/dvdstore/view/admin/accept.xhtml 2008-08-13 16:18:52 UTC (rev 8683) +++ trunk/examples/dvdstore/view/admin/accept.xhtml 2008-08-13 18:27:29 UTC (rev 8684) @@ -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: trunk/examples/dvdstore/view/admin/admin.xhtml =================================================================== --- trunk/examples/dvdstore/view/admin/admin.xhtml 2008-08-13 16:18:52 UTC (rev 8683) +++ trunk/examples/dvdstore/view/admin/admin.xhtml 2008-08-13 18:27:29 UTC (rev 8684) @@ -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: trunk/examples/dvdstore/view/admin/process.xhtml =================================================================== --- trunk/examples/dvdstore/view/admin/process.xhtml 2008-08-13 16:18:52 UTC (rev 8683) +++ trunk/examples/dvdstore/view/admin/process.xhtml 2008-08-13 18:27:29 UTC (rev 8684) @@ -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: trunk/examples/dvdstore/view/admin/ship.xhtml =================================================================== --- trunk/examples/dvdstore/view/admin/ship.xhtml 2008-08-13 16:18:52 UTC (rev 8683) +++ trunk/examples/dvdstore/view/admin/ship.xhtml 2008-08-13 18:27:29 UTC (rev 8684) @@ -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">  <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: trunk/examples/dvdstore/view/browse.xhtml =================================================================== --- trunk/examples/dvdstore/view/browse.xhtml 2008-08-13 16:18:52 UTC (rev 8683) +++ trunk/examples/dvdstore/view/browse.xhtml 2008-08-13 18:27:29 UTC (rev 8684) @@ -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: trunk/examples/dvdstore/view/checkout.xhtml =================================================================== --- trunk/examples/dvdstore/view/checkout.xhtml 2008-08-13 16:18:52 UTC (rev 8683) +++ trunk/examples/dvdstore/view/checkout.xhtml 2008-08-13 18:27:29 UTC (rev 8684) @@ -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: trunk/examples/dvdstore/view/complete.xhtml =================================================================== --- trunk/examples/dvdstore/view/complete.xhtml 2008-08-13 16:18:52 UTC (rev 8683) +++ trunk/examples/dvdstore/view/complete.xhtml 2008-08-13 18:27:29 UTC (rev 8684) @@ -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: trunk/examples/dvdstore/view/confirm.xhtml =================================================================== --- trunk/examples/dvdstore/view/confirm.xhtml 2008-08-13 16:18:52 UTC (rev 8683) +++ trunk/examples/dvdstore/view/confirm.xhtml 2008-08-13 18:27:29 UTC (rev 8684) @@ -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: trunk/examples/dvdstore/view/dvd.xhtml =================================================================== --- trunk/examples/dvdstore/view/dvd.xhtml 2008-08-13 16:18:52 UTC (rev 8683) +++ trunk/examples/dvdstore/view/dvd.xhtml 2008-08-13 18:27:29 UTC (rev 8684) @@ -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: trunk/examples/dvdstore/view/home.xhtml =================================================================== --- trunk/examples/dvdstore/view/home.xhtml 2008-08-13 16:18:52 UTC (rev 8683) +++ trunk/examples/dvdstore/view/home.xhtml 2008-08-13 18:27:29 UTC (rev 8684) @@ -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: trunk/examples/dvdstore/view/newuser/account.xhtml =================================================================== --- trunk/examples/dvdstore/view/newuser/account.xhtml 2008-08-13 16:18:52 UTC (rev 8683) +++ trunk/examples/dvdstore/view/newuser/account.xhtml 2008-08-13 18:27:29 UTC (rev 8684) @@ -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: trunk/examples/dvdstore/view/newuser/card.xhtml =================================================================== --- trunk/examples/dvdstore/view/newuser/card.xhtml 2008-08-13 16:18:52 UTC (rev 8683) +++ trunk/examples/dvdstore/view/newuser/card.xhtml 2008-08-13 18:27:29 UTC (rev 8684) @@ -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: trunk/examples/dvdstore/view/newuser/complete.xhtml =================================================================== --- trunk/examples/dvdstore/view/newuser/complete.xhtml 2008-08-13 16:18:52 UTC (rev 8683) +++ trunk/examples/dvdstore/view/newuser/complete.xhtml 2008-08-13 18:27:29 UTC (rev 8684) @@ -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: trunk/examples/dvdstore/view/newuser/contact.xhtml =================================================================== --- trunk/examples/dvdstore/view/newuser/contact.xhtml 2008-08-13 16:18:52 UTC (rev 8683) +++ trunk/examples/dvdstore/view/newuser/contact.xhtml 2008-08-13 18:27:29 UTC (rev 8684) @@ -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: trunk/examples/dvdstore/view/showorders.xhtml =================================================================== --- trunk/examples/dvdstore/view/showorders.xhtml 2008-08-13 16:18:52 UTC (rev 8683) +++ trunk/examples/dvdstore/view/showorders.xhtml 2008-08-13 18:27:29 UTC (rev 8684) @@ -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>

17 years, 8 months

1
0
0 / 0

Seam SVN: r8683 - trunk/build.

by seam-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-08-13 12:18:52 -0400 (Wed, 13 Aug 2008) New Revision: 8683 Modified: trunk/build/root.pom.xml Log: JBSEAM-3255 Modified: trunk/build/root.pom.xml =================================================================== --- trunk/build/root.pom.xml 2008-08-13 15:40:32 UTC (rev 8682) +++ trunk/build/root.pom.xml 2008-08-13 16:18:52 UTC (rev 8683) @@ -212,7 +212,7 @@ <dependency> <groupId>javax.faces</groupId> <artifactId>jsf-impl</artifactId> - <version>1.2_04-p02</version> + <version>1.2_09-BETA1</version> <exclusions> <exclusion> <groupId>commons-collections</groupId> @@ -238,7 +238,7 @@ <dependency> <groupId>jboss</groupId> <artifactId>jboss-cache</artifactId> - <version>1.4.1.SP8</version> + <version>1.4.1.SP9</version> </dependency> <dependency> @@ -404,7 +404,7 @@ <dependency> <groupId>jboss</groupId> <artifactId>jboss-system</artifactId> - <version>4.2.0.GA</version> + <version>4.2.3.GA</version> </dependency> <dependency> @@ -458,7 +458,7 @@ <dependency> <groupId>jboss</groupId> <artifactId>jboss-jmx</artifactId> - <version>4.2.0.GA</version> + <version>4.2.3.GA</version> </dependency>  @@ -473,7 +473,7 @@ <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> - <version>3.3.GA</version> + <version>3.8.0.GA</version> </dependency>  @@ -868,7 +868,7 @@ <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> - <version>1.6.1</version> + <version>1.6.1-brew</version> <exclusions> <exclusion> <groupId>xml-apis</groupId> @@ -925,6 +925,14 @@ <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </exclusion> </exclusions> </dependency> @@ -1017,7 +1025,7 @@ <dependency> <groupId>hsqldb</groupId> <artifactId>hsqldb</artifactId> - <version>1.8.0.2</version> + <version>1.8.0.8-brew</version> </dependency> <dependency>

17 years, 8 months

1
0
0 / 0

Seam SVN: r8682 - branches/Seam_2_0/doc/Seam_Reference_Guide/en-US.

by seam-commits＠lists.jboss.org

Author: jbalunas(a)redhat.com Date: 2008-08-13 11:40:32 -0400 (Wed, 13 Aug 2008) New Revision: 8682 Modified: branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Configuration.xml branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Dependencies.xml branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Gettingstarted.xml branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Testing.xml Log: JBSEAM-3178 - updated JDK 6 information Modified: branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Configuration.xml =================================================================== --- branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Configuration.xml 2008-08-13 15:32:26 UTC (rev 8681) +++ branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Configuration.xml 2008-08-13 15:40:32 UTC (rev 8682) @@ -707,7 +707,8 @@ <para> Embedded JBoss must by installed into Tomcat for Seam applications - to run correctly on it. Embedded JBoss only runs on JDK 1.5 (not JDK 1.6). + to run correctly on it. Embedded JBoss runs with JDK 5 or JDK 6 ( + see <xref linkend="jdk_dependencies" /> for details on using JDK 6). Embedded JBoss can be downloaded <ulink url="http://sourceforge.net/project/showfiles.php?group_id=22866&package_i...">here</ulink>. The process for installing Embedded JBoss into Tomcat 6 is quite Modified: branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Dependencies.xml =================================================================== --- branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Dependencies.xml 2008-08-13 15:32:26 UTC (rev 8681) +++ branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Dependencies.xml 2008-08-13 15:40:32 UTC (rev 8682) @@ -4,6 +4,40 @@ <chapter id="dependencies"> <title>Dependencies</title> + <section id="jdk_dependencies"> + <title>JDK Dependencies</title> + + <para> + Seam does not work with JDK 1.4 and requires JDK 5 or above as it uses + annotations and other JDK 5.0 features.. Seam has been thoroughly tested + using Sun's JDKs. However there are no known issues specific to Seam with + other JDK's. + </para> + + <section id="jdk6_dependencies"> + <title>Sun's JDK 6 Considerations</title> + <para> + Earlier versions of Sun's JDK 6 contained an incompatible + version of JAXB and required overriding it using the "endorsed" + directory. Sun's JDK6 Update 4 release upgraded to JAXB 2.1 and + removed this requirement. When building, testing, or executing be + sure to use this version or higher. + </para> + + <para> + Seam used JBoss Embedded in its unit and integration testing. This + has an additional requirement when using JDK 6. In order to run + JBoss Embedded with JDK 6 you need to set the following JVM argument: + + <programlisting>-Dsun.lang.ClassLoader.allowArraySyntax=true</programlisting> + + Seam's internal build system is setting this by default when it + executes Seam's test suite. However if you are also using JBoss + Embedded for your testing you will need to set this value. + </para> + </section> + </section> + <section> <title>Project Dependencies</title> Modified: branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Gettingstarted.xml =================================================================== --- branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Gettingstarted.xml 2008-08-13 15:32:26 UTC (rev 8681) +++ branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Gettingstarted.xml 2008-08-13 15:40:32 UTC (rev 8682) @@ -24,7 +24,8 @@ <section> <title>Before you start</title> - <para>Make sure you have JDK 5 or JDK 6, JBoss AS 4.2 and Ant 1.6, along with recent versions of Eclipse, the + <para>Make sure you have JDK 5 or JDK 6 (see <xref linkend="jdk_dependencies"/> + for details), JBoss AS 4.2 and Ant 1.6, along with recent versions of Eclipse, the JBoss IDE plugin for Eclipse and the TestNG plugin for Eclipse correctly installed before starting. Add your JBoss installation to the JBoss Server View in Eclipse. Start JBoss in debug mode. Finally, start a command prompt in the directory where you unzipped the Seam distribution.</para> Modified: branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Testing.xml =================================================================== --- branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Testing.xml 2008-08-13 15:32:26 UTC (rev 8681) +++ branches/Seam_2_0/doc/Seam_Reference_Guide/en-US/Testing.xml 2008-08-13 15:40:32 UTC (rev 8682) @@ -103,8 +103,8 @@ <para> The approach taken by Seam is to let you write tests that exercise your components while running inside a pruned down container environment (Seam, - together with the JBoss Embedded container; n.b. JBoss Embedded requires - JDK 1.5 and does not work with JDK 1.6). + together with the JBoss Embedded container; see + <xref linkend="config.install.embedded" /> for configuration details). </para> <programlisting role="JAVA"><![CDATA[public class RegisterTest extends SeamTest

17 years, 8 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

seam-commits August 2008