Author: vdedik Date: 2013-03-18 07:43:41 -0400 (Mon, 18 Mar 2013) New Revision: 15457 Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/util/TypeInfo.ftl branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/editproperty.xhtml.ftl branches/enterprise/WFK-2_1/jboss-seam/src/main/resources/META-INF/faces-config.xml Log: fix of the fix for bz 875867 Modified: branches/enterprise/WFK-2_1/jboss-seam/src/main/resources/META-INF/faces-config.xml =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam/src/main/resources/META-INF/faces-config.xml 2013-03-18 09:38:02 UTC (rev 15456) +++ branches/enterprise/WFK-2_1/jboss-seam/src/main/resources/META-INF/faces-config.xml 2013-03-18 11:43:41 UTC (rev 15457) @@ -25,8 +25,4 @@ <phase-listener>org.jboss.seam.document.DocumentStorePhaseListener</phase-listener> </lifecycle> - <converter> - <converter-id>javax.faces.DateTime</converter-id> - <converter-class>org.jboss.seam.ui.converter.DateTimeConverter</converter-class> - </converter> </faces-config> Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/util/TypeInfo.ftl =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/util/TypeInfo.ftl 2013-03-18 09:38:02 UTC (rev 15456) +++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/util/TypeInfo.ftl 2013-03-18 11:43:41 UTC (rev 15457) @@ -39,15 +39,15 @@ <#assign padding = ""?left_pad(indent)/> <#if isDate(property)> ${padding}<h:outputText value="${expression}"> -${padding} <f:convertDateTime type="date" dateStyle="short"/> +${padding} <s:convertDateTime type="date" dateStyle="short"/> ${padding}</h:outputText> <#elseif isTime(property)> ${padding}<h:outputText value="${expression}"> -${padding} <f:convertDateTime type="time"/> +${padding} <s:convertDateTime type="time"/> ${padding}</h:outputText> <#elseif isTimestamp(property)> ${padding}<h:outputText value="${expression}"> -${padding} <f:convertDateTime type="both" dateStyle="short"/> +${padding} <s:convertDateTime type="both" dateStyle="short"/> ${padding}</h:outputText> <#elseif isBigDecimal(property)> ${padding}<h:outputText value="${expression}"> Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/editproperty.xhtml.ftl =================================================================== --- branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/editproperty.xhtml.ftl 2013-03-18 09:38:02 UTC (rev 15456) +++ branches/enterprise/WFK-2_1/jboss-seam-gen/dist/view/editproperty.xhtml.ftl 2013-03-18 11:43:41 UTC (rev 15457) @@ -25,7 +25,7 @@ required="true" </#if> value="${'#'}{${homeName}.instance.${property.name}.${componentProperty.name}}"> - <f:convertDateTime type="time"/> + <s:convertDateTime type="time"/> <a:ajax event="blur" render="${componentProperty.name}Field" bypassUpdates="true"/> </h:inputText> <#elseif isTimestamp(componentProperty)> @@ -136,7 +136,7 @@ required="true" </#if> value="${'#'}{${homeName}.instance.${property.name}}"> - <f:convertDateTime type="time"/> + <s:convertDateTime type="time"/> <a:ajax event="blur" render="${property.name}Field" bypassUpdates="true"/> </h:inputText> <#elseif isTimestamp(property)>